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

fix: Decimal point issue in gross profit print

Browse Source
This commit is contained in:
deepeshgarg007 2019-02-21 12:08:32 +05:30
parent bc3bdd77f6
commit 14ff6bfc32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,9 +135,9 @@ class GrossProfitGenerator(object):
row.buying_rate, row.base_rate = 0.0, 0.0 row.buying_rate, row.base_rate = 0.0, 0.0
# calculate gross profit # calculate gross profit
row.gross_profit = row.base_amount - row.buying_amount row.gross_profit = flt(row.base_amount - row.buying_amount, 3)
if row.base_amount: if row.base_amount:
row.gross_profit_percent = (row.gross_profit / row.base_amount) * 100.0 row.gross_profit_percent = flt((row.gross_profit / row.base_amount) * 100.0, 3)
else: else:
row.gross_profit_percent = 0.0 row.gross_profit_percent = 0.0
@ -174,8 +174,8 @@ class GrossProfitGenerator(object):
self.grouped_data.append(row) self.grouped_data.append(row)
def set_average_rate(self, new_row): def set_average_rate(self, new_row):
new_row.gross_profit = new_row.base_amount - new_row.buying_amount new_row.gross_profit = flt(new_row.base_amount - new_row.buying_amount,3)
new_row.gross_profit_percent = ((new_row.gross_profit / new_row.base_amount) * 100.0) \ new_row.gross_profit_percent = flt(((new_row.gross_profit / new_row.base_amount) * 100.0),3) \
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) if new_row.qty else 0 new_row.buying_rate = (new_row.buying_amount / new_row.qty) if new_row.qty else 0
new_row.base_rate = (new_row.base_amount / new_row.qty) if new_row.qty else 0 new_row.base_rate = (new_row.base_amount / new_row.qty) if new_row.qty else 0