Merge branch 'develop' into FR_ISS_204863

erpnext/assets/desk_page/assets/assets.json

@@ -58,7 +58,7 @@
    "type": "Report"
   },
   {
-   "label": "Assets Dashboard",
+   "label": "Dashboard",
    "link_to": "Asset",
    "type": "Dashboard"
   }

erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+from frappe import _
 
 def get_data():
 	return {
@@ -8,13 +9,17 @@ def get_data():
 		},
 		'transactions': [
 			{
-				'items': ['Employee']
+				'label': _('Employees'),
-			},
+				'items': ['Employee', 'Employee Grade']
-			{
-				'items': ['Employee Grade']
 			},
 			{
+				'label': _('Leaves'),
 				'items': ['Leave Allocation']
 			},
 		]
-	}
+	}
+
+
+
+
+	

erpnext/manufacturing/dashboard_fixtures.py

@@ -192,7 +192,7 @@ def get_number_cards():
 		]),
 		"function": "Count",
 		"is_public": 1,
-		"label": _("Monthly Total Work Order"),
+		"label": _("Monthly Total Work Orders"),
 		"show_percentage_stats": 1,
 		"stats_time_interval": "Weekly"
 	},
@@ -207,7 +207,7 @@ def get_number_cards():
 		]),
 		"function": "Count",
 		"is_public": 1,
-		"label": _("Monthly Completed Work Order"),
+		"label": _("Monthly Completed Work Orders"),
 		"show_percentage_stats": 1,
 		"stats_time_interval": "Weekly"
 	},
@@ -221,7 +221,7 @@ def get_number_cards():
 		]),
 		"function": "Count",
 		"is_public": 1,
-		"label": _("Ongoing Job Card"),
+		"label": _("Ongoing Job Cards"),
 		"show_percentage_stats": 1,
 		"stats_time_interval": "Weekly"
 	},
@@ -235,7 +235,7 @@ def get_number_cards():
 		]),
 		"function": "Count",
 		"is_public": 1,
-		"label": _("Monthly Quality Inspection"),
+		"label": _("Monthly Quality Inspections"),
 		"show_percentage_stats": 1,
 		"stats_time_interval": "Weekly"
 	}]

erpnext/manufacturing/desk_page/manufacturing/manufacturing.json

@@ -93,12 +93,6 @@
    "stats_filter": "{ \n    \"status\": [\"not in\", [\"Completed\"]]\n}",
    "type": "DocType"
   },
-  {
-   "label": "Dashboard",
-   "link_to": "Manufacturing",
-   "restrict_to_domain": "Manufacturing",
-   "type": "Dashboard"
-  },
   {
    "label": "Forecasting",
    "link_to": "Exponential Smoothing Forecasting",
@@ -119,6 +113,12 @@
    "label": "Production Planning Report",
    "link_to": "Production Planning Report",
    "type": "Report"
-  }
+  },
+  {
+    "label": "Dashboard",
+    "link_to": "Manufacturing",
+    "restrict_to_domain": "Manufacturing",
+    "type": "Dashboard"
+   } 
  ]
 }

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-19 12:51:42.744570",
+ "modified": "2020-06-29 20:25:36.899106",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Manufacturing",
@@ -52,6 +52,5 @@
  ],
  "subtitle": "Products, Raw Materials, BOM, Work Order and more.",
  "success_message": "Manufacturing module is all setup!",
- "title": "Let's Setup Manufacturing Module",
+ "title": "Let's Set Up the Manufacturing Module"
- "user_can_dismiss": 1
+}
-}

erpnext/projects/desk_page/projects/projects.json

@@ -68,7 +68,7 @@
    "type": "Report"
   },
   {
-   "label": "Project Dashboard",
+   "label": "Dashboard",
    "link_to": "Project",
    "type": "Dashboard"
   }