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 03abc93e0b8..5307ccb1931 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 @@ -1,6 +1,6 @@
| {%= __(" ") %} | -{%= __(range1) %} | -{%= __(range2) %} | -{%= __(range3) %} | -{%= __(range4) %} | -{%= __(range5) %} | -{%= __(range6) %} | -{%= __("Total") %} | +{{ _(" ") }} | +{{ _(range1) }} | +{{ _(range2) }} | +{{ _(range3) }} | +{{ _(range4) }} | +{{ _(range5) }} | +{{ _(range6) }} | +{{ _("Total") }} |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {%= __("Total Outstanding") %} | +{{ _("Total Outstanding") }} | - {%= format_number(balance_row["age"], null, 2) %} + {{ format_number(balance_row["age"], null, 2) }} | - {%= format_currency(balance_row["range1"], data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(balance_row["range1"], data[data.length-1]["currency"]) }} | - {%= format_currency(balance_row["range2"], data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(balance_row["range2"], data[data.length-1]["currency"]) }} | - {%= format_currency(balance_row["range3"], data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(balance_row["range3"], data[data.length-1]["currency"]) }} | - {%= format_currency(balance_row["range4"], data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(balance_row["range4"], data[data.length-1]["currency"]) }} | - {%= format_currency(balance_row["range5"], data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(balance_row["range5"], data[data.length-1]["currency"]) }} | - {%= format_currency(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) }} | {%= __("Future Payments") %} | +{{ _("Future Payments") }} | @@ -109,10 +114,10 @@ | - {%= format_currency(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) %} + {{ frappe.utils.fmt_money(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) }} | |||
| {%= __("Cheques Required") %} | +{{ _("Cheques Required") }} | @@ -120,168 +125,224 @@ | - {%= format_currency(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) %} | + {{ frappe.utils.fmt_money(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) }}
| {%= __("Date") %} | -{%= __("Age (Days)") %} | + {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %} +{{ _("Date") }} | +{{ _("Age (Days)") }} | - {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %} -{%= __("Reference") %} | -{%= __("Sales Person") %} | - {% } else { %} -{%= __("Reference") %} | - {% } %} - {% if(!filters.show_future_payments) { %} -{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} | - {% } %} -{%= __("Invoiced Amount") %} | - {% if(!filters.show_future_payments) { %} -{%= __("Paid Amount") %} | -{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %} | - {% } %} -{%= __("Outstanding Amount") %} | - {% if(filters.show_future_payments) { %} - {% if(report.report_name === "Accounts Receivable") { %} -{%= __("Customer LPO No.") %} | - {% } %} -{%= __("Future Payment Ref") %} | -{%= __("Future Payment Amount") %} | -{%= __("Remaining Balance") %} | - {% } %} - {% } else { %} -{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} | -{%= __("Total Invoiced Amount") %} | -{%= __("Total Paid Amount") %} | -{%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %} | -{%= __("Total Outstanding Amount") %} | - {% } %} + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} +{{ _("Reference") }} | +{{ _("Sales Person") }} | + {% else %} +{{ _("Reference") }} | + {% endif %} + {% if not(filters.show_future_payments) %} ++ {% if (filters.customer or filters.supplier or filters.customer_name) %} + {{ _("Remarks") }} + {% else %} + {{ _("Party") }} + {% endif %} + | + {% endif %} +{{ _("Invoiced Amount") }} | + {% if not(filters.show_future_payments) %} +{{ _("Paid Amount") }} | ++ {% if report.report_name == "Accounts Receivable" %} + {{ _('Credit Note') }} + {% else %} + {{ _('Debit Note') }} + {% endif %} + | + {% endif %} +{{ _("Outstanding Amount") }} | + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} +{{ _("Customer LPO No.") }} | + {% endif %} +{{ _("Future Payment Ref") }} | +{{ _("Future Payment Amount") }} | +{{ _("Remaining Balance") }} | + {% endif %} + {% else %} ++ {% 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") }} | + {% endif %}{%= frappe.datetime.str_to_user(data[i]["posting_date"]) %} | -{%= data[i]["age"] %} | + {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %} + {% if(data[i]["party"]) %} +{{ (data[i]["posting_date"]) }} | +{{ data[i]["age"] }} |
- {% if(!filters.show_future_payments) { %}
- {%= data[i]["voucher_type"] %}
+ {% if not(filters.show_future_payments) %}
+ {{ data[i]["voucher_type"] }}
- {% } %} - {%= data[i]["voucher_no"] %} + {% endif %} + {{ data[i]["voucher_no"] }} |
- {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %}
- {%= data[i]["sales_person"] %} | - {% } %} + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} +{{ data[i]["sales_person"] }} | + {% endif %} - {% if(!filters.show_future_payments) { %} + {% if not (filters.show_future_payments) %}
- {% if(!(filters.customer || filters.supplier)) { %}
- {%= data[i]["party"] %}
- {% if(data[i]["customer_name"] && data[i]["customer_name"] != data[i]["party"]) { %}
- {%= data[i]["customer_name"] %} - {% } else if(data[i]["supplier_name"] != data[i]["party"]) { %} - {%= data[i]["supplier_name"] %} - {% } %} - {% } %} + {% 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"] %}
- {% } %}
+ {{ _("Remarks") }}:
+ {{ data[i]["remarks"] }}
+ {% endif %}
|
- {% } %}
+ {% endif %}
- {%= format_currency(data[i]["invoiced"], data[i]["currency"]) %} | + {{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }} - {% if(!filters.show_future_payments) { %} + {% if not(filters.show_future_payments) %}- {%= format_currency(data[i]["paid"], data[i]["currency"]) %} | + {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }}- {%= format_currency(data[i]["credit_note"], data[i]["currency"]) %} | - {% } %} + {{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} + {% endif %}- {%= format_currency(data[i]["outstanding"], data[i]["currency"]) %} | + {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} - {% if(filters.show_future_payments) { %} - {% if(report.report_name === "Accounts Receivable") { %} + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %}- {%= data[i]["po_no"] %} | - {% } %} -{%= data[i]["future_ref"] %} | -{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %} | -{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %} | - {% } %} - {% } else { %} + {{ data[i]["po_no"] }} + {% endif %} +{{ 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"]) }} | + {% endif %} + {% else %}- {% if(!filters.show_future_payments) { %} + {% if not(filters.show_future_payments) %} | - {% } %} - {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %} + {% endif %} + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} | - {% } %} + {% endif %} | - | {%= __("Total") %} | +{{ _("Total") }} | - {%= format_currency(data[i]["invoiced"], data[i]["currency"] ) %} | + {{ frappe.utils.fmt_money(data[i]["invoiced"], data[i]["currency"]) }} - {% if(!filters.show_future_payments) { %} + {% if not(filters.show_future_payments) %}- {%= format_currency(data[i]["paid"], data[i]["currency"]) %} | -{%= format_currency(data[i]["credit_note"], 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"]) }} | + {% endif %}- {%= format_currency(data[i]["outstanding"], data[i]["currency"]) %} | + {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} - {% if(filters.show_future_payments) { %} - {% if(report.report_name === "Accounts Receivable") { %} + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %}- {%= data[i]["po_no"] %} | - {% } %} -{%= data[i]["future_ref"] %} | -{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %} | -{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %} | - {% } %} - {% } %} - {% } else { %} - {% if(data[i]["party"]|| " ") { %} - {% if(!data[i]["is_total_row"]) { %} + {{ data[i]["po_no"] }} + {% endif %} +{{ 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"]) }} | + {% endif %} + {% endif %} + {% else %} + {% if(data[i]["party"] or " ") %} + {% if not(data[i]["is_total_row"]) %}
- {% if(!(filters.customer || filters.supplier)) { %}
- {%= data[i]["party"] %}
- {% if(data[i]["customer_name"] && data[i]["customer_name"] != data[i]["party"]) { %}
- {%= data[i]["customer_name"] %} - {% } else if(data[i]["supplier_name"] != data[i]["party"]) { %} - {%= data[i]["supplier_name"] %} - {% } %} - {% } %} - {%= __("Remarks") %}: - {%= data[i]["remarks"] %} + {% if(not(filters.customer | filters.supplier)) %} + {{ 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 %} + {{ _("Remarks") }}: + {{ data[i]["remarks"] }} |
- {% } else { %}
- {%= __("Total") %} | - {% } %} -{%= format_currency(data[i]["invoiced"], data[i]["currency"]) %} | -{%= format_currency(data[i]["paid"], data[i]["currency"]) %} | -{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %} | -{%= format_currency(data[i]["outstanding"], data[i]["currency"]) %} | - {% } %} - {% } %} + {% else %} +{{ _("Total") }} | + {% 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"]) }} | + {% endif %} + {% endif %} - {% } %} + {% endfor %} ++ | + | + | + | {{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(data|sum(attribute="credit_note"), currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }} |
|---|
{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
+| 30 Days | +60 Days | +90 Days | +120 Days | +
|---|---|---|---|
| {{ frappe.utils.fmt_money(ageing.range1, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range2, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range3, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range4, currency=data[0]["currency"]) }} | +
{{ _("Printed On ") }}{{ frappe.utils.now() }}