fix: Default year start and end dates in reports

erpnext/accounts/doctype/account/account.js

@@ -79,8 +79,8 @@ frappe.ui.form.on('Account', {
 			frm.add_custom_button(__('General Ledger'), function () {
 				frappe.route_options = {
 					"account": frm.doc.name,
-					"from_date": frappe.sys_defaults.year_start_date,
+					"from_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
-					"to_date": frappe.sys_defaults.year_end_date,
+					"to_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 					"company": frm.doc.company
 				};
 				frappe.set_route("query-report", "General Ledger");

erpnext/accounts/doctype/account/account_tree.js

@@ -194,8 +194,8 @@ frappe.treeview_settings["Account"] = {
 			click: function(node, btn) {
 				frappe.route_options = {
 					"account": node.label,
-					"from_date": frappe.sys_defaults.year_start_date,
+					"from_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
-					"to_date": frappe.sys_defaults.year_end_date,
+					"to_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 					"company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
 				};
 				frappe.set_route("query-report", "General Ledger");

erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js

@@ -15,14 +15,14 @@ frappe.query_reports["Asset Depreciations and Balances"] = {
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			"reqd": 1
 		},
 		{
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			"reqd": 1
 		},
 		{

erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js

@@ -7,7 +7,7 @@ frappe.query_reports["Bank Clearance Summary"] = {
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			"width": "80"
 		},
 		{

erpnext/accounts/report/budget_variance_report/budget_variance_report.js

@@ -8,7 +8,7 @@ frappe.query_reports["Budget Variance Report"] = {
 			label: __("From Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: frappe.sys_defaults.fiscal_year,
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
 			reqd: 1
 		},
 		{
@@ -16,7 +16,7 @@ frappe.query_reports["Budget Variance Report"] = {
 			label: __("To Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: frappe.sys_defaults.fiscal_year,
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
 			reqd: 1
 		},
 		{

erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js

@@ -38,14 +38,14 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 				"fieldname": "from_date",
 				"label": __("From Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_start_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 				"reqd": 1
 			},
 			{
 				"fieldname": "to_date",
 				"label": __("To Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_end_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 				"reqd": 1
 			},
 			{

erpnext/accounts/report/gross_profit/gross_profit.js

@@ -15,14 +15,14 @@ frappe.query_reports["Gross Profit"] = {
 			"fieldname": "from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			"reqd": 1
 		},
 		{
 			"fieldname": "to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			"reqd": 1
 		},
 		{

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js

@@ -15,7 +15,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			fieldname:"to_date",

erpnext/accounts/report/profitability_analysis/profitability_analysis.js

@@ -66,13 +66,13 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 				"fieldname": "from_date",
 				"label": __("From Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_start_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			},
 			{
 				"fieldname": "to_date",
 				"label": __("To Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_end_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			},
 			{
 				"fieldname": "show_zero_values",

erpnext/accounts/report/trial_balance/trial_balance.js

@@ -37,13 +37,13 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 				"fieldname": "from_date",
 				"label": __("From Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_start_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			},
 			{
 				"fieldname": "to_date",
 				"label": __("To Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_end_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			},
 			{
 				"fieldname": "cost_center",

erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js

@@ -36,13 +36,13 @@ frappe.query_reports["Trial Balance for Party"] = {
 			"fieldname": "from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			"fieldname": "to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 		},
 		{
 			"fieldname":"party_type",

erpnext/buying/report/procurement_tracker/procurement_tracker.js

@@ -27,13 +27,13 @@ frappe.query_reports["Procurement Tracker"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 		},
 	]
 }

erpnext/buying/report/purchase_analytics/purchase_analytics.js

@@ -35,14 +35,14 @@ frappe.query_reports["Purchase Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			reqd: 1
 		},
 		{
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			reqd: 1
 		},
 		{

erpnext/crm/report/campaign_efficiency/campaign_efficiency.js

@@ -6,13 +6,13 @@ frappe.query_reports["Campaign Efficiency"] = {
 			"fieldname": "from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			"fieldname": "to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 		}
 	]
 };

erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js

@@ -6,12 +6,12 @@
 				"fieldname": "from_date",
 				"label": __("From Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_start_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			},
 			{
 				"fieldname": "to_date",
 				"label": __("To Date"),
 				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_end_date"),
+				"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			}
 		]};

erpnext/manufacturing/report/job_card_summary/job_card_summary.js

@@ -37,14 +37,14 @@ frappe.query_reports["Job Card Summary"] = {
 			label: __("From Posting Date"),
 			fieldname:"from_date",
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			reqd: 1
 		},
 		{
 			label: __("To Posting Date"),
 			fieldname:"to_date",
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			reqd: 1,
 		},
 		{

erpnext/manufacturing/report/production_analytics/production_analytics.js

@@ -16,14 +16,14 @@ frappe.query_reports["Production Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			reqd: 1
 		},
 		{
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			reqd: 1
 		},
 		{

erpnext/public/js/purchase_trends_filters.js

@@ -28,7 +28,7 @@ erpnext.get_purchase_trends_filters = function() {
 			"label": __("Fiscal Year"),
 			"fieldtype": "Link",
 			"options":'Fiscal Year',
-			"default": frappe.sys_defaults.fiscal_year
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today())
 		},
 		{
 			"fieldname":"period_based_on",

erpnext/public/js/sales_trends_filters.js

@@ -48,7 +48,7 @@ erpnext.get_sales_trends_filters = function() {
 			"label": __("Fiscal Year"),
 			"fieldtype": "Link",
 			"options":'Fiscal Year',
-			"default": frappe.sys_defaults.fiscal_year
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
 		},
 		{
 			"fieldname":"company",

erpnext/public/js/utils.js

@@ -400,7 +400,7 @@ $.extend(erpnext.utils, {
 		});
 	},
 
-	get_fiscal_year: function(date) {
+	get_fiscal_year: function(date, with_dates) {
 		if(!date) {
 			date = frappe.datetime.get_today();
 		}
@@ -414,6 +414,9 @@ $.extend(erpnext.utils, {
 			async: false,
 			callback: function(r) {
 				if (r.message) {
+					if (with_dates)
+						fiscal_year = r.message;
+					else
 						fiscal_year = r.message[0];
 				}
 			}

erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js

@@ -23,14 +23,14 @@ frappe.query_reports["Customer Acquisition and Loyalty"] = {
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			"reqd": 1
 		},
 		{
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date"),
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			"reqd": 1
 		}
 	],

erpnext/selling/report/sales_analytics/sales_analytics.js

@@ -35,14 +35,14 @@ frappe.query_reports["Sales Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			reqd: 1
 		},
 		{
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 			reqd: 1
 		},
 		{

erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js

@@ -16,7 +16,7 @@ frappe.query_reports["Sales Partner Target Variance based on Item Group"] = {
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: frappe.sys_defaults.fiscal_year
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today())
 		},
 		{
 			fieldname: "doctype",

erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js

@@ -22,7 +22,7 @@ frappe.query_reports["Sales Person Commission Summary"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			fieldname:"to_date",

erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js

@@ -16,7 +16,7 @@ frappe.query_reports["Sales Person Target Variance Based On Item Group"] = {
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: frappe.sys_defaults.fiscal_year
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
 		},
 		{
 			fieldname: "doctype",

erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js

@@ -20,7 +20,7 @@ frappe.query_reports["Sales Person-wise Transaction Summary"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			fieldname:"to_date",

erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js

@@ -16,7 +16,7 @@ frappe.query_reports["Territory Target Variance Based On Item Group"] = {
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: frappe.sys_defaults.fiscal_year
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today())
 		},
 		{
 			fieldname: "doctype",

erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js

@@ -8,7 +8,7 @@ frappe.query_reports["Batch Item Expiry Status"] = {
 			"label": __("From Date"),
 			"fieldtype": "Date",
 			"width": "80",
-			"default": frappe.sys_defaults.year_start_date,
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			"reqd": 1,
 		},
 		{

erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js

@@ -16,7 +16,7 @@ frappe.query_reports["Batch-Wise Balance History"] = {
 			"label": __("From Date"),
 			"fieldtype": "Date",
 			"width": "80",
-			"default": frappe.sys_defaults.year_start_date,
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 			"reqd": 1
 		},
 		{

erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js

@@ -22,14 +22,14 @@ frappe.query_reports["Incorrect Serial No Valuation"] = {
 			fieldtype: 'Date',
 			fieldname: 'from_date',
 			reqd: 1,
-			default: frappe.defaults.get_user_default("year_start_date")
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			label: __('To Date'),
 			fieldtype: 'Date',
 			fieldname: 'to_date',
 			reqd: 1,
-			default: frappe.defaults.get_user_default("year_end_date")
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[2],
 		}
 	]
 };

erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js

@@ -7,7 +7,7 @@ frappe.query_reports["Itemwise Recommended Reorder Level"] = {
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": frappe.sys_defaults.year_start_date
+			"default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), with_dates=true)[1],
 		},
 		{
 			"fieldname":"to_date",