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 5efd9b165dc..c3603290f47 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 @@ -34,11 +34,13 @@ {{ _("Date") }} - {{ _("Reference") }} - {{ _("Remarks") }} + {{ _("Reference") }} {{ _("Debit") }} {{ _("Credit") }} {{ _("Balance (Dr - Cr)") }} + {% if filters.show_remarks %} + {{ _("Remarks") }} + {% endif %} @@ -47,36 +49,51 @@ {% if(row.posting_date) %} {{ frappe.format(row.posting_date, 'Date') }} {{ row.voucher_type }} -
{{ row.voucher_no }} - - {% if not (filters.party or filters.account) %} +
{{ row.voucher_no }} + {% if not (filters.party or filters.account) %} {{ row.party or row.account }}
{% endif %} - -
{{ _("Remarks:") }} {{ row.remarks }} {% if row.bill_no %} -
{{ _("Supplier Invoice No") }}: {{ row.bill_no }} + {{ _("Supplier Invoice No") }}: {{ row.bill_no }} {% endif %} {{ frappe.utils.fmt_money(row.debit, currency=filters.presentation_currency) }} {{ frappe.utils.fmt_money(row.credit, currency=filters.presentation_currency) }} + + {{ frappe.utils.fmt_money(row.balance, currency=filters.presentation_currency) }} + + {% if filters.show_remarks %} + + {% if row.remarks %} + {{ _("Remarks:") }} {{ row.remarks }} + {% endif %} + + {% endif %} {% else %} - - {{ frappe.format(row.account, {fieldtype: "Link"}) or " " }} + + {{ frappe.format(row.account, {fieldtype: "Link"}) or " " }} + {{ row.get('account', '') and frappe.utils.fmt_money(row.debit, currency=filters.presentation_currency) }} {{ row.get('account', '') and frappe.utils.fmt_money(row.credit, currency=filters.presentation_currency) }} - {% endif %} {{ frappe.utils.fmt_money(row.balance, currency=filters.presentation_currency) }} + {% if filters.show_remarks %} + + {% if row.remarks %} + {{ _("Remarks:") }} {{ row.remarks }} + {% endif %} + + {% endif %} + {% endif %} {% endfor %} diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html index 9a9a59b3be5..441a4b3da43 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html @@ -159,7 +159,7 @@ {% else %} {{ _("Reference") }} {% endif %} - {% if not(filters.show_future_payments) %} + {% if not(filters.show_future_payments) and filters.show_remarks %} {% if (filters.customer or filters.supplier or filters.customer_name) %} {{ _("Remarks") }} @@ -228,7 +228,7 @@ {{ data[i]["sales_person"] }} {% endif %} - {% if not (filters.show_future_payments) %} + {% if not (filters.show_future_payments) and filters.show_remarks %} {% if(not(filters.customer or filters.supplier or filters.customer_name)) %} {{ data[i]["party"] }} @@ -327,7 +327,9 @@ {% endfor %} - + {% if (filters.show_future_payments) or filters.show_remarks %} + + {% endif %} {% if not(filters.show_future_payments) %} {{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}