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

fix: Transfer Bucket logic for Repack Entry with split batch rows

Browse Source
This commit is contained in:
marination 2022-02-15 18:10:57 +05:30
parent f89a64db48
commit 799671c748
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/stock/report/stock_ageing/stock_ageing.py
View File

@ -286,10 +286,11 @@ class FIFOSlots:
def __compute_incoming_stock(self, row: Dict, fifo_queue: List, transfer_key: Tuple, serial_nos: List): def __compute_incoming_stock(self, row: Dict, fifo_queue: List, transfer_key: Tuple, serial_nos: List):
"Update FIFO Queue on inward stock." "Update FIFO Queue on inward stock."
if self.transferred_item_details.get(transfer_key): transfer_data = self.transferred_item_details.get(transfer_key)
# inward/outward from same voucher, item & warehouse if transfer_data:
slot = self.transferred_item_details[transfer_key].pop(0) # [Repack] inward/outward from same voucher, item & warehouse
fifo_queue.append(slot) # consume transfer data and add stock to fifo queue
self.__adjust_incoming_transfer_qty(transfer_data, fifo_queue, row)
else: else:
if not serial_nos: if not serial_nos:
if fifo_queue and flt(fifo_queue[0][0]) < 0: if fifo_queue and flt(fifo_queue[0][0]) < 0:
@ -333,6 +334,27 @@ class FIFOSlots:
self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1]]) self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1]])
qty_to_pop = 0 qty_to_pop = 0
def __adjust_incoming_transfer_qty(self, transfer_data: Dict, fifo_queue: List, row: Dict):
"Add previously removed stock back to FIFO Queue."
transfer_qty_to_pop = flt(row.actual_qty)
first_bucket_qty = transfer_data[0][0]
first_bucket_date = transfer_data[0][1]
while transfer_qty_to_pop:
if transfer_data and 0 > first_bucket_qty <= transfer_qty_to_pop:
# bucket qty is not enough, consume whole
transfer_qty_to_pop -= first_bucket_qty
slot = transfer_data.pop(0)
fifo_queue.append(slot)
elif not transfer_data:
# transfer bucket is empty, extra incoming qty
fifo_queue.append([transfer_qty_to_pop, row.posting_date])
else:
# ample bucket qty to consume
first_bucket_qty -= transfer_qty_to_pop
fifo_queue.append([transfer_qty_to_pop, first_bucket_date])
transfer_qty_to_pop = 0
def __update_balances(self, row: Dict, key: Union[Tuple, str]): def __update_balances(self, row: Dict, key: Union[Tuple, str]):
self.item_details[key]["qty_after_transaction"] = row.qty_after_transaction self.item_details[key]["qty_after_transaction"] = row.qty_after_transaction