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

Merge pull request #25304 from ankush/fix_sl_rounding

Browse Source 
fix(stock_ledger): round off values near to zero
This commit is contained in:
rohitwaghchaure 2021-04-15 14:44:09 +05:30 committed by GitHub
commit 1bdc457777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/stock/stock_ledger.py
View File

@ -604,7 +604,7 @@ class update_entries_after(object):
batch = self.wh_data.stock_queue[index] batch = self.wh_data.stock_queue[index]
if qty_to_pop >= batch[0]: if qty_to_pop >= batch[0]:
# consume current batch # consume current batch
qty_to_pop = qty_to_pop - batch[0] qty_to_pop = _round_off_if_near_zero(qty_to_pop - batch[0])
self.wh_data.stock_queue.pop(index) self.wh_data.stock_queue.pop(index)
if not self.wh_data.stock_queue and qty_to_pop: if not self.wh_data.stock_queue and qty_to_pop:
# stock finished, qty still remains to be withdrawn # stock finished, qty still remains to be withdrawn
@ -618,8 +618,8 @@ class update_entries_after(object):
batch[0] = batch[0] - qty_to_pop batch[0] = batch[0] - qty_to_pop
qty_to_pop = 0 qty_to_pop = 0
stock_value = sum((flt(batch[0]) * flt(batch[1]) for batch in self.wh_data.stock_queue)) stock_value = _round_off_if_near_zero(sum((flt(batch[0]) * flt(batch[1]) for batch in self.wh_data.stock_queue)))
stock_qty = sum((flt(batch[0]) for batch in self.wh_data.stock_queue)) stock_qty = _round_off_if_near_zero(sum((flt(batch[0]) for batch in self.wh_data.stock_queue)))
if stock_qty: if stock_qty:
self.wh_data.valuation_rate = stock_value / flt(stock_qty) self.wh_data.valuation_rate = stock_value / flt(stock_qty)
@ -858,3 +858,12 @@ def get_future_sle_with_negative_qty(args):
order by timestamp(posting_date, posting_time) asc order by timestamp(posting_date, posting_time) asc
limit 1 limit 1
""", args, as_dict=1) """, args, as_dict=1)
def _round_off_if_near_zero(number: float, precision: int = 6) -> float:
""" Rounds off the number to zero only if number is close to zero for decimal
specified in precision. Precision defaults to 6.
"""
if flt(number) < (1.0 / (10**precision)):
return 0
return flt(number)