Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Do not show any finance book record if no finance book filter is applied

Browse Source
This commit is contained in:
Deepesh Garg 2020-01-30 15:33:51 +05:30
parent 7fda3a12cc
commit ce04526db8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/cash_flow/cash_flow.py
View File

@ -136,6 +136,8 @@ def get_account_type_based_gl_data(company, start_date, end_date, account_type,
cond = """ AND (finance_book in (%s, %s, '') OR finance_book IS NULL) cond = """ AND (finance_book in (%s, %s, '') OR finance_book IS NULL)
""" %(frappe.db.escape(filters.finance_book), frappe.db.escape(company_fb)) """ %(frappe.db.escape(filters.finance_book), frappe.db.escape(company_fb))
else:
cond = "AND (finance_book = '' OR finance_book IS NULL)"
gl_sum = frappe.db.sql_list(""" gl_sum = frappe.db.sql_list("""
select sum(credit) - sum(debit) select sum(credit) - sum(debit)

6
erpnext/accounts/report/financial_statements.py
View File

@ -13,7 +13,7 @@ import frappe, erpnext
from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
from frappe import _ from frappe import _
from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate) from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate, cstr)
from six import itervalues from six import itervalues
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
@ -356,7 +356,7 @@ def set_gl_entries_by_account(
"company": company, "company": company,
"from_date": from_date, "from_date": from_date,
"to_date": to_date, "to_date": to_date,
"finance_book": filters.get("finance_book") "finance_book": cstr(filters.get("finance_book"))
} }
if filters.get("include_default_book_entries"): if filters.get("include_default_book_entries"):
@ -411,6 +411,8 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
additional_conditions.append("(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)") additional_conditions.append("(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)")
else: else:
additional_conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)") additional_conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
else:
additional_conditions.append("(finance_book = '' OR finance_book IS NULL)")
if accounting_dimensions: if accounting_dimensions:
for dimension in accounting_dimensions: for dimension in accounting_dimensions: