Skip to content

Commit 2fffc94

Browse files
diptanilsahamergify[bot]
authored andcommitted
fix(fiscal_year_company): made company field mandatory
(cherry picked from commit 94fb7e1) # Conflicts: # erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
1 parent 5a1c61f commit 2fffc94

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,29 @@
1515
"ignore_user_permissions": 1,
1616
"in_list_view": 1,
1717
"label": "Company",
18-
"options": "Company"
18+
"options": "Company",
19+
"reqd": 1
1920
}
2021
],
2122
"index_web_pages_for_search": 1,
2223
"istable": 1,
2324
"links": [],
25+
<<<<<<< HEAD
2426
"modified": "2021-09-28 18:01:53.495929",
27+
=======
28+
"modified": "2026-02-20 23:02:26.193606",
29+
>>>>>>> 94fb7e11b4 (fix(`fiscal_year_company`): made `company` field mandatory)
2530
"modified_by": "Administrator",
2631
"module": "Accounts",
2732
"name": "Fiscal Year Company",
2833
"owner": "Administrator",
2934
"permissions": [],
35+
<<<<<<< HEAD
3036
"sort_field": "modified",
37+
=======
38+
"row_format": "Dynamic",
39+
"sort_field": "creation",
40+
>>>>>>> 94fb7e11b4 (fix(`fiscal_year_company`): made `company` field mandatory)
3141
"sort_order": "DESC",
3242
"track_changes": 1
33-
}
43+
}

erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class FiscalYearCompany(Document):
1414
if TYPE_CHECKING:
1515
from frappe.types import DF
1616

17-
company: DF.Link | None
17+
company: DF.Link
1818
parent: DF.Data
1919
parentfield: DF.Data
2020
parenttype: DF.Data

0 commit comments

Comments
 (0)