nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fiscal year error on new setup and continuous request (#47431)

Browse Source 
fix: fiscal year error on new setup
This commit is contained in:
Diptanil Saha
2025-05-12 14:06:03 +05:30
committed by GitHub
parent 04ef4c2b16
commit 3965e2f3de
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/public/js/utils.js
View File

@@ -432,8 +432,9 @@ $.extend(erpnext.utils, {
if (!frappe.boot.setup_complete) { if (!frappe.boot.setup_complete) {
return; return;
} }
const today = frappe.datetime.get_today();
if (!date) { if (!date) {
date = frappe.datetime.get_today(); date = today;
} }
let fiscal_year = ""; let fiscal_year = "";
@@ -444,7 +445,7 @@ $.extend(erpnext.utils, {
) { ) {
if (with_dates) fiscal_year = frappe.boot.current_fiscal_year; if (with_dates) fiscal_year = frappe.boot.current_fiscal_year;
else fiscal_year = frappe.boot.current_fiscal_year[0]; else fiscal_year = frappe.boot.current_fiscal_year[0];
} else { } else if (today != date) {
frappe.call({ frappe.call({
method: "erpnext.accounts.utils.get_fiscal_year", method: "erpnext.accounts.utils.get_fiscal_year",
type: "GET", // make it cacheable type: "GET", // make it cacheable

5
erpnext/startup/boot.py
View File

@@ -3,6 +3,7 @@
import frappe import frappe
from frappe.defaults import get_user_default
from frappe.utils import cint from frappe.utils import cint
import erpnext.accounts.utils import erpnext.accounts.utils
@@ -57,7 +58,9 @@ def boot_session(bootinfo):
party_account_types = frappe.db.sql(""" select name, ifnull(account_type, '') from `tabParty Type`""") party_account_types = frappe.db.sql(""" select name, ifnull(account_type, '') from `tabParty Type`""")
bootinfo.party_account_types = frappe._dict(party_account_types) bootinfo.party_account_types = frappe._dict(party_account_types)
fiscal_year = erpnext.accounts.utils.get_fiscal_years(frappe.utils.nowdate(), raise_on_missing=False) fiscal_year = erpnext.accounts.utils.get_fiscal_years(
frappe.utils.nowdate(), company=get_user_default("company"), raise_on_missing=False
)
if fiscal_year: if fiscal_year:
bootinfo.current_fiscal_year = fiscal_year[0] bootinfo.current_fiscal_year = fiscal_year[0]