schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42481 from frappe/mergify/bp/version-14-hotfix/pr-42444

Browse Source 
fix: parenttype in purchase and sales item query (backport #42444)
This commit is contained in:
Smit Vora
2024-07-26 15:16:44 +05:30
committed by GitHub
parent 37f24ae763 97f2e88f4c
commit 04840762dd
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

@@ -312,8 +312,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)
@@ -350,6 +351,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

@@ -407,8 +407,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 = (
@@ -456,6 +457,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: