Merge branch 'develop' into FR_ISS_204863
diff --git a/erpnext/assets/desk_page/assets/assets.json b/erpnext/assets/desk_page/assets/assets.json
index 94939fd..449a5fa 100644
--- a/erpnext/assets/desk_page/assets/assets.json
+++ b/erpnext/assets/desk_page/assets/assets.json
@@ -58,7 +58,7 @@
"type": "Report"
},
{
- "label": "Assets Dashboard",
+ "label": "Dashboard",
"link_to": "Asset",
"type": "Dashboard"
}
diff --git a/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py b/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py
index 48a2045..ff5dc2f 100644
--- a/erpnext/hr/doctype/leave_policy/leave_policy_dashboard.py
+++ b/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 @@
},
'transactions': [
{
- 'items': ['Employee']
+ 'label': _('Employees'),
+ 'items': ['Employee', 'Employee Grade']
},
{
- 'items': ['Employee Grade']
- },
- {
+ 'label': _('Leaves'),
'items': ['Leave Allocation']
},
]
- }
\ No newline at end of file
+ }
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_fixtures.py b/erpnext/manufacturing/dashboard_fixtures.py
index 64e4bc6..0e9a21c 100644
--- a/erpnext/manufacturing/dashboard_fixtures.py
+++ b/erpnext/manufacturing/dashboard_fixtures.py
@@ -192,7 +192,7 @@
]),
"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 @@
]),
"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 @@
]),
"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 @@
]),
"function": "Count",
"is_public": 1,
- "label": _("Monthly Quality Inspection"),
+ "label": _("Monthly Quality Inspections"),
"show_percentage_stats": 1,
"stats_time_interval": "Weekly"
}]
\ No newline at end of file
diff --git a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
index 763f533..8d11294 100644
--- a/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/desk_page/manufacturing/manufacturing.json
@@ -94,12 +94,6 @@
"type": "DocType"
},
{
- "label": "Dashboard",
- "link_to": "Manufacturing",
- "restrict_to_domain": "Manufacturing",
- "type": "Dashboard"
- },
- {
"label": "Forecasting",
"link_to": "Exponential Smoothing Forecasting",
"type": "Report"
@@ -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"
+ }
]
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/module_onboarding/manufacturing/manufacturing.json b/erpnext/manufacturing/module_onboarding/manufacturing/manufacturing.json
index 952d1f0..a36b63a 100644
--- 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-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",
- "user_can_dismiss": 1
-}
\ No newline at end of file
+ "title": "Let's Set Up the Manufacturing Module"
+}
diff --git a/erpnext/projects/desk_page/projects/projects.json b/erpnext/projects/desk_page/projects/projects.json
index d91fe53..e24cf30 100644
--- a/erpnext/projects/desk_page/projects/projects.json
+++ b/erpnext/projects/desk_page/projects/projects.json
@@ -68,7 +68,7 @@
"type": "Report"
},
{
- "label": "Project Dashboard",
+ "label": "Dashboard",
"link_to": "Project",
"type": "Dashboard"
}