CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 11:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle mode of payment filter (backport #49185) (#49221)

Browse Source 
Merge pull request #49185 from aerele/mop-sales-register

fix: handle mode of payment filter
(cherry picked from commit d656e02441)

Co-authored-by: Logesh Periyasamy <logeshperiyasamy24@gmail.com>
This commit is contained in:
ruthra kumar
2025-08-19 12:26:25 +05:30
committed by GitHub
parent 2cfdb2d2cd cfb7558465
commit b6c992ffeb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -355,7 +355,13 @@ def apply_conditions(query, si, sii, sip, filters, additional_conditions=None):
query = query.where(si.posting_date <= filters.get("to_date")) query = query.where(si.posting_date <= filters.get("to_date"))
if filters.get("mode_of_payment"): if filters.get("mode_of_payment"):
query = query.where(sip.mode_of_payment == filters.get("mode_of_payment")) subquery = (
frappe.qb.from_(sip)
.select(sip.parent)
.where(sip.mode_of_payment == filters.get("mode_of_payment"))
.groupby(sip.parent)
)
query = query.where(si.name.isin(subquery))
if filters.get("warehouse"): if filters.get("warehouse"):
if frappe.db.get_value("Warehouse", filters.get("warehouse"), "is_group"): if frappe.db.get_value("Warehouse", filters.get("warehouse"), "is_group"):
@@ -424,8 +430,6 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
frappe.qb.from_(si) frappe.qb.from_(si)
.join(sii) .join(sii)
.on(si.name == sii.parent) .on(si.name == sii.parent)
.left_join(sip)
.on(sip.parent == si.name)
.left_join(item) .left_join(item)
.on(sii.item_code == item.name) .on(sii.item_code == item.name)
.select( .select(
@@ -465,7 +469,6 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
si.update_stock, si.update_stock,
sii.uom, sii.uom,
sii.qty, sii.qty,
sip.mode_of_payment,
) )
.where(si.docstatus == 1) .where(si.docstatus == 1)
.where(sii.parenttype == doctype) .where(sii.parenttype == doctype)