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

- make barcode mandatory if child row is added

Browse Source 
- check valid barcode only if exists
This commit is contained in:
Giovanni 2017-12-10 20:56:48 +01:00
parent ff7d73e418
commit 43372d3333
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,15 +486,16 @@ class Item(WebsiteGenerator):
from stdnum import ean from stdnum import ean
if len(self.barcodes) > 0: if len(self.barcodes) > 0:
for item_barcode in self.barcodes: for item_barcode in self.barcodes:
duplicate = frappe.db.sql("""select parent from `tabItem Barcode` where barcode = %s and parent != %s""", (item_barcode.barcode, self.name)) if item_barcode.barcode:
if duplicate: duplicate = frappe.db.sql("""select parent from `tabItem Barcode` where barcode = %s and parent != %s""", (item_barcode.barcode, self.name))
frappe.throw(_("Barcode {0} already used in Item {1}").format( if duplicate:
item_barcode.barcode, duplicate[0][0])) frappe.throw(_("Barcode {0} already used in Item {1}").format(
item_barcode.barcode, duplicate[0][0]))
if item_barcode.barcode_type: if item_barcode.barcode_type:
if not ean.is_valid(item_barcode.barcode): if not ean.is_valid(item_barcode.barcode):
frappe.throw(_("Barcode {0} is not a valid {1} code").format( frappe.throw(_("Barcode {0} is not a valid {1} code").format(
item_barcode.barcode, item_barcode.barcode_type)) item_barcode.barcode, item_barcode.barcode_type))
def validate_warehouse_for_reorder(self): def validate_warehouse_for_reorder(self):
'''Validate Reorder level table for duplicate and conditional mandatory''' '''Validate Reorder level table for duplicate and conditional mandatory'''

4
erpnext/stock/doctype/item_barcode/item_barcode.json
View File

@ -38,7 +38,7 @@
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 1 "unique": 1
@ -85,7 +85,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-12-10 19:45:08.634821", "modified": "2017-12-10 20:55:23.814039",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item Barcode", "name": "Item Barcode",