From 9fe627746fac1aa8f6ebcab20d60d69614a2deff Mon Sep 17 00:00:00 2001 From: David Date: Mon, 18 Mar 2024 19:52:24 +0100 Subject: [PATCH 1/2] fix: permissions for selling settings --- .../doctype/sales_order/sales_order.py | 7 +++ .../doctype/sales_order/sales_order_list.js | 50 ++++++++++++------- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 2e5112c870..eff49ab886 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -847,6 +847,13 @@ def get_list_context(context=None): return list_context +@frappe.whitelist() +def is_enable_cutoff_date_on_bulk_delivery_note_creation(): + return frappe.db.get_single_value( + "Accounts Settings", "enable_cutoff_date_on_bulk_delivery_note_creation" + ) + + @frappe.whitelist() def close_or_unclose_sales_orders(names, status): if not frappe.has_permission("Sales Order", "write"): diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index cb1e864db3..01e7821386 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -52,25 +52,39 @@ frappe.listview_settings['Sales Order'] = { erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Sales Invoice"); }); - listview.page.add_action_item(__("Delivery Note"), ()=>{ - frappe.db.get_single_value("Selling Settings", "enable_cutoff_date_on_bulk_delivery_note_creation").then((value) => { - if (value) { - var dialog = new frappe.ui.Dialog({ - title: __("Select Items up to Delivery Date"), - fields: [{fieldtype: "Date", fieldname: "delivery_date", default: frappe.datetime.add_days(frappe.datetime.nowdate(), 1)}] - }); - dialog.set_primary_action(__("Select"), function(values) { - var until_delivery_date = values.delivery_date; - erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Delivery Note", { - until_delivery_date + listview.page.add_action_item(__("Delivery Note"), () => { + frappe.call({ + method: "erpnext.selling.doctype.sales_order.sales_order.is_enable_cutoff_date_on_bulk_delivery_note_creation", + callback: (r) => { + if (r.message) { + var dialog = new frappe.ui.Dialog({ + title: __("Select Items up to Delivery Date"), + fields: [ + { + fieldtype: "Date", + fieldname: "delivery_date", + default: frappe.datetime.add_days(frappe.datetime.nowdate(), 1), + }, + ], }); - dialog.hide(); - }); - dialog.show(); - } else { - erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Delivery Note"); - } - }) + dialog.set_primary_action(__("Select"), function (values) { + var until_delivery_date = values.delivery_date; + erpnext.bulk_transaction_processing.create( + listview, + "Sales Order", + "Delivery Note", + { + until_delivery_date, + } + ); + dialog.hide(); + }); + dialog.show(); + } else { + erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Delivery Note"); + } + }, + }); }); listview.page.add_action_item(__("Advance Payment"), ()=>{ -- GitLab From 3c3f599a154859407c12ce8effacb271f6a76714 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 22 Mar 2024 09:55:47 +0530 Subject: [PATCH 2/2] fix: query 'Selling Settings' --- erpnext/selling/doctype/sales_order/sales_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index eff49ab886..98fb9a5f2d 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -850,7 +850,7 @@ def get_list_context(context=None): @frappe.whitelist() def is_enable_cutoff_date_on_bulk_delivery_note_creation(): return frappe.db.get_single_value( - "Accounts Settings", "enable_cutoff_date_on_bulk_delivery_note_creation" + "Selling Settings", "enable_cutoff_date_on_bulk_delivery_note_creation" ) -- GitLab