From 24f658d633980fbbdaa56d74cc3e0fcc8ec24cb5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 16 Nov 2016 11:13:46 +0530 Subject: [PATCH] [fix] [minor] accounts receivable not translated (#6943) --- .../accounts_receivable.html | 20 +++++++++---------- .../utilities/web_form/addresses/addresses.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index 75c3e8c205..f463c07579 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -4,7 +4,7 @@

{%= __(report.report_name) %}

{%= filters.customer || filters.supplier %}

- {%= filters.ageing_based_on %} + {%= __(filters.ageing_based_on) %} {%= __("Until") %} {%= dateutil.str_to_user(filters.report_date) %}
@@ -12,7 +12,7 @@ - {% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %} + {% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %} @@ -30,7 +30,7 @@ {% for(var i=0, l=data.length; i - {% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %} + {% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %} {% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %} + {%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"]) %} + {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %} + {%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %} {% } else { %} + {%= format_currency(data[i]["Invoiced Amount"]) %} + {%= format_currency(data[i]["Paid Amount"]) %} + {%= format_currency(data[i]["Outstanding Amount"]) %} {% } %} {% } else { %} {% if(data[i][__("Customer")] || data[i][__("Supplier")]|| " ") { %} @@ -71,4 +71,4 @@ {% } %}
{%= __("Date") %} {%= __("Ref") %} {%= __("Party") %}
{%= dateutil.str_to_user(data[i][__("Posting Date")]) %} {%= data[i][__("Voucher Type")] %} @@ -38,21 +38,21 @@ {%= data[i][__("Customer Name")] || data[i][__("Customer")] || data[i][__("Supplier Name")] || data[i][__("Supplier")] %}
{%= __("Remarks") %}: {%= data[i][__("Remarks")] %}
- {%= format_currency(data[i][__("Invoiced Amount")], data[i]["currency"]) %} - {%= format_currency(data[i][__("Paid Amount")], data[i]["currency"]) %} - {%= format_currency(data[i][__("Outstanding Amount")], data[i]["currency"]) %} {%= __("Total") %} - {%= format_currency(data[i][__("Invoiced Amount")]) %} - {%= format_currency(data[i][__("Paid Amount")]) %} - {%= format_currency(data[i][__("Outstanding Amount")]) %}
-

Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}

\ No newline at end of file +

{{ __("Printed On") }}{%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}

\ No newline at end of file diff --git a/erpnext/utilities/web_form/addresses/addresses.py b/erpnext/utilities/web_form/addresses/addresses.py index 2334f8b26d..3fd10175fb 100644 --- a/erpnext/utilities/web_form/addresses/addresses.py +++ b/erpnext/utilities/web_form/addresses/addresses.py @@ -4,4 +4,4 @@ import frappe def get_context(context): # do your magic here - pass + context.show_sidebar = True