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

Merge pull request #21215 from vishdha/batch_message_v13

Browse Source 
fix(UX): batch error message improved
This commit is contained in:
Marica 2020-04-13 15:38:33 +05:30 committed by GitHub
commit 3ea95ee451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ class StockLedgerEntry(Document):
frappe.throw(_("Actual Qty is mandatory")) frappe.throw(_("Actual Qty is mandatory"))
def validate_item(self): def validate_item(self):
item_det = frappe.db.sql("""select name, has_batch_no, docstatus, item_det = frappe.db.sql("""select name, item_name, has_batch_no, docstatus,
is_stock_item, has_variants, stock_uom, create_new_batch is_stock_item, has_variants, stock_uom, create_new_batch
from tabItem where name=%s""", self.item_code, as_dict=True) from tabItem where name=%s""", self.item_code, as_dict=True)
@ -87,10 +87,11 @@ class StockLedgerEntry(Document):
# check if batch number is required # check if batch number is required
if self.voucher_type != 'Stock Reconciliation': if self.voucher_type != 'Stock Reconciliation':
if item_det.has_batch_no ==1: if item_det.has_batch_no ==1:
batch_item = self.item_code if self.item_code == item_det.item_name else self.item_code + ":" + item_det.item_name
if not self.batch_no: if not self.batch_no:
frappe.throw(_("Batch number is mandatory for Item {0}").format(self.item_code)) frappe.throw(_("Batch number is mandatory for Item {0}").format(batch_item))
elif not frappe.db.get_value("Batch",{"item": self.item_code, "name": self.batch_no}): elif not frappe.db.get_value("Batch",{"item": self.item_code, "name": self.batch_no}):
frappe.throw(_("{0} is not a valid Batch Number for Item {1}").format(self.batch_no, self.item_code)) frappe.throw(_("{0} is not a valid Batch Number for Item {1}").format(self.batch_no, batch_item))
elif item_det.has_batch_no ==0 and self.batch_no and self.is_cancelled == "No": elif item_det.has_batch_no ==0 and self.batch_no and self.is_cancelled == "No":
frappe.throw(_("The Item {0} cannot have Batch").format(self.item_code)) frappe.throw(_("The Item {0} cannot have Batch").format(self.item_code))