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

Minor fix in gross profit report

Browse Source
This commit is contained in:
Nabin Hait 2017-04-03 12:11:36 +05:30
parent 2c892c7e7f
commit 731efe3a95
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,8 @@ class GrossProfitGenerator(object):
def get_average_buying_rate(self, row, item_code): def get_average_buying_rate(self, row, item_code):
if not item_code in self.average_buying_rate: if not item_code in self.average_buying_rate:
if item_code in self.non_stock_items: if item_code in self.non_stock_items:
self.average_buying_rate[item_code] = flt(frappe.db.sql("""select sum(base_net_amount) / sum(qty * conversion_factor) self.average_buying_rate[item_code] = flt(frappe.db.sql("""
select sum(base_net_amount) / sum(qty * conversion_factor)
from `tabPurchase Invoice Item` from `tabPurchase Invoice Item`
where item_code = %s and docstatus=1""", item_code)[0][0]) where item_code = %s and docstatus=1""", item_code)[0][0])
else: else:
@ -228,7 +229,7 @@ class GrossProfitGenerator(object):
row.parenttype, row.parent, allow_zero_rate=True, row.parenttype, row.parent, allow_zero_rate=True,
currency=self.filters.currency) currency=self.filters.currency)
self.average_buying_rate[item_code] = average_buying_rate self.average_buying_rate[item_code] = flt(average_buying_rate)
return self.average_buying_rate[item_code] return self.average_buying_rate[item_code]