mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-18 00:55:02 +00:00
chore: fix conflicts
Removed unused voucher_no and posting_date retrieval.
This commit is contained in:
@@ -1334,8 +1334,6 @@ class SerialBatchCreation:
|
||||
if self.get("voucher_no"):
|
||||
voucher_no = self.get("voucher_no")
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
voucher_type = ""
|
||||
if self.get("voucher_type"):
|
||||
voucher_type = self.get("voucher_type")
|
||||
@@ -1346,13 +1344,6 @@ class SerialBatchCreation:
|
||||
def get_series(partial_series, digits):
|
||||
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))):
|
||||
current_value += 1
|
||||
serial_no = parse_naming_series(self.serial_no_series, number_generator=get_series)
|
||||
|
||||
Reference in New Issue
Block a user