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

Merge pull request #35419 from frappe/mergify/bp/version-14-hotfix/pr-35417

Browse Source 
fix(Gross Profit): 'company' column is ambiguous in filter (backport #35417)
This commit is contained in:
ruthra kumar
2023-05-25 16:44:45 +05:30
committed by GitHub
parent 151b599808 a59c205d2e
commit 54fac5786a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,7 +736,7 @@ class GrossProfitGenerator(object):
def load_invoice_items(self):
conditions = ""
if self.filters.company:
conditions += " and company = %(company)s"
conditions += " and `tabSales Invoice`.company = %(company)s"
if self.filters.from_date:
conditions += " and posting_date >= %(from_date)s"
if self.filters.to_date: