Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh

This commit is contained in:
Shivam Mishra
2020-05-05 18:48:35 +05:30
48 changed files with 997 additions and 388 deletions

View File

@@ -29,7 +29,8 @@ def get_default_dashboards():
{ "chart": "Incoming Bills (Purchase Invoice)" },
{ "chart": "Bank Balance" },
{ "chart": "Income" },
{ "chart": "Expenses" }
{ "chart": "Expenses" },
{ "chart": "Patient Appointments" }
]
},
{
@@ -126,6 +127,21 @@ def get_default_dashboards():
'type': 'Bar',
'custom_options': '{"type": "bar", "colors": ["#98d85b", "#fc4f51", "#7679fc"], "axisOptions": { "shortenYAxisNumbers": 1}, "barOptions": { "stacked": 1 }}',
},
{
"doctype": "Dashboard Chart",
"time_interval": "Daily",
"chart_name": "Patient Appointments",
"timespan": "Last Month",
"color": "#77ecca",
"filters_json": json.dumps({}),
"chart_type": "Count",
"timeseries": 1,
"based_on": "appointment_datetime",
"owner": "Administrator",
"document_type": "Patient Appointment",
"type": "Line",
"width": "Half"
}
]
}