diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html index b9680dfb3bfd..03abc93e0b8b 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html @@ -15,7 +15,12 @@

{{ _("STATEMENTS OF ACCOUNTS") }}

-
{{ _("Customer: ") }} {{filters.party_name[0] }}
+ {% if filters.party[0] == filters.party_name[0] %} +
{{ _("Customer: ") }} {{ filters.party_name[0] }}
+ {% else %} +
{{ _("Customer: ") }} {{ filters.party[0] }}
+
{{ _("Customer Name: ") }} {{filters.party_name[0] }}
+ {% endif %}
{{ _("Date: ") }} {{ frappe.format(filters.from_date, 'Date')}} 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 a26267ba5e83..0620e566b74b 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 @@ -34,6 +34,8 @@ "terms_and_conditions", "section_break_1", "enable_auto_email", + "column_break_ocfq", + "sender", "section_break_18", "frequency", "filter_duration", @@ -284,10 +286,32 @@ "fieldtype": "Link", "label": "Terms and Conditions", "options": "Terms and Conditions" + }, + { + "default": "1", + "fieldname": "include_break", + "fieldtype": "Check", + "label": "Page Break After Each SoA" + }, + { + "default": "0", + "fieldname": "show_net_values_in_party_account", + "fieldtype": "Check", + "label": "Show Net Values in Party Account" + }, + { + "fieldname": "sender", + "fieldtype": "Link", + "label": "Sender", + "options": "Email Account" + }, + { + "fieldname": "column_break_ocfq", + "fieldtype": "Column Break" } ], "links": [], - "modified": "2021-09-06 21:00:45.732505", + "modified": "2023-04-26 12:46:43.645455", "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 39b801432085..18d2f3b5a13b 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 @@ -327,7 +327,7 @@ def send_emails(document_name, from_scheduler=False): queue="short", method=frappe.sendmail, recipients=recipients, - sender=frappe.session.user, + sender=doc.sender or frappe.session.user, cc=cc, subject=subject, message=message, diff --git a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json index 8bffd6a93b92..1749d72e167b 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json @@ -27,7 +27,7 @@ }, { "fieldname": "billing_email", - "fieldtype": "Read Only", + "fieldtype": "Data", "in_list_view": 1, "label": "Billing Email" }, @@ -41,7 +41,7 @@ ], "istable": 1, "links": [], - "modified": "2023-03-13 00:12:34.508086", + "modified": "2023-04-26 13:02:41.964499", "modified_by": "Administrator", "module": "Accounts", "name": "Process Statement Of Accounts Customer",