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

fix: naming series issue

Browse Source 
(cherry picked from commit 3a50056968)

# Conflicts:
#	erpnext/stock/doctype/batch/batch.py
This commit is contained in:
Rohit Waghchaure
2026-06-05 18:45:46 +05:30
committed by Mergify
parent ffb36cff78
commit e7eaa87a77
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/batch/batch.py
View File

@@ -10,8 +10,12 @@ from frappe.model.document import Document
from frappe.model.naming import make_autoname, revert_series_if_last from frappe.model.naming import make_autoname, revert_series_if_last
from frappe.query_builder.functions import CurDate, Sum from frappe.query_builder.functions import CurDate, Sum
from frappe.utils import cint, flt, get_link_to_form from frappe.utils import cint, flt, get_link_to_form
<<<<<<< HEAD
from frappe.utils.data import add_days from frappe.utils.data import add_days
from frappe.utils.jinja import render_template from frappe.utils.jinja import render_template
=======
from frappe.utils.data import DateTimeLikeObject, add_days
>>>>>>> 3a50056968 (fix: naming series issue)
class UnableToSelectBatchError(frappe.ValidationError): class UnableToSelectBatchError(frappe.ValidationError):
@@ -225,10 +229,8 @@ class Batch(Document):
:return: The string that was generated. :return: The string that was generated.
""" """
naming_series_prefix = _get_batch_prefix() naming_series_prefix = _get_batch_prefix()
# validate_template(naming_series_prefix)
naming_series_prefix = render_template(str(naming_series_prefix), self.__dict__)
key = _make_naming_series_key(naming_series_prefix) key = _make_naming_series_key(naming_series_prefix)
name = make_autoname(key) name = make_autoname(key, doc=self)
return name return name

18
erpnext/stock/doctype/batch/test_batch.py
View File

@@ -506,6 +506,24 @@ class TestBatch(FrappeTestCase):
if not use_naming_series: if not use_naming_series:
frappe.set_value("Stock Settings", "Stock Settings", "use_naming_series", 0) frappe.set_value("Stock Settings", "Stock Settings", "use_naming_series", 0)
def test_naming_series_prefix_is_not_rendered_as_jinja(self):
from frappe.model.naming import InvalidNamingSeriesError
stock_settings = frappe.get_single("Stock Settings")
use_naming_series = cint(stock_settings.use_naming_series)
original_prefix = stock_settings.naming_series_prefix
frappe.set_value("Stock Settings", "Stock Settings", "use_naming_series", 1)
frappe.set_value("Stock Settings", "Stock Settings", "naming_series_prefix", "{{ 7*7 }}")
try:
self.assertRaises(
InvalidNamingSeriesError, self.make_new_batch, "_Test Stock Item For Batch SSTI"
)
finally:
frappe.set_value("Stock Settings", "Stock Settings", "naming_series_prefix", original_prefix)
frappe.set_value("Stock Settings", "Stock Settings", "use_naming_series", use_naming_series)
def make_new_batch(self, item_name=None, batch_id=None, do_not_insert=0): def make_new_batch(self, item_name=None, batch_id=None, do_not_insert=0):
batch = frappe.new_doc("Batch") batch = frappe.new_doc("Batch")
item = self.make_batch_item(item_name) item = self.make_batch_item(item_name)