From 23e1d2b536b6da805eb305c70c6878374d07aaa6 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Tue, 18 May 2021 17:11:47 +0530 Subject: [PATCH 01/14] refactor: update stock onboarding --- .../stock/module_onboarding/stock/stock.json | 16 +++++++++---- .../create_a_delivery_note.json | 20 ++++++++++++++++ .../create_a_purchase_receipt.json | 5 ++-- .../create_a_stock_entry.json | 5 ++-- .../create_a_supplier/create_a_supplier.json | 7 +++--- .../create_a_warehouse.json | 20 ++++++++++++++++ .../create_an_item/create_an_item.json | 22 ++++++++++++++++++ .../introduction_to_stock_entry.json | 5 ++-- .../setup_your_warehouse.json | 4 ++-- .../stock_settings/stock_settings.json | 5 ++-- .../view_stock_ledger/view_stock_ledger.json | 23 +++++++++++++++++++ .../view_warehouses/view_warehouses.json | 20 ++++++++++++++++ 12 files changed, 134 insertions(+), 18 deletions(-) create mode 100644 erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json create mode 100644 erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json create mode 100644 erpnext/stock/onboarding_step/create_an_item/create_an_item.json create mode 100644 erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json create mode 100644 erpnext/stock/onboarding_step/view_warehouses/view_warehouses.json diff --git a/erpnext/stock/module_onboarding/stock/stock.json b/erpnext/stock/module_onboarding/stock/stock.json index 847464822b4..6cc8ec6b052 100644 --- a/erpnext/stock/module_onboarding/stock/stock.json +++ b/erpnext/stock/module_onboarding/stock/stock.json @@ -19,20 +19,23 @@ "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/stock", "idx": 0, "is_complete": 0, - "modified": "2020-10-14 14:54:42.741971", + "modified": "2021-05-18 17:01:36.137180", "modified_by": "Administrator", "module": "Stock", "name": "Stock", "owner": "Administrator", "steps": [ { - "step": "Setup your Warehouse" + "step": "Create an Item" }, { - "step": "Create a Product" + "step": "View Warehouses" }, { - "step": "Create a Supplier" + "step": "Create a Warehouse" + }, + { + "step": "Stock Settings" }, { "step": "Introduction to Stock Entry" @@ -40,11 +43,14 @@ { "step": "Create a Stock Entry" }, + { + "step": "View Stock Ledger" + }, { "step": "Create a Purchase Receipt" }, { - "step": "Stock Settings" + "step": "Create a Delivery Note" } ], "subtitle": "Inventory, Warehouses, Analysis, and more.", diff --git a/erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json b/erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json new file mode 100644 index 00000000000..7b702f013b6 --- /dev/null +++ b/erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json @@ -0,0 +1,20 @@ +{ + "action": "Create Entry", + "creation": "2021-05-17 16:15:11.745214", + "description": "# Create a Delivery Note\nA [**Delivery Note**](https://docs.erpnext.com/docs/user/manual/en/stock/delivery-note) is made when a shipment is shipped from the company\u2019s *Warehouse* to the *Customer*. \n\nIn this step we will create a *Delivery Note*.", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-05-18 15:33:47.452298", + "modified_by": "Administrator", + "name": "Create a Delivery Note", + "owner": "Administrator", + "reference_document": "Delivery Note", + "show_form_tour": 1, + "show_full_form": 1, + "title": "Create a Delivery Note", + "validate_action": 1 +} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json b/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json index 9012493f57e..549fe26c253 100644 --- a/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json +++ b/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json @@ -1,18 +1,19 @@ { "action": "Create Entry", "creation": "2020-05-19 18:59:13.266713", + "description": "# Create a Purchase Entry\nA [**Purchase Receipt**](https://docs.erpnext.com/docs/user/manual/en/stock/purchase-receipt) is made when an *Item* is received from a *Supplier*. \n\nIn this step we will create a *Purchase Receipt*.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, - "is_mandatory": 0, "is_single": 0, "is_skipped": 0, - "modified": "2020-10-14 14:53:25.618434", + "modified": "2021-05-18 15:17:44.204445", "modified_by": "Administrator", "name": "Create a Purchase Receipt", "owner": "Administrator", "reference_document": "Purchase Receipt", + "show_form_tour": 1, "show_full_form": 1, "title": "Create a Purchase Receipt", "validate_action": 1 diff --git a/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json b/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json index 09902b8844e..2244c13d5de 100644 --- a/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json +++ b/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json @@ -1,18 +1,19 @@ { "action": "Create Entry", "creation": "2020-05-15 03:20:16.277043", + "description": "# Create a Stock Entry\nA [**Stock Entry**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-entry) allows you to record the movement of *Items* between *Warehouses*. \n\nIn this step we will create *Stock Entry*.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, - "is_mandatory": 0, "is_single": 0, "is_skipped": 0, - "modified": "2020-10-14 14:53:00.105905", + "modified": "2021-05-18 15:15:26.355884", "modified_by": "Administrator", "name": "Create a Stock Entry", "owner": "Administrator", "reference_document": "Stock Entry", + "show_form_tour": 1, "show_full_form": 1, "title": "Create a Stock Entry", "validate_action": 1 diff --git a/erpnext/stock/onboarding_step/create_a_supplier/create_a_supplier.json b/erpnext/stock/onboarding_step/create_a_supplier/create_a_supplier.json index ef61fa3b2e2..49efe578a29 100644 --- a/erpnext/stock/onboarding_step/create_a_supplier/create_a_supplier.json +++ b/erpnext/stock/onboarding_step/create_a_supplier/create_a_supplier.json @@ -1,18 +1,19 @@ { - "action": "Create Entry", + "action": "Show Form Tour", "creation": "2020-05-14 22:09:10.043554", + "description": "# Create a Supplier\nIn this step we will create a **Supplier**. If you have already created a **Supplier** you can skip this step.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, - "is_mandatory": 0, "is_single": 0, "is_skipped": 0, - "modified": "2020-10-14 14:53:00.120455", + "modified": "2021-05-17 16:37:37.697077", "modified_by": "Administrator", "name": "Create a Supplier", "owner": "Administrator", "reference_document": "Supplier", + "show_form_tour": 0, "show_full_form": 0, "title": "Create a Supplier", "validate_action": 1 diff --git a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json new file mode 100644 index 00000000000..b31b0d03d7b --- /dev/null +++ b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json @@ -0,0 +1,20 @@ +{ + "action": "Create Entry", + "creation": "2021-05-17 16:13:19.297789", + "description": "# Create a Warehouse\nIn this step we will create a [**Warehouse**](https://docs.erpnext.com/docs/user/manual/en/stock/warehouse).", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-05-18 15:00:36.896793", + "modified_by": "Administrator", + "name": "Create a Warehouse", + "owner": "Administrator", + "reference_document": "Warehouse", + "show_form_tour": 1, + "show_full_form": 1, + "title": "Create a Warehouse", + "validate_action": 1 +} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/create_an_item/create_an_item.json b/erpnext/stock/onboarding_step/create_an_item/create_an_item.json new file mode 100644 index 00000000000..016cbd566d5 --- /dev/null +++ b/erpnext/stock/onboarding_step/create_an_item/create_an_item.json @@ -0,0 +1,22 @@ +{ + "action": "Create Entry", + "action_label": "", + "creation": "2021-05-17 13:47:18.515052", + "description": "# Create an Item\nThe Stock module deals with the movement of items.\n\nIn this step we will create an [**Item**](https://docs.erpnext.com/docs/user/manual/en/stock/item).", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "intro_video_url": "", + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-05-18 16:15:20.695028", + "modified_by": "Administrator", + "name": "Create an Item", + "owner": "Administrator", + "reference_document": "Item", + "show_form_tour": 1, + "show_full_form": 1, + "title": "Create an Item", + "validate_action": 1 +} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json b/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json index 212e5055eda..384950e8b99 100644 --- a/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json +++ b/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json @@ -1,17 +1,18 @@ { "action": "Watch Video", "creation": "2020-05-15 02:47:17.958806", + "description": "# Introduction to Stock Entry\nThis video will give a quick introduction to [**Stock Entry**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-entry).", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, - "is_mandatory": 0, "is_single": 0, "is_skipped": 0, - "modified": "2020-10-14 14:53:00.075177", + "modified": "2021-05-18 15:13:43.306064", "modified_by": "Administrator", "name": "Introduction to Stock Entry", "owner": "Administrator", + "show_form_tour": 0, "show_full_form": 0, "title": "Introduction to Stock Entry", "validate_action": 1, diff --git a/erpnext/stock/onboarding_step/setup_your_warehouse/setup_your_warehouse.json b/erpnext/stock/onboarding_step/setup_your_warehouse/setup_your_warehouse.json index 75940ed2a6c..5d33a649100 100644 --- a/erpnext/stock/onboarding_step/setup_your_warehouse/setup_your_warehouse.json +++ b/erpnext/stock/onboarding_step/setup_your_warehouse/setup_your_warehouse.json @@ -5,15 +5,15 @@ "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, - "is_mandatory": 0, "is_single": 0, "is_skipped": 0, - "modified": "2020-10-14 14:53:25.538900", + "modified": "2021-05-17 13:53:06.936579", "modified_by": "Administrator", "name": "Setup your Warehouse", "owner": "Administrator", "path": "Tree/Warehouse", "reference_document": "Warehouse", + "show_form_tour": 0, "show_full_form": 0, "title": "Set up your Warehouse", "validate_action": 1 diff --git a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json index ae34afa695f..096a3d2b471 100644 --- a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json +++ b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json @@ -1,18 +1,19 @@ { "action": "Show Form Tour", "creation": "2020-05-15 02:53:57.209967", + "description": "# Stock Settings\nIn this step we will view the [**Stock Settings**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-settings) page, here you can set the default settings for your stock related transactions.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, - "is_mandatory": 0, "is_single": 1, "is_skipped": 0, - "modified": "2020-10-14 14:53:00.092504", + "modified": "2021-05-18 16:44:58.084849", "modified_by": "Administrator", "name": "Stock Settings", "owner": "Administrator", "reference_document": "Stock Settings", + "show_form_tour": 0, "show_full_form": 0, "title": "Explore Stock Settings", "validate_action": 1 diff --git a/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json b/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json new file mode 100644 index 00000000000..13661bc9fbd --- /dev/null +++ b/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json @@ -0,0 +1,23 @@ +{ + "action": "View Report", + "creation": "2021-05-17 16:16:10.727959", + "description": "# View Stock Ledger\nThe [**Stock Ledger**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-ledger) is a detailed record that keeps track of stock movements for a company. \n\nIn this step we will view the *Stock Ledger*.", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-05-18 16:16:38.150079", + "modified_by": "Administrator", + "name": "View Stock Ledger", + "owner": "Administrator", + "reference_report": "Stock Ledger", + "report_description": "You can set the filters to see entries specific to the previous steps.", + "report_reference_doctype": "Stock Ledger Entry", + "report_type": "Script Report", + "show_form_tour": 0, + "show_full_form": 0, + "title": "View Stock Ledger", + "validate_action": 1 +} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/view_warehouses/view_warehouses.json b/erpnext/stock/onboarding_step/view_warehouses/view_warehouses.json new file mode 100644 index 00000000000..c46c4bdab86 --- /dev/null +++ b/erpnext/stock/onboarding_step/view_warehouses/view_warehouses.json @@ -0,0 +1,20 @@ +{ + "action": "Go to Page", + "creation": "2021-05-17 16:12:43.427579", + "description": "# View Warehouse\nIn ERPNext the term 'warehouse' can be thought of as a storage location.\n\nWarehouses are arranged in ERPNext in a tree like structure, where multiple sub-warehouses can be grouped under a single warehouse.\n\nIn this step we will view the [**Warehouse Tree**](https://docs.erpnext.com/docs/user/manual/en/stock/warehouse#21-tree-view) to view the [**Warehouses**](https://docs.erpnext.com/docs/user/manual/en/stock/warehouse) that are set by default.", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-05-18 15:04:41.198413", + "modified_by": "Administrator", + "name": "View Warehouses", + "owner": "Administrator", + "path": "Tree/Warehouse", + "show_form_tour": 0, + "show_full_form": 0, + "title": "View Warehouses", + "validate_action": 1 +} \ No newline at end of file From 0b669b3d7e0e079a4029ec5898d8de0e38333648 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Tue, 18 May 2021 17:18:04 +0530 Subject: [PATCH 02/14] refactor: add form tour for stock module onboarding --- .../doctype/delivery_note/delivery_note.js | 20 ++++++++++ erpnext/stock/doctype/item/item.js | 39 +++++++++++++++++++ .../purchase_receipt/purchase_receipt.js | 20 ++++++++++ .../stock/doctype/stock_entry/stock_entry.js | 20 ++++++++++ erpnext/stock/doctype/warehouse/warehouse.js | 25 +++++++++++- 5 files changed, 123 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 36dfa6d7951..b73ebd6c3bd 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -356,3 +356,23 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){ dn_fields['taxes'].print_hide = 0; } } + + +frappe.tour['Delivery Note'] = [ + { + fieldname: "customer", + title: __("Customer"), + description: __("This field is used to set the 'Customer'.") + }, + { + fieldname: "items", + title: __("Items"), + description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc. ") + + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") + }, + { + fieldname: "set_posting_time", + title: __("Edit Posting Date and Time"), + description: __("This option can be checked to edit the 'Posting Date' and 'Posting Time' fields.") + } +] diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index c5bc9f14fb1..6af14c95a45 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -793,3 +793,42 @@ frappe.ui.form.on("UOM Conversion Detail", { } } }) + + +frappe.tour['Item'] = [ + { + fieldname: "item_name", + title: __("Item Name"), + description: __("This is the actual name of the product or service.") + }, + { + fieldname: "item_code", + title: __("Item Code"), + description: __("The Item Code can be thought of as a short-form that refers to the item. ") + + __("For more information click here: ") + + "Item Codification" + + __("."), + }, + { + fieldname: "item_group", + title: __("Item Group"), + description: __("This is used for categorizing items under a common criteria. ") + + __("For more information click here: ") + + "Item Group" + + __("."), + }, + { + fieldname: "stock_uom", + title: __("Default Unit of Measure"), + description: __("The Item Code can be thought of as a short-form that refers to the item. ") + + __("For more information click here: ") + + "Unit of Measure" + + __("."), + }, + { + fieldname: "is_stock_item", + title: __("Maintain Stock"), + description: __("Selecting this creates a stock item and 'Stock Ledger' entries are created for all transcations. ") + + __("Unselect this for a non-stock item such as a service.") + }, +] diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 0182ed55a18..fd4be86ae98 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -347,3 +347,23 @@ var validate_sample_quantity = function(frm, cdt, cdn) { }); } }; + + +frappe.tour['Purchase Receipt'] = [ + { + fieldname: "supplier", + title: __("Supplier"), + description: __("This field is used to set the 'Supplier'.") + }, + { + fieldname: "items", + title: __("Items"), + description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc. ") + + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") + }, + { + fieldname: "set_posting_time", + title: __("Edit Posting Date and Time"), + description: __("This option can be checked to edit the 'Posting Date' and 'Posting Time' fields.") + } +] diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 908020d02ba..8616a4cd3fe 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1101,3 +1101,23 @@ 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: __("There are multiple 'Stock Entry Type's you can even create your own. ") + + __("For moving material between warehouses you can select 'Material Transfer'") + }, + { + fieldname: "items", + title: __("Items"), + description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc. ") + + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") + }, + { + fieldname: "set_posting_time", + title: __("Edit Posting Date and Time"), + description: __("This option can be checked to edit the 'Posting Date' and 'Posting Time' fields.") + } +] diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 1f172504a7f..9b5f2bc0b1d 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -85,4 +85,27 @@ function convert_to_group_or_ledger(frm){ } }) -} \ No newline at end of file +} + +frappe.tour['Warehouse'] = [ + { + fieldname: "warehouse_name", + title: __("Warehouse Name"), + description: __("A 'Warehouse Name' can be assigned to the warehouse. This should reflect the type of goods it contains.") + }, + { + fieldname: "warehouse_type", + title: __("Warehouse Type"), + description: __("A 'Warehouse Type' can be set to classify warehouses.") + }, + { + fieldname: "is_group", + title: __("Is Group"), + description: __("If you check 'Is Group', you can group warehouses under this warehouse.") + }, + { + fieldname: "account", + title: __("Account"), + description: __("This field can be used to set a default account for all transactions with this warehouse.") + }, +] From 1851232e3cc13676c131de99cc2df0b6fc5526ee Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Tue, 18 May 2021 17:30:23 +0530 Subject: [PATCH 03/14] refactor: move trailing whitespace out of translate func --- erpnext/stock/doctype/delivery_note/delivery_note.js | 2 +- erpnext/stock/doctype/item/item.js | 12 ++++++------ .../doctype/purchase_receipt/purchase_receipt.js | 2 +- erpnext/stock/doctype/stock_entry/stock_entry.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index b73ebd6c3bd..706ca365988 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -367,7 +367,7 @@ frappe.tour['Delivery Note'] = [ { fieldname: "items", title: __("Items"), - description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc. ") + + description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc.") + " " + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") }, { diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 6af14c95a45..e664e9c1cd7 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -804,7 +804,7 @@ frappe.tour['Item'] = [ { fieldname: "item_code", title: __("Item Code"), - description: __("The Item Code can be thought of as a short-form that refers to the item. ") + + description: __("The Item Code can be thought of as a short-form that refers to the item.") + " " + __("For more information click here: ") + "Item Codification" + __("."), @@ -812,23 +812,23 @@ frappe.tour['Item'] = [ { fieldname: "item_group", title: __("Item Group"), - description: __("This is used for categorizing items under a common criteria. ") + - __("For more information click here: ") + + description: __("This is used for categorizing items under a common criteria.") + " " + + __("For more information click here:") + " " + "Item Group" + __("."), }, { fieldname: "stock_uom", title: __("Default Unit of Measure"), - description: __("The Item Code can be thought of as a short-form that refers to the item. ") + - __("For more information click here: ") + + description: __("The Item Code can be thought of as a short-form that refers to the item.") + " " + + __("For more information click here:") + " " + "Unit of Measure" + __("."), }, { fieldname: "is_stock_item", title: __("Maintain Stock"), - description: __("Selecting this creates a stock item and 'Stock Ledger' entries are created for all transcations. ") + + description: __("Selecting this creates a stock item and 'Stock Ledger' entries are created for all transcations.") + " " + __("Unselect this for a non-stock item such as a service.") }, ] diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index fd4be86ae98..9f002f459fb 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -358,7 +358,7 @@ frappe.tour['Purchase Receipt'] = [ { fieldname: "items", title: __("Items"), - description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc. ") + + description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc.") + " " + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") }, { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 8616a4cd3fe..30d0750959e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1106,13 +1106,13 @@ frappe.tour['Stock Entry'] = [ { fieldname: "stock_entry_type", title: __("Stock Entry Type"), - description: __("There are multiple 'Stock Entry Type's you can even create your own. ") + + description: __("There are multiple 'Stock Entry Type's you can even create your own.") + " " + __("For moving material between warehouses you can select 'Material Transfer'") }, { fieldname: "items", title: __("Items"), - description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc. ") + + description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc.") + " " + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") }, { From 51d2317bb5339022040d2e177156c30157a6c20e Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Tue, 18 May 2021 17:50:59 +0530 Subject: [PATCH 04/14] refactor: sider/semgrep --- erpnext/stock/doctype/item/item.js | 6 +++--- erpnext/stock/doctype/warehouse/warehouse.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index e664e9c1cd7..3144f1c12a6 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -792,7 +792,7 @@ frappe.ui.form.on("UOM Conversion Detail", { }); } } -}) +}); frappe.tour['Item'] = [ @@ -805,7 +805,7 @@ frappe.tour['Item'] = [ fieldname: "item_code", title: __("Item Code"), description: __("The Item Code can be thought of as a short-form that refers to the item.") + " " + - __("For more information click here: ") + + __("For more information click here:") + " " + "Item Codification" + __("."), }, @@ -831,4 +831,4 @@ frappe.tour['Item'] = [ description: __("Selecting this creates a stock item and 'Stock Ledger' entries are created for all transcations.") + " " + __("Unselect this for a non-stock item such as a service.") }, -] +]; diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 9b5f2bc0b1d..af9a5152470 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -108,4 +108,4 @@ frappe.tour['Warehouse'] = [ title: __("Account"), description: __("This field can be used to set a default account for all transactions with this warehouse.") }, -] +]; From 1d67d20185e48e537a1841d5bc73ceb56ad41cfd Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Thu, 20 May 2021 13:04:59 +0530 Subject: [PATCH 05/14] refactor: remove DN, PR; change wording, add/remove steps in tour --- erpnext/stock/doctype/item/item.js | 20 +++++++++--------- .../stock/doctype/stock_entry/stock_entry.js | 21 ++++++++++++------- erpnext/stock/doctype/warehouse/warehouse.js | 8 +++---- .../create_a_delivery_note.json | 20 ------------------ .../create_a_purchase_receipt.json | 20 ------------------ 5 files changed, 27 insertions(+), 62 deletions(-) delete mode 100644 erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json delete mode 100644 erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 3144f1c12a6..5c632fc7d54 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -796,23 +796,23 @@ frappe.ui.form.on("UOM Conversion Detail", { frappe.tour['Item'] = [ - { - fieldname: "item_name", - title: __("Item Name"), - description: __("This is the actual name of the product or service.") - }, { fieldname: "item_code", title: __("Item Code"), - description: __("The Item Code can be thought of as a short-form that refers to the item.") + " " + + description: __("Select an item code, this can be an SKU or a product code.") + " " + __("For more information click here:") + " " + "Item Codification" + __("."), }, + { + fieldname: "item_name", + title: __("Item Name"), + description: __("Select an item name, this is the actual name of the item. You will be able to search and select an item with its name as well.") + }, { fieldname: "item_group", title: __("Item Group"), - description: __("This is used for categorizing items under a common criteria.") + " " + + description: __("Select an item group to categorizing items under a common criteria. You can even create custom Item Groups.") + " " + __("For more information click here:") + " " + "Item Group" + __("."), @@ -820,7 +820,7 @@ frappe.tour['Item'] = [ { fieldname: "stock_uom", title: __("Default Unit of Measure"), - description: __("The Item Code can be thought of as a short-form that refers to the item.") + " " + + description: __("This decides the unit of measure in which stock balance will be maintained for this item.") + " " + __("For more information click here:") + " " + "Unit of Measure" + __("."), @@ -828,7 +828,7 @@ frappe.tour['Item'] = [ { fieldname: "is_stock_item", title: __("Maintain Stock"), - description: __("Selecting this creates a stock item and 'Stock Ledger' entries are created for all transcations.") + " " + - __("Unselect this for a non-stock item such as a service.") + description: __("Check this field to maintain stock for this item.") + " " + + __("Uncheck this field for non-stock items such as a service.") }, ]; diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 30d0750959e..e7bf0f3bf9b 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1106,18 +1106,23 @@ frappe.tour['Stock Entry'] = [ { fieldname: "stock_entry_type", title: __("Stock Entry Type"), - description: __("There are multiple 'Stock Entry Type's you can even create your own.") + " " + - __("For moving material between warehouses you can select 'Material Transfer'") + description: __("Select the type of Stock Entry to be made.") + " " + + __("For now, to move stock between warehouses select Material Transfer.") + }, + { + fieldname: "from_warehouse", + title: __("Default Source Warehouse"), + description: __("Select a source warehouse, where you have stock available.") + }, + { + fieldname: "to_warehouse", + title: __("Default Target Warehouse"), + description: __("Select a target warehouse, where stock needs to be transferred.") }, { fieldname: "items", title: __("Items"), - description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc.") + " " + + description: __("Select an item and entry quantity to be delivered.") + " " + __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") }, - { - fieldname: "set_posting_time", - title: __("Edit Posting Date and Time"), - description: __("This option can be checked to edit the 'Posting Date' and 'Posting Time' fields.") - } ] diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index af9a5152470..b29c6fdde3c 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -91,21 +91,21 @@ frappe.tour['Warehouse'] = [ { fieldname: "warehouse_name", title: __("Warehouse Name"), - description: __("A 'Warehouse Name' can be assigned to the warehouse. This should reflect the type of goods it contains.") + description: __("Select a name for the warehouse. This should reflect it's location or purpose.") }, { fieldname: "warehouse_type", title: __("Warehouse Type"), - description: __("A 'Warehouse Type' can be set to classify warehouses.") + description: __("Select a warehouse type to categorize the warehouse into a sub-group.") }, { fieldname: "is_group", title: __("Is Group"), - description: __("If you check 'Is Group', you can group warehouses under this warehouse.") + description: __("Check this field to group warehouses under this warehouse.") }, { fieldname: "account", title: __("Account"), - description: __("This field can be used to set a default account for all transactions with this warehouse.") + description: __("Select an account to set a default account for all transactions with this warehouse.") }, ]; diff --git a/erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json b/erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json deleted file mode 100644 index 7b702f013b6..00000000000 --- a/erpnext/stock/onboarding_step/create_a_delivery_note/create_a_delivery_note.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "action": "Create Entry", - "creation": "2021-05-17 16:15:11.745214", - "description": "# Create a Delivery Note\nA [**Delivery Note**](https://docs.erpnext.com/docs/user/manual/en/stock/delivery-note) is made when a shipment is shipped from the company\u2019s *Warehouse* to the *Customer*. \n\nIn this step we will create a *Delivery Note*.", - "docstatus": 0, - "doctype": "Onboarding Step", - "idx": 0, - "is_complete": 0, - "is_single": 0, - "is_skipped": 0, - "modified": "2021-05-18 15:33:47.452298", - "modified_by": "Administrator", - "name": "Create a Delivery Note", - "owner": "Administrator", - "reference_document": "Delivery Note", - "show_form_tour": 1, - "show_full_form": 1, - "title": "Create a Delivery Note", - "validate_action": 1 -} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json b/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json deleted file mode 100644 index 549fe26c253..00000000000 --- a/erpnext/stock/onboarding_step/create_a_purchase_receipt/create_a_purchase_receipt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "action": "Create Entry", - "creation": "2020-05-19 18:59:13.266713", - "description": "# Create a Purchase Entry\nA [**Purchase Receipt**](https://docs.erpnext.com/docs/user/manual/en/stock/purchase-receipt) is made when an *Item* is received from a *Supplier*. \n\nIn this step we will create a *Purchase Receipt*.", - "docstatus": 0, - "doctype": "Onboarding Step", - "idx": 0, - "is_complete": 0, - "is_single": 0, - "is_skipped": 0, - "modified": "2021-05-18 15:17:44.204445", - "modified_by": "Administrator", - "name": "Create a Purchase Receipt", - "owner": "Administrator", - "reference_document": "Purchase Receipt", - "show_form_tour": 1, - "show_full_form": 1, - "title": "Create a Purchase Receipt", - "validate_action": 1 -} \ No newline at end of file From 9581836885bd37e577e5c70fadf72738ecb0a7a3 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Thu, 20 May 2021 15:23:17 +0530 Subject: [PATCH 06/14] refactor: add watch video step for stock opening balance --- .../stock/module_onboarding/stock/stock.json | 7 ++----- .../stock_opening_balance.json | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json diff --git a/erpnext/stock/module_onboarding/stock/stock.json b/erpnext/stock/module_onboarding/stock/stock.json index 6cc8ec6b052..9e91090d5b2 100644 --- a/erpnext/stock/module_onboarding/stock/stock.json +++ b/erpnext/stock/module_onboarding/stock/stock.json @@ -19,7 +19,7 @@ "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/stock", "idx": 0, "is_complete": 0, - "modified": "2021-05-18 17:01:36.137180", + "modified": "2021-05-20 15:08:11.987145", "modified_by": "Administrator", "module": "Stock", "name": "Stock", @@ -47,10 +47,7 @@ "step": "View Stock Ledger" }, { - "step": "Create a Purchase Receipt" - }, - { - "step": "Create a Delivery Note" + "step": "Stock Opening Balance" } ], "subtitle": "Inventory, Warehouses, Analysis, and more.", diff --git a/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json b/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json new file mode 100644 index 00000000000..19d6a37ba4d --- /dev/null +++ b/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json @@ -0,0 +1,21 @@ +{ + "action": "Watch Video", + "creation": "2021-05-17 16:13:47.511883", + "description": "# Stock Opening Balance\nTo set the Stock Opening Balance, you can create a [**Stock Reconciliation**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-reconciliation) entry with _Purpose_ set to _Opening Balance_.\n\nFor more information you can watch the video.", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-05-20 15:07:19.545934", + "modified_by": "Administrator", + "name": "Stock Opening Balance", + "owner": "Administrator", + "reference_document": "Stock Reconciliation", + "show_form_tour": 1, + "show_full_form": 1, + "title": "Stock Opening Balance", + "validate_action": 1, + "video_url": "https://www.youtube.com/watch?v=nlHX0ZZ84Lw" +} \ No newline at end of file From 37466631f20b16e94253ac2115717aed2ceeb9b8 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Thu, 20 May 2021 15:28:08 +0530 Subject: [PATCH 07/14] refactor: reorder steps according to stock settings refactor --- erpnext/stock/doctype/stock_settings/stock_settings.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js index 48624e0f25e..e2f1f951ec3 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.js +++ b/erpnext/stock/doctype/stock_settings/stock_settings.js @@ -27,17 +27,17 @@ frappe.tour['Stock Settings'] = [ 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: "allow_negative_stock", title: __("Allow Negative Stock"), description: __("This will allow stock items to be displayed in negative values. Using this option depends on your use case. With this option unchecked, the system warns before obstructing a transaction that is causing negative stock.") }, - { - 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"), From 95992a7ea54de397c200c3be4925e7c0a5fa6482 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Thu, 20 May 2021 15:29:24 +0530 Subject: [PATCH 08/14] refactor: fix typo, remove target warehouse cause SE Type dependency --- erpnext/stock/doctype/stock_entry/stock_entry.js | 5 ----- erpnext/stock/doctype/warehouse/warehouse.js | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index e7bf0f3bf9b..ecd3fee8286 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1114,11 +1114,6 @@ frappe.tour['Stock Entry'] = [ title: __("Default Source Warehouse"), description: __("Select a source warehouse, where you have stock available.") }, - { - fieldname: "to_warehouse", - title: __("Default Target Warehouse"), - description: __("Select a target warehouse, where stock needs to be transferred.") - }, { fieldname: "items", title: __("Items"), diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index b29c6fdde3c..30575a7c933 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -91,7 +91,7 @@ frappe.tour['Warehouse'] = [ { fieldname: "warehouse_name", title: __("Warehouse Name"), - description: __("Select a name for the warehouse. This should reflect it's location or purpose.") + description: __("Select a name for the warehouse. This should reflect its location or purpose.") }, { fieldname: "warehouse_type", From 599c1024a221624f83f50a7295768292aebce48a Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Thu, 20 May 2021 15:49:26 +0530 Subject: [PATCH 09/14] fix: semgrep, remove trailing and leading whitespaces --- erpnext/stock/doctype/stock_settings/stock_settings.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js index e2f1f951ec3..6a919309f54 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.js +++ b/erpnext/stock/doctype/stock_settings/stock_settings.js @@ -20,7 +20,9 @@ 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."), + 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", @@ -30,7 +32,9 @@ frappe.tour['Stock Settings'] = [ { fieldname: "valuation_method", title: __("Valuation Method"), - description: __("Choose between FIFO and Moving Average Valuation Methods. Click ") + "here" + __(" to know more about them.") + description: __("Choose between FIFO and Moving Average Valuation Methods. Click") + " " + + "here" + " " + + __("to know more about them.") }, { fieldname: "allow_negative_stock", From f7b747e19c322df60f7cc31ac3cf0c75bc9e29aa Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Fri, 18 Jun 2021 14:43:56 +0530 Subject: [PATCH 10/14] refactor: reduce steps, reword cards --- erpnext/stock/doctype/item/item.js | 39 ------------------- .../purchase_receipt/purchase_receipt.js | 20 ---------- .../stock_reconciliation.js | 13 +++++++ .../stock/module_onboarding/stock/stock.json | 17 ++------ .../create_a_stock_entry.json | 7 ++-- .../create_a_warehouse.json | 7 ++-- .../stock_opening_balance.json | 9 +++-- .../stock_settings/stock_settings.json | 7 ++-- .../view_stock_balance.json | 24 ++++++++++++ .../view_stock_ledger/view_stock_ledger.json | 7 ++-- 10 files changed, 62 insertions(+), 88 deletions(-) create mode 100644 erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 5c632fc7d54..c587dd5c7ec 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -793,42 +793,3 @@ frappe.ui.form.on("UOM Conversion Detail", { } } }); - - -frappe.tour['Item'] = [ - { - fieldname: "item_code", - title: __("Item Code"), - description: __("Select an item code, this can be an SKU or a product code.") + " " + - __("For more information click here:") + " " + - "Item Codification" + - __("."), - }, - { - fieldname: "item_name", - title: __("Item Name"), - description: __("Select an item name, this is the actual name of the item. You will be able to search and select an item with its name as well.") - }, - { - fieldname: "item_group", - title: __("Item Group"), - description: __("Select an item group to categorizing items under a common criteria. You can even create custom Item Groups.") + " " + - __("For more information click here:") + " " + - "Item Group" + - __("."), - }, - { - fieldname: "stock_uom", - title: __("Default Unit of Measure"), - description: __("This decides the unit of measure in which stock balance will be maintained for this item.") + " " + - __("For more information click here:") + " " + - "Unit of Measure" + - __("."), - }, - { - fieldname: "is_stock_item", - title: __("Maintain Stock"), - description: __("Check this field to maintain stock for this item.") + " " + - __("Uncheck this field for non-stock items such as a service.") - }, -]; diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 9f002f459fb..0182ed55a18 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -347,23 +347,3 @@ var validate_sample_quantity = function(frm, cdt, cdn) { }); } }; - - -frappe.tour['Purchase Receipt'] = [ - { - fieldname: "supplier", - title: __("Supplier"), - description: __("This field is used to set the 'Supplier'.") - }, - { - fieldname: "items", - title: __("Items"), - description: __("This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc.") + " " + - __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") - }, - { - fieldname: "set_posting_time", - title: __("Edit Posting Date and Time"), - description: __("This option can be checked to edit the 'Posting Date' and 'Posting Time' fields.") - } -] diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index 84f65a077e0..49c85401ace 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -302,3 +302,16 @@ 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: "items", + title: __("Items"), + description: __("Select the items for which the opening stock has to be set.") + }, +]; diff --git a/erpnext/stock/module_onboarding/stock/stock.json b/erpnext/stock/module_onboarding/stock/stock.json index 9e91090d5b2..4503f534c7c 100644 --- a/erpnext/stock/module_onboarding/stock/stock.json +++ b/erpnext/stock/module_onboarding/stock/stock.json @@ -19,35 +19,26 @@ "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/stock", "idx": 0, "is_complete": 0, - "modified": "2021-05-20 15:08:11.987145", + "modified": "2021-06-18 14:41:24.286683", "modified_by": "Administrator", "module": "Stock", "name": "Stock", "owner": "Administrator", "steps": [ { - "step": "Create an Item" - }, - { - "step": "View Warehouses" + "step": "Stock Settings" }, { "step": "Create a Warehouse" }, - { - "step": "Stock Settings" - }, - { - "step": "Introduction to Stock Entry" - }, { "step": "Create a Stock Entry" }, { - "step": "View Stock Ledger" + "step": "Stock Opening Balance" }, { - "step": "Stock Opening Balance" + "step": "View Stock Balance" } ], "subtitle": "Inventory, Warehouses, Analysis, and more.", diff --git a/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json b/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json index 2244c13d5de..3cb522c893d 100644 --- a/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json +++ b/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json @@ -1,20 +1,21 @@ { "action": "Create Entry", + "action_label": "Create a Material Transfer Entry", "creation": "2020-05-15 03:20:16.277043", - "description": "# Create a Stock Entry\nA [**Stock Entry**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-entry) allows you to record the movement of *Items* between *Warehouses*. \n\nIn this step we will create *Stock Entry*.", + "description": "# Manage Stock Movements\nStock entry allows you to register the movement of stock for various purposes like transfer, received, issues, repacked, etc. To address issues related to theft and pilferages, you can always ensure that the movement of goods happens against a document reference Stock Entry in ERPNext.\n\nLet\u2019s get a quick walk-through on the various scenarios covered in Stock Entry by watching [*this video*](https://www.youtube.com/watch?v=Njt107hlY3I).", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, "is_single": 0, "is_skipped": 0, - "modified": "2021-05-18 15:15:26.355884", + "modified": "2021-06-18 13:57:11.434063", "modified_by": "Administrator", "name": "Create a Stock Entry", "owner": "Administrator", "reference_document": "Stock Entry", "show_form_tour": 1, "show_full_form": 1, - "title": "Create a Stock Entry", + "title": "Manage Stock Movements", "validate_action": 1 } \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json index b31b0d03d7b..0ef6c3615c4 100644 --- a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json +++ b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json @@ -1,20 +1,21 @@ { "action": "Create Entry", + "action_label": "Let\u2019s create your first warehouse ", "creation": "2021-05-17 16:13:19.297789", - "description": "# Create a Warehouse\nIn this step we will create a [**Warehouse**](https://docs.erpnext.com/docs/user/manual/en/stock/warehouse).", + "description": "# Setup a Warehouse\nThe warehouse can be your location/godown/store where you maintain the item's inventory, and receive/deliver them to various parties.\n\nIn ERPNext, you can maintain a Warehouse in the tree structure, so that location and sub-location of an item can be tracked. Also, you can link a Warehouse to a specific Accounting ledger, where the real-time stock value of that warehouse\u2019s item will be reflected.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, "is_single": 0, "is_skipped": 0, - "modified": "2021-05-18 15:00:36.896793", + "modified": "2021-06-18 13:52:51.126984", "modified_by": "Administrator", "name": "Create a Warehouse", "owner": "Administrator", "reference_document": "Warehouse", "show_form_tour": 1, "show_full_form": 1, - "title": "Create a Warehouse", + "title": "Setup a Warehouse", "validate_action": 1 } \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json b/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json index 19d6a37ba4d..48fd1fddee0 100644 --- a/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json +++ b/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json @@ -1,21 +1,22 @@ { - "action": "Watch Video", + "action": "Create Entry", + "action_label": "Let\u2019s create a stock opening entry", "creation": "2021-05-17 16:13:47.511883", - "description": "# Stock Opening Balance\nTo set the Stock Opening Balance, you can create a [**Stock Reconciliation**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-reconciliation) entry with _Purpose_ set to _Opening Balance_.\n\nFor more information you can watch the video.", + "description": "# Update Stock Opening Balance\nIt\u2019s an entry to update the stock balance of an item, in a warehouse, on a date and time you are going live on ERPNext.\n\nOnce opening stocks are updated, you can create transactions like manufacturing and stock deliveries, where this opening stock will be consumed.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, "is_single": 0, "is_skipped": 0, - "modified": "2021-05-20 15:07:19.545934", + "modified": "2021-06-18 13:59:36.021097", "modified_by": "Administrator", "name": "Stock Opening Balance", "owner": "Administrator", "reference_document": "Stock Reconciliation", "show_form_tour": 1, "show_full_form": 1, - "title": "Stock Opening Balance", + "title": "Update Stock Opening Balance", "validate_action": 1, "video_url": "https://www.youtube.com/watch?v=nlHX0ZZ84Lw" } \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json index 096a3d2b471..f7238da3348 100644 --- a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json +++ b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json @@ -1,20 +1,21 @@ { "action": "Show Form Tour", + "action_label": "Take a walk through Stock Settings", "creation": "2020-05-15 02:53:57.209967", - "description": "# Stock Settings\nIn this step we will view the [**Stock Settings**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-settings) page, here you can set the default settings for your stock related transactions.", + "description": "# Review Stock Settings\n\nIn ERPNext, the Stock module\u2019s features are configurable as per your business needs. Stock Settings is the place where you can set your preferences for:\n- Default values for Item and Pricing\n- Default valuation method for inventory valuation\n- Set preference for serialization and batching of item\n- Set tolerance for over-receipt and delivery of items", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, "is_single": 1, "is_skipped": 0, - "modified": "2021-05-18 16:44:58.084849", + "modified": "2021-06-18 14:13:12.678178", "modified_by": "Administrator", "name": "Stock Settings", "owner": "Administrator", "reference_document": "Stock Settings", "show_form_tour": 0, "show_full_form": 0, - "title": "Explore Stock Settings", + "title": "Review Stock Settings", "validate_action": 1 } \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json b/erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json new file mode 100644 index 00000000000..ed5fe369459 --- /dev/null +++ b/erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json @@ -0,0 +1,24 @@ +{ + "action": "View Report", + "action_label": "Check Stock Balance", + "creation": "2021-05-17 16:15:54.617572", + "description": "# Check Stock Reports\nBased on the various stock transactions, you can get a host of one-click Stock Reports in ERPNext like Stock Ledger, Stock Balance, Projected Quantity, and Ageing analysis.", + "docstatus": 0, + "doctype": "Onboarding Step", + "idx": 0, + "is_complete": 0, + "is_single": 0, + "is_skipped": 0, + "modified": "2021-06-18 14:41:18.499215", + "modified_by": "Administrator", + "name": "View Stock Balance", + "owner": "Administrator", + "reference_report": "Stock Balance", + "report_description": "You can set the filters to narrow the results, then click on Generate New Report to see the updated report.", + "report_reference_doctype": "Stock Ledger Entry", + "report_type": "Script Report", + "show_form_tour": 0, + "show_full_form": 0, + "title": "Check Stock Reports", + "validate_action": 1 +} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json b/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json index 13661bc9fbd..7a5f164e016 100644 --- a/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json +++ b/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json @@ -1,14 +1,15 @@ { "action": "View Report", + "action_label": "Check Stock Ledger", "creation": "2021-05-17 16:16:10.727959", - "description": "# View Stock Ledger\nThe [**Stock Ledger**](https://docs.erpnext.com/docs/user/manual/en/stock/stock-ledger) is a detailed record that keeps track of stock movements for a company. \n\nIn this step we will view the *Stock Ledger*.", + "description": "# Check Stock Reports\nBased on the various stock transactions, you can get a host of one-click Stock Reports in ERPNext like Stock Ledger, Stock Balance, Projected Quantity, and Ageing analysis.", "docstatus": 0, "doctype": "Onboarding Step", "idx": 0, "is_complete": 0, "is_single": 0, "is_skipped": 0, - "modified": "2021-05-18 16:16:38.150079", + "modified": "2021-06-18 14:09:39.399311", "modified_by": "Administrator", "name": "View Stock Ledger", "owner": "Administrator", @@ -18,6 +19,6 @@ "report_type": "Script Report", "show_form_tour": 0, "show_full_form": 0, - "title": "View Stock Ledger", + "title": "Check Stock Reports", "validate_action": 1 } \ No newline at end of file From 77ebbdd172c355f8598dcdc92cd1340cb8ad1f29 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Fri, 20 Aug 2021 16:21:33 +0530 Subject: [PATCH 11/14] fix: minor changes - remove Is Group from warehouse - change stock entry type - link to stock entry type - add posting date to stock reco - change report to Stock Projected Qty - highlight quality inspection action - remove allow neg highlight --- .../stock/doctype/stock_entry/stock_entry.js | 12 ++++------ .../stock_reconciliation.js | 5 ++++ .../doctype/stock_settings/stock_settings.js | 12 +++++----- erpnext/stock/doctype/warehouse/warehouse.js | 8 ++----- .../stock/module_onboarding/stock/stock.json | 4 ++-- .../create_a_warehouse.json | 2 +- .../stock_settings/stock_settings.json | 2 +- .../view_stock_ledger/view_stock_ledger.json | 24 ------------------- .../view_stock_projected_qty.json} | 14 +++++------ 9 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json rename erpnext/stock/onboarding_step/{view_stock_balance/view_stock_balance.json => view_stock_projected_qty/view_stock_projected_qty.json} (69%) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index ecd3fee8286..5ea733c66d3 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -1106,18 +1106,16 @@ 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 move stock between warehouses select Material Transfer.") + description: __("Select the type of Stock Entry to be made. For now, to receive stock into a warehouses select") + ' ' + __("Material Receipt.") + "" }, { - fieldname: "from_warehouse", - title: __("Default Source Warehouse"), - description: __("Select a source warehouse, where you have stock available.") + 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.") + " " + - __("Different 'Source Warehouse' and 'Target Warehouse' can be set for each row.") + 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 49c85401ace..f91d0a740d8 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -309,6 +309,11 @@ frappe.tour['Stock Reconciliation'] = [ 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"), diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js index 6a919309f54..08606fdcaa6 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.js +++ b/erpnext/stock/doctype/stock_settings/stock_settings.js @@ -36,17 +36,17 @@ frappe.tour['Stock Settings'] = [ "here" + " " + __("to know more about them.") }, - { - fieldname: "allow_negative_stock", - title: __("Allow Negative Stock"), - description: __("This will allow stock items to be displayed in negative values. Using this option depends on your use case. With this option unchecked, the system warns before obstructing a transaction that is causing negative stock.") - - }, { 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"), diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 30575a7c933..8b925bebf9e 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -91,21 +91,17 @@ frappe.tour['Warehouse'] = [ { fieldname: "warehouse_name", title: __("Warehouse Name"), - description: __("Select a name for the warehouse. This should reflect its location or purpose.") + 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: "is_group", - title: __("Is Group"), - description: __("Check this field to group warehouses under this warehouse.") - }, { fieldname: "account", title: __("Account"), description: __("Select an account to set a default account for all transactions with this warehouse.") }, ]; + diff --git a/erpnext/stock/module_onboarding/stock/stock.json b/erpnext/stock/module_onboarding/stock/stock.json index 4503f534c7c..c246747a5b3 100644 --- a/erpnext/stock/module_onboarding/stock/stock.json +++ b/erpnext/stock/module_onboarding/stock/stock.json @@ -19,7 +19,7 @@ "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/stock", "idx": 0, "is_complete": 0, - "modified": "2021-06-18 14:41:24.286683", + "modified": "2021-08-20 14:38:55.570067", "modified_by": "Administrator", "module": "Stock", "name": "Stock", @@ -38,7 +38,7 @@ "step": "Stock Opening Balance" }, { - "step": "View Stock Balance" + "step": "View Stock Projected Qty" } ], "subtitle": "Inventory, Warehouses, Analysis, and more.", diff --git a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json index 0ef6c3615c4..22c88bf10ea 100644 --- a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json +++ b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json @@ -9,7 +9,7 @@ "is_complete": 0, "is_single": 0, "is_skipped": 0, - "modified": "2021-06-18 13:52:51.126984", + "modified": "2021-08-18 12:23:36.675572", "modified_by": "Administrator", "name": "Create a Warehouse", "owner": "Administrator", diff --git a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json index f7238da3348..2cf90e806cd 100644 --- a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json +++ b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json @@ -9,7 +9,7 @@ "is_complete": 0, "is_single": 1, "is_skipped": 0, - "modified": "2021-06-18 14:13:12.678178", + "modified": "2021-08-18 12:06:51.139387", "modified_by": "Administrator", "name": "Stock Settings", "owner": "Administrator", diff --git a/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json b/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json deleted file mode 100644 index 7a5f164e016..00000000000 --- a/erpnext/stock/onboarding_step/view_stock_ledger/view_stock_ledger.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "action": "View Report", - "action_label": "Check Stock Ledger", - "creation": "2021-05-17 16:16:10.727959", - "description": "# Check Stock Reports\nBased on the various stock transactions, you can get a host of one-click Stock Reports in ERPNext like Stock Ledger, Stock Balance, Projected Quantity, and Ageing analysis.", - "docstatus": 0, - "doctype": "Onboarding Step", - "idx": 0, - "is_complete": 0, - "is_single": 0, - "is_skipped": 0, - "modified": "2021-06-18 14:09:39.399311", - "modified_by": "Administrator", - "name": "View Stock Ledger", - "owner": "Administrator", - "reference_report": "Stock Ledger", - "report_description": "You can set the filters to see entries specific to the previous steps.", - "report_reference_doctype": "Stock Ledger Entry", - "report_type": "Script Report", - "show_form_tour": 0, - "show_full_form": 0, - "title": "Check Stock Reports", - "validate_action": 1 -} \ No newline at end of file diff --git a/erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json b/erpnext/stock/onboarding_step/view_stock_projected_qty/view_stock_projected_qty.json similarity index 69% rename from erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json rename to erpnext/stock/onboarding_step/view_stock_projected_qty/view_stock_projected_qty.json index ed5fe369459..e684780751f 100644 --- a/erpnext/stock/onboarding_step/view_stock_balance/view_stock_balance.json +++ b/erpnext/stock/onboarding_step/view_stock_projected_qty/view_stock_projected_qty.json @@ -1,7 +1,7 @@ { "action": "View Report", - "action_label": "Check Stock Balance", - "creation": "2021-05-17 16:15:54.617572", + "action_label": "Check Stock Projected Qty", + "creation": "2021-08-20 14:38:41.649103", "description": "# Check Stock Reports\nBased on the various stock transactions, you can get a host of one-click Stock Reports in ERPNext like Stock Ledger, Stock Balance, Projected Quantity, and Ageing analysis.", "docstatus": 0, "doctype": "Onboarding Step", @@ -9,16 +9,16 @@ "is_complete": 0, "is_single": 0, "is_skipped": 0, - "modified": "2021-06-18 14:41:18.499215", + "modified": "2021-08-20 14:38:41.649103", "modified_by": "Administrator", - "name": "View Stock Balance", + "name": "View Stock Projected Qty", "owner": "Administrator", - "reference_report": "Stock Balance", + "reference_report": "Stock Projected Qty", "report_description": "You can set the filters to narrow the results, then click on Generate New Report to see the updated report.", - "report_reference_doctype": "Stock Ledger Entry", + "report_reference_doctype": "Item", "report_type": "Script Report", "show_form_tour": 0, "show_full_form": 0, - "title": "Check Stock Reports", + "title": "Check Stock Projected Qty", "validate_action": 1 } \ No newline at end of file From f4487c3ae540c7afa790a0a906e63ca95e736fde Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Fri, 20 Aug 2021 16:25:20 +0530 Subject: [PATCH 12/14] refactor: use Form Tour doc instead of controller form tour note - keeping controller form tours as a fallback, new form tours seem to work only for Stock Settings --- .../create_a_stock_entry.json | 56 ++++++++++++ .../create_a_warehouse.json | 54 +++++++++++ .../create_warehouse/create_warehouse.json | 54 +++++++++++ .../stock_opening_balance.json | 55 ++++++++++++ .../stock_settings/stock_settings.json | 89 +++++++++++++++++++ 5 files changed, 308 insertions(+) create mode 100644 erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json create mode 100644 erpnext/stock/form_tour/create_a_warehouse/create_a_warehouse.json create mode 100644 erpnext/stock/form_tour/create_warehouse/create_warehouse.json create mode 100644 erpnext/stock/form_tour/stock_opening_balance/stock_opening_balance.json create mode 100644 erpnext/stock/form_tour/stock_settings/stock_settings.json diff --git a/erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json b/erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json new file mode 100644 index 00000000000..fbc4b558bc1 --- /dev/null +++ b/erpnext/stock/form_tour/create_a_stock_entry/create_a_stock_entry.json @@ -0,0 +1,56 @@ +{ + "creation": "2021-08-20 16:02:59.314742", + "docstatus": 0, + "doctype": "Form Tour", + "idx": 0, + "is_standard": 1, + "modified": "2021-08-20 16:05:40.593997", + "modified_by": "Administrator", + "module": "Stock", + "name": "Create a Stock Entry", + "owner": "Administrator", + "reference_doctype": "Stock Entry", + "save_on_complete": 1, + "steps": [ + { + "description": "Select the type of Stock Entry to be made. For now, to receive stock into a warehouses select Material Receipt.", + "field": "", + "fieldname": "stock_entry_type", + "fieldtype": "Link", + "has_next_condition": 1, + "is_table_field": 0, + "label": "Stock Entry Type", + "next_step_condition": "eval: doc.stock_entry_type === \"Material Receipt\"", + "parent_field": "", + "position": "Top", + "title": "Stock Entry Type" + }, + { + "description": "Select a target warehouse where the stock will be received.", + "field": "", + "fieldname": "to_warehouse", + "fieldtype": "Link", + "has_next_condition": 1, + "is_table_field": 0, + "label": "Default Target Warehouse", + "next_step_condition": "eval: doc.to_warehouse", + "parent_field": "", + "position": "Top", + "title": "Default Target Warehouse" + }, + { + "description": "Select an item and entry quantity to be delivered.", + "field": "", + "fieldname": "items", + "fieldtype": "Table", + "has_next_condition": 1, + "is_table_field": 0, + "label": "Items", + "next_step_condition": "eval: doc.items[0]?.item_code", + "parent_field": "", + "position": "Bottom", + "title": "Items" + } + ], + "title": "Create a Stock Entry" +} \ No newline at end of file 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 new file mode 100644 index 00000000000..e9a598b4b1a --- /dev/null +++ b/erpnext/stock/form_tour/create_a_warehouse/create_a_warehouse.json @@ -0,0 +1,54 @@ +{ + "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_warehouse/create_warehouse.json b/erpnext/stock/form_tour/create_warehouse/create_warehouse.json new file mode 100644 index 00000000000..f25e3a1cf3a --- /dev/null +++ b/erpnext/stock/form_tour/create_warehouse/create_warehouse.json @@ -0,0 +1,54 @@ +{ + "creation": "2021-08-20 15:42:47.059290", + "docstatus": 0, + "doctype": "Form Tour", + "idx": 0, + "is_standard": 1, + "modified": "2021-08-20 15:54:58.440497", + "modified_by": "Administrator", + "module": "Stock", + "name": "Create 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 Warehouse" +} \ 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_opening_balance/stock_opening_balance.json new file mode 100644 index 00000000000..94bdbbc442c --- /dev/null +++ b/erpnext/stock/form_tour/stock_opening_balance/stock_opening_balance.json @@ -0,0 +1,55 @@ +{ + "creation": "2021-08-20 16:08:39.298267", + "docstatus": 0, + "doctype": "Form Tour", + "idx": 0, + "is_standard": 1, + "modified": "2021-08-20 16:08:39.298267", + "modified_by": "Administrator", + "module": "Stock", + "name": "Stock Opening Balance", + "owner": "Administrator", + "reference_doctype": "Stock Reconciliation", + "save_on_complete": 1, + "steps": [ + { + "description": "Set Purpose to Opening Stock to set the stock opening balance.", + "field": "", + "fieldname": "purpose", + "fieldtype": "Select", + "has_next_condition": 1, + "is_table_field": 0, + "label": "Purpose", + "next_step_condition": "eval: doc.purpose === \"Opening Stock\"", + "parent_field": "", + "position": "Top", + "title": "Purpose" + }, + { + "description": "Edit the Posting Date by clicking on the Edit Posting Date and Time checkbox below.", + "field": "", + "fieldname": "posting_date", + "fieldtype": "Date", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Posting Date", + "parent_field": "", + "position": "Bottom", + "title": "Posting Date" + }, + { + "description": "Select the items for which the opening stock has to be set.", + "field": "", + "fieldname": "items", + "fieldtype": "Table", + "has_next_condition": 1, + "is_table_field": 0, + "label": "Items", + "next_step_condition": "eval: doc.items[0]?.item_code", + "parent_field": "", + "position": "Bottom", + "title": "Items" + } + ], + "title": "Stock Opening Balance" +} \ No newline at end of file diff --git a/erpnext/stock/form_tour/stock_settings/stock_settings.json b/erpnext/stock/form_tour/stock_settings/stock_settings.json new file mode 100644 index 00000000000..282b87c21fc --- /dev/null +++ b/erpnext/stock/form_tour/stock_settings/stock_settings.json @@ -0,0 +1,89 @@ +{ + "creation": "2021-08-20 15:20:59.336585", + "docstatus": 0, + "doctype": "Form Tour", + "idx": 0, + "is_standard": 1, + "modified": "2021-08-20 15:37:36.151783", + "modified_by": "Administrator", + "module": "Stock", + "name": "Stock Settings", + "owner": "Administrator", + "reference_doctype": "Stock Settings", + "save_on_complete": 1, + "steps": [ + { + "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.", + "field": "", + "fieldname": "item_naming_by", + "fieldtype": "Select", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Item Naming By", + "parent_field": "", + "position": "Bottom", + "title": "Item Naming By" + }, + { + "description": "Set a Default Warehouse for Inventory Transactions. This will be fetched into the Default Warehouse in the Item master.", + "field": "", + "fieldname": "default_warehouse", + "fieldtype": "Link", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Default Warehouse", + "parent_field": "", + "position": "Bottom", + "title": "Default Warehouse" + }, + { + "description": "Choose between FIFO and Moving Average Valuation Methods. Click here to know more about them.", + "field": "", + "fieldname": "valuation_method", + "fieldtype": "Select", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Default Valuation Method", + "parent_field": "", + "position": "Bottom", + "title": "Default Valuation Method" + }, + { + "description": "Show 'Scan Barcode' field above every child table to insert Items with ease.", + "field": "", + "fieldname": "show_barcode_field", + "fieldtype": "Check", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Show Barcode Field in Stock Transactions", + "parent_field": "", + "position": "Bottom", + "title": "Show Barcode Field" + }, + { + "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.", + "field": "", + "fieldname": "action_if_quality_inspection_is_not_submitted", + "fieldtype": "Select", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Action If Quality Inspection Is Not Submitted", + "parent_field": "", + "position": "Bottom", + "title": "Action if Quality Inspection Is Not Submitted" + }, + { + "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.", + "field": "", + "fieldname": "automatically_set_serial_nos_based_on_fifo", + "fieldtype": "Check", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Automatically Set Serial Nos Based on FIFO", + "parent_field": "", + "position": "Bottom", + "title": "Automatically Set Serial Nos based on FIFO" + } + ], + "title": "Stock Settings" +} \ No newline at end of file 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 13/14] 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 From dbea840ecfc82cb94fb2fb90f6125b97bb2e9150 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Wed, 25 Aug 2021 16:34:31 +0530 Subject: [PATCH 14/14] fix: re-order tour to circumvent glitchy save highlight --- .../form_tour/stock_entry/stock_entry.json | 4 +- .../stock_reconciliation.json | 28 +++++------ .../stock_settings/stock_settings.json | 50 +++++++++---------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/erpnext/stock/form_tour/stock_entry/stock_entry.json b/erpnext/stock/form_tour/stock_entry/stock_entry.json index 98c5d62f10a..6363c6ad4dd 100644 --- a/erpnext/stock/form_tour/stock_entry/stock_entry.json +++ b/erpnext/stock/form_tour/stock_entry/stock_entry.json @@ -4,7 +4,7 @@ "doctype": "Form Tour", "idx": 0, "is_standard": 1, - "modified": "2021-08-24 14:50:48.017420", + "modified": "2021-08-25 16:31:31.441194", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", @@ -48,7 +48,7 @@ "label": "Items", "next_step_condition": "eval: doc.items[0]?.item_code", "parent_field": "", - "position": "Bottom", + "position": "Top", "title": "Items" } ], diff --git a/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json index 83083b639a1..5b7fd72c082 100644 --- a/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json +++ b/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json @@ -4,7 +4,7 @@ "doctype": "Form Tour", "idx": 0, "is_standard": 1, - "modified": "2021-08-24 14:50:41.512219", + "modified": "2021-08-25 16:26:11.718664", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reconciliation", @@ -25,6 +25,19 @@ "position": "Top", "title": "Purpose" }, + { + "description": "Select the items for which the opening stock has to be set.", + "field": "", + "fieldname": "items", + "fieldtype": "Table", + "has_next_condition": 1, + "is_table_field": 0, + "label": "Items", + "next_step_condition": "eval: doc.items[0]?.item_code", + "parent_field": "", + "position": "Top", + "title": "Items" + }, { "description": "Edit the Posting Date by clicking on the Edit Posting Date and Time checkbox below.", "field": "", @@ -36,19 +49,6 @@ "parent_field": "", "position": "Bottom", "title": "Posting Date" - }, - { - "description": "Select the items for which the opening stock has to be set.", - "field": "", - "fieldname": "items", - "fieldtype": "Table", - "has_next_condition": 1, - "is_table_field": 0, - "label": "Items", - "next_step_condition": "eval: doc.items[0]?.item_code", - "parent_field": "", - "position": "Bottom", - "title": "Items" } ], "title": "Stock Reconciliation" diff --git a/erpnext/stock/form_tour/stock_settings/stock_settings.json b/erpnext/stock/form_tour/stock_settings/stock_settings.json index 282b87c21fc..3d164e33b3b 100644 --- a/erpnext/stock/form_tour/stock_settings/stock_settings.json +++ b/erpnext/stock/form_tour/stock_settings/stock_settings.json @@ -4,7 +4,7 @@ "doctype": "Form Tour", "idx": 0, "is_standard": 1, - "modified": "2021-08-20 15:37:36.151783", + "modified": "2021-08-25 16:19:37.699528", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", @@ -36,30 +36,6 @@ "position": "Bottom", "title": "Default Warehouse" }, - { - "description": "Choose between FIFO and Moving Average Valuation Methods. Click here to know more about them.", - "field": "", - "fieldname": "valuation_method", - "fieldtype": "Select", - "has_next_condition": 0, - "is_table_field": 0, - "label": "Default Valuation Method", - "parent_field": "", - "position": "Bottom", - "title": "Default Valuation Method" - }, - { - "description": "Show 'Scan Barcode' field above every child table to insert Items with ease.", - "field": "", - "fieldname": "show_barcode_field", - "fieldtype": "Check", - "has_next_condition": 0, - "is_table_field": 0, - "label": "Show Barcode Field in Stock Transactions", - "parent_field": "", - "position": "Bottom", - "title": "Show Barcode Field" - }, { "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.", "field": "", @@ -83,6 +59,30 @@ "parent_field": "", "position": "Bottom", "title": "Automatically Set Serial Nos based on FIFO" + }, + { + "description": "Show 'Scan Barcode' field above every child table to insert Items with ease.", + "field": "", + "fieldname": "show_barcode_field", + "fieldtype": "Check", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Show Barcode Field in Stock Transactions", + "parent_field": "", + "position": "Bottom", + "title": "Show Barcode Field" + }, + { + "description": "Choose between FIFO and Moving Average Valuation Methods. Click here to know more about them.", + "field": "", + "fieldname": "valuation_method", + "fieldtype": "Select", + "has_next_condition": 0, + "is_table_field": 0, + "label": "Default Valuation Method", + "parent_field": "", + "position": "Bottom", + "title": "Default Valuation Method" } ], "title": "Stock Settings"