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
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index ecd3fee..5ea733c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -1106,18 +1106,16 @@
{
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") + ' <a href="https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/stock-entry-purpose#2purpose-material-receipt" target="_blank">' + __("Material Receipt.") + "</a>"
},
{
- 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 49c8540..f91d0a7 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -310,6 +310,11 @@
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 6a91930..08606fd 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.js
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.js
@@ -37,17 +37,17 @@
__("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"),
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 30575a7..8b925be 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -91,7 +91,7 @@
{
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",
@@ -99,13 +99,9 @@
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 4503f53..c246747 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 0ef6c36..22c88bf 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 f7238da..2cf90e8 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 7a5f164..0000000
--- 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 68%
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 ed5fe36..e684780 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