refactor: use 'boolean' parameter while fetching FY year
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 31bc6fd..7d91309 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -53,6 +53,9 @@
def get_fiscal_year(
date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False, boolean=False
):
+ if isinstance(boolean, str):
+ boolean = frappe.json.loads(boolean)
+
fiscal_years = get_fiscal_years(
date, fiscal_year, label, verbose, company, as_dict=as_dict, boolean=boolean
)
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 907a775..1b10d8a 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -139,7 +139,6 @@
"label": __("Start Year"),
"fieldtype": "Link",
"options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
"reqd": 1,
"depends_on": "eval:doc.filter_based_on == 'Fiscal Year'"
},
@@ -148,7 +147,6 @@
"label": __("End Year"),
"fieldtype": "Link",
"options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
"reqd": 1,
"depends_on": "eval:doc.filter_based_on == 'Fiscal Year'"
},
@@ -197,5 +195,13 @@
}
]
+ // Dynamically set 'default' values for fiscal year filters
+ let fy_filters = filters.filter(x=>{return ["from_fiscal_year", "to_fiscal_year"].includes(x.fieldname);})
+ let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), false, true);
+ if (fiscal_year) {
+ let fy = erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), false, false);
+ fy_filters.forEach(x=>{x.default = fy;})
+ }
+
return filters;
}
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index d435711..25fc754 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -404,7 +404,7 @@
});
},
- get_fiscal_year: function(date, with_dates=false) {
+ get_fiscal_year: function(date, with_dates=false, boolean=false) {
if(!date) {
date = frappe.datetime.get_today();
}
@@ -413,7 +413,8 @@
frappe.call({
method: "erpnext.accounts.utils.get_fiscal_year",
args: {
- date: date
+ date: date,
+ boolean: boolean
},
async: false,
callback: function(r) {