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

Merge pull request #22206 from frappe/clarkejj-patch-1

Browse Source 
fix: TypeError in Stock ageing report
This commit is contained in:
Deepesh Garg 2020-06-12 21:14:15 +05:30 committed by GitHub
commit bf66d1dca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,10 +180,10 @@ def get_fifo_queue(filters, sle=None):
qty_to_pop = abs(d.actual_qty) qty_to_pop = abs(d.actual_qty)
while qty_to_pop: while qty_to_pop:
batch = fifo_queue[0] if fifo_queue else [0, None] batch = fifo_queue[0] if fifo_queue else [0, None]
if 0 < batch[0] <= qty_to_pop: if 0 < flt(batch[0]) <= qty_to_pop:
# if batch qty > 0 # if batch qty > 0
# not enough or exactly same qty in current batch, clear batch # not enough or exactly same qty in current batch, clear batch
qty_to_pop -= batch[0] qty_to_pop -= flt(batch[0])
transferred_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) transferred_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0))
else: else:
# all from current batch # all from current batch
@ -262,4 +262,4 @@ def get_chart_data(data, filters):
] ]
}, },
"type" : "bar" "type" : "bar"
} }