nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 07:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: parenttype in item wise purchase and sales register

Browse Source 
(cherry picked from commit 35981b8730)
This commit is contained in:
ljain112
2024-07-23 17:36:33 +05:30
committed by Mergify
parent dd8fff6d43
commit 322fbe92ee
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -315,8 +315,9 @@ def apply_conditions(query, pi, pii, filters):
def get_items(filters, additional_table_columns): def get_items(filters, additional_table_columns):
pi = frappe.qb.DocType("Purchase Invoice") doctype = "Purchase Invoice"
pii = frappe.qb.DocType("Purchase Invoice Item") pi = frappe.qb.DocType(doctype)
pii = frappe.qb.DocType(f"{doctype} Item")
Item = frappe.qb.DocType("Item") Item = frappe.qb.DocType("Item")
query = ( query = (
frappe.qb.from_(pi) frappe.qb.from_(pi)
@@ -353,6 +354,7 @@ def get_items(filters, additional_table_columns):
pi.mode_of_payment, pi.mode_of_payment,
) )
.where(pi.docstatus == 1) .where(pi.docstatus == 1)
.where(pii.parenttype == doctype)
) )
if filters.get("supplier"): if filters.get("supplier"):

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

@@ -410,8 +410,9 @@ def apply_group_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):
si = frappe.qb.DocType("Sales Invoice") doctype = "Sales Invoice"
sii = frappe.qb.DocType("Sales Invoice Item") si = frappe.qb.DocType(doctype)
sii = frappe.qb.DocType(f"{doctype} Item")
item = frappe.qb.DocType("Item") item = frappe.qb.DocType("Item")
query = ( query = (
@@ -459,6 +460,7 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
sii.qty, sii.qty,
) )
.where(si.docstatus == 1) .where(si.docstatus == 1)
.where(sii.parenttype == doctype)
) )
if additional_query_columns: if additional_query_columns: