From ad735522cb777431c9e85a900a24d38b6633a377 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Tue, 24 Aug 2021 14:54:38 +0530 Subject: [PATCH] fix: rename form tours to doctype names, remove tours from js controllers --- .../stock/doctype/stock_entry/stock_entry.js | 17 ------ .../stock_reconciliation.js | 17 ------ .../doctype/stock_settings/stock_settings.js | 37 ------------- erpnext/stock/doctype/warehouse/warehouse.js | 18 ------- .../create_a_warehouse.json | 54 ------------------- .../stock_entry.json} | 8 +-- .../stock_reconciliation.json} | 8 +-- .../warehouse.json} | 8 +-- 8 files changed, 12 insertions(+), 155 deletions(-) delete mode 100644 erpnext/stock/form_tour/create_a_warehouse/create_a_warehouse.json rename erpnext/stock/form_tour/{create_a_stock_entry/create_a_stock_entry.json => stock_entry/stock_entry.json} (91%) rename erpnext/stock/form_tour/{stock_opening_balance/stock_opening_balance.json => stock_reconciliation/stock_reconciliation.json} (89%) rename erpnext/stock/form_tour/{create_warehouse/create_warehouse.json => warehouse/warehouse.json} (89%) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 5ea733c66d3..8f34794db9a 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1102,20 +1102,3 @@ function check_should_not_attach_bom_items(bom_no) { $.extend(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm})); -frappe.tour['Stock Entry'] = [ - { - fieldname: "stock_entry_type", - title: __("Stock Entry Type"), - description: __("Select the type of Stock Entry to be made. For now, to receive stock into a warehouses select") + ' ' + __("Material Receipt.") + "" - }, - { - fieldname: "to_warehouse", - title: __("Default Target Warehouse"), - description: __("Select a target warehouse where the stock will be received.") - }, - { - fieldname: "items", - title: __("Items"), - description: __("Select an item and entry quantity to be delivered.") - }, -] diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index f91d0a740d8..aa502a432df 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -303,20 +303,3 @@ erpnext.stock.StockReconciliation = class StockReconciliation extends erpnext.st cur_frm.cscript = new erpnext.stock.StockReconciliation({frm: cur_frm}); -frappe.tour['Stock Reconciliation'] = [ - { - fieldname: "purpose", - title: __("Purpose"), - description: __("Set Purpose to Opening Stock to set the stock opening balance.") - }, - { - fieldname: "posting_date", - title: __("Posting Date"), - description: __("Edit the Posting Date by clicking on the Edit Posting Date and Time checkbox below.") - }, - { - fieldname: "items", - title: __("Items"), - description: __("Select the items for which the opening stock has to be set.") - }, -]; diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js index 08606fdcaa6..6167becdaac 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.js +++ b/erpnext/stock/doctype/stock_settings/stock_settings.js @@ -16,40 +16,3 @@ frappe.ui.form.on('Stock Settings', { } }); -frappe.tour['Stock Settings'] = [ - { - fieldname: "item_naming_by", - title: __("Item Naming By"), - description: __("By default, the Item Name is set as per the Item Code entered. If you want Items to be named by a") + " " + - "Naming Series" + " " + - __("choose the 'Naming Series' option."), - }, - { - fieldname: "default_warehouse", - title: __("Default Warehouse"), - description: __("Set a Default Warehouse for Inventory Transactions. This will be fetched into the Default Warehouse in the Item master.") - }, - { - fieldname: "valuation_method", - title: __("Valuation Method"), - description: __("Choose between FIFO and Moving Average Valuation Methods. Click") + " " + - "here" + " " + - __("to know more about them.") - }, - { - fieldname: "show_barcode_field", - title: __("Show Barcode Field"), - description: __("Show 'Scan Barcode' field above every child table to insert Items with ease.") - }, - { - fieldname: "action_if_quality_inspection_is_not_submitted", - title: __("Action if Quality Inspection Is Not Submitted"), - description: __("Quality inspection is performed on the inward and outward movement of goods. Receipt and delivery transactions will be stopped or the user will be warned if the quality inspection is not performed.") - - }, - { - fieldname: "automatically_set_serial_nos_based_on_fifo", - title: __("Automatically Set Serial Nos based on FIFO"), - description: __("Serial numbers for stock will be set automatically based on the Items entered based on first in first out in transactions like Purchase/Sales Invoices, Delivery Notes, etc.") - } -]; diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index b0c1c033a3b..4e1679c4116 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -87,21 +87,3 @@ function convert_to_group_or_ledger(frm){ }) } -frappe.tour['Warehouse'] = [ - { - fieldname: "warehouse_name", - title: __("Warehouse Name"), - description: __("Select name for the warehouse. This should reflect its location or purpose.") - }, - { - fieldname: "warehouse_type", - title: __("Warehouse Type"), - description: __("Select a warehouse type to categorize the warehouse into a sub-group.") - }, - { - fieldname: "account", - title: __("Account"), - description: __("Select an account to set a default account for all transactions with this warehouse.") - }, -]; - diff --git a/erpnext/stock/form_tour/create_a_warehouse/create_a_warehouse.json b/erpnext/stock/form_tour/create_a_warehouse/create_a_warehouse.json deleted file mode 100644 index e9a598b4b1a..00000000000 --- a/erpnext/stock/form_tour/create_a_warehouse/create_a_warehouse.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "creation": "2021-08-20 15:56:10.157109", - "docstatus": 0, - "doctype": "Form Tour", - "idx": 0, - "is_standard": 1, - "modified": "2021-08-20 15:56:10.157109", - "modified_by": "Administrator", - "module": "Stock", - "name": "Create a Warehouse", - "owner": "Administrator", - "reference_doctype": "Warehouse", - "save_on_complete": 1, - "steps": [ - { - "description": "Select a name for the warehouse. This should reflect its location or purpose.", - "field": "", - "fieldname": "warehouse_name", - "fieldtype": "Data", - "has_next_condition": 1, - "is_table_field": 0, - "label": "Warehouse Name", - "next_step_condition": "eval: doc.warehouse_name", - "parent_field": "", - "position": "Bottom", - "title": "Warehouse Name" - }, - { - "description": "Select a warehouse type to categorize the warehouse into a sub-group.", - "field": "", - "fieldname": "warehouse_type", - "fieldtype": "Link", - "has_next_condition": 0, - "is_table_field": 0, - "label": "Warehouse Type", - "parent_field": "", - "position": "Top", - "title": "Warehouse Type" - }, - { - "description": "Select an account to set a default account for all transactions with this warehouse.", - "field": "", - "fieldname": "account", - "fieldtype": "Link", - "has_next_condition": 0, - "is_table_field": 0, - "label": "Account", - "parent_field": "", - "position": "Top", - "title": "Account" - } - ], - "title": "Create a Warehouse" -} \ No newline at end of file diff --git a/erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json b/erpnext/stock/form_tour/stock_entry/stock_entry.json similarity index 91% rename from erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json rename to erpnext/stock/form_tour/stock_entry/stock_entry.json index fbc4b558bc1..98c5d62f10a 100644 --- a/erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json +++ b/erpnext/stock/form_tour/stock_entry/stock_entry.json @@ -1,13 +1,13 @@ { - "creation": "2021-08-20 16:02:59.314742", + "creation": "2021-08-24 14:44:22.292652", "docstatus": 0, "doctype": "Form Tour", "idx": 0, "is_standard": 1, - "modified": "2021-08-20 16:05:40.593997", + "modified": "2021-08-24 14:50:48.017420", "modified_by": "Administrator", "module": "Stock", - "name": "Create a Stock Entry", + "name": "Stock Entry", "owner": "Administrator", "reference_doctype": "Stock Entry", "save_on_complete": 1, @@ -52,5 +52,5 @@ "title": "Items" } ], - "title": "Create a Stock Entry" + "title": "Stock Entry" } \ No newline at end of file diff --git a/erpnext/stock/form_tour/stock_opening_balance/stock_opening_balance.json b/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json similarity index 89% rename from erpnext/stock/form_tour/stock_opening_balance/stock_opening_balance.json rename to erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json index 94bdbbc442c..83083b639a1 100644 --- a/erpnext/stock/form_tour/stock_opening_balance/stock_opening_balance.json +++ b/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json @@ -1,13 +1,13 @@ { - "creation": "2021-08-20 16:08:39.298267", + "creation": "2021-08-24 14:44:46.770952", "docstatus": 0, "doctype": "Form Tour", "idx": 0, "is_standard": 1, - "modified": "2021-08-20 16:08:39.298267", + "modified": "2021-08-24 14:50:41.512219", "modified_by": "Administrator", "module": "Stock", - "name": "Stock Opening Balance", + "name": "Stock Reconciliation", "owner": "Administrator", "reference_doctype": "Stock Reconciliation", "save_on_complete": 1, @@ -51,5 +51,5 @@ "title": "Items" } ], - "title": "Stock Opening Balance" + "title": "Stock Reconciliation" } \ No newline at end of file diff --git a/erpnext/stock/form_tour/create_warehouse/create_warehouse.json b/erpnext/stock/form_tour/warehouse/warehouse.json similarity index 89% rename from erpnext/stock/form_tour/create_warehouse/create_warehouse.json rename to erpnext/stock/form_tour/warehouse/warehouse.json index f25e3a1cf3a..23ff2aebbaa 100644 --- a/erpnext/stock/form_tour/create_warehouse/create_warehouse.json +++ b/erpnext/stock/form_tour/warehouse/warehouse.json @@ -1,13 +1,13 @@ { - "creation": "2021-08-20 15:42:47.059290", + "creation": "2021-08-24 14:43:44.465237", "docstatus": 0, "doctype": "Form Tour", "idx": 0, "is_standard": 1, - "modified": "2021-08-20 15:54:58.440497", + "modified": "2021-08-24 14:50:31.988256", "modified_by": "Administrator", "module": "Stock", - "name": "Create Warehouse", + "name": "Warehouse", "owner": "Administrator", "reference_doctype": "Warehouse", "save_on_complete": 1, @@ -50,5 +50,5 @@ "title": "Account" } ], - "title": "Create Warehouse" + "title": "Warehouse" } \ No newline at end of file