Skip to content

Commit 442fe9a

Browse files
fix(stock): fix email error message (#53606)
1 parent 086fea7 commit 442fe9a

1 file changed

Lines changed: 5 additions & 16 deletions

File tree

erpnext/stock/reorder_item.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import frappe
99
from frappe import _
10-
from frappe.utils import add_days, cint, flt, nowdate
10+
from frappe.utils import add_days, cint, escape_html, flt, nowdate
1111

1212
import erpnext
1313

@@ -223,15 +223,6 @@ def create_material_request(material_requests):
223223
mr_list = []
224224
exceptions_list = []
225225

226-
def _log_exception(mr):
227-
if frappe.local.message_log:
228-
exceptions_list.extend(frappe.local.message_log)
229-
frappe.local.message_log = []
230-
else:
231-
exceptions_list.append(frappe.get_traceback(with_context=True))
232-
233-
mr.log_error("Unable to create material request")
234-
235226
company_wise_mr = frappe._dict({})
236227
for request_type in material_requests:
237228
for company in material_requests[request_type]:
@@ -305,8 +296,9 @@ def _log_exception(mr):
305296

306297
company_wise_mr.setdefault(company, []).append(mr)
307298

308-
except Exception:
309-
_log_exception(mr)
299+
except Exception as exception:
300+
exceptions_list.append(exception)
301+
mr.log_error("Unable to create material request")
310302

311303
if company_wise_mr:
312304
if getattr(frappe.local, "reorder_email_notify", None) is None:
@@ -391,10 +383,7 @@ def notify_errors(exceptions_list):
391383

392384
for exception in exceptions_list:
393385
try:
394-
exception = json.loads(exception)
395-
error_message = """<div class='small text-muted'>{}</div><br>""".format(
396-
_(exception.get("message"))
397-
)
386+
error_message = f"<div class='small text-muted'>{escape_html(str(exception))}</div><br>"
398387
content += error_message
399388
except Exception:
400389
pass

0 commit comments

Comments
 (0)