nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Get average selling rate based on group by

Browse Source
This commit is contained in:
Nabin Hait
2016-04-12 17:01:39 +05:30
parent f1b276122e
commit f509d13d28
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

@@ -145,11 +145,11 @@ class GrossProfitGenerator(object):
self.data.append(row) self.data.append(row)
if self.grouped: if self.grouped:
self.collapse_group() self.get_average_rate_based_on_group_by()
else: else:
self.grouped_data = [] self.grouped_data = []
def collapse_group(self): def get_average_rate_based_on_group_by(self):
# sum buying / selling totals for group # sum buying / selling totals for group
self.grouped_data = [] self.grouped_data = []
for key in self.grouped.keys(): for key in self.grouped.keys():
@@ -166,6 +166,8 @@ class GrossProfitGenerator(object):
if new_row.base_amount else 0 if new_row.base_amount else 0
new_row.buying_rate = (new_row.buying_amount / new_row.qty) \ new_row.buying_rate = (new_row.buying_amount / new_row.qty) \
if new_row.qty else 0 if new_row.qty else 0
new_row.base_rate = (new_row.base_amount / new_row.qty) \
if new_row.qty else 0
self.grouped_data.append(new_row) self.grouped_data.append(new_row)