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 81ebf9744c4..d00af5d9a0c 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,56 @@ {% 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 %} +<<<<<<< HEAD
{{ _("Remarks") }}: {{ row.remarks }} +======= +>>>>>>> b98977dc75 (fix: remove remarks if show_remarks is unchecked (#49567)) {% 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 526c5b01437..4aa62f2b875 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 @@ -207,12 +207,221 @@ +<<<<<<< HEAD {% for i in range(data|length) %} {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %} {% if(data[i]["party"]) %} {{ frappe.format((data[i]["posting_date"]), 'Date') }} {{ data[i]["age"] }} +======= + + {{ _("Total Outstanding") }} + + {{ frappe.utils.flt(balance_row["age"], 2) }} + + + {{ frappe.utils.fmt_money(balance_row["range1"], currency=balance_row["currency"]) }} + + + {{ frappe.utils.fmt_money(balance_row["range2"], currency=balance_row["currency"]) }} + + + {{ frappe.utils.fmt_money(balance_row["range3"], currency=balance_row["currency"]) }} + + + {{ frappe.utils.fmt_money(balance_row["range4"], currency=balance_row["currency"]) }} + + + {{ frappe.utils.fmt_money(balance_row["range5"], currency=balance_row["currency"]) }} + + + {{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["outstanding"]), currency=balance_row["currency"]) }} + + + {{ _("Future Payments") }} + + + + + + + + {{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["future_amount"]), currency=balance_row["currency"]) }} + + + {{ _("Cheques Required") }} + + + + + + + + {{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["outstanding"] - balance_row["future_amount"]), currency=balance_row["currency"]) }} + + + + + {% endif %} +{% endif %} + + + + {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %} + + + + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} + + + {% else %} + + {% endif %} + {% if not(filters.show_future_payments) and filters.show_remarks %} + + {% endif %} + + {% if not(filters.show_future_payments) %} + + + {% endif %} + + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} + + {% endif %} + + + + {% endif %} + {% else %} + + + + + + {% endif %} + + + + {% for i in range(data|length) %} + + {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %} + {% if(data[i]["party"]) %} + + + + + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} + + {% endif %} + + {% if not (filters.show_future_payments) and filters.show_remarks %} + + {% endif %} + + + + {% if not(filters.show_future_payments) %} + + + {% endif %} + + + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} + + {% endif %} + + + + {% endif %} + {% else %} + + {% if not(filters.show_future_payments) %} + + {% endif %} + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} + + {% endif %} + + + + + {% if not(filters.show_future_payments) %} + + + {% endif %} + + + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} + + {% endif %} + + + + {% endif %} + {% endif %} + {% else %} + {% if(data[i]["party"] or " ") %} + {% if not(data[i]["is_total_row"]) %} +>>>>>>> b98977dc75 (fix: remove remarks if show_remarks is unchecked (#49567)) {% endif %} {% endif %} +<<<<<<< HEAD {% endfor %} +======= + {% endif %} + + {% endfor %} + + + {% if (filters.show_future_payments) or filters.show_remarks %} + + {% endif %} + {% if not(filters.show_future_payments) %} +>>>>>>> b98977dc75 (fix: remove remarks if show_remarks is unchecked (#49567))
{{ _("Date") }}{{ _("Age (Days)") }}{{ _("Reference") }}{{ _("Sales Person") }}{{ _("Reference") }} + {% if (filters.customer or filters.supplier or filters.customer_name) %} + {{ _("Remarks") }} + {% else %} + {{ _("Party") }} + {% endif %} + {{ _("Invoiced Amount") }}{{ _("Paid Amount") }} + {% if report.report_name == "Accounts Receivable" %} + {{ _("Credit Note") }} + {% else %} + {{ _("Debit Note") }} + {% endif %} + {{ _("Outstanding Amount") }}{{ _("Customer LPO No.") }}{{ _("Future Payment Ref") }}{{ _("Future Payment Amount") }}{{ _("Remaining Balance") }} + {% if (filters.customer or filters.supplier or filters.customer_name) %} + {{ _("Remarks")}} + {% else %} + {{ _("Party") }} + {% endif %} + {{ _("Total Invoiced Amount") }}{{ _("Total Paid Amount") }} + {% if report.report_name == "Accounts Receivable Summary" %} + {{ _("Credit Note Amount") }} + {% else %} + {{ _("Debit Note Amount") }} + {% endif %} + {{ _("Total Outstanding Amount") }}
{{ frappe.format(data[i]["posting_date"], 'Date') }}{{ data[i]["age"] }} + {% if not(filters.show_future_payments) %} + {{ data[i]["voucher_type"] }} +
+ {% endif %} + {{ data[i]["voucher_no"] }} + 		{{ data[i]["sales_person"] }} + {% if(not(filters.customer or filters.supplier or filters.customer_name)) %} + {{ data[i]["party"] }} + {% if(data[i]["customer_name"] and data[i]["customer_name"] != data[i]["party"]) %} +
{{ data[i]["customer_name"] }} + {% elif(data[i]["supplier_name"] != data[i]["party"]) %} +
{{ data[i]["supplier_name"] }} + {% endif %} + {% endif %} +
+ {% if data[i]["remarks"] %} + {{ _("Remarks") }}: + {{ data[i]["remarks"] }} + {% endif %} +
+ 		+ {{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }} + {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} + {{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} + {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} + {{ data[i]["po_no"] }}{{ data[i]["future_ref"] }}{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }}{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }}{{ _("Total") }} + {{ frappe.utils.fmt_money(data[i]["invoiced"], data[i]["currency"]) }} + {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }}{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} + {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} + {{ data[i]["po_no"] }}{{ data[i]["future_ref"] }}{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }}{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }} {% if not(filters.show_future_payments) %} {{ data[i]["voucher_type"] }} @@ -320,11 +529,23 @@ {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }}
{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }} {{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }}