CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 19:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: company is ambiguous

Browse Source 
(cherry picked from commit 3e1065a561)
This commit is contained in:
Dany Robert
2023-09-01 04:58:59 +00:00
committed by Mergify
parent 58163d5aa8
commit fe69d5364d
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 = "" conditions = ""
for opts in ( for opts in (
("company", " and company=%(company)s"), ("company", " and `tabPurchase Invoice`.company=%(company)s"),
("supplier", " and `tabPurchase Invoice`.supplier = %(supplier)s"), ("supplier", " and `tabPurchase Invoice`.supplier = %(supplier)s"),
("item_code", " and `tabPurchase Invoice Item`.item_code = %(item_code)s"), ("item_code", " and `tabPurchase Invoice Item`.item_code = %(item_code)s"),
("from_date", " and `tabPurchase Invoice`.posting_date>=%(from_date)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 = "" conditions = ""
for opts in ( for opts in (
("company", " and company=%(company)s"), ("company", " and `tabSales Invoice`.company=%(company)s"),
("customer", " and `tabSales Invoice`.customer = %(customer)s"), ("customer", " and `tabSales Invoice`.customer = %(customer)s"),
("item_code", " and `tabSales Invoice Item`.item_code = %(item_code)s"), ("item_code", " and `tabSales Invoice Item`.item_code = %(item_code)s"),
("from_date", " and `tabSales Invoice`.posting_date>=%(from_date)s"), ("from_date", " and `tabSales Invoice`.posting_date>=%(from_date)s"),