commit 28ccaa3c880fdbbd23bab1e653cd7486967fe0fb
author Nabin Hait <nabinhait@gmail.com> Wed Jan 16 17:49:22 2019 +0530
committer GitHub <noreply@github.com> Wed Jan 16 17:49:22 2019 +0530
tree b52511454b02798d9ee411d3d7c0b0eb26719f48
parent fccb1e55ec01f80764bf656e75bac370b5e76db7
parent 0e0f7c0d32e30bb0df83c499ebab59ff89db4a7e

Merge branch 'staging-fixes' into Gross-Profit-Return-Fix

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 7ecc695..01211a9 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -184,7 +184,7 @@
 	def get_returned_invoice_items(self):
 		returned_invoices = frappe.db.sql("""
 			select
-				si.name, si_item.item_code, si_item.qty, si_item.base_amount, si.return_against
+				si.name, si_item.item_code, si_item.stock_qty as qty, si_item.base_net_amount as base_amount, si.return_against
 			from
 				`tabSales Invoice` si, `tabSales Invoice Item` si_item
 			where