diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index c5d732ed697..f55fef068c1 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -312,8 +312,9 @@ def apply_conditions(query, pi, pii, filters): def get_items(filters, additional_table_columns): - pi = frappe.qb.DocType("Purchase Invoice") - pii = frappe.qb.DocType("Purchase Invoice Item") + doctype = "Purchase Invoice" + pi = frappe.qb.DocType(doctype) + pii = frappe.qb.DocType(f"{doctype} Item") Item = frappe.qb.DocType("Item") query = ( frappe.qb.from_(pi) @@ -350,6 +351,7 @@ def get_items(filters, additional_table_columns): pi.mode_of_payment, ) .where(pi.docstatus == 1) + .where(pii.parenttype == doctype) ) if filters.get("supplier"): diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index cd50b118715..7bb73143c28 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -407,8 +407,9 @@ def apply_group_by_conditions(query, si, ii, filters): def get_items(filters, additional_query_columns, additional_conditions=None): - si = frappe.qb.DocType("Sales Invoice") - sii = frappe.qb.DocType("Sales Invoice Item") + doctype = "Sales Invoice" + si = frappe.qb.DocType(doctype) + sii = frappe.qb.DocType(f"{doctype} Item") item = frappe.qb.DocType("Item") query = ( @@ -456,6 +457,7 @@ def get_items(filters, additional_query_columns, additional_conditions=None): sii.qty, ) .where(si.docstatus == 1) + .where(sii.parenttype == doctype) ) if additional_query_columns: