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

[fixes] floating point issue in buying rate

Browse Source
This commit is contained in:
Nabin Hait 2013-05-07 13:12:02 +05:30
parent 620576080a
commit f2d4df975e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/selling_controller.py
View File

@ -59,7 +59,8 @@ class SellingController(StockController):
buying_amount = get_buying_amount(item.item_code, item.warehouse, -1*item.qty, buying_amount = get_buying_amount(item.item_code, item.warehouse, -1*item.qty,
self.doc.doctype, self.doc.name, item.name, stock_ledger_entries, self.doc.doctype, self.doc.name, item.name, stock_ledger_entries,
item_sales_bom) item_sales_bom)
item.buying_amount = buying_amount > 0 and buying_amount or 0
item.buying_amount = buying_amount >= 0.01 and buying_amount or 0
webnotes.conn.set_value(item.doctype, item.name, "buying_amount", webnotes.conn.set_value(item.doctype, item.name, "buying_amount",
item.buying_amount) item.buying_amount)

6
stock/doctype/stock_entry/stock_entry.py
View File

@ -194,10 +194,10 @@ class DocType(StockController):
total_valuation_amount = 0 total_valuation_amount = 0
for item in self.doclist.get({"parentfield": "mtn_details"}): for item in self.doclist.get({"parentfield": "mtn_details"}):
if item.t_warehouse and not item.s_warehouse: if item.t_warehouse and not item.s_warehouse:
total_valuation_amount += flt(item.incoming_rate) * flt(item.transfer_qty) total_valuation_amount += flt(item.incoming_rate, 2) * flt(item.transfer_qty)
if item.s_warehouse and not item.t_warehouse: if item.s_warehouse and not item.t_warehouse:
total_valuation_amount -= flt(item.incoming_rate) * flt(item.transfer_qty) total_valuation_amount -= flt(item.incoming_rate, 2) * flt(item.transfer_qty)
return total_valuation_amount return total_valuation_amount
@ -607,7 +607,7 @@ class DocType(StockController):
'voucher_no': self.doc.name, 'voucher_no': self.doc.name,
'voucher_detail_no': d.name, 'voucher_detail_no': d.name,
'actual_qty': qty, 'actual_qty': qty,
'incoming_rate': flt(d.incoming_rate) or 0, 'incoming_rate': flt(d.incoming_rate, 2) or 0,
'stock_uom': d.stock_uom, 'stock_uom': d.stock_uom,
'company': self.doc.company, 'company': self.doc.company,
'is_cancelled': (is_cancelled ==1) and 'Yes' or 'No', 'is_cancelled': (is_cancelled ==1) and 'Yes' or 'No',