Merge branch 'stock-dashboard' of https://github.com/marination/erpnext into marination-stock-dashboard
diff --git a/erpnext/accounts/dashboard_fixtures.py b/erpnext/accounts/dashboard_fixtures.py
index 214e467..cdd3758 100644
--- a/erpnext/accounts/dashboard_fixtures.py
+++ b/erpnext/accounts/dashboard_fixtures.py
@@ -26,8 +26,8 @@
def get_dashboards():
return [{
- "name": "Accounts Dashboard",
- "dashboard_name": "Accounts Dashboard",
+ "name": "Accounts",
+ "dashboard_name": "Accounts",
"doctype": "Dashboard",
"charts": [
{ "chart": "Profit and Loss" , "width": "Full"},
diff --git a/erpnext/manufacturing/dashboard_fixtures.py b/erpnext/manufacturing/dashboard_fixtures.py
index 587a032..ef61f23 100644
--- a/erpnext/manufacturing/dashboard_fixtures.py
+++ b/erpnext/manufacturing/dashboard_fixtures.py
@@ -15,8 +15,8 @@
def get_dashboards():
return [{
- "name": "Manufacturing Dashboard",
- "dashboard_name": "Manufacturing Dashboard",
+ "name": "Manufacturing",
+ "dashboard_name": "Manufacturing",
"charts": [
{ "chart": "Produced Quantity", "width": "Half" },
{ "chart": "Completed Operation", "width": "Half" },
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index 0f15e47..1df9fb7 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -18,7 +18,7 @@
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
- "modified": "2020-03-06 05:24:05.749664",
+ "modified": "2020-05-19 13:01:10.729088",
"modified_by": "Administrator",
"module": "Support",
"name": "issues",
@@ -76,7 +76,7 @@
{
"allow_read_on_all_link_options": 0,
"fieldname": "description",
- "fieldtype": "Text",
+ "fieldtype": "Text Editor",
"hidden": 0,
"label": "Description",
"max_length": 0,