nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8258 from rohitwaghchaure/gross_profit_issue_v_8

Browse Source 
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
This commit is contained in:
Nabin Hait
2017-03-31 17:39:58 +05:30
committed by GitHub
parent 4b0381c820 b15d999147
commit 9f84a99158
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,8 +225,10 @@ class GrossProfitGenerator(object):
average_buying_rate = get_incoming_rate(row) average_buying_rate = get_incoming_rate(row)
if not average_buying_rate: if not average_buying_rate:
average_buying_rate = get_valuation_rate(item_code, row.warehouse, average_buying_rate = get_valuation_rate(item_code, row.warehouse,
allow_zero_rate=True, currency=self.filters.currency) row.parenttype, row.parent, allow_zero_rate=True,
self.average_buying_rate[item_code] = average_buying_rate currency=self.filters.currency)
self.average_buying_rate[item_code] = average_buying_rate
return self.average_buying_rate[item_code] return self.average_buying_rate[item_code]