From aa94abf60112ad3deba5fbea7f1584cbcfdc5d07 Mon Sep 17 00:00:00 2001 From: Afshan <33727827+AfshanKhan@users.noreply.github.com> Date: Thu, 23 Jul 2020 19:12:38 +0530 Subject: [PATCH] fix: asset dashboard report changes (#22759) * fix: asset dashboard report changes * fix: moved static filters to dynamic filters Co-authored-by: Nabin Hait Co-authored-by: Marica --- .../assets/assets_dashboard/asset/asset.json | 39 +++++++++++++++++++ .../asset_value_analytics.json | 27 +++++++++++++ .../category_wise_asset_value.json | 29 ++++++++++++++ .../location_wise_asset_value.json | 29 ++++++++++++++ .../number_card/asset_value/asset_value.json | 21 ++++++++++ .../new_assets_(this_year).json | 20 ++++++++++ .../total_assets/total_assets.json | 20 ++++++++++ 7 files changed, 185 insertions(+) create mode 100644 erpnext/assets/assets_dashboard/asset/asset.json create mode 100644 erpnext/assets/dashboard_chart/asset_value_analytics/asset_value_analytics.json create mode 100644 erpnext/assets/dashboard_chart/category_wise_asset_value/category_wise_asset_value.json create mode 100644 erpnext/assets/dashboard_chart/location_wise_asset_value/location_wise_asset_value.json create mode 100644 erpnext/assets/number_card/asset_value/asset_value.json create mode 100644 erpnext/assets/number_card/new_assets_(this_year)/new_assets_(this_year).json create mode 100644 erpnext/assets/number_card/total_assets/total_assets.json diff --git a/erpnext/assets/assets_dashboard/asset/asset.json b/erpnext/assets/assets_dashboard/asset/asset.json new file mode 100644 index 0000000000..56b1e2a71c --- /dev/null +++ b/erpnext/assets/assets_dashboard/asset/asset.json @@ -0,0 +1,39 @@ +{ + "cards": [ + { + "card": "Total Assets" + }, + { + "card": "New Assets (This Year)" + }, + { + "card": "Asset Value" + } + ], + "charts": [ + { + "chart": "Asset Value Analytics", + "width": "Full" + }, + { + "chart": "Category-wise Asset Value", + "width": "Half" + }, + { + "chart": "Location-wise Asset Value", + "width": "Half" + } + ], + "creation": "2020-07-14 18:23:53.343082", + "dashboard_name": "Asset", + "docstatus": 0, + "doctype": "Dashboard", + "idx": 0, + "is_default": 0, + "is_standard": 1, + "modified": "2020-07-21 18:14:25.078929", + "modified_by": "Administrator", + "module": "Assets", + "name": "Asset", + "owner": "Administrator" +} \ No newline at end of file diff --git a/erpnext/assets/dashboard_chart/asset_value_analytics/asset_value_analytics.json b/erpnext/assets/dashboard_chart/asset_value_analytics/asset_value_analytics.json new file mode 100644 index 0000000000..bc2edc9d7d --- /dev/null +++ b/erpnext/assets/dashboard_chart/asset_value_analytics/asset_value_analytics.json @@ -0,0 +1,27 @@ +{ + "chart_name": "Asset Value Analytics", + "chart_type": "Report", + "creation": "2020-07-14 18:23:53.091233", + "custom_options": "{\"type\": \"bar\", \"barOptions\": {\"stacked\": 1}, \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"tooltipOptions\": {}}", + "docstatus": 0, + "doctype": "Dashboard Chart", + "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_fiscal_year\":\"frappe.sys_defaults.fiscal_year\",\"to_fiscal_year\":\"frappe.sys_defaults.fiscal_year\",\"from_date\":\"frappe.datetime.add_months(frappe.datetime.nowdate(), -12)\",\"to_date\":\"frappe.datetime.nowdate()\"}", + "filters_json": "{\"status\":\"In Location\",\"filter_based_on\":\"Fiscal Year\",\"period_start_date\":\"2020-04-01\",\"period_end_date\":\"2021-03-31\",\"date_based_on\":\"Purchase Date\",\"group_by\":\"--Select a group--\"}", + "group_by_type": "Count", + "idx": 0, + "is_public": 0, + "is_standard": 1, + "modified": "2020-07-23 13:53:33.211371", + "modified_by": "Administrator", + "module": "Assets", + "name": "Asset Value Analytics", + "number_of_groups": 0, + "owner": "Administrator", + "report_name": "Fixed Asset Register", + "time_interval": "Yearly", + "timeseries": 0, + "timespan": "Last Year", + "type": "Bar", + "use_report_chart": 1, + "y_axis": [] +} \ No newline at end of file diff --git a/erpnext/assets/dashboard_chart/category_wise_asset_value/category_wise_asset_value.json b/erpnext/assets/dashboard_chart/category_wise_asset_value/category_wise_asset_value.json new file mode 100644 index 0000000000..e79d2d7372 --- /dev/null +++ b/erpnext/assets/dashboard_chart/category_wise_asset_value/category_wise_asset_value.json @@ -0,0 +1,29 @@ +{ + "chart_name": "Category-wise Asset Value", + "chart_type": "Report", + "creation": "2020-07-14 18:23:53.146304", + "custom_options": "{\"type\": \"donut\", \"height\": 300, \"axisOptions\": {\"shortenYAxisNumbers\": 1}}", + "docstatus": 0, + "doctype": "Dashboard Chart", + "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_date\":\"frappe.datetime.add_months(frappe.datetime.nowdate(), -12)\",\"to_date\":\"frappe.datetime.nowdate()\"}", + "filters_json": "{\"status\":\"In Location\",\"group_by\":\"Asset Category\",\"is_existing_asset\":0}", + "idx": 0, + "is_public": 0, + "is_standard": 1, + "modified": "2020-07-23 13:39:32.429240", + "modified_by": "Administrator", + "module": "Assets", + "name": "Category-wise Asset Value", + "number_of_groups": 0, + "owner": "Administrator", + "report_name": "Fixed Asset Register", + "timeseries": 0, + "type": "Donut", + "use_report_chart": 0, + "x_field": "asset_category", + "y_axis": [ + { + "y_field": "asset_value" + } + ] +} \ No newline at end of file diff --git a/erpnext/assets/dashboard_chart/location_wise_asset_value/location_wise_asset_value.json b/erpnext/assets/dashboard_chart/location_wise_asset_value/location_wise_asset_value.json new file mode 100644 index 0000000000..481586e7ca --- /dev/null +++ b/erpnext/assets/dashboard_chart/location_wise_asset_value/location_wise_asset_value.json @@ -0,0 +1,29 @@ +{ + "chart_name": "Location-wise Asset Value", + "chart_type": "Report", + "creation": "2020-07-14 18:23:53.195389", + "custom_options": "{\"type\": \"donut\", \"height\": 300, \"axisOptions\": {\"shortenYAxisNumbers\": 1}}", + "docstatus": 0, + "doctype": "Dashboard Chart", + "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_date\":\"frappe.datetime.add_months(frappe.datetime.nowdate(), -12)\",\"to_date\":\"frappe.datetime.nowdate()\"}", + "filters_json": "{\"status\":\"In Location\",\"group_by\":\"Location\",\"is_existing_asset\":0}", + "idx": 0, + "is_public": 0, + "is_standard": 1, + "modified": "2020-07-23 13:42:44.912551", + "modified_by": "Administrator", + "module": "Assets", + "name": "Location-wise Asset Value", + "number_of_groups": 0, + "owner": "Administrator", + "report_name": "Fixed Asset Register", + "timeseries": 0, + "type": "Donut", + "use_report_chart": 0, + "x_field": "location", + "y_axis": [ + { + "y_field": "asset_value" + } + ] +} \ No newline at end of file diff --git a/erpnext/assets/number_card/asset_value/asset_value.json b/erpnext/assets/number_card/asset_value/asset_value.json new file mode 100644 index 0000000000..68e5f54c78 --- /dev/null +++ b/erpnext/assets/number_card/asset_value/asset_value.json @@ -0,0 +1,21 @@ +{ + "aggregate_function_based_on": "value_after_depreciation", + "creation": "2020-07-14 18:23:53.302457", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Asset", + "filters_json": "[]", + "function": "Sum", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Asset Value", + "modified": "2020-07-21 18:13:47.647997", + "modified_by": "Administrator", + "module": "Assets", + "name": "Asset Value", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/assets/number_card/new_assets_(this_year)/new_assets_(this_year).json b/erpnext/assets/number_card/new_assets_(this_year)/new_assets_(this_year).json new file mode 100644 index 0000000000..6c8fb35657 --- /dev/null +++ b/erpnext/assets/number_card/new_assets_(this_year)/new_assets_(this_year).json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-14 18:23:53.267919", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Asset", + "filters_json": "[[\"Asset\",\"creation\",\"Timespan\",\"this year\",false]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "New Assets (This Year)", + "modified": "2020-07-23 13:45:20.418766", + "modified_by": "Administrator", + "module": "Assets", + "name": "New Assets (This Year)", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/assets/number_card/total_assets/total_assets.json b/erpnext/assets/number_card/total_assets/total_assets.json new file mode 100644 index 0000000000..d127de8f2c --- /dev/null +++ b/erpnext/assets/number_card/total_assets/total_assets.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-14 18:23:53.233328", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Asset", + "filters_json": "[]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Assets", + "modified": "2020-07-21 18:12:51.664292", + "modified_by": "Administrator", + "module": "Assets", + "name": "Total Assets", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file