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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-12-07 13:10:40 +05:30
committed by GitHub
parent 408a09233b
commit a204abcaa5
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -179,14 +179,7 @@ class BOM(WebsiteGenerator):
"BOM", filters={"name": ("like", search_key), "amended_from": ["is", "not set"]}, pluck="name" "BOM", filters={"name": ("like", search_key), "amended_from": ["is", "not set"]}, pluck="name"
) )
<<<<<<< HEAD
if existing_boms:
index = self.get_next_version_index(existing_boms)
else:
index = 1
=======
index = self.get_index_for_bom(existing_boms) index = self.get_index_for_bom(existing_boms)
>>>>>>> a5cc307417 (fix: BOM name issue (backport #44586) (#44589))
prefix = self.doctype prefix = self.doctype
suffix = "%.3i" % index # convert index to string (1 -> "001") suffix = "%.3i" % index # convert index to string (1 -> "001")