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

refactor: batch no filter handling

Browse Source
This commit is contained in:
Ankush Menat 2022-03-19 18:50:05 +05:30 committed by Ankush Menat
parent b9eec331e3
commit a585dff6fd
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,16 @@ import json
import frappe
from frappe import ValidationError, _
from frappe.model.naming import make_autoname
from frappe.utils import add_days, cint, cstr, flt, get_link_to_form, getdate, nowdate
from frappe.utils import (
add_days,
cint,
cstr,
flt,
get_link_to_form,
getdate,
nowdate,
safe_json_loads,
)
from erpnext.controllers.stock_controller import StockController
from erpnext.stock.get_item_details import get_reserved_qty_for_so
@ -566,7 +575,8 @@ def get_delivery_note_serial_no(item_code, qty, delivery_note):
@frappe.whitelist()
def auto_fetch_serial_number(qty, item_code, warehouse,
posting_date=None, batch_nos=None, for_doctype=None, exclude_sr_nos=None):
filters = { "item_code": item_code, "warehouse": warehouse }
filters = frappe._dict({"item_code": item_code, "warehouse": warehouse})
if exclude_sr_nos is None:
exclude_sr_nos = []
@ -574,13 +584,14 @@ def auto_fetch_serial_number(qty, item_code, warehouse,
exclude_sr_nos = get_serial_nos(clean_serial_no_string("\n".join(exclude_sr_nos)))
if batch_nos:
try:
filters["batch_no"] = json.loads(batch_nos) if (type(json.loads(batch_nos)) == list) else [json.loads(batch_nos)]
except Exception:
filters["batch_no"] = [batch_nos]
batch_nos = safe_json_loads(batch_nos)
if isinstance(batch_nos, list):
filters.batch_no = batch_nos
elif isinstance(batch_nos, str):
filters.batch_no = [batch_nos]
if posting_date:
filters["expiry_date"] = posting_date
filters.expiry_date = posting_date
serial_numbers = []
if for_doctype == 'POS Invoice':