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

fix: Batch number selection code

Browse Source
This commit is contained in:
Suraj Shetty 2019-07-30 10:02:10 +05:30
parent 55ab31314c
commit e260e8239f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/pick_ticket/pick_ticket.py
View File

@ -63,6 +63,8 @@ def set_serial_nos(item_doc):
}, limit=item_doc.qty, order_by='purchase_date') }, limit=item_doc.qty, order_by='purchase_date')
item_doc.set('serial_no', '\n'.join([serial_no.name for serial_no in serial_nos])) item_doc.set('serial_no', '\n'.join([serial_no.name for serial_no in serial_nos]))
# should we assume that all serialized item available in stock will have serial no?
def set_batch_no(item_doc, parent_doc): def set_batch_no(item_doc, parent_doc):
batches = frappe.db.sql(""" batches = frappe.db.sql("""
SELECT SELECT
@ -88,18 +90,19 @@ def set_batch_no(item_doc, parent_doc):
while required_qty > 0 and batches: while required_qty > 0 and batches:
batch = batches.pop() batch = batches.pop()
batch_expiry = frappe.get_value('Batch', batch.batch_no, 'expiry_date') batch_expiry = frappe.get_value('Batch', batch.batch_no, 'expiry_date')
if batch_expiry and batch_expiry < frappe.utils.getdate(): if batch_expiry and batch_expiry <= frappe.utils.getdate():
print('---------- Batch {} is expired. Skipping... -------------'.format(batch.batch_no)) print('---------- Batch {} is expired. Skipping... -------------'.format(batch.batch_no))
continue continue
item_doc.batch_no = batch.batch_no item_doc.batch_no = batch.batch_no
required_qty -= batch.qty
if batch.qty >= item_doc.qty: if batch.qty >= item_doc.qty:
required_qty = 0
break break
else: else:
# split item if quantity of item in batch is less that required # split item if quantity of item in batch is less that required
# Look for another batch # Look for another batch
# set quantity of of item equal to batch quantity # set quantity of of item equal to batch quantity
required_qty -= batch.qty
item_doc.set('qty', batch.qty) item_doc.set('qty', batch.qty)
item_doc = parent_doc.append('items', { item_doc = parent_doc.append('items', {
'item': item_doc.item, 'item': item_doc.item,