From 774db567621e3b0b7393f85faa93686e7be950b9 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 13 Aug 2024 10:37:55 +0530 Subject: [PATCH 1/4] refactor: combine vouchers from both ignore (cherry picked from commit 4cc5cd5a71fbc434ca7e95b24b9b7a491840854a) --- erpnext/accounts/report/general_ledger/general_ledger.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 63e57438fca..2564eb0800f 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -248,7 +248,10 @@ def get_conditions(filters): as_list=True, ) 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"): conditions.append("voucher_no not in %(voucher_no_not_in)s") From 19dfeca96d1d623acfb04bde765027f337ebadbf Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 13 Aug 2024 10:41:31 +0530 Subject: [PATCH 2/4] refactor: cr and dr note filter in Statement of Accounts (cherry picked from commit 0cf478c4c26f61b1e23195a27468f69cbb21b7b4) # Conflicts: # erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json --- .../process_statement_of_accounts.json | 11 +++++++++++ .../process_statement_of_accounts.py | 1 + 2 files changed, 12 insertions(+) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json index ae6059c0057..545ea22d799 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json @@ -16,6 +16,7 @@ "cost_center", "territory", "ignore_exchange_rate_revaluation_journals", + "ignore_cr_dr_notes", "column_break_14", "to_date", "finance_book", @@ -383,10 +384,20 @@ "fieldname": "ignore_exchange_rate_revaluation_journals", "fieldtype": "Check", "label": "Ignore Exchange Rate Revaluation Journals" + }, + { + "default": "0", + "fieldname": "ignore_cr_dr_notes", + "fieldtype": "Check", + "label": "Ignore System Generated Credit / Debit Notes" } ], "links": [], +<<<<<<< HEAD "modified": "2023-12-18 12:20:08.965120", +======= + "modified": "2024-08-13 10:41:18.381165", +>>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts) "modified_by": "Administrator", "module": "Accounts", "name": "Process Statement Of Accounts", diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py index e0ec144e314..43951ac5046 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py @@ -54,6 +54,7 @@ class ProcessStatementOfAccounts(Document): frequency: DF.Literal["Weekly", "Monthly", "Quarterly"] from_date: DF.Date | None group_by: DF.Literal["", "Group by Voucher", "Group by Voucher (Consolidated)"] + ignore_cr_dr_notes: DF.Check ignore_exchange_rate_revaluation_journals: DF.Check include_ageing: DF.Check include_break: DF.Check From f3401243be08d70150a257e2004eca5df0f5334c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 13 Aug 2024 10:42:32 +0530 Subject: [PATCH 3/4] refactor: pass filter to General Ledger (cherry picked from commit 90880c8c01642cd40782f51c08d30d0896ac066e) --- .../process_statement_of_accounts.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py index 43951ac5046..509199ccae6 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py @@ -134,6 +134,9 @@ def get_statement_dict(doc, get_statement_dict=False): if doc.ignore_exchange_rate_revaluation_journals: filters.update({"ignore_err": True}) + if doc.ignore_cr_dr_notes: + filters.update({"ignore_cr_dr_notes": True}) + if doc.report == "General Ledger": filters.update(get_gl_filters(doc, entry, tax_id, presentation_currency)) col, res = get_soa(filters) From 70d5593aceca5a6aa5f86cab985f86d0bd0f02cd Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 13 Aug 2024 11:21:09 +0530 Subject: [PATCH 4/4] chore: resolve conflict --- .../process_statement_of_accounts.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json index 545ea22d799..22be5299280 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json @@ -393,11 +393,7 @@ } ], "links": [], -<<<<<<< HEAD - "modified": "2023-12-18 12:20:08.965120", -======= "modified": "2024-08-13 10:41:18.381165", ->>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts) "modified_by": "Administrator", "module": "Accounts", "name": "Process Statement Of Accounts",