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] 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