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

perf: max recursion depth error in serial no (backport #54629) (#54631)

Browse Source 
perf: max recursion depth error in serial no (#54629)

(cherry picked from commit 503b5bf140)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2026-04-29 08:53:07 +00:00
committed by GitHub
parent d6f2ff6b87
commit 808214fd95
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -8,11 +8,10 @@ from collections import Counter, defaultdict
import frappe import frappe
import frappe.query_builder import frappe.query_builder
import frappe.query_builder.functions
from frappe import _, _dict, bold from frappe import _, _dict, bold
from frappe.model.document import Document from frappe.model.document import Document
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
from frappe.query_builder.functions import Concat_ws, Locate, Sum from frappe.query_builder.functions import Concat_ws, Sum
from frappe.utils import ( from frappe.utils import (
cint, cint,
cstr, cstr,
@@ -3358,22 +3357,21 @@ def get_stock_ledgers_for_serial_nos(kwargs):
serial_nos = [serial_nos] serial_nos = [serial_nos]
if serial_nos: if serial_nos:
import re
escaped_serial_nos = [re.escape(sn) for sn in serial_nos if sn]
regex_pattern = r"\n(" + "|".join(escaped_serial_nos) + r")\n"
query = ( query = (
query.left_join(serial_batch_entry) query.left_join(serial_batch_entry)
.on(stock_ledger_entry.serial_and_batch_bundle == serial_batch_entry.parent) .on(stock_ledger_entry.serial_and_batch_bundle == serial_batch_entry.parent)
.where(
serial_batch_entry.serial_no.isin(serial_nos)
| Concat_ws("", "\n", stock_ledger_entry.serial_no, "\n").regexp(regex_pattern)
)
.distinct() .distinct()
) )
bundle_match = serial_batch_entry.serial_no.isin(serial_nos)
padded_serial_no = Concat_ws("", "\n", stock_ledger_entry.serial_no, "\n")
direct_match = None
for sn in serial_nos:
cond = Locate(f"\n{sn}\n", padded_serial_no) > 0
direct_match = cond if direct_match is None else (direct_match | cond)
query = query.where(bundle_match | direct_match)
if kwargs.ignore_voucher_detail_no: if kwargs.ignore_voucher_detail_no:
query = query.where(stock_ledger_entry.voucher_detail_no != kwargs.ignore_voucher_detail_no) query = query.where(stock_ledger_entry.voucher_detail_no != kwargs.ignore_voucher_detail_no)