nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dashboard chart dialog filters

Browse Source
This commit is contained in:
Saqib Ansari
2020-05-14 15:33:37 +05:30
committed by Nabin Hait
parent 7c5e22e9d8
commit 4f024128af
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
View File

@@ -26,31 +26,22 @@ frappe.query_reports["Fixed Asset Register"] = {
"fieldtype": "Select", "fieldtype": "Select",
"options": ["Fiscal Year", "Date Range"], "options": ["Fiscal Year", "Date Range"],
"default": ["Fiscal Year"], "default": ["Fiscal Year"],
"reqd": 1, "reqd": 1
on_change: function() {
let filter_based_on = frappe.query_report.get_filter_value('filter_based_on');
frappe.query_report.toggle_filter_display('from_fiscal_year', filter_based_on === 'Date Range');
frappe.query_report.toggle_filter_display('to_fiscal_year', filter_based_on === 'Date Range');
frappe.query_report.toggle_filter_display('from_date', filter_based_on === 'Fiscal Year');
frappe.query_report.toggle_filter_display('to_date', filter_based_on === 'Fiscal Year');
frappe.query_report.refresh();
}
}, },
{ {
"fieldname":"from_date", "fieldname":"from_date",
"label": __("Start Date"), "label": __("Start Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.datetime.nowdate(), "default": frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
"hidden": 1, "depends_on": "eval: doc.filter_based_on == 'Date Range'",
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname":"to_date", "fieldname":"to_date",
"label": __("End Date"), "label": __("End Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.datetime.add_months(frappe.datetime.nowdate(), 12), "default": frappe.datetime.nowdate(),
"hidden": 1, "depends_on": "eval: doc.filter_based_on == 'Date Range'",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -59,6 +50,7 @@ frappe.query_reports["Fixed Asset Register"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Fiscal Year", "options": "Fiscal Year",
"default": frappe.defaults.get_user_default("fiscal_year"), "default": frappe.defaults.get_user_default("fiscal_year"),
"depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -67,6 +59,7 @@ frappe.query_reports["Fixed Asset Register"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Fiscal Year", "options": "Fiscal Year",
"default": frappe.defaults.get_user_default("fiscal_year"), "default": frappe.defaults.get_user_default("fiscal_year"),
"depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
"reqd": 1 "reqd": 1
}, },
{ {