nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 12:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add below-0 column in ar/ap report (backport #51673) (#51780)

Browse Source 
Merge pull request #51673 from Jatin3128/ar/ap-future-range-fix

fix: add below-0 column in ar/ap report
(cherry picked from commit c5b0787de6)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
This commit is contained in:
ruthra kumar
2026-01-16 12:46:26 +05:30
committed by GitHub
parent 876e2d4e6e f62ad83d6f
commit 5c93bf5798
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -877,11 +877,15 @@ class ReceivablePayableReport:
else: else:
entry_date = row.posting_date entry_date = row.posting_date
row.range0 = 0.0
self.get_ageing_data(entry_date, row) self.get_ageing_data(entry_date, row)
# ageing buckets should not have amounts if due date is not reached
if getdate(entry_date) > getdate(self.age_as_on): if getdate(entry_date) > getdate(self.age_as_on):
row.range0 = row.outstanding
[setattr(row, f"range{i}", 0.0) for i in self.range_numbers] [setattr(row, f"range{i}", 0.0) for i in self.range_numbers]
row.total_due = 0
return
row.total_due = sum(row[f"range{i}"] for i in self.range_numbers) row.total_due = sum(row[f"range{i}"] for i in self.range_numbers)
@@ -1281,6 +1285,8 @@ class ReceivablePayableReport:
ranges = [*self.ranges, _("Above")] ranges = [*self.ranges, _("Above")]
prev_range_value = 0 prev_range_value = 0
self.add_column(label=_("<0"), fieldname="range0", fieldtype="Currency")
self.ageing_column_labels.append(_("<0"))
for idx, curr_range_value in enumerate(ranges): for idx, curr_range_value in enumerate(ranges):
label = f"{prev_range_value}-{curr_range_value}" label = f"{prev_range_value}-{curr_range_value}"
self.add_column(label=label, fieldname="range" + str(idx + 1)) self.add_column(label=label, fieldname="range" + str(idx + 1))
@@ -1296,7 +1302,9 @@ class ReceivablePayableReport:
for row in self.data: for row in self.data:
row = frappe._dict(row) row = frappe._dict(row)
if not cint(row.bold): if not cint(row.bold):
values = [flt(row.get(f"range{i}", None), precision) for i in self.range_numbers] values = [flt(row.get("range0", 0), precision)] + [
flt(row.get(f"range{i}", 0), precision) for i in self.range_numbers
]
rows.append({"values": values}) rows.append({"values": values})
self.chart = { self.chart = {