Merge branch 'hotfix' into kennethsequeira-patch-2

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -487,13 +487,8 @@ class ReceivablePayableReport(object):
 			conditions.append("company=%s")
 			values.append(self.filters.company)
 
-		company_finance_book = erpnext.get_default_finance_book(self.filters.company)
+		if self.filters.finance_book:
-
-		if not self.filters.finance_book or (self.filters.finance_book == company_finance_book):
 			conditions.append("ifnull(finance_book,'') in (%s, '')")
-			values.append(company_finance_book)
-		elif self.filters.finance_book:
-			conditions.append("ifnull(finance_book,'') = %s")
 			values.append(self.filters.finance_book)
 
 		if self.filters.get(party_type_field):

erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py

@@ -31,11 +31,8 @@ def get_data(filters):
 
 		filters_data.append(["against_voucher", "in", assets])
 
-	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if filters.get("finance_book"):
-	if (not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book)):
 		filters_data.append(["finance_book", "in", ['', filters.get('finance_book')]])
-	elif filters.get("finance_book"):
-		filters_data.append(["finance_book", "=", filters.get('finance_book')])
 
 	gl_entries = frappe.get_all('GL Entry',
 		filters= filters_data,

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

@@ -101,7 +101,7 @@ def get_income_expense_data(companies, fiscal_year, filters):
 	net_profit_loss = get_net_profit_loss(income, expense, companies, filters.company, company_currency, True)
 
 	return income, expense, net_profit_loss
-	
+
 def get_cash_flow_data(fiscal_year, companies, filters):
 	cash_flow_accounts = get_cash_flow_accounts()
 
@@ -123,7 +123,7 @@ def get_cash_flow_data(fiscal_year, companies, filters):
 			# add first net income in operations section
 			if net_profit_loss:
 				net_profit_loss.update({
-					"indent": 1, 
+					"indent": 1,
 					"parent_account": cash_flow_accounts[0]['section_header']
 				})
 				data.append(net_profit_loss)
@@ -327,7 +327,7 @@ def set_gl_entries_by_account(from_date, to_date, root_lft, root_rgt, filters, g
 	accounts_by_name, ignore_closing_entries=False):
 	"""Returns a dict like { "account": [gl entries], ... }"""
 
-	company_lft, company_rgt = frappe.get_cached_value('Company', 
+	company_lft, company_rgt = frappe.get_cached_value('Company',
 		filters.get('company'),  ["lft", "rgt"])
 
 	additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters)
@@ -354,7 +354,8 @@ def set_gl_entries_by_account(from_date, to_date, root_lft, root_rgt, filters, g
 				"to_date": to_date,
 				"lft": root_lft,
 				"rgt": root_rgt,
-				"company": d.name
+				"company": d.name,
+				"finance_book": filters.get("finance_book")
 			},
 			as_dict=True)
 
@@ -384,14 +385,8 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 	if from_date:
 		additional_conditions.append("gl.posting_date >= %(from_date)s")
 
-	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if filters.get("finance_book"):
-
+		additional_conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
-	if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
-		additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
-			frappe.db.escape(company_finance_book))
-	elif filters.get("finance_book"):
-		additional_conditions.append("ifnull(finance_book, '') = '%s' " %
-			frappe.db.escape(filters.get("finance_book")))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py

@@ -184,12 +184,8 @@ class PartyLedgerSummaryReport(object):
 		if self.filters.company:
 			conditions.append("gle.company=%(company)s")
 
-		self.filters.company_finance_book = erpnext.get_default_finance_book(self.filters.company)
+		if self.filters.finance_book:
-
+			conditions.append("ifnull(finance_book,'') in (%(finance_book)s, '')")
-		if not self.filters.finance_book or (self.filters.finance_book == self.filters.company_finance_book):
-			conditions.append("ifnull(finance_book,'') in (%(company_finance_book)s, '')")
-		elif self.filters.finance_book:
-			conditions.append("ifnull(finance_book,'') = %(finance_book)s")
 
 		if self.filters.get("party"):
 			conditions.append("party=%(party)s")

erpnext/accounts/report/financial_statements.py

@@ -392,14 +392,8 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 			filters.cost_center = get_cost_centers_with_children(filters.cost_center)
 			additional_conditions.append("cost_center in %(cost_center)s")
 
-		company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+		if filters.get("finance_book"):
-
+			additional_conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
-		if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
-			additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
-				frappe.db.escape(company_finance_book))
-		elif filters.get("finance_book"):
-			additional_conditions.append("ifnull(finance_book, '') = '%s' " %
-				frappe.db.escape(filters.get("finance_book")))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -186,12 +186,8 @@ def get_conditions(filters):
 	if filters.get("project"):
 		conditions.append("project in %(project)s")
 
-	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if filters.get("finance_book"):
-	if not filters.get("finance_book") or (filters.get("finance_book") == company_finance_book):
-		filters['finance_book'] = company_finance_book
 		conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
-	elif filters.get("finance_book"):
-		conditions.append("ifnull(finance_book, '') = %(finance_book)s")
 
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")

erpnext/projects/report/billing_summary.py

@@ -54,9 +54,6 @@ def get_data(filters):
 	data = []
 	record = get_records(filters)
 
-	billable_hours_worked = 0
-	hours_worked = 0
-	working_cost = 0
 	for entries in record:
 		total_hours = 0
 		total_billable_hours = 0
@@ -81,11 +78,6 @@ def get_data(filters):
 				total_hours, total_billable_hours, total_amount = get_billable_and_total_hours(activity,
 					time_end, time_start, total_hours, total_billable_hours, total_amount)
 
-
-		hours_worked += total_hours
-		billable_hours_worked += total_billable_hours
-		working_cost += total_amount
-
 		row = {
 			"employee": entries.employee,
 			"employee_name": entries.employee_name,
@@ -97,14 +89,6 @@ def get_data(filters):
 		if entries_exists:
 			data.append(row)
 			entries_exists = False
-
-	total = {
-		"total_billable_hours": billable_hours_worked,
-		"total_hours": hours_worked,
-		"amount": working_cost
-	}
-	if billable_hours_worked !=0 or hours_worked !=0 or working_cost !=0:
-		data.append(total)
 	return data
 
 def get_records(filters):

erpnext/projects/report/employee_billing_summary/employee_billing_summary.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "creation": "2019-03-08 15:08:19.929728", 
  "disable_prepared_report": 0, 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2019-03-08 15:08:19.929728", 
+ "modified": "2019-04-16 17:29:18.376932", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Employee Billing Summary", 

erpnext/projects/report/project_billing_summary/project_billing_summary.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "creation": "2019-03-11 16:22:39.460524", 
  "disable_prepared_report": 0, 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2019-03-11 16:22:39.460524", 
+ "modified": "2019-04-16 17:28:32.749633", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project Billing Summary",