Skip to content

Commit cd2938e

Browse files
rohitwaghchaurenabinhait
authored andcommitted
fix: accounts receivable for PDC not showing 120 days column (frappe#17892)
1 parent f37a09d commit cd2938e

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

erpnext/accounts/report/accounts_receivable/accounts_receivable.html

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ <h5 class="text-center">
4646
var range2 = report.columns[12].label;
4747
var range3 = report.columns[13].label;
4848
var range4 = report.columns[14].label;
49+
var range5 = report.columns[15].label;
50+
var range6 = report.columns[16].label;
4951
%}
5052
{% if(balance_row) { %}
5153
<table class="table table-bordered table-condensed">
@@ -56,8 +58,10 @@ <h5 class="text-center">
5658
<col style="width: 18mm;">
5759
<col style="width: 18mm;">
5860
<col style="width: 18mm;">
59-
<col style="width: 18mm;">
60-
<col style="width: 18mm;">
61+
<col style="width: 18mm;">
62+
<col style="width: 18mm;">
63+
<col style="width: 18mm;">
64+
<col style="width: 18mm;">
6165
</colgroup>
6266

6367
<thead>
@@ -67,16 +71,20 @@ <h5 class="text-center">
6771
<th>{%= __(range2) %}</th>
6872
<th>{%= __(range3) %}</th>
6973
<th>{%= __(range4) %}</th>
74+
<th>{%= __(range5) %}</th>
75+
<th>{%= __(range6) %}</th>
7076
<th>{%= __("Total") %}</th>
7177
</tr>
7278
</thead>
7379
<tbody>
7480
<tr>
7581
<td>{%= __("Total Outstanding") %}</td>
76-
<td class="text-right">{%= format_currency(balance_row[range1]) %}</td>
82+
<td class="text-right">{%= format_number(balance_row[range1], null, 2) %}</td>
7783
<td class="text-right">{%= format_currency(balance_row[range2]) %}</td>
7884
<td class="text-right">{%= format_currency(balance_row[range3]) %}</td>
7985
<td class="text-right">{%= format_currency(balance_row[range4]) %}</td>
86+
<td class="text-right">{%= format_currency(balance_row[range5]) %}</td>
87+
<td class="text-right">{%= format_currency(balance_row[range6]) %}</td>
8088
<td class="text-right">
8189
{%= format_currency(flt(balance_row[("outstanding_amount")]), data[data.length-1]["currency"]) %}
8290
</td>
@@ -86,6 +94,8 @@ <h5 class="text-center">
8694
<td></td>
8795
<td></td>
8896
<td></td>
97+
<td></td>
98+
<td></td>
8999
<td class="text-right">
90100
{%= format_currency(flt(balance_row[("pdc/lc_amount")]), data[data.length-1]["currency"]) %}
91101
</td>
@@ -95,6 +105,8 @@ <h5 class="text-center">
95105
<th></th>
96106
<th></th>
97107
<th></th>
108+
<th></th>
109+
<th></th>
98110
<th class="text-right">
99111
{%= format_currency(flt(balance_row[("outstanding_amount")]-balance_row[("pdc/lc_amount")]), data[data.length-1]["currency"]) %}</th>
100112
</tr>

0 commit comments

Comments
 (0)