From a99f49d7e2d611792f8c1e8425f0a78b76810e23 Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Tue, 27 Feb 2024 11:10:05 +0100 Subject: [PATCH 1/2] chore: Remove `debugger` statements --- erpnext/templates/includes/rfq.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/templates/includes/rfq.js b/erpnext/templates/includes/rfq.js index c4f17117baa..0bca3870863 100644 --- a/erpnext/templates/includes/rfq.js +++ b/erpnext/templates/includes/rfq.js @@ -73,7 +73,6 @@ rfq = class rfq { submit_rfq(){ $('.btn-sm').click(function(){ - debugger frappe.freeze(); frappe.call({ type: "POST", @@ -83,7 +82,6 @@ rfq = class rfq { }, btn: this, callback: function(r){ - debugger frappe.unfreeze(); if(r.message){ $('.btn-sm').hide() -- GitLab From a585377f0288e555cad868af68824a0b25e25fdf Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Tue, 27 Feb 2024 11:12:03 +0100 Subject: [PATCH 2/2] fix(hooks): Merge Jinja hooks to fix get_serial_or_batch_nos Used in Serial and Batch Bundle / Purchase Receipt S&BB print formats. --- erpnext/hooks.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 74171f585ea..c1469e84c25 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -81,6 +81,9 @@ jinja = { "methods": [ "erpnext.stock.serial_batch_bundle.get_serial_or_batch_nos", ], + "filters": [ + "frappe.contacts.doctype.address.address.get_condensed_address", + ], } webform_list_context = "erpnext.controllers.website_list_for_contact.get_webform_list_context" @@ -721,10 +724,4 @@ default_log_clearing_doctypes = { "Repost Item Valuation": 60, } -jinja = { - "filters": [ - "frappe.contacts.doctype.address.address.get_condensed_address", - ], -} - export_python_type_annotations = True -- GitLab