diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index bb0d0a132a5..79a6aabd987 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -42,11 +42,13 @@ {% if(filters.show_future_payments) { %} {% var balance_row = data.slice(-1).pop(); - var range1 = report.columns[11].label; - var range2 = report.columns[12].label; - var range3 = report.columns[13].label; - var range4 = report.columns[14].label; - var range5 = report.columns[15].label; + var start = filters.based_on_payment_terms ? 13 : 11; + var range1 = report.columns[start].label; + var range2 = report.columns[start+1].label; + var range3 = report.columns[start+2].label; + var range4 = report.columns[start+3].label; + var range5 = report.columns[start+4].label; + var range6 = report.columns[start+5].label; %} {% if(balance_row) { %}
| {%= __(range3) %} | {%= __(range4) %} | {%= __(range5) %} | +{%= __(range6) %} | {%= __("Total") %} | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {%= __("Total Outstanding") %} | -{%= format_number(balance_row["range1"], null, 2) %} | -{%= format_currency(balance_row["range2"]) %} | -{%= format_currency(balance_row["range3"]) %} | -{%= format_currency(balance_row["range4"]) %} | -{%= format_currency(balance_row["range5"]) %} | ++ {%= format_number(balance_row["age"], null, 2) %} + | ++ {%= format_currency(balance_row["range1"], data[data.length-1]["currency"]) %} + | ++ {%= format_currency(balance_row["range2"], data[data.length-1]["currency"]) %} + | ++ {%= format_currency(balance_row["range3"], data[data.length-1]["currency"]) %} + | ++ {%= format_currency(balance_row["range4"], data[data.length-1]["currency"]) %} + | ++ {%= format_currency(balance_row["range5"], data[data.length-1]["currency"]) %} + | {%= format_currency(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) %} - | +{%= __("Future Payments") %} | @@ -91,6 +107,7 @@ | + | {%= format_currency(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) %} | @@ -101,6 +118,7 @@+ | {%= format_currency(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) %} | @@ -218,15 +236,15 @@{%= __("Total") %} | - {%= format_currency(data[i]["invoiced"], data[0]["currency"] ) %} | + {%= format_currency(data[i]["invoiced"], data[i]["currency"] ) %} {% if(!filters.show_future_payments) { %}- {%= format_currency(data[i]["paid"], data[0]["currency"]) %} | -{%= format_currency(data[i]["credit_note"], data[0]["currency"]) %} | + {%= format_currency(data[i]["paid"], data[i]["currency"]) %} +{%= format_currency(data[i]["credit_note"], data[i]["currency"]) %} | {% } %}- {%= format_currency(data[i]["outstanding"], data[0]["currency"]) %} | + {%= format_currency(data[i]["outstanding"], data[i]["currency"]) %} {% if(filters.show_future_payments) { %} {% if(report.report_name === "Accounts Receivable") { %} @@ -234,8 +252,8 @@ {%= data[i]["po_no"] %} {% } %}{%= data[i]["future_ref"] %} | -{%= format_currency(data[i]["future_amount"], data[0]["currency"]) %} | -{%= format_currency(data[i]["remaining_balance"], data[0]["currency"]) %} | +{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %} | +{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %} | {% } %} {% } %} {% } else { %} @@ -256,10 +274,10 @@ {% } else { %}{%= __("Total") %} | {% } %} -{%= format_currency(data[i]["invoiced"], data[0]["currency"]) %} | -{%= format_currency(data[i]["paid"], data[0]["currency"]) %} | -{%= format_currency(data[i]["credit_note"], data[0]["currency"]) %} | -{%= format_currency(data[i]["outstanding"], data[0]["currency"]) %} | +{%= 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"]) %} | {% } %} {% } %}