From 7f14f28099643b97482b7f4a0bb62c67fe484b7e Mon Sep 17 00:00:00 2001 From: Ashwini Save Date: Tue, 13 Jun 2017 11:18:39 +0530 Subject: [PATCH] Account Receivable - Credit Note column added to print format. (#9230) * Account Receivable - Credit Note column added to print Format. * Review changes for translation: Account Receivable add credit note column * Review changes for translation: Account Receivable add credit note column * Review changes for translation: Account Receivable add credit note column --- .../report/accounts_receivable/accounts_receivable.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index ba847c0061..390bb27fd5 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -21,11 +21,13 @@ {%= __("Party") %} {%= __("Invoiced Amount") %} {%= __("Paid Amount") %} + {%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %} {%= __("Outstanding Amount") %} {% } else { %} {%= __("Party") %} {%= __("Total Invoiced Amount") %} {%= __("Total Paid Amount") %} + {%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %} {%= __("Total Outstanding Amount") %} {% } %} @@ -44,6 +46,8 @@ {%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"]) %} {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %} + + {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} {%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %} {% } else { %} @@ -54,6 +58,7 @@ {%= format_currency(data[i]["Invoiced Amount"]) %} {%= format_currency(data[i]["Paid Amount"]) %} + {% report.report_name === "Accounts Receivable" ? format_currency(data[i][__("Credit Note Amt")]) : format_currency(data[i][__("Debit Note Amt")]) %} {%= format_currency(data[i]["Outstanding Amount"]) %} {% } %} @@ -67,6 +72,7 @@ {% } %} {%= format_currency(data[i][__("Total Invoiced Amt")]) %} {%= format_currency(data[i][__("Total Paid Amt")]) %} + {%= report.report_name === "Accounts Receivable Summary" ? format_currency(data[i][__("Credit Note Amt")]) : format_currency(data[i][__("Debit Note Amt")]) %} {%= format_currency(data[i][__("Total Outstanding Amt")]) %} {% } %} {% } %}