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

fix: Selling and buying amount precision fix (#16764)

Browse Source
This commit is contained in:
Deepesh Garg 2019-03-04 12:56:27 +05:30 committed by Faris Ansari
parent 40743840b7
commit 44ff41188d
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import frappe
from frappe import _, scrub from frappe import _, scrub
from erpnext.stock.utils import get_incoming_rate from erpnext.stock.utils import get_incoming_rate
from erpnext.controllers.queries import get_match_cond from erpnext.controllers.queries import get_match_cond
from frappe.utils import flt from frappe.utils import flt, cint
def execute(filters=None): def execute(filters=None):
@ -106,11 +106,14 @@ class GrossProfitGenerator(object):
self.grouped = {} self.grouped = {}
self.grouped_data = [] self.grouped_data = []
self.currency_precision = cint(frappe.db.get_default("currency_precision")) or 3
self.float_precision = cint(frappe.db.get_default("float_precision")) or 2
for row in self.si_list: for row in self.si_list:
if self.skip_row(row, self.product_bundles): if self.skip_row(row, self.product_bundles):
continue continue
row.base_amount = flt(row.base_net_amount) row.base_amount = flt(row.base_net_amount, self.currency_precision)
product_bundles = [] product_bundles = []
if row.update_stock: if row.update_stock:
@ -129,15 +132,15 @@ class GrossProfitGenerator(object):
# get buying rate # get buying rate
if row.qty: if row.qty:
row.buying_rate = row.buying_amount / row.qty row.buying_rate = flt(row.buying_amount / row.qty, self.float_precision)
row.base_rate = row.base_amount / row.qty row.base_rate = flt(row.base_amount / row.qty, self.float_precision)
else: else:
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 = flt(row.base_amount - row.buying_amount, 3) row.gross_profit = flt(row.base_amount - row.buying_amount, self.currency_precision)
if row.base_amount: if row.base_amount:
row.gross_profit_percent = flt((row.gross_profit / row.base_amount) * 100.0, 3) row.gross_profit_percent = flt((row.gross_profit / row.base_amount) * 100.0, self.currency_precision)
else: else:
row.gross_profit_percent = 0.0 row.gross_profit_percent = 0.0
@ -156,8 +159,8 @@ class GrossProfitGenerator(object):
new_row = row new_row = row
else: else:
new_row.qty += row.qty new_row.qty += row.qty
new_row.buying_amount += row.buying_amount new_row.buying_amount += flt(row.buying_amount, self.currency_precision)
new_row.base_amount += row.base_amount new_row.base_amount += flt(row.base_amount, self.currency_precision)
new_row = self.set_average_rate(new_row) new_row = self.set_average_rate(new_row)
self.grouped_data.append(new_row) self.grouped_data.append(new_row)
else: else:
@ -167,18 +170,19 @@ class GrossProfitGenerator(object):
returned_item_rows = self.returned_invoices[row.parent][row.item_code] returned_item_rows = self.returned_invoices[row.parent][row.item_code]
for returned_item_row in returned_item_rows: for returned_item_row in returned_item_rows:
row.qty += returned_item_row.qty row.qty += returned_item_row.qty
row.base_amount += returned_item_row.base_amount row.base_amount += flt(returned_item_row.base_amount, self.currency_precision)
row.buying_amount = row.qty * row.buying_rate row.buying_amount = flt(row.qty * row.buying_rate, self.currency_precision)
if row.qty or row.base_amount: if row.qty or row.base_amount:
row = self.set_average_rate(row) row = self.set_average_rate(row)
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 = flt(new_row.base_amount - new_row.buying_amount,3) new_row.gross_profit = flt(new_row.base_amount - new_row.buying_amount, self.currency_precision)
new_row.gross_profit_percent = flt(((new_row.gross_profit / new_row.base_amount) * 100.0),3) \ new_row.gross_profit_percent = flt(((new_row.gross_profit / new_row.base_amount) * 100.0), self.currency_precision) \
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 = flt(new_row.buying_amount / new_row.qty, self.float_precision) 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 = flt(new_row.base_amount / new_row.qty, self.float_precision) if new_row.qty else 0
return new_row return new_row
def get_returned_invoice_items(self): def get_returned_invoice_items(self):