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

Merge pull request #36976 from frappe/mergify/bp/version-14-hotfix/pr-36898

Browse Source 
fix: `company` is ambiguous (#36898)
This commit is contained in:
Deepesh Garg
2023-09-10 11:41:46 +05:30
committed by GitHub
parent 43d9a10093 fe69d5364d
commit 7acf732a9c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,7 +287,7 @@ def get_conditions(filters):
conditions = ""
for opts in (
("company", " and company=%(company)s"),
("company", " and `tabPurchase Invoice`.company=%(company)s"),
("supplier", " and `tabPurchase Invoice`.supplier = %(supplier)s"),
("item_code", " and `tabPurchase Invoice Item`.item_code = %(item_code)s"),
("from_date", " and `tabPurchase Invoice`.posting_date>=%(from_date)s"),

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

@@ -332,7 +332,7 @@ def get_conditions(filters, additional_conditions=None):
conditions = ""
for opts in (
("company", " and company=%(company)s"),
("company", " and `tabSales Invoice`.company=%(company)s"),
("customer", " and `tabSales Invoice`.customer = %(customer)s"),
("item_code", " and `tabSales Invoice Item`.item_code = %(item_code)s"),
("from_date", " and `tabSales Invoice`.posting_date>=%(from_date)s"),