From cca71127c3502b435a7765781cb64216715503ce Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 18 Jan 2021 15:03:42 +0530 Subject: [PATCH 1/3] feat: feat: Provision to disbale serial no and batch selector --- erpnext/public/js/controllers/transaction.js | 24 +++++++++++++------ .../stock_settings/stock_settings.json | 9 ++++++- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index f144c290f5e0..c424f69fce8f 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -586,13 +586,23 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ () => me.toggle_conversion_factor(item), () => { if (show_batch_dialog) - return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) - .then((r) => { - if (r.message && - (r.message.has_batch_no || r.message.has_serial_no)) { - frappe.flags.hide_serial_batch_dialog = false; - } - }); + return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) + .then((r) => { + if (r.message && + (r.message.has_batch_no || r.message.has_serial_no)) { + frappe.flags.hide_serial_batch_dialog = false; + } + }); + }, + () => { + // check if batch serial selector is disabled or not + if (show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) + return frappe.db.get_single_value('Stock Settings', 'disable_serial_no_and_batch_selector') + .then((value) => { + if(value) { + frappe.flags.hide_serial_batch_dialog = true; + } + }); }, () => { if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) { diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 3ff396ba77e2..84af57b48dd4 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -16,6 +16,7 @@ "action_if_quality_inspection_is_not_submitted", "show_barcode_field", "clean_description_html", + "disable_serial_no_and_batch_selector", "section_break_7", "auto_insert_price_list_rate_if_missing", "allow_negative_stock", @@ -227,6 +228,12 @@ "fieldname": "control_historical_stock_transactions_section", "fieldtype": "Section Break", "label": "Control Historical Stock Transactions" + }, + { + "default": "0", + "fieldname": "disable_serial_no_and_batch_selector", + "fieldtype": "Check", + "label": "Disable Serial No And Batch Selector" } ], "icon": "icon-cog", @@ -234,7 +241,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-12-29 12:53:31.162247", + "modified": "2021-01-18 13:15:38.352796", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", From 2846ba55300c16bb7d8614c1eee9eab4e3e96329 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 19 Jan 2021 11:06:57 +0530 Subject: [PATCH 2/3] fix: Sider issues --- erpnext/public/js/controllers/transaction.js | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index c424f69fce8f..abd1066fb662 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -586,23 +586,23 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ () => me.toggle_conversion_factor(item), () => { if (show_batch_dialog) - return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) - .then((r) => { - if (r.message && - (r.message.has_batch_no || r.message.has_serial_no)) { - frappe.flags.hide_serial_batch_dialog = false; - } - }); + return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) + .then((r) => { + if (r.message && + (r.message.has_batch_no || r.message.has_serial_no)) { + frappe.flags.hide_serial_batch_dialog = false; + } + }); }, () => { // check if batch serial selector is disabled or not if (show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) - return frappe.db.get_single_value('Stock Settings', 'disable_serial_no_and_batch_selector') - .then((value) => { - if(value) { - frappe.flags.hide_serial_batch_dialog = true; - } - }); + return frappe.db.get_single_value('Stock Settings', 'disable_serial_no_and_batch_selector') + .then((value) => { + if (value) { + frappe.flags.hide_serial_batch_dialog = true; + } + }); }, () => { if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) { From 9efdadb9efbcf366b33dac1a3a5863d87a698505 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 19 Jan 2021 13:18:31 +0530 Subject: [PATCH 3/3] fix: Linting issues --- erpnext/public/js/controllers/transaction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index abd1066fb662..c8cefe729edc 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -601,8 +601,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ .then((value) => { if (value) { frappe.flags.hide_serial_batch_dialog = true; - } - }); + } + }); }, () => { if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) {