Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3998 from nabinhait/fix7

Browse Source 
[fix] Gross Profit report should not include return entries
This commit is contained in:
Nabin Hait 2015-09-09 10:37:30 +05:30
commit 0b17a91aba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ class GrossProfitGenerator(object):
inner join `tabSales Invoice Item` item on item.parent = si.name inner join `tabSales Invoice Item` item on item.parent = si.name
left join `tabSales Team` sales on sales.parent = si.name left join `tabSales Team` sales on sales.parent = si.name
where where
si.docstatus = 1 %s si.docstatus = 1 and si.is_return != 1 %s
order by order by
si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1) si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1)