From c207b8425c2acf331846ea1ea2505b503cde67f4 Mon Sep 17 00:00:00 2001 From: S Sakthivel Murugan Date: Mon, 1 Jun 2026 15:58:45 +0530 Subject: [PATCH] fix(accounts): allow process statement of account generation with opening entries (cherry picked from commit d0f1239d2be5112c005c618fa329a7d125e89636) # Conflicts: # erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json --- .../process_statement_of_accounts.json | 26 ++++++++++++++++++- .../process_statement_of_accounts.py | 3 ++- 2 files changed, 27 insertions(+), 2 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 5c451dc55c2..1384fbfa241 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 @@ "categorize_by", "cost_center", "territory", + "show_opening_entries", "ignore_exchange_rate_revaluation_journals", "ignore_cr_dr_notes", "column_break_14", @@ -399,10 +400,33 @@ "fieldtype": "Select", "label": "Categorize By", "options": "\nCategorize by Voucher\nCategorize by Voucher (Consolidated)" +<<<<<<< HEAD +======= + }, + { + "default": "0", + "depends_on": "eval:(doc.report == 'Accounts Receivable');", + "fieldname": "show_future_payments", + "fieldtype": "Check", + "label": "Show Future Payments" + }, + { + "fieldname": "print_format", + "fieldtype": "Link", + "label": "Print Format", + "options": "Print Format" + }, + { + "default": "0", + "depends_on": "eval:(doc.report == 'General Ledger');", + "fieldname": "show_opening_entries", + "fieldtype": "Check", + "label": "Show Opening Entries" +>>>>>>> d0f1239d2b (fix(accounts): allow process statement of account generation with opening entries) } ], "links": [], - "modified": "2025-10-07 12:19:20.719898", + "modified": "2026-06-01 15:37:07.660442", "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 bf130db8e22..2abdb4f718e 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 @@ -73,6 +73,7 @@ class ProcessStatementOfAccounts(Document): sales_person: DF.Link | None sender: DF.Link | None show_net_values_in_party_account: DF.Check + show_opening_entries: DF.Check show_remarks: DF.Check start_date: DF.Date | None subject: DF.Data | None @@ -249,7 +250,7 @@ def get_gl_filters(doc, entry, tax_id, presentation_currency): "categorize_by": doc.categorize_by, "currency": doc.currency, "project": [p.project_name for p in doc.project], - "show_opening_entries": 0, + "show_opening_entries": doc.show_opening_entries, "include_default_book_entries": 0, "tax_id": tax_id if tax_id else None, "show_net_values_in_party_account": doc.show_net_values_in_party_account,