From 2fffc9448b8d38c50d238de6d14a0f8c6eca6fc8 Mon Sep 17 00:00:00 2001
From: diptanilsaha <diptanil@frappe.io>
Date: Sat, 21 Feb 2026 02:02:03 +0530
Subject: [PATCH] fix(`fiscal_year_company`): made `company` field mandatory

(cherry picked from commit 94fb7e11b4713886dc6400fb8631dd7539ab2fd0)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
---
 .../fiscal_year_company/fiscal_year_company.json   | 14 ++++++++++++--
 .../fiscal_year_company/fiscal_year_company.py     |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
index 67acb26c7ee..4dc16a782bc 100644
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
@@ -15,19 +15,29 @@
    "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Company",
-   "options": "Company"
+   "options": "Company",
+   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-09-28 18:01:53.495929",
+=======
+ "modified": "2026-02-20 23:02:26.193606",
+>>>>>>> 94fb7e11b4 (fix(`fiscal_year_company`): made `company` field mandatory)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year Company",
  "owner": "Administrator",
  "permissions": [],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> 94fb7e11b4 (fix(`fiscal_year_company`): made `company` field mandatory)
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py
index 9447120d326..b68069bca27 100644
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py
@@ -14,7 +14,7 @@ class FiscalYearCompany(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		company: DF.Link | None
+		company: DF.Link
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data