mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-21 07:38:29 +00:00
fix: TypeError in group field filter in supplier ledger summary
(cherry picked from commit 872e94a316)
This commit is contained in:
@@ -100,7 +100,7 @@ class PartyLedgerSummaryReport:
|
|||||||
conditions.append(doctype.territory.isin(self.filters.territory))
|
conditions.append(doctype.territory.isin(self.filters.territory))
|
||||||
|
|
||||||
if self.filters.get(group_field):
|
if self.filters.get(group_field):
|
||||||
conditions.append(doctype.get(group_field).isin(self.filters.get(group_field)))
|
conditions.append(doctype[group_field].isin(self.filters.get(group_field)))
|
||||||
|
|
||||||
if self.filters.payment_terms_template:
|
if self.filters.payment_terms_template:
|
||||||
conditions.append(doctype.payment_terms == self.filters.payment_terms_template)
|
conditions.append(doctype.payment_terms == self.filters.payment_terms_template)
|
||||||
|
|||||||
@@ -59,3 +59,33 @@ class TestSupplierLedgerSummary(FrappeTestCase, AccountsTestMixin):
|
|||||||
for field in expected:
|
for field in expected:
|
||||||
with self.subTest(field=field):
|
with self.subTest(field=field):
|
||||||
self.assertEqual(report_output[0].get(field), expected.get(field))
|
self.assertEqual(report_output[0].get(field), expected.get(field))
|
||||||
|
|
||||||
|
def test_supplier_ledger_summary_with_filters(self):
|
||||||
|
self.create_purchase_invoice()
|
||||||
|
|
||||||
|
supplier_group = frappe.db.get_value("Supplier", self.supplier, "supplier_group")
|
||||||
|
|
||||||
|
filters = {
|
||||||
|
"company": self.company,
|
||||||
|
"from_date": today(),
|
||||||
|
"to_date": today(),
|
||||||
|
"supplier_group": supplier_group,
|
||||||
|
}
|
||||||
|
|
||||||
|
expected = {
|
||||||
|
"party": "_Test Supplier",
|
||||||
|
"party_name": "_Test Supplier",
|
||||||
|
"opening_balance": 0,
|
||||||
|
"invoiced_amount": 300.0,
|
||||||
|
"paid_amount": 0,
|
||||||
|
"return_amount": 0,
|
||||||
|
"closing_balance": 300.0,
|
||||||
|
"currency": "INR",
|
||||||
|
"supplier_name": "_Test Supplier",
|
||||||
|
}
|
||||||
|
|
||||||
|
report_output = execute(filters)[1]
|
||||||
|
self.assertEqual(len(report_output), 1)
|
||||||
|
for field in expected:
|
||||||
|
with self.subTest(field=field):
|
||||||
|
self.assertEqual(report_output[0].get(field), expected.get(field))
|
||||||
|
|||||||
Reference in New Issue
Block a user