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

fix: Fixes in stock ageing report

Browse Source
This commit is contained in:
deepeshgarg007 2019-07-23 08:30:09 +05:30
parent 7fdab021b6
commit 06f99cae36
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,30 +148,28 @@ def get_fifo_queue(filters):
if d.voucher_type == "Stock Reconciliation": if d.voucher_type == "Stock Reconciliation":
d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0))
serial_no_list = get_serial_nos(d.serial_no) if d.serial_no else []
if d.actual_qty > 0: if d.actual_qty > 0:
if transfered_item_details.get((d.voucher_no, d.name)): if transfered_item_details.get((d.voucher_no, d.name)):
qty_to_add = d.actual_qty
batch = transfered_item_details[(d.voucher_no, d.name)][0] batch = transfered_item_details[(d.voucher_no, d.name)][0]
fifo_queue.append(batch) fifo_queue.append(batch)
transfered_item_details[((d.voucher_no, d.name))].pop(0) transfered_item_details[((d.voucher_no, d.name))].pop(0)
else: else:
if d.serial_no: if serial_no_list:
if d.serial_no: for serial_no in serial_no_list:
for no in get_serial_nos(d.serial_no): if serial_no_batch_purchase_details.get(serial_no):
if serial_no_batch_purchase_details.get(no): fifo_queue.append([serial_no, serial_no_batch_purchase_details.get(serial_no)])
fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) else:
else: serial_no_batch_purchase_details.setdefault(serial_no, d.posting_date)
serial_no_batch_purchase_details.setdefault(no, d.posting_date) fifo_queue.append([serial_no, d.posting_date])
fifo_queue.append([no, d.posting_date])
else: else:
fifo_queue.append([d.actual_qty, d.posting_date]) fifo_queue.append([d.actual_qty, d.posting_date])
else: else:
if d.serial_no: if serial_no_list:
if d.serial_no: for serial_no in fifo_queue:
serial_no_list = get_serial_nos(d.serial_no) if serial_no[0] in serial_no_list:
for serial_no in fifo_queue: fifo_queue.remove(serial_no)
if serial_no[0] in serial_no_list:
fifo_queue.remove(serial_no)
else: else:
qty_to_pop = abs(d.actual_qty) qty_to_pop = abs(d.actual_qty)
while qty_to_pop: while qty_to_pop: