diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index f833ff33e5..69c88ed3c4 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -31,16 +31,11 @@ {% for(var i=0, l=data.length; i {% if(__(report.report_name) == "Accounts Receivable" || __(report.report_name) == "Accounts Payable") { %} - {% if(data[i][__("Posting Date")]) { %} + {% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %} {%= dateutil.str_to_user(data[i][__("Posting Date")]) %} {%= data[i][__("Voucher Type")] %}
{%= data[i][__("Voucher No")] %} {%= data[i][__("Customer Name")] || data[i][__("Customer")] || data[i][__("Supplier Name")] || data[i][__("Supplier")] %} - {% if(__(report.report_name) == "Accounts Receivable") { %} -
{%= __("Territory") %}: {%= data[i][__("Territory")] %} - {% } else { %} -
{%= __("Supplier Type") %}: {%= data[i][__("Supplier Type")] %} - {% } %}
{%= __("Remarks") %}: {%= data[i][__("Remarks")] %} {%= format_currency(data[i][__("Invoiced Amount")]) %} {%= format_currency(data[i][__("Paid Amount")]) %} @@ -48,23 +43,22 @@ {% } else { %} - {%= data[i][__("Customer")] || data[i][__("Supplier")] || " " %} + {%= __("Total") %} - {%= data[i][__("Account")] && format_currency(data[i][__("Invoiced Amount")]) %} + {%= format_currency(data[i][__("Invoiced Amount")]) %} - {%= data[i][__("Account")] && format_currency(data[i][__("Paid Amount")]) %} + {%= format_currency(data[i][__("Paid Amount")]) %} - {%= data[i][__("Account")] && format_currency(data[i][__("Outstanding Amount")]) %} + {%= format_currency(data[i][__("Outstanding Amount")]) %} {% } %} {% } else { %} {% if(data[i][__("Customer")] || data[i][__("Supplier")]|| " ") { %} - {%= data[i][__("Customer")] || data[i][__("Supplier")] %} - {% if(__(report.report_name) == "Accounts Receivable Summary") { %} -
{%= __("Territory") %}: {%= data[i][__("Territory")] %} - {% } else { %} -
{%= __("Supplier Type") %}: {%= data[i][__("Supplier Type")] %} - {% } %} + {% if((data[i][__("Customer")] || data[i][__("Supplier")]) != __("'Total'")) { %} + {%= data[i][__("Customer")] || data[i][__("Supplier")] %}
{%= __("Remarks") %}: {%= data[i][__("Remarks")] %} + {% } else { %} + {%= __("Total") %} + {% } %} {%= format_currency(data[i][__("Total Invoiced Amt")]) %} {%= format_currency(data[i][__("Total Paid Amt")]) %} {%= format_currency(data[i][__("Total Outstanding Amt")]) %}