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

fix: handle empty FBs properly in TB and GL [develop] (#35190)

Browse Source 
fix: handle empty FBs properly in TB and GL
This commit is contained in:
Anand Baburajan 2023-05-08 16:54:00 +05:30 committed by GitHub
parent 446f3d12eb
commit 5a3acab110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,12 +546,13 @@ def apply_additional_conditions(doctype, query, from_date, ignore_closing_entrie
) )
query = query.where( query = query.where(
(gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(company_fb)])) (gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
| (gl_entry.finance_book.isnull()) | (gl_entry.finance_book.isnull())
) )
else: else:
query = query.where( query = query.where(
(gl_entry.finance_book.isin([cstr(filters.finance_book)])) | (gl_entry.finance_book.isnull()) (gl_entry.finance_book.isin([cstr(filters.finance_book), ""]))
| (gl_entry.finance_book.isnull())
) )
if accounting_dimensions: if accounting_dimensions:

8
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@ -253,14 +253,14 @@ def get_conditions(filters):
_("To use a different finance book, please uncheck 'Include Default Book Entries'") _("To use a different finance book, please uncheck 'Include Default Book Entries'")
) )
else: else:
conditions.append("(finance_book in (%(finance_book)s) OR finance_book IS NULL)") conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
else: else:
conditions.append("(finance_book in (%(company_fb)s) OR finance_book IS NULL)") conditions.append("(finance_book in (%(company_fb)s, '') OR finance_book IS NULL)")
else: else:
if filters.get("finance_book"): if filters.get("finance_book"):
conditions.append("(finance_book in (%(finance_book)s) OR finance_book IS NULL)") conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
else: else:
conditions.append("(finance_book IS NULL)") conditions.append("(finance_book in ('') OR finance_book IS NULL)")
if not filters.get("show_cancelled_entries"): if not filters.get("show_cancelled_entries"):
conditions.append("is_cancelled = 0") conditions.append("is_cancelled = 0")

4
erpnext/accounts/report/trial_balance/trial_balance.py
View File

@ -256,12 +256,12 @@ def get_opening_balance(
) )
opening_balance = opening_balance.where( opening_balance = opening_balance.where(
(closing_balance.finance_book.isin([cstr(filters.finance_book), cstr(company_fb)])) (closing_balance.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
| (closing_balance.finance_book.isnull()) | (closing_balance.finance_book.isnull())
) )
else: else:
opening_balance = opening_balance.where( opening_balance = opening_balance.where(
(closing_balance.finance_book.isin([cstr(filters.finance_book)])) (closing_balance.finance_book.isin([cstr(filters.finance_book), ""]))
| (closing_balance.finance_book.isnull()) | (closing_balance.finance_book.isnull())
) )