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..5efd9b165dc 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 @@ -13,7 +13,7 @@ {% endif %} -

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

+

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

{% if filters.party[0] == filters.party_name[0] %}
{{ _("Customer: ") }} {{ filters.party_name[0] }}
@@ -22,11 +22,11 @@
{{ _("Customer Name: ") }} {{filters.party_name[0] }}
{% endif %}
- {{ _("Date: ") }} - {{ frappe.format(filters.from_date, 'Date')}} - {{ _("to") }} - {{ frappe.format(filters.to_date, 'Date')}} -
+ {{ _("Date: {0} to {1}").format( + frappe.format(filters.from_date, "Date"), + frappe.format(filters.to_date, 'Date') + ) }} +

@@ -54,7 +54,7 @@
{% endif %} -
{{ _("Remarks") }}: {{ row.remarks }} +
{{ _("Remarks:") }} {{ row.remarks }} {% if row.bill_no %}
{{ _("Supplier Invoice No") }}: {{ row.bill_no }} {% endif %} @@ -83,17 +83,20 @@
{% if ageing %} -

{{ _("Ageing Report based on ") }} {{ ageing.ageing_based_on }} - {{ _("up to " ) }} {{ frappe.format(filters.to_date, 'Date')}} +

+ {{ _("Ageing Report based on {0} up to {1}").format( + ageing.ageing_based_on, + frappe.format(filters.to_date, "Date") + ) }}

- - - - - + + + + + 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 d81a8b207d9..e9b1577c028 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 @@ -29,24 +29,25 @@
{% if (filters.tax_id) %} - {{ _("Tax Id: ") }}{{ filters.tax_id }} + {{ _("Tax Id: {0}").format(filters.tax_id) }} {% endif %}
- {{ _(filters.ageing_based_on) }} - {{ _("Until") }} - {{ frappe.format(filters.report_date, 'Date') }} + {{ _("{0} until {1}").format( + _(filters.ageing_based_on), + frappe.format(filters.report_date, 'Date') + ) }}
{% if(filters.payment_terms) %} - {{ _("Payment Terms") }}: {{ filters.payment_terms }} + {{ _("Payment Terms:") }} {{ filters.payment_terms }} {% endif %}
{% if(filters.credit_limit) %} - {{ _("Credit Limit") }}: {{ frappe.utils.fmt_money(filters.credit_limit) }} + {{ _("Credit Limit:") }} {{ frappe.utils.fmt_money(filters.credit_limit) }} {% endif %}
@@ -68,7 +69,7 @@ {% if(balance_row) %}
0 - 30 Days30 - 60 Days60 - 90 Days90 - 120 DaysAbove 120 Days{{ _("0 - 30 Days") }}{{ _("30 - 60 Days") }}{{ _("60 - 90 Days") }}{{ _("90 - 120 Days") }}{{ _("Above 120 Days") }}
- + @@ -170,9 +171,9 @@ {% endif %} @@ -197,9 +198,9 @@ @@ -334,17 +335,20 @@
(Amount in {{ data[0]["currency"] ~ "" }}){{ _("Amount in {0}").format(data[0]["currency"] ~ "") }}
{{ _("Paid Amount") }} {% if report.report_name == "Accounts Receivable" %} - {{ _('Credit Note') }} + {{ _("Credit Note") }} {% else %} - {{ _('Debit Note') }} + {{ _("Debit Note") }} {% endif %} {{ _("Total Paid Amount") }} {% if report.report_name == "Accounts Receivable Summary" %} - {{ _('Credit Note Amount') }} + {{ _("Credit Note Amount") }} {% else %} - {{ _('Debit Note Amount') }} + {{ _("Debit Note Amount") }} {% endif %} {{ _("Total Outstanding Amount") }}

{% if ageing %} -

{{ _("Ageing Report based on ") }} {{ ageing.ageing_based_on }} - {{ _("up to " ) }} {{ frappe.format(filters.report_date, 'Date')}} +

+ {{ _("Ageing Report based on {0} up to {1}").format( + ageing.ageing_based_on, + frappe.format(filters.report_date, "Date") + ) }}

- - - - - + + + + + @@ -363,4 +367,4 @@ {{ terms_and_conditions }} {% endif %} -

{{ _("Printed On ") }}{{ frappe.utils.now() }}

+

{{ _("Printed on {0}").format(frappe.utils.now()) }}

0 - 30 Days30 - 60 Days60 - 90 Days90 - 120 DaysAbove 120 Days{{ _("0 - 30 Days") }}{{ _("30 - 60 Days") }}{{ _("60 - 90 Days") }}{{ _("90 - 120 Days") }}{{ _("Above 120 Days") }}