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

fix: remove spaces and order import

Browse Source 
(cherry picked from commit 3ef551872a)
This commit is contained in:
hrzzz
2022-08-15 09:23:56 -03:00
committed by Mergify
parent 60fa421409
commit 055556b7f1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,8 @@ from frappe import _, scrub
from frappe.utils import cint, flt, formatdate from frappe.utils import cint, flt, formatdate
from erpnext.controllers.queries import get_match_cond from erpnext.controllers.queries import get_match_cond
from erpnext.stock.utils import get_incoming_rate
from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition
from erpnext.stock.utils import get_incoming_rate
def execute(filters=None): def execute(filters=None):
@@ -681,9 +681,9 @@ class GrossProfitGenerator(object):
conditions += " and {0}".format(get_item_group_condition(self.filters.item_group)) conditions += " and {0}".format(get_item_group_condition(self.filters.item_group))
if self.filters.sales_person: if self.filters.sales_person:
conditions += """ conditions += """
and exists(select 1 and exists(select 1
from `tabSales Team` st from `tabSales Team` st
where st.parent = `tabSales Invoice`.name where st.parent = `tabSales Invoice`.name
and st.sales_person = %(sales_person)s) and st.sales_person = %(sales_person)s)
""" """