Merge pull request #21768 from rohitwaghchaure/updated-manufacturing-desk-and-desk

fix: updated manufacturing onboarding and desk
2020-05-19 13:04:39 +05:30 · 2020-05-19 13:04:39 +05:30 · 862a596e6f
commit 862a596e6f
parent f2fb9368db 84011b79d1
13 changed files with 101 additions and 35 deletions
--- a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
@ -3,7 +3,7 @@
  {
   "hidden": 0,
   "label": "Production",
-   "links": "[\n    {\n        \"dependencies\": [\n            \"Item\",\n            \"BOM\"\n        ],\n        \"description\": \"Orders released for production.\",\n        \"label\": \"Work Order\",\n        \"name\": \"Work Order\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Item\",\n            \"BOM\"\n        ],\n        \"description\": \"Generate Material Requests (MRP) and Work Orders.\",\n        \"label\": \"Production Plan\",\n        \"name\": \"Production Plan\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Item\"\n        ],\n        \"label\": \"Stock Entry\",\n        \"name\": \"Stock Entry\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Activity Type\"\n        ],\n        \"description\": \"Time Sheet for manufacturing.\",\n        \"label\": \"Timesheet\",\n        \"name\": \"Timesheet\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Job Card\",\n        \"name\": \"Job Card\",\n        \"type\": \"doctype\"\n    }\n]"
+   "links": "[\n    {\n        \"dependencies\": [\n            \"Item\",\n            \"BOM\"\n        ],\n        \"description\": \"Orders released for production.\",\n        \"label\": \"Work Order\",\n        \"name\": \"Work Order\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Item\",\n            \"BOM\"\n        ],\n        \"description\": \"Generate Material Requests (MRP) and Work Orders.\",\n        \"label\": \"Production Plan\",\n        \"name\": \"Production Plan\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Item\"\n        ],\n        \"label\": \"Stock Entry\",\n        \"name\": \"Stock Entry\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Job Card\",\n        \"name\": \"Job Card\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Downtime Entry\",\n        \"name\": \"Downtime Entry\",\n        \"type\": \"doctype\"\n    }\n]"
  },
  {
   "hidden": 0,
@ -43,11 +43,10 @@
 "docstatus": 0,
 "doctype": "Desk Page",
 "extends_another_page": 0,
- "hide_custom": 0,
 "idx": 0,
 "is_standard": 1,
 "label": "Manufacturing",
- "modified": "2020-05-19 12:06:25.047481",
+ "modified": "2020-05-19 12:54:04.104444",
 "modified_by": "Administrator",
 "module": "Manufacturing",
 "name": "Manufacturing",
@ -78,7 +77,7 @@
   "label": "Work Order",
   "link_to": "Work Order",
   "restrict_to_domain": "Manufacturing",
-   "stats_filter": "{ \"status\": \n    (\n    \"in\", [\"Draft\", \"Not Started\", \"In Process\"]\n    )\n}",
+   "stats_filter": "{ \n    \"status\": [\"in\", \n        [\"Draft\", \"Not Started\", \"In Process\"]\n    ]\n}",
   "type": "DocType"
  },
  {
@ -86,7 +85,7 @@
   "label": "Production Plan",
   "link_to": "Production Plan",
   "restrict_to_domain": "Manufacturing",
-   "stats_filter": "{ \"status\": \n    (\n    \"!=\", \"Completed\"\n    )\n}",
+   "stats_filter": "{ \n    \"status\": [\"not in\", [\"Completed\"]]\n}",
   "type": "DocType"
  },
  {
--- a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
+++ b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
@ -13,7 +13,9 @@
  "to_time",
  "downtime",
  "downtime_reason_section",
-  "reason"
+  "stop_reason",
+  "column_break_9",
+  "remarks"
 ],
 "fields": [
  {
@ -41,12 +43,6 @@
   "fieldname": "column_break_4",
   "fieldtype": "Column Break"
  },
-  {
-   "fieldname": "reason",
-   "fieldtype": "Text",
-   "label": "Reason",
-   "reqd": 1
-  },
  {
   "fieldname": "operator",
   "fieldtype": "Link",
@ -66,10 +62,26 @@
   "fieldtype": "Float",
   "label": "Downtime",
   "read_only": 1
+  },
+  {
+   "fieldname": "stop_reason",
+   "fieldtype": "Select",
+   "label": "Stop Reason",
+   "options": "\nExcessive machine set up time\nUnplanned machine maintenance\nOn-machine press checks\nMachine operator errors\nMachine malfunction\nElectricity down\nOther",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "remarks",
+   "fieldtype": "Text",
+   "label": "Remarks"
  }
 ],
 "links": [],
- "modified": "2020-04-20 17:34:51.299607",
+ "modified": "2020-05-19 12:59:37.358483",
 "modified_by": "Administrator",
 "module": "Manufacturing",
 "name": "Downtime Entry",
--- a/erpnext/manufacturing/module_onboarding/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/module_onboarding/manufacturing/manufacturing.json
@ -19,7 +19,7 @@
 "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/manufacturing",
 "idx": 0,
 "is_complete": 0,
- "modified": "2020-05-14 19:12:17.289867",
+ "modified": "2020-05-19 12:51:42.744570",
 "modified_by": "Administrator",
 "module": "Manufacturing",
 "name": "Manufacturing",
@ -37,6 +37,9 @@
  {
   "step": "Create Product"
  },
+  {
+   "step": "Create Raw Materials"
+  },
  {
   "step": "Create BOM"
  },
@ -44,7 +47,7 @@
   "step": "Work Order"
  },
  {
-   "step": "Introduction to Manufacturing"
+   "step": "Explore Manufacturing Settings"
  }
 ],
 "subtitle": "Products, Raw Materials, BOM, Work Order and more.",
--- a/erpnext/manufacturing/onboarding_step/create_bom/create_bom.json
+++ b/erpnext/manufacturing/onboarding_step/create_bom/create_bom.json
@ -8,12 +8,12 @@
 "is_mandatory": 1,
 "is_single": 0,
 "is_skipped": 0,
- "modified": "2020-05-14 19:11:57.153679",
+ "modified": "2020-05-19 12:51:31.315686",
 "modified_by": "Administrator",
 "name": "Create BOM",
 "owner": "Administrator",
 "reference_document": "BOM",
 "show_full_form": 1,
- "title": "Create BOM (Bill of Material)",
+ "title": "Create a BOM (Bill of Material)",
 "validate_action": 1
 }
--- a/erpnext/manufacturing/onboarding_step/create_product/create_product.json
+++ b/erpnext/manufacturing/onboarding_step/create_product/create_product.json
@ -8,12 +8,12 @@
 "is_mandatory": 1,
 "is_single": 0,
 "is_skipped": 0,
- "modified": "2020-05-14 19:10:39.974370",
+ "modified": "2020-05-19 12:50:59.010439",
 "modified_by": "Administrator",
 "name": "Create Product",
 "owner": "Administrator",
 "reference_document": "Item",
 "show_full_form": 0,
- "title": "Create Product (Raw Materials / Finished Good)",
+ "title": "Create a Finished Good",
 "validate_action": 1
 }
--- a/erpnext/manufacturing/onboarding_step/create_raw_materials/create_raw_materials.json
+++ b/erpnext/manufacturing/onboarding_step/create_raw_materials/create_raw_materials.json
@ -0,0 +1,19 @@
+{
+ "action": "Create Entry",
+ "creation": "2020-05-19 11:53:17.295372",
+ "docstatus": 0,
+ "doctype": "Onboarding Step",
+ "idx": 0,
+ "is_complete": 0,
+ "is_mandatory": 0,
+ "is_single": 0,
+ "is_skipped": 0,
+ "modified": "2020-05-19 11:53:25.147837",
+ "modified_by": "Administrator",
+ "name": "Create Raw Materials",
+ "owner": "Administrator",
+ "reference_document": "Item",
+ "show_full_form": 0,
+ "title": "Create Raw Materials",
+ "validate_action": 1
+}
--- a/erpnext/manufacturing/onboarding_step/explore_manufacturing_settings/explore_manufacturing_settings.json
+++ b/erpnext/manufacturing/onboarding_step/explore_manufacturing_settings/explore_manufacturing_settings.json
@ -0,0 +1,20 @@
+{
+ "action": "Update Settings",
+ "creation": "2020-05-19 11:55:11.378374",
+ "docstatus": 0,
+ "doctype": "Onboarding Step",
+ "idx": 0,
+ "is_complete": 0,
+ "is_mandatory": 0,
+ "is_single": 1,
+ "is_skipped": 0,
+ "modified": "2020-05-19 12:12:28.145366",
+ "modified_by": "Administrator",
+ "name": "Explore Manufacturing Settings",
+ "owner": "Administrator",
+ "reference_document": "Manufacturing Settings",
+ "show_full_form": 0,
+ "title": "Explore Manufacturing Settings",
+ "validate_action": 0,
+ "video_url": "https://www.youtube.com/watch?v=UVGfzwOOZC4"
+}
--- a/erpnext/manufacturing/onboarding_step/operation/operation.json
+++ b/erpnext/manufacturing/onboarding_step/operation/operation.json
@ -8,12 +8,12 @@
 "is_mandatory": 0,
 "is_single": 0,
 "is_skipped": 0,
- "modified": "2020-05-14 19:10:27.258157",
+ "modified": "2020-05-19 12:50:41.642754",
 "modified_by": "Administrator",
 "name": "Operation",
 "owner": "Administrator",
 "reference_document": "Operation",
 "show_full_form": 0,
- "title": "Create Operation",
+ "title": "Create a Operation",
 "validate_action": 1
 }
--- a/erpnext/manufacturing/onboarding_step/warehouse/warehouse.json
+++ b/erpnext/manufacturing/onboarding_step/warehouse/warehouse.json
@ -8,12 +8,12 @@
 "is_mandatory": 0,
 "is_single": 0,
 "is_skipped": 0,
- "modified": "2020-05-14 19:10:07.439037",
+ "modified": "2020-05-19 12:50:13.766712",
 "modified_by": "Administrator",
 "name": "Warehouse",
 "owner": "Administrator",
 "reference_document": "Warehouse",
 "show_full_form": 0,
- "title": "Create Warehouse",
+ "title": "Create a Warehouse",
 "validate_action": 1
 }
--- a/erpnext/manufacturing/onboarding_step/work_order/work_order.json
+++ b/erpnext/manufacturing/onboarding_step/work_order/work_order.json
@ -8,12 +8,12 @@
 "is_mandatory": 0,
 "is_single": 0,
 "is_skipped": 0,
- "modified": "2020-05-14 19:11:57.145924",
+ "modified": "2020-05-19 12:51:38.133150",
 "modified_by": "Administrator",
 "name": "Work Order",
 "owner": "Administrator",
 "reference_document": "Work Order",
 "show_full_form": 1,
- "title": "Create Work Order",
+ "title": "Create a Work Order",
 "validate_action": 1
 }
--- a/erpnext/manufacturing/onboarding_step/workstation/workstation.json
+++ b/erpnext/manufacturing/onboarding_step/workstation/workstation.json
@ -8,12 +8,12 @@
 "is_mandatory": 0,
 "is_single": 0,
 "is_skipped": 0,
- "modified": "2020-05-14 19:10:20.930139",
+ "modified": "2020-05-19 12:50:33.938176",
 "modified_by": "Administrator",
 "name": "Workstation",
 "owner": "Administrator",
 "reference_document": "Workstation",
 "show_full_form": 0,
- "title": "Create Workstation / Machine",
+ "title": "Create a Workstation / Machine",
 "validate_action": 1
 }
--- a/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.js
+++ b/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.js
@ -7,15 +7,15 @@ frappe.query_reports["Downtime Analysis"] = {
 		{
 			label: __("From Date"),
 			fieldname:"from_date",
-			fieldtype: "Date",
-			default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+			fieldtype: "Datetime",
+			default: frappe.datetime.add_months(frappe.datetime.now_datetime(), -1),
 			reqd: 1
 		},
 		{
 			label: __("To Date"),
 			fieldname:"to_date",
-			fieldtype: "Date",
-			default: frappe.datetime.get_today(),
+			fieldtype: "Datetime",
+			default: frappe.datetime.now_datetime(),
 			reqd: 1,
 		},
 		{
--- a/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.py
+++ b/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.py
@ -16,7 +16,7 @@ def execute(filters=None):
 def get_data(filters):
 	query_filters = {}

-	fields = ["workstation", "operator", "from_time", "to_time", "downtime", "reason"]
+	fields = ["name", "workstation", "operator", "from_time", "to_time", "downtime", "stop_reason", "remarks"]

 	query_filters["from_time"] = (">=", filters.get("from_date"))
 	query_filters["to_time"] = ("<=", filters.get("to_date"))
@ -54,6 +54,13 @@ def get_chart_data(data, columns):

 def get_columns(filters):
 	return [
+		{
+			"label": _("ID"),
+			"fieldname": "name",
+			"fieldtype": "Link",
+			"options": "Downtime Entry",
+			"width": 100
+		},
 		{
 			"label": _("Machine"),
 			"fieldname": "workstation",
@ -87,9 +94,15 @@ def get_columns(filters):
 			"width": 150
 		},
 		{
-			"label": _("Reason"),
-			"fieldname": "reason",
+			"label": _("Stop Reason"),
+			"fieldname": "stop_reason",
+			"fieldtype": "Data",
+			"width": 220
+		},
+		{
+			"label": _("Remarks"),
+			"fieldname": "remarks",
 			"fieldtype": "Text",
-			"width": 180
+			"width": 100
 		}
 	]