diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index d00bcf643e7..791f3f8008b 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -1,275 +1,269 @@ + .print-format { + padding: 4mm; + font-size: 8.0pt !important; + } + .print-format td { + vertical-align:middle !important; + } + -
| {%= __(" ") %} | +{%= __(range1) %} | +{%= __(range2) %} | +{%= __(range3) %} | +{%= __(range4) %} | +{%= __(range5) %} | +{%= __("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_currency(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) %} + | +{%= __("Future Payments") %} | ++ | + | + | + | + | + {%= format_currency(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) %} + | +
| {%= __("Cheques Required") %} | ++ | + | + | + | + | + {%= format_currency(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) %} | +
| {%= __(" ") %} | -{%= __(range1) %} | -{%= __(range2) %} | -{%= __(range3) %} | -{%= __(range4) %} | -{%= __(range5) %} | -{%= __(range6) %} | -{%= __("Total") %} | + {% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %} +{%= __("Date") %} | +{%= __("Age (Days)") %} | + + {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %} +{%= __("Reference") %} | +{%= __("Sales Person") %} | + {% } else { %} +{%= __("Reference") %} | + {% } %} + {% if(!filters.show_future_payments) { %} +{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} | + {% } %} +{%= __("Invoiced Amount") %} | + {% if(!filters.show_future_payments) { %} +{%= __("Paid Amount") %} | +{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %} | + {% } %} +{%= __("Outstanding Amount") %} | + {% if(filters.show_future_payments) { %} + {% if(report.report_name === "Accounts Receivable") { %} +{%= __("Customer LPO No.") %} | + {% } %} +{%= __("Future Payment Ref") %} | +{%= __("Future Payment Amount") %} | +{%= __("Remaining Balance") %} | + {% } %} + {% } else { %} +{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} | +{%= __("Total Invoiced Amount") %} | +{%= __("Total Paid Amount") %} | +{%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %} | +{%= __("Total Outstanding Amount") %} | + {% } %}
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {%= __("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_currency(balance_row[range6]) %} | -- {%= format_currency(flt(balance_row[("outstanding_amount")]), data[data.length-1]["currency"]) %} - | -{%= __("PDC/LC") %} | -- | - | - | - | - | - | - {%= format_currency(flt(balance_row[("pdc/lc_amount")]), data[data.length-1]["currency"]) %} - | -|||||||||||
| {%= __("Cheques Required") %} | -- | - | - | - | - | - | - {%= format_currency(flt(balance_row[("outstanding_amount")]-balance_row[("pdc/lc_amount")]), data[data.length-1]["currency"]) %} | -
| {%= __("Date") %} | -{%= __("Age (Days)") %} | - - {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %} -{%= __("Reference") %} | -{%= __("Sales Person") %} | - {% } else { %} -{%= __("Reference") %} | - {% } %} - {% if(!filters.show_future_payments) { %} -{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} | - {% } %} -{%= __("Invoiced Amount") %} | - {% if(!filters.show_future_payments) { %} -{%= __("Paid Amount") %} | -{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %} | - {% } %} -{%= __("Outstanding Amount") %} | - {% if(filters.show_future_payments) { %} - {% if(report.report_name === "Accounts Receivable") { %} -{%= __("Customer LPO No.") %} | - {% } %} -{%= __("PDC/LC Ref") %} | -{%= __("PDC/LC Amount") %} | -{%= __("Remaining Balance") %} | - {% } %} - {% } else { %} -{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} | -{%= __("Total Invoiced Amount") %} | -{%= __("Total Paid Amount") %} | -{%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %} | -{%= __("Total Outstanding Amount") %} | - {% } %} -{%= frappe.datetime.str_to_user(data[i]["posting_date"]) %} | -{%= data[i][__("Age (Days)")] %} | -
- {% if(!filters.show_future_payments) { %}
- {%= data[i]["voucher_type"] %}
- - {% } %} - {%= data[i]["voucher_no"] %} - |
-
- {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %}
- {%= data[i]["sales_person"] %} | - {% } %} - - {% if(!filters.show_future_payments) { %} -
- {% if(!(filters.customer || filters.supplier)) { %}
- {%= data[i][__("Customer")] || data[i][__("Supplier")] %}
- {% if(data[i][__("Customer Name")] && data[i][__("Customer Name")] != data[i][__("Customer")]) { %}
- {%= data[i][__("Customer Name")] %} - {% } else if(data[i][__("Supplier Name")] != data[i][__("Supplier")]) { %} - {%= data[i][__("Supplier Name")] %} + {% for(var i=0, l=data.length; i {%= frappe.datetime.str_to_user(data[i]["posting_date"]) %} |
+ {%= data[i]["age"] %} |
+
+ {% if(!filters.show_future_payments) { %}
+ {%= data[i]["voucher_type"] %}
+ |
+
+ {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %}
+ {% } %} + {%= data[i]["voucher_no"] %} + {%= data[i]["sales_person"] %} |
{% } %}
-
- {% if data[i][__("Remarks")] %}
- {%= __("Remarks") %}:
- {%= data[i][__("Remarks")] %}
- {% } %}
-
- |
- {% } %}
- - {%= format_currency(data[i]["invoiced_amount"], data[i]["currency"]) %} | - - {% if(!filters.show_future_payments) { %} -- {%= 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"]) %} | - - {% if(filters.show_future_payments) { %} - {% if(report.report_name === "Accounts Receivable") { %} -- {%= data[i]["po_no"] %} | - {% } %} -{%= data[i][("pdc/lc_ref")] %} | -{%= format_currency(data[i][("pdc/lc_amount")], data[i]["currency"]) %} | -{%= format_currency(data[i][("remaining_balance")], data[i]["currency"]) %} | - {% } %} - {% } else { %} -- {% if(!filters.show_future_payments) { %} - | - {% } %} - {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %} - | - {% } %} - | - | {%= __("Total") %} | -- {%= format_currency(data[i]["invoiced_amount"], data[i]["currency"] ) %} | - - {% if(!filters.show_future_payments) { %} -- {%= 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"]) %} | - - {% if(filters.show_future_payments) { %} - {% if(report.report_name === "Accounts Receivable") { %} -- {%= data[i][__("Customer LPO")] %} | - {% } %} -{%= data[i][("pdc/lc_ref")] %} | -{%= format_currency(data[i][("pdc/lc_amount")], data[i]["currency"]) %} | -{%= format_currency(data[i][("remaining_balance")], data[i]["currency"]) %} | - {% } %} - {% } %} - {% } else { %} - {% if(data[i][__("Customer")] || data[i][__("Supplier")]|| " ") { %} - {% if((data[i][__("Customer")] || data[i][__("Supplier")]) != __("'Total'")) { %} + {% if(!filters.show_future_payments) { %}
{% if(!(filters.customer || filters.supplier)) { %}
- {%= data[i][__("Customer")] || data[i][__("Supplier")] %}
- {% if(data[i][__("Customer Name")] && data[i][__("Customer Name")] != data[i][__("Customer")]) { %}
- {%= data[i][__("Customer Name")] %} - {% } else if(data[i][__("Supplier Name")] != data[i][__("Supplier")]) { %} - {%= data[i][__("Supplier Name")] %} + {%= data[i]["party"] %} + {% if(data[i]["customer_name"] && data[i]["customer_name"] != data[i]["party"]) { %} + {%= data[i]["customer_name"] %} + {% } else if(data[i]["supplier_name"] != data[i]["party"]) { %} + {%= data[i]["supplier_name"] %} {% } %} {% } %} - {%= __("Remarks") %}: - {%= data[i][__("Remarks")] %} +
+ {% if data[i]["remarks"] %}
+ {%= __("Remarks") %}:
+ {%= data[i]["remarks"] %}
+ {% } %}
+
|
+ {% } %}
+
+ + {%= format_currency(data[i]["invoiced"], data[i]["currency"]) %} | + + {% if(!filters.show_future_payments) { %} ++ {%= 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"]) %} | + + {% if(filters.show_future_payments) { %} + {% if(report.report_name === "Accounts Receivable") { %} ++ {%= data[i]["po_no"] %} | + {% } %} +{%= data[i]["future_ref"] %} | +{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %} | +{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %} | + {% } %} {% } else { %} -{%= __("Total") %} | ++ {% if(!filters.show_future_payments) { %} + | + {% } %} + {% if(report.report_name === "Accounts Receivable" && filters.show_sales_person) { %} + | + {% } %} + | + | {%= __("Total") %} | ++ {%= format_currency(data[i]["invoiced"], data[i]["currency"] ) %} | + + {% if(!filters.show_future_payments) { %} ++ {%= 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"]) %} | + + {% if(filters.show_future_payments) { %} + {% if(report.report_name === "Accounts Receivable") { %} ++ {%= data[i]["po_no"] %} | + {% } %} +{%= data[i]["future_ref"] %} | +{%= format_currency(data[i]["future_amount"], data[i]["currency"]) %} | +{%= format_currency(data[i]["remaining_balance"], data[i]["currency"]) %} | + {% } %} + {% } %} + {% } else { %} + {% if(data[i]["party"]|| " ") { %} + {% if((data[i]["party"]) != __("'Total'")) { %} +
+ {% if(!(filters.customer || filters.supplier)) { %}
+ {%= data[i]["party"] %}
+ {% if(data[i]["customer_name"] && data[i]["customer_name"] != data[i]["party"]) { %}
+ {%= data[i]["customer_name"] %} + {% } else if(data[i]["supplier_name"] != data[i]["party"]) { %} + {%= data[i]["supplier_name"] %} + {% } %} + {% } %} + {%= __("Remarks") %}: + {%= data[i]["remarks"] %} + |
+ {% } else { %}
+ {%= __("Total") %} | + {% } %} +{%= 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"]) %} | {% } %} -{%= format_currency(data[i][("total_invoiced_amt")], data[i]["currency"]) %} | -{%= format_currency(data[i][("total_paid_amt")], data[i]["currency"]) %} | -{%= report.report_name === "Accounts Receivable Summary" ? format_currency(data[i][__("credit_note_amt")], data[i]["currency"]) : format_currency(data[i][__("debit_note_amt")], data[i]["currency"]) %} | -{%= format_currency(data[i][("total_outstanding_amt")], data[i]["currency"]) %} | {% } %} + {% } %} - - {% } %} -
|---|
{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
+ +{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}