nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 23:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't make naming series mandatory for items

Browse Source 
Item variants are an exception, hence this needs to be checked
conditionally.
This commit is contained in:
Ankush Menat
2021-11-15 17:11:33 +05:30
committed by Ankush Menat
parent 2eccb7a1ca
commit 7fcaeca403
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/naming_series/naming_series.py
View File

@@ -180,11 +180,11 @@ class NamingSeries(Document):
prefix = parse_naming_series(parts) prefix = parse_naming_series(parts)
return prefix return prefix
def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True): def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True, make_mandatory=1):
from frappe.custom.doctype.property_setter.property_setter import make_property_setter from frappe.custom.doctype.property_setter.property_setter import make_property_setter
if naming_series: if naming_series:
make_property_setter(doctype, "naming_series", "hidden", 0, "Check", validate_fields_for_doctype=False) make_property_setter(doctype, "naming_series", "hidden", 0, "Check", validate_fields_for_doctype=False)
make_property_setter(doctype, "naming_series", "reqd", 1, "Check", validate_fields_for_doctype=False) make_property_setter(doctype, "naming_series", "reqd", make_mandatory, "Check", validate_fields_for_doctype=False)
# set values for mandatory # set values for mandatory
try: try:

2
erpnext/stock/doctype/stock_settings/stock_settings.py
View File

@@ -20,7 +20,7 @@ class StockSettings(Document):
from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
set_by_naming_series("Item", "item_code", set_by_naming_series("Item", "item_code",
self.get("item_naming_by")=="Naming Series", hide_name_field=True) self.get("item_naming_by")=="Naming Series", hide_name_field=True, make_mandatory=0)
stock_frozen_limit = 356 stock_frozen_limit = 356
submitted_stock_frozen = self.stock_frozen_upto_days or 0 submitted_stock_frozen = self.stock_frozen_upto_days or 0