nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Removed unused voucher_no and posting_date retrieval.
This commit is contained in:
rohitwaghchaure
2025-11-11 10:47:06 +05:30
committed by GitHub
parent 6ba24912c3
commit 4ec25ac82e
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/serial_batch_bundle.py
View File

@@ -1334,8 +1334,6 @@ class SerialBatchCreation:
if self.get("voucher_no"): if self.get("voucher_no"):
voucher_no = self.get("voucher_no") voucher_no = self.get("voucher_no")
<<<<<<< HEAD
=======
voucher_type = "" voucher_type = ""
if self.get("voucher_type"): if self.get("voucher_type"):
voucher_type = self.get("voucher_type") voucher_type = self.get("voucher_type")
@@ -1346,13 +1344,6 @@ class SerialBatchCreation:
def get_series(partial_series, digits): def get_series(partial_series, digits):
return f"{current_value:0{digits}d}" return f"{current_value:0{digits}d}"
posting_date = frappe.db.get_value(
voucher_type,
voucher_no,
"posting_date",
)
>>>>>>> 19a9497273 (perf: serial no creation)
for _i in range(abs(cint(self.actual_qty))): for _i in range(abs(cint(self.actual_qty))):
current_value += 1 current_value += 1
serial_no = parse_naming_series(self.serial_no_series, number_generator=get_series) serial_no = parse_naming_series(self.serial_no_series, number_generator=get_series)