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

Merge pull request #3714 from nabinhait/fix4

Browse Source 
[fix] gross profit report
This commit is contained in:
Nabin Hait
2015-07-24 14:25:35 +05:30
parent 15b4f6310c f666535223
commit 21897e3c52
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,12 +174,12 @@ class GrossProfitGenerator(object):
return flt(row.qty) * item_rate return flt(row.qty) * item_rate
else: else:
if row.update_stock or row.dn_detail: my_sle = self.sle.get((item_code, row.warehouse))
if (row.update_stock or row.dn_detail) and my_sle:
parenttype, parent, item_row = row.parenttype, row.parent, row.item_row parenttype, parent, item_row = row.parenttype, row.parent, row.item_row
if row.dn_detail: if row.dn_detail:
parenttype, parent, item_row = "Delivery Note", row.delivery_note, row.dn_detail parenttype, parent, item_row = "Delivery Note", row.delivery_note, row.dn_detail
my_sle = self.sle.get((item_code, row.warehouse))
for i, sle in enumerate(my_sle): for i, sle in enumerate(my_sle):
# find the stock valution rate from stock ledger entry # find the stock valution rate from stock ledger entry
if sle.voucher_type == parenttype and parent == sle.voucher_no and \ if sle.voucher_type == parenttype and parent == sle.voucher_no and \