Merge branch 'develop' into qmsystem

erpnext/manufacturing/report/bom_explorer/bom_explorer.js

@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 /* eslint-disable */
 
-frappe.query_reports["BOM Items and Scraps"] = {
+frappe.query_reports["BOM Explorer"] = {
 	"filters": [
 		{
 			fieldname: "bom",

erpnext/manufacturing/report/bom_explorer/bom_explorer.json

@@ -1,20 +1,20 @@
 {
  "add_total_row": 0,
- "creation": "2019-05-14 12:06:14.998746",
+ "creation": "2019-06-06 15:42:53.021714",
  "disable_prepared_report": 0,
  "disabled": 0,
  "docstatus": 0,
  "doctype": "Report",
  "idx": 0,
  "is_standard": "Yes",
- "modified": "2019-05-14 12:06:14.998746",
+ "modified": "2019-06-06 15:42:53.021714",
  "modified_by": "Administrator",
  "module": "Manufacturing",
- "name": "BOM Items and Scraps",
+ "name": "BOM Explorer",
  "owner": "Administrator",
  "prepared_report": 0,
  "ref_doctype": "BOM",
- "report_name": "BOM Items and Scraps ",
+ "report_name": "BOM Explorer",
  "report_type": "Script Report",
  "roles": [
   {