commit 0b17a91aba9bb42a6d007fd0e5fad1f3dc67697e
author Nabin Hait <nabinhait@gmail.com> Wed Sep 09 10:37:30 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Sep 09 10:37:30 2015 +0530
tree cf66e4a92842d6f5ee1e08771b07429dd41ce1e4
parent 38f64ea3ab2b4983cf5e6fa6218f4a3cd865ff17
parent 83dd3e14e58b8f2e1d2dbe4190c454858ef54ea0

Merge pull request #3998 from nabinhait/fix7

[fix] Gross Profit report should not include return entries

erpnext/accounts/report/gross_profit/gross_profit.py

diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index ef9bbac..bfeeb34 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -226,7 +226,7 @@
 			inner join `tabSales Invoice Item` item on item.parent = si.name
 			left join `tabSales Team` sales on sales.parent = si.name
 			where
-				si.docstatus = 1 %s
+				si.docstatus = 1 and si.is_return != 1 %s
 			order by
 				si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1)