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

fix: fetch sales invoice based on mode_of_payment in item-wise sales register

Browse Source 
(cherry picked from commit 39cd7a29df)
This commit is contained in:
ravibharathi656
2025-07-03 15:37:44 +05:30
committed by Mergify
parent 0a9f45aacf
commit d04c256b73
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,7 +343,7 @@ def get_columns(additional_table_columns, filters):
return columns return columns
def apply_conditions(query, si, sii, filters, additional_conditions=None): def apply_conditions(query, si, sii, sip, filters, additional_conditions=None):
for opts in ("company", "customer"): for opts in ("company", "customer"):
if filters.get(opts): if filters.get(opts):
query = query.where(si[opts] == filters[opts]) query = query.where(si[opts] == filters[opts])
@@ -355,10 +355,7 @@ def apply_conditions(query, si, sii, 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"):
sales_invoice = frappe.db.get_all( query = query.where(sip.mode_of_payment == filters.get("mode_of_payment"))
"Sales Invoice Payment", {"mode_of_payment": filters.get("mode_of_payment")}, pluck="parent"
)
query = query.where(si.name.isin(sales_invoice))
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"):
@@ -416,6 +413,7 @@ def apply_order_by_conditions(query, si, ii, filters):
def get_items(filters, additional_query_columns, additional_conditions=None): def get_items(filters, additional_query_columns, additional_conditions=None):
doctype = "Sales Invoice" doctype = "Sales Invoice"
si = frappe.qb.DocType(doctype) si = frappe.qb.DocType(doctype)
sip = frappe.qb.DocType(f"{doctype} Payment")
sii = frappe.qb.DocType(f"{doctype} Item") sii = frappe.qb.DocType(f"{doctype} Item")
item = frappe.qb.DocType("Item") item = frappe.qb.DocType("Item")
@@ -423,6 +421,8 @@ 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(
@@ -462,6 +462,7 @@ 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)
@@ -481,7 +482,7 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
if filters.get("customer_group"): if filters.get("customer_group"):
query = query.where(si.customer_group == filters["customer_group"]) query = query.where(si.customer_group == filters["customer_group"])
query = apply_conditions(query, si, sii, filters, additional_conditions) query = apply_conditions(query, si, sii, sip, filters, additional_conditions)
from frappe.desk.reportview import build_match_conditions from frappe.desk.reportview import build_match_conditions