schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: filter serial no based on batch no

Browse Source
This commit is contained in:
vishal
2020-02-11 11:44:24 +05:30
parent 90a46acc0d
commit cde48a44cf
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/public/js/utils/serial_no_batch_selector.js
View File

@@ -90,7 +90,8 @@ erpnext.SerialNoBatchSelector = Class.extend({
args: {
qty: qty,
item_code: me.item_code,
warehouse: me.warehouse_details.name
warehouse: me.warehouse_details.name,
batch_no: me.item.batch_no || null
}
});
@@ -392,7 +393,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
delivery_document_no: ""
}
if (this.has_batch) {
if (this.item.batch_no) {
serial_no_filters["batch_no"] = this.item.batch_no;
}

4
erpnext/stock/doctype/serial_no/serial_no.py
View File

@@ -398,7 +398,6 @@ def make_serial_no(serial_no, args):
sr.asset = args.get('asset')
sr.location = args.get('location')
if args.get('purchase_document_type'):
sr.purchase_document_type = args.get('purchase_document_type')
sr.purchase_document_no = args.get('purchase_document_no')
@@ -474,10 +473,11 @@ def get_delivery_note_serial_no(item_code, qty, delivery_note):
return serial_nos
@frappe.whitelist()
def auto_fetch_serial_number(qty, item_code, warehouse):
def auto_fetch_serial_number(qty, item_code, warehouse, batch_no=None):
serial_numbers = frappe.get_list("Serial No", filters={
"item_code": item_code,
"warehouse": warehouse,
"batch_no": batch_no,
"delivery_document_no": "",
"sales_invoice": ""
}, limit=qty, order_by="creation")