Skip to content

Commit 95ef5b5

Browse files
ruthra-kumarruthra-kumar
authored
Merge pull request #53292 from frappe/version-16-hotfix
chore: release v16
2 parents a7eb244 + 46d8028 commit 95ef5b5

99 files changed

Lines changed: 3280 additions & 1979 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json‎

Lines changed: 145 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,64 +6,83 @@
66
"Current Assets": {
77
"Accounts Receivable": {
88
"Debtors": {
9-
"account_type": "Receivable"
9+
"account_type": "Receivable",
10+
"account_category": "Trade Receivables"
1011
}
1112
},
1213
"Bank Accounts": {
1314
"account_type": "Bank",
14-
"is_group": 1
15+
"is_group": 1,
16+
"account_category": "Cash and Cash Equivalents"
1517
},
1618
"Cash In Hand": {
1719
"Cash": {
18-
"account_type": "Cash"
20+
"account_type": "Cash",
21+
"account_category": "Cash and Cash Equivalents"
1922
},
20-
"account_type": "Cash"
23+
"account_type": "Cash",
24+
"account_category": "Cash and Cash Equivalents"
2125
},
2226
"Loans and Advances (Assets)": {
23-
"is_group": 1
27+
"is_group": 1,
28+
"account_category": "Other Receivables"
2429
},
2530
"Securities and Deposits": {
26-
"Earnest Money": {}
31+
"Earnest Money": {
32+
"account_category": "Other Current Assets"
33+
}
2734
},
2835
"Stock Assets": {
2936
"Stock In Hand": {
30-
"account_type": "Stock"
37+
"account_type": "Stock",
38+
"account_category": "Stock Assets"
3139
},
32-
"account_type": "Stock"
40+
"account_type": "Stock",
41+
"account_category": "Stock Assets"
3342
},
3443
"Tax Assets": {
35-
"is_group": 1
44+
"is_group": 1,
45+
"account_category": "Other Current Assets"
3646
}
3747
},
3848
"Fixed Assets": {
3949
"Capital Equipment": {
40-
"account_type": "Fixed Asset"
50+
"account_type": "Fixed Asset",
51+
"account_category": "Tangible Assets"
4152
},
4253
"Electronic Equipment": {
43-
"account_type": "Fixed Asset"
54+
"account_type": "Fixed Asset",
55+
"account_category": "Tangible Assets"
4456
},
4557
"Furniture and Fixtures": {
46-
"account_type": "Fixed Asset"
58+
"account_type": "Fixed Asset",
59+
"account_category": "Tangible Assets"
4760
},
4861
"Office Equipment": {
49-
"account_type": "Fixed Asset"
62+
"account_type": "Fixed Asset",
63+
"account_category": "Tangible Assets"
5064
},
5165
"Plants and Machineries": {
52-
"account_type": "Fixed Asset"
66+
"account_type": "Fixed Asset",
67+
"account_category": "Tangible Assets"
5368
},
5469
"Buildings": {
55-
"account_type": "Fixed Asset"
70+
"account_type": "Fixed Asset",
71+
"account_category": "Tangible Assets"
5672
},
5773
"Accumulated Depreciations": {
58-
"account_type": "Accumulated Depreciation"
74+
"account_type": "Accumulated Depreciation",
75+
"account_category": "Tangible Assets"
5976
}
6077
},
6178
"Investments": {
62-
"is_group": 1
79+
"is_group": 1,
80+
"account_category": "Long-term Investments"
6381
},
6482
"Temporary Accounts": {
6583
"Temporary Opening": {
66-
"account_type": "Temporary"
84+
"account_type": "Temporary",
85+
"account_category": "Other Non-current Assets"
6786
}
6887
},
6988
"root_type": "Asset"
@@ -72,55 +91,103 @@
7291
"Direct Expenses": {
7392
"Stock Expenses": {
7493
"Cost of Goods Sold": {
75-
"account_type": "Cost of Goods Sold"
94+
"account_type": "Cost of Goods Sold",
95+
"account_category": "Cost of Goods Sold"
7696
},
7797
"Expenses Included In Valuation": {
78-
"account_type": "Expenses Included In Valuation"
98+
"account_type": "Expenses Included In Valuation",
99+
"account_category": "Other Direct Costs"
79100
},
80101
"Stock Adjustment": {
81-
"account_type": "Stock Adjustment"
102+
"account_type": "Stock Adjustment",
103+
"account_category": "Other Direct Costs"
82104
}
83105
}
84106
},
85107
"Indirect Expenses": {
86-
"Administrative Expenses": {},
87-
"Commission on Sales": {},
108+
"Administrative Expenses": {
109+
"account_category": "Operating Expenses"
110+
},
111+
"Commission on Sales": {
112+
"account_category": "Operating Expenses"
113+
},
88114
"Depreciation": {
89-
"account_type": "Depreciation"
115+
"account_type": "Depreciation",
116+
"account_category": "Operating Expenses"
117+
},
118+
"Entertainment Expenses": {
119+
"account_category": "Operating Expenses"
90120
},
91-
"Entertainment Expenses": {},
92121
"Freight and Forwarding Charges": {
93-
"account_type": "Chargeable"
94-
},
95-
"Legal Expenses": {},
96-
"Marketing Expenses": {},
97-
"Miscellaneous Expenses": {},
98-
"Office Maintenance Expenses": {},
99-
"Office Rent": {},
100-
"Postal Expenses": {},
101-
"Print and Stationery": {},
122+
"account_type": "Chargeable",
123+
"account_category": "Operating Expenses"
124+
},
125+
"Legal Expenses": {
126+
"account_category": "Operating Expenses"
127+
},
128+
"Marketing Expenses": {
129+
"account_type": "Chargeable",
130+
"account_category": "Operating Expenses"
131+
},
132+
"Miscellaneous Expenses": {
133+
"account_type": "Chargeable",
134+
"account_category": "Operating Expenses"
135+
},
136+
"Office Maintenance Expenses": {
137+
"account_category": "Operating Expenses"
138+
},
139+
"Office Rent": {
140+
"account_category": "Operating Expenses"
141+
},
142+
"Postal Expenses": {
143+
"account_category": "Operating Expenses"
144+
},
145+
"Print and Stationery": {
146+
"account_category": "Operating Expenses"
147+
},
102148
"Rounded Off": {
103-
"account_type": "Round Off"
104-
},
105-
"Salary": {},
106-
"Sales Expenses": {},
107-
"Telephone Expenses": {},
108-
"Travel Expenses": {},
109-
"Utility Expenses": {},
110-
"Write Off": {},
111-
"Exchange Gain/Loss": {},
112-
"Gain/Loss on Asset Disposal": {},
113-
"Impairment": {}
149+
"account_type": "Round Off",
150+
"account_category": "Operating Expenses"
151+
},
152+
"Salary": {
153+
"account_category": "Operating Expenses"
154+
},
155+
"Sales Expenses": {
156+
"account_category": "Operating Expenses"
157+
},
158+
"Telephone Expenses": {
159+
"account_category": "Operating Expenses"
160+
},
161+
"Travel Expenses": {
162+
"account_category": "Operating Expenses"
163+
},
164+
"Utility Expenses": {
165+
"account_category": "Operating Expenses"
166+
},
167+
"Write Off": {
168+
"account_category": "Operating Expenses"
169+
},
170+
"Exchange Gain/Loss": {
171+
"account_category": "Operating Expenses"
172+
},
173+
"Gain/Loss on Asset Disposal": {
174+
"account_category": "Other Operating Income"
175+
},
176+
"Impairment": {
177+
"account_category": "Operating Expenses"
178+
}
114179
},
115180
"root_type": "Expense"
116181
},
117182
"Income": {
118183
"Direct Income": {
119184
"Sales": {
120-
"account_type": "Income Account"
185+
"account_type": "Income Account",
186+
"account_category": "Revenue from Operations"
121187
},
122188
"Service": {
123-
"account_type": "Income Account"
189+
"account_type": "Income Account",
190+
"account_category": "Revenue from Operations"
124191
},
125192
"account_type": "Income Account"
126193
},
@@ -132,31 +199,51 @@
132199
},
133200
"Source of Funds (Liabilities)": {
134201
"Capital Account": {
135-
"Reserves and Surplus": {},
136-
"Shareholders Funds": {},
137-
"Revaluation Surplus": {}
202+
"Reserves and Surplus": {
203+
"account_category": "Reserves and Surplus"
204+
},
205+
"Shareholders Funds": {
206+
"account_category": "Share Capital"
207+
},
208+
"Revaluation Surplus": {
209+
"account_category": "Reserves and Surplus"
210+
}
138211
},
139212
"Current Liabilities": {
140213
"Accounts Payable": {
141214
"Creditors": {
142-
"account_type": "Payable"
215+
"account_type": "Payable",
216+
"account_category": "Trade Payables"
143217
},
144-
"Payroll Payable": {}
218+
"Payroll Payable": {
219+
"account_category": "Other Payables"
220+
}
145221
},
146222
"Stock Liabilities": {
147223
"Stock Received But Not Billed": {
148-
"account_type": "Stock Received But Not Billed"
224+
"account_type": "Stock Received But Not Billed",
225+
"account_category": "Trade Payables"
149226
}
150227
},
151228
"Duties and Taxes": {
152229
"TDS": {
153-
"account_type": "Tax"
154-
}
230+
"account_type": "Tax",
231+
"account_category": "Current Tax Liabilities"
232+
},
233+
"account_type": "Tax",
234+
"is_group": 1,
235+
"account_category": "Current Tax Liabilities"
155236
},
156237
"Loans (Liabilities)": {
157-
"Secured Loans": {},
158-
"Unsecured Loans": {},
159-
"Bank Overdraft Account": {}
238+
"Secured Loans": {
239+
"account_category": "Long-term Borrowings"
240+
},
241+
"Unsecured Loans": {
242+
"account_category": "Long-term Borrowings"
243+
},
244+
"Bank Overdraft Account": {
245+
"account_category": "Short-term Borrowings"
246+
}
160247
}
161248
},
162249
"root_type": "Liability"

‎erpnext/accounts/doctype/accounting_period/accounting_period.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
{
2121
"fieldname": "period_name",
2222
"fieldtype": "Data",
23-
"in_list_view": 1,
2423
"label": "Period Name",
2524
"reqd": 1,
2625
"unique": 1
@@ -79,7 +78,7 @@
7978
}
8079
],
8180
"links": [],
82-
"modified": "2025-12-01 16:53:44.631299",
81+
"modified": "2026-03-09 17:15:33.577217",
8382
"modified_by": "Administrator",
8483
"module": "Accounts",
8584
"name": "Accounting Period",

‎erpnext/accounts/doctype/accounting_period/accounting_period.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def validate_accounting_period_on_doc_save(doc, method=None):
9797
if doc.doctype == "Bank Clearance":
9898
return
9999
elif doc.doctype == "Asset":
100-
if doc.is_existing_asset:
100+
if doc.asset_type == "Existing Asset":
101101
return
102102
else:
103103
date = doc.available_for_use_date

‎erpnext/accounts/doctype/accounts_settings/accounts_settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
"description": "Payment Terms from orders will be fetched into the invoices as is",
206206
"fieldname": "automatically_fetch_payment_terms",
207207
"fieldtype": "Check",
208-
"label": "Automatically Fetch Payment Terms from Order"
208+
"label": "Automatically Fetch Payment Terms from Order/Quotation"
209209
},
210210
{
211211
"description": "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 ",
@@ -697,7 +697,7 @@
697697
"index_web_pages_for_search": 1,
698698
"issingle": 1,
699699
"links": [],
700-
"modified": "2026-02-04 17:15:38.609327",
700+
"modified": "2026-02-27 01:04:09.415288",
701701
"modified_by": "Administrator",
702702
"module": "Accounts",
703703
"name": "Accounts Settings",

‎erpnext/accounts/doctype/journal_entry/journal_entry.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
{
141141
"fieldname": "company",
142142
"fieldtype": "Link",
143+
"in_list_view": 1,
143144
"in_standard_filter": 1,
144145
"label": "Company",
145146
"oldfieldname": "company",
@@ -181,7 +182,6 @@
181182
"fieldname": "cheque_no",
182183
"fieldtype": "Data",
183184
"in_global_search": 1,
184-
"in_list_view": 1,
185185
"label": "Reference Number",
186186
"mandatory_depends_on": "eval:doc.voucher_type == \"Bank Entry\"",
187187
"no_copy": 1,
@@ -665,7 +665,7 @@
665665
"table_fieldname": "payment_entries"
666666
}
667667
],
668-
"modified": "2026-02-16 16:06:10.468482",
668+
"modified": "2026-03-09 17:15:26.569327",
669669
"modified_by": "Administrator",
670670
"module": "Accounts",
671671
"name": "Journal Entry",

0 commit comments

Comments
 (0)
⚡