From 083382399faf7eb3b95c4db29d884a92c65f1eed Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 18 Oct 2024 18:02:25 +0530 Subject: [PATCH 1/2] fix: "show_remarks" checkbox in Process statement of accounts (cherry picked from commit f4600df1f718440698aa98d460178f3e1f9ab430) # Conflicts: # erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py --- .../process_statement_of_accounts.json | 9 ++- .../process_statement_of_accounts.py | 59 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) 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 8584cbb31cb..27f7853410b 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 @@ -25,6 +25,7 @@ "payment_terms_template", "sales_partner", "sales_person", + "show_remarks", "based_on_payment_terms", "section_break_3", "customer_collection", @@ -388,10 +389,16 @@ "fieldname": "ignore_cr_dr_notes", "fieldtype": "Check", "label": "Ignore System Generated Credit / Debit Notes" + }, + { + "default": "0", + "fieldname": "show_remarks", + "fieldtype": "Check", + "label": "Show Remarks" } ], "links": [], - "modified": "2024-08-13 10:41:18.381165", + "modified": "2024-10-18 17:51:39.108481", "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 078ac034eeb..e5aa204ea1a 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 @@ -22,6 +22,64 @@ from erpnext.accounts.report.general_ledger.general_ledger import execute as get class ProcessStatementOfAccounts(Document): +<<<<<<< HEAD +======= + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.accounts.doctype.process_statement_of_accounts_customer.process_statement_of_accounts_customer import ( + ProcessStatementOfAccountsCustomer, + ) + from erpnext.accounts.doctype.psoa_cost_center.psoa_cost_center import PSOACostCenter + from erpnext.accounts.doctype.psoa_project.psoa_project import PSOAProject + + account: DF.Link | None + ageing_based_on: DF.Literal["Due Date", "Posting Date"] + based_on_payment_terms: DF.Check + body: DF.TextEditor | None + cc_to: DF.Link | None + collection_name: DF.DynamicLink | None + company: DF.Link + cost_center: DF.TableMultiSelect[PSOACostCenter] + currency: DF.Link | None + customer_collection: DF.Literal["", "Customer Group", "Territory", "Sales Partner", "Sales Person"] + customers: DF.Table[ProcessStatementOfAccountsCustomer] + enable_auto_email: DF.Check + filter_duration: DF.Int + finance_book: DF.Link | None + 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 + letter_head: DF.Link | None + orientation: DF.Literal["Landscape", "Portrait"] + payment_terms_template: DF.Link | None + pdf_name: DF.Data | None + posting_date: DF.Date | None + primary_mandatory: DF.Check + project: DF.TableMultiSelect[PSOAProject] + report: DF.Literal["General Ledger", "Accounts Receivable"] + sales_partner: DF.Link | None + sales_person: DF.Link | None + sender: DF.Link | None + show_net_values_in_party_account: DF.Check + show_remarks: DF.Check + start_date: DF.Date | None + subject: DF.Data | None + terms_and_conditions: DF.Link | None + territory: DF.Link | None + to_date: DF.Date | None + # end: auto-generated types + +>>>>>>> f4600df1f7 (fix: "show_remarks" checkbox in Process statement of accounts) def validate(self): if not self.subject: self.subject = "Statement Of Accounts for {{ customer.customer_name }}" @@ -132,6 +190,7 @@ def get_common_filters(doc): "finance_book": doc.finance_book if doc.finance_book else None, "account": [doc.account] if doc.account else None, "cost_center": [cc.cost_center_name for cc in doc.cost_center], + "show_remarks": doc.show_remarks, } ) From beb53184465067f20acc0719f1478b670f4bca61 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 21 Oct 2024 12:21:51 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- .../process_statement_of_accounts.py | 58 ------------------- 1 file changed, 58 deletions(-) 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 e5aa204ea1a..06c037dba84 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 @@ -22,64 +22,6 @@ from erpnext.accounts.report.general_ledger.general_ledger import execute as get class ProcessStatementOfAccounts(Document): -<<<<<<< HEAD -======= - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - from erpnext.accounts.doctype.process_statement_of_accounts_customer.process_statement_of_accounts_customer import ( - ProcessStatementOfAccountsCustomer, - ) - from erpnext.accounts.doctype.psoa_cost_center.psoa_cost_center import PSOACostCenter - from erpnext.accounts.doctype.psoa_project.psoa_project import PSOAProject - - account: DF.Link | None - ageing_based_on: DF.Literal["Due Date", "Posting Date"] - based_on_payment_terms: DF.Check - body: DF.TextEditor | None - cc_to: DF.Link | None - collection_name: DF.DynamicLink | None - company: DF.Link - cost_center: DF.TableMultiSelect[PSOACostCenter] - currency: DF.Link | None - customer_collection: DF.Literal["", "Customer Group", "Territory", "Sales Partner", "Sales Person"] - customers: DF.Table[ProcessStatementOfAccountsCustomer] - enable_auto_email: DF.Check - filter_duration: DF.Int - finance_book: DF.Link | None - 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 - letter_head: DF.Link | None - orientation: DF.Literal["Landscape", "Portrait"] - payment_terms_template: DF.Link | None - pdf_name: DF.Data | None - posting_date: DF.Date | None - primary_mandatory: DF.Check - project: DF.TableMultiSelect[PSOAProject] - report: DF.Literal["General Ledger", "Accounts Receivable"] - sales_partner: DF.Link | None - sales_person: DF.Link | None - sender: DF.Link | None - show_net_values_in_party_account: DF.Check - show_remarks: DF.Check - start_date: DF.Date | None - subject: DF.Data | None - terms_and_conditions: DF.Link | None - territory: DF.Link | None - to_date: DF.Date | None - # end: auto-generated types - ->>>>>>> f4600df1f7 (fix: "show_remarks" checkbox in Process statement of accounts) def validate(self): if not self.subject: self.subject = "Statement Of Accounts for {{ customer.customer_name }}"