schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42734 from frappe/mergify/bp/version-14-hotfix/pr-42733

Browse Source 
refactor: add a new filter flag in Process Statement of Accounts (backport #42733)
This commit is contained in:
ruthra kumar
2024-08-13 11:49:19 +05:30
committed by GitHub
parent 34662e6e3c e421e16fdc
commit a5b5b5e62c
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
View File

@@ -16,6 +16,7 @@
"cost_center", "cost_center",
"territory", "territory",
"ignore_exchange_rate_revaluation_journals", "ignore_exchange_rate_revaluation_journals",
"ignore_cr_dr_notes",
"column_break_14", "column_break_14",
"to_date", "to_date",
"finance_book", "finance_book",
@@ -381,10 +382,16 @@
"fieldname": "ignore_exchange_rate_revaluation_journals", "fieldname": "ignore_exchange_rate_revaluation_journals",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Ignore Exchange Rate Revaluation Journals" "label": "Ignore Exchange Rate Revaluation Journals"
},
{
"default": "0",
"fieldname": "ignore_cr_dr_notes",
"fieldtype": "Check",
"label": "Ignore System Generated Credit / Debit Notes"
} }
], ],
"links": [], "links": [],
"modified": "2023-12-18 12:20:08.965120", "modified": "2024-08-13 10:41:18.381165",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Statement Of Accounts", "name": "Process Statement Of Accounts",

3
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@@ -79,6 +79,9 @@ def get_statement_dict(doc, get_statement_dict=False):
if doc.ignore_exchange_rate_revaluation_journals: if doc.ignore_exchange_rate_revaluation_journals:
filters.update({"ignore_err": True}) filters.update({"ignore_err": True})
if doc.ignore_cr_dr_notes:
filters.update({"ignore_cr_dr_notes": True})
if doc.report == "General Ledger": if doc.report == "General Ledger":
filters.update(get_gl_filters(doc, entry, tax_id, presentation_currency)) filters.update(get_gl_filters(doc, entry, tax_id, presentation_currency))
col, res = get_soa(filters) col, res = get_soa(filters)

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

@@ -246,7 +246,10 @@ def get_conditions(filters):
as_list=True, as_list=True,
) )
if system_generated_cr_dr_journals: if system_generated_cr_dr_journals:
filters.update({"voucher_no_not_in": [x[0] for x in system_generated_cr_dr_journals]}) vouchers_to_ignore = (filters.get("voucher_no_not_in") or []) + [
x[0] for x in system_generated_cr_dr_journals
]
filters.update({"voucher_no_not_in": vouchers_to_ignore})
if filters.get("voucher_no_not_in"): if filters.get("voucher_no_not_in"):
conditions.append("voucher_no not in %(voucher_no_not_in)s") conditions.append("voucher_no not in %(voucher_no_not_in)s")