Merge pull request #36742 from ruthra-kumar/ar_summary_incorrect_gl_balance_on_multi_company
fix: incorrect gl balance on AR summary rpt on multi company setup
This commit is contained in:
commit
3de9fed230
@ -55,7 +55,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
|
|||||||
)
|
)
|
||||||
|
|
||||||
if self.filters.show_gl_balance:
|
if self.filters.show_gl_balance:
|
||||||
gl_balance_map = get_gl_balance(self.filters.report_date)
|
gl_balance_map = get_gl_balance(self.filters.report_date, self.filters.company)
|
||||||
|
|
||||||
for party, party_dict in self.party_total.items():
|
for party, party_dict in self.party_total.items():
|
||||||
if party_dict.outstanding == 0:
|
if party_dict.outstanding == 0:
|
||||||
@ -232,12 +232,12 @@ class AccountsReceivableSummary(ReceivablePayableReport):
|
|||||||
self.add_column(label="Total Amount Due", fieldname="total_due")
|
self.add_column(label="Total Amount Due", fieldname="total_due")
|
||||||
|
|
||||||
|
|
||||||
def get_gl_balance(report_date):
|
def get_gl_balance(report_date, company):
|
||||||
return frappe._dict(
|
return frappe._dict(
|
||||||
frappe.db.get_all(
|
frappe.db.get_all(
|
||||||
"GL Entry",
|
"GL Entry",
|
||||||
fields=["party", "sum(debit - credit)"],
|
fields=["party", "sum(debit - credit)"],
|
||||||
filters={"posting_date": ("<=", report_date), "is_cancelled": 0},
|
filters={"posting_date": ("<=", report_date), "is_cancelled": 0, "company": company},
|
||||||
group_by="party",
|
group_by="party",
|
||||||
as_list=1,
|
as_list=1,
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user