Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: running balance after sorting

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-24 17:42:13 +05:30
parent 59a2a04fcc
commit db49d53aaf
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ def _execute(filters=None, additional_table_columns=None):
"balance": flt(opening_row.balance), "balance": flt(opening_row.balance),
} }
) )
running_balance = flt(opening_row.balance)
data = [] data = []
for inv in invoice_list: for inv in invoice_list:
# invoice details # invoice details
@ -136,12 +136,16 @@ def _execute(filters=None, additional_table_columns=None):
row.update({"debit": inv.base_grand_total, "credit": 0.0}) row.update({"debit": inv.base_grand_total, "credit": 0.0})
else: else:
row.update({"debit": 0.0, "credit": inv.base_grand_total}) row.update({"debit": 0.0, "credit": inv.base_grand_total})
if include_payments:
running_balance += row["debit"] - row["credit"]
row.update({"balance": running_balance})
data.append(row) data.append(row)
res += sorted(data, key=lambda x: x["posting_date"]) res += sorted(data, key=lambda x: x["posting_date"])
if include_payments:
running_balance = flt(opening_row.balance)
for row in range(1, len(res)):
running_balance += res[row]["debit"] - res[row]["credit"]
res[row].update({"balance": running_balance})
return columns, res, None, None, None, include_payments return columns, res, None, None, None, include_payments

14
erpnext/accounts/report/sales_register/sales_register.py
View File

@ -66,13 +66,13 @@ def _execute(filters, additional_table_columns=None):
)[0] )[0]
res.append( res.append(
{ {
"receivable_account": opening_row, "receivable_account": opening_row.account,
"debit": flt(opening_row.debit), "debit": flt(opening_row.debit),
"credit": flt(opening_row.credit), "credit": flt(opening_row.credit),
"balance": flt(opening_row.balance), "balance": flt(opening_row.balance),
} }
) )
running_balance = flt(opening_row.balance)
data = [] data = []
for inv in invoice_list: for inv in invoice_list:
# invoice details # invoice details
@ -152,12 +152,16 @@ def _execute(filters, additional_table_columns=None):
row.update({"debit": inv.base_grand_total, "credit": 0.0}) row.update({"debit": inv.base_grand_total, "credit": 0.0})
else: else:
row.update({"debit": 0.0, "credit": inv.base_grand_total}) row.update({"debit": 0.0, "credit": inv.base_grand_total})
if include_payments:
running_balance += row["debit"] - row["credit"]
row.update({"balance": running_balance})
data.append(row) data.append(row)
res += sorted(data, key=lambda x: x["posting_date"]) res += sorted(data, key=lambda x: x["posting_date"])
if include_payments:
running_balance = flt(opening_row.balance)
for row in range(1, len(res)):
running_balance += res[row]["debit"] - res[row]["credit"]
res[row].update({"balance": running_balance})
return columns, res, None, None, None, include_payments return columns, res, None, None, None, include_payments