CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Maintain same rate in Stock Ledger until stock become positive (#27227)

Browse Source 
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive

(cherry picked from commit 10754831c3)

# Conflicts:
#	erpnext/stock/stock_ledger.py
This commit is contained in:
Nabin Hait
2021-09-14 13:34:36 +05:30
committed by Mergify
parent 987a95d2b5
commit 5bb4058ef4
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/stock/stock_ledger.py
View File

@@ -1376,8 +1376,24 @@ class update_entries_after:
self.wh_data.qty_after_transaction + actual_qty
)
<<<<<<< HEAD
if self.valuation_method == "LIFO":
stock_queue = LIFOValuation(self.wh_data.stock_queue)
=======
# last row has the same rate, just updated the qty
if self.wh_data.stock_queue[-1][1]==incoming_rate:
self.wh_data.stock_queue[-1][0] += actual_qty
else:
# Item has a positive balance qty, add new entry
if self.wh_data.stock_queue[-1][0] > 0:
self.wh_data.stock_queue.append([actual_qty, incoming_rate])
else: # negative balance qty
qty = self.wh_data.stock_queue[-1][0] + actual_qty
if qty > 0: # new balance qty is positive
self.wh_data.stock_queue[-1] = [qty, incoming_rate]
else: # new balance qty is still negative, maintain same rate
self.wh_data.stock_queue[-1][0] = qty
>>>>>>> 10754831c3 (fix: Maintain same rate in Stock Ledger until stock become positive (#27227))
else:
stock_queue = FIFOValuation(self.wh_data.stock_queue)