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

Allow Disabling Batch and edit Validations (#15076)

Browse Source
This commit is contained in:
Doridel Cahanap 2018-08-06 17:15:18 +08:00 committed by Nabin Hait
parent 614959d5f8
commit 59e4c32e9f
3 changed files with 537 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/queries.py
View File

@ -282,7 +282,8 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
from `tabStock Ledger Entry` sle from `tabStock Ledger Entry` sle
INNER JOIN `tabBatch` batch on sle.batch_no = batch.name INNER JOIN `tabBatch` batch on sle.batch_no = batch.name
where where
sle.item_code = %(item_code)s batch.disabled = 0
and sle.item_code = %(item_code)s
and sle.warehouse = %(warehouse)s and sle.warehouse = %(warehouse)s
and (sle.batch_no like %(txt)s and (sle.batch_no like %(txt)s
or batch.manufacturing_date like %(txt)s) or batch.manufacturing_date like %(txt)s)
@ -297,7 +298,8 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
return batch_nos return batch_nos
else: else:
return frappe.db.sql("""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date) from `tabBatch` batch return frappe.db.sql("""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date) from `tabBatch` batch
where item = %(item_code)s where batch.disabled = 0
and item = %(item_code)s
and (name like %(txt)s and (name like %(txt)s
or manufacturing_date like %(txt)s) or manufacturing_date like %(txt)s)
and docstatus < 2 and docstatus < 2
@ -425,7 +427,8 @@ def get_doctype_wise_filters(filters):
@frappe.whitelist() @frappe.whitelist()
def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters): def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters):
query = """select batch_id from `tabBatch` query = """select batch_id from `tabBatch`
where (expiry_date >= CURDATE() or expiry_date IS NULL) where disabled = 0
and (expiry_date >= CURDATE() or expiry_date IS NULL)
and name like '{txt}'""".format(txt = frappe.db.escape('%{0}%'.format(txt))) and name like '{txt}'""".format(txt = frappe.db.escape('%{0}%'.format(txt)))
if filters and filters.get('item'): if filters and filters.get('item'):

980
erpnext/stock/doctype/batch/batch.json
View File

File diff suppressed because it is too large Load Diff

17
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -1027,14 +1027,19 @@ class StockEntry(StockController):
frappe.MappingMismatchError) frappe.MappingMismatchError)
def validate_batch(self): def validate_batch(self):
if self.purpose in ["Material Transfer for Manufacture", "Manufacture", "Repack", "Subcontract"]: if self.purpose in ["Material Transfer for Manufacture", "Manufacture", "Repack", "Subcontract", "Material Issue"]:
for item in self.get("items"): for item in self.get("items"):
if item.batch_no: if item.batch_no:
expiry_date = frappe.db.get_value("Batch", item.batch_no, "expiry_date") disabled = frappe.db.get_value("Batch", item.batch_no, "disabled")
if expiry_date: if disabled == 0:
if getdate(self.posting_date) > getdate(expiry_date): expiry_date = frappe.db.get_value("Batch", item.batch_no, "expiry_date")
frappe.throw(_("Batch {0} of Item {1} has expired.") if expiry_date:
.format(item.batch_no, item.item_code)) if getdate(self.posting_date) > getdate(expiry_date):
frappe.throw(_("Batch {0} of Item {1} has expired.")
.format(item.batch_no, item.item_code))
else:
frappe.throw(_("Batch {0} of Item {1} is disabled.")
.format(item.batch_no, item.item_code))
def update_purchase_order_supplied_items(self): def update_purchase_order_supplied_items(self):
#Get PO Supplied Items Details #Get PO Supplied Items Details