Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Correctly extract last message (#37602)

Browse Source 
frappe.message_log now contains plain dictionary and not JSON strings,
so no need to load them.
This commit is contained in:
Ankush Menat 2023-10-20 15:50:40 +05:30
parent e76860fae1
commit 5cca001a58
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
View File

@ -454,7 +454,7 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):
except Exception as e: except Exception as e:
frappe.db.rollback() frappe.db.rollback()
message_log = frappe.message_log.pop() if frappe.message_log else str(e) message_log = frappe.message_log.pop() if frappe.message_log else str(e)
error_message = safe_load_json(message_log) error_message = get_error_message(message_log)
if closing_entry: if closing_entry:
closing_entry.set_status(update=True, status="Failed") closing_entry.set_status(update=True, status="Failed")
@ -483,7 +483,7 @@ def cancel_merge_logs(merge_logs, closing_entry=None):
except Exception as e: except Exception as e:
frappe.db.rollback() frappe.db.rollback()
message_log = frappe.message_log.pop() if frappe.message_log else str(e) message_log = frappe.message_log.pop() if frappe.message_log else str(e)
error_message = safe_load_json(message_log) error_message = get_error_message(message_log)
if closing_entry: if closing_entry:
closing_entry.set_status(update=True, status="Submitted") closing_entry.set_status(update=True, status="Submitted")
@ -525,10 +525,8 @@ def check_scheduler_status():
frappe.throw(_("Scheduler is inactive. Cannot enqueue job."), title=_("Scheduler Inactive")) frappe.throw(_("Scheduler is inactive. Cannot enqueue job."), title=_("Scheduler Inactive"))
def safe_load_json(message): def get_error_message(message) -> str:
try: try:
json_message = json.loads(message).get("message") return message["message"]
except Exception: except Exception:
json_message = message return str(message)
return json_message