Skip to content

Commit

Permalink
fix: company is ambiguous
Browse files Browse the repository at this point in the history
(cherry picked from commit 3e1065a)
  • Loading branch information
rtdany10 authored and mergify[bot] committed Sep 6, 2023
1 parent 58163d5 commit fe69d53
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down

0 comments on commit fe69d53

Please sign in to comment.