Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
91a748d
refactor(test): remove explicit sql delete calls
ruthra-kumar Apr 21, 2026
99bc2c1
Merge pull request #54463 from frappe/mergify/bp/version-16-hotfix/pr…
ruthra-kumar Apr 22, 2026
090aab3
fix: py error on stock ageing report (backport #54467) (#54469)
mergify[bot] Apr 22, 2026
386f499
fix: delivery schedule in the sales order
rohitwaghchaure Apr 22, 2026
dd2763a
Merge pull request #54472 from frappe/mergify/bp/version-16-hotfix/pr…
rohitwaghchaure Apr 22, 2026
9276cd7
refactor: use consistent report column names
vorasmit Apr 21, 2026
be0e58f
refactor: how data is built
vorasmit Apr 21, 2026
fffaf83
refactor: better label for entity type
vorasmit Apr 21, 2026
e6cfdb8
refactor: updated key for withholding_date
vorasmit Apr 21, 2026
40466be
test: None is better than zero, as no values exist
vorasmit Apr 21, 2026
6392126
refactor: make report extensible by regional apps
vorasmit Apr 22, 2026
c6d4802
fix: add party type for dynamic link support
vorasmit Apr 22, 2026
4f8184e
Merge pull request #54477 from frappe/mergify/bp/version-16-hotfix/pr…
vorasmit Apr 23, 2026
055ff56
feat: Add XLSX styling support to custom financial report templates (…
Abdeali099 Apr 23, 2026
96bab08
feat: enhance account category with root type (#53190)
Abdeali099 Apr 23, 2026
df3fbed
feat: Add XLSX styling support to custom financial report templates (…
vorasmit Apr 23, 2026
01b2225
Merge pull request #54486 from frappe/mergify/bp/version-16-hotfix/pr…
vorasmit Apr 23, 2026
f7b87ed
fix(stock): show available qty in warehouse link field (backport #544…
mergify[bot] Apr 23, 2026
ddc9ea1
ci: test correctness pattern (backport #54186) (#54473)
mergify[bot] Apr 23, 2026
2a244d1
fix(edi): restrict Code List imports to files and trusted backend URL…
mergify[bot] Apr 23, 2026
456e99b
fix: preserve inventory dimensions when raw materials are reset (back…
mergify[bot] Apr 23, 2026
c4010b0
ci: fix timezone for python mariadb tests (backport #54464) (#54465)
mergify[bot] Apr 23, 2026
1b14673
fix: skip BudgetValidation when cancelling GL entries
nareshkannasln Mar 11, 2026
719d982
fix: ensure tax withholding entries respect date range of category
ljain112 Apr 23, 2026
aecf2c1
Merge pull request #54505 from frappe/mergify/bp/version-16-hotfix/pr…
vorasmit Apr 24, 2026
8a5fa64
Merge pull request #54504 from frappe/mergify/bp/version-16-hotfix/pr…
khushi8112 Apr 24, 2026
f3996fb
fix(PCV): set correct filters of `from_date` and `to_date` on General…
mergify[bot] Apr 24, 2026
8de9ac4
refactor(UX): selling settings form (backport #54412) (#54527)
mergify[bot] Apr 25, 2026
85d1eb8
fix(stock): show item code in serial and batch selector dialog
Sudharsanan11 Apr 25, 2026
62bbe28
fix(stock): add stock entry in batch master connection
Sudharsanan11 Apr 25, 2026
4c95daa
Merge pull request #54531 from frappe/mergify/bp/version-16-hotfix/pr…
rohitwaghchaure Apr 26, 2026
cabea2f
fix(stock): set incoming rate as zero for outward sle (backport #5451…
mergify[bot] Apr 26, 2026
5c0d2cb
feat: danish_bosnian_address_template (backport #54093) (#54516)
mergify[bot] Apr 26, 2026
23cac0d
chore: update POT file (#54535)
frappe-pr-bot Apr 26, 2026
ac9aa7f
refactor: quality inspection item query (backport #54511) (#54540)
mergify[bot] Apr 27, 2026
cc85370
fix(stock): remove validation for transfer_qty field (backport #54542…
mergify[bot] Apr 27, 2026
d56df96
fix: make inv dimen reqd only in delivery note (backport #54546) (#54…
mergify[bot] Apr 27, 2026
0df38a8
fix: correct display depends on condition (#54556)
mihir-kandoi Apr 27, 2026
d9a9a5b
fix: debit credit not equal in purchase transactions for multi curren…
mergify[bot] Apr 27, 2026
f7fa394
fix: negative quantity check in validate_item_qty (backport #54559) (…
mergify[bot] Apr 28, 2026
f14751d
fix(manufacturing): remove conversion factor for stock qty (backport …
mergify[bot] Apr 28, 2026
15b6633
feat: add setting to hide Subscription references across doctypes (#5…
Jatin3128 Apr 28, 2026
134e4b7
fix: update status of quotation in patch (backport #54577) (#54580)
mergify[bot] Apr 28, 2026
386a373
chore(sidebar): moved `Inactive Customers` from CRM to Selling Worksp…
mergify[bot] Apr 28, 2026
45dc2c4
fix: hide feature flag controlled fields on install
ruthra-kumar Apr 24, 2026
185ef4e
Merge pull request #54553 from frappe/mergify/bp/version-16-hotfix/pr…
ruthra-kumar Apr 28, 2026
5289aa0
fix(payment_entry): escape arguments on invoice and order fetching sq…
mergify[bot] Apr 28, 2026
9f04fcc
fix(`get_stock_balance`): validate inventory dimension fieldnames (ba…
mergify[bot] Apr 28, 2026
fba7871
fix: ensure fiscal year is checked before validating date filters in …
Abdeali099 Apr 23, 2026
6570796
fix: update fiscal year filter to use mandatory_depends_on instead of…
Abdeali099 Apr 23, 2026
e6f0bb6
fix: add filter labels and required filters for financial report vali…
Abdeali099 Apr 23, 2026
7b60ec8
fix: update account identification to avoid using name_field in finan…
Abdeali099 Apr 23, 2026
859b24d
chore: minor fix
Abdeali099 Apr 23, 2026
446c111
fix: always exclude pcv entries except for closing account head
vorasmit Apr 22, 2026
fa90194
test: pcv is excluded from PL accounts
vorasmit Apr 28, 2026
6bd6e62
fix: filter opening entries in first year in custom financial statement
vorasmit Apr 17, 2026
d51ce66
fix: summing of values could be zero even if values exist
vorasmit Apr 22, 2026
4675921
chore: comment
vorasmit Apr 24, 2026
7f32c3a
test: opening entries after period closing
vorasmit Apr 28, 2026
64a724b
test: include both accounts to test sum = 0
vorasmit Apr 28, 2026
9c5c87b
Merge pull request #54594 from frappe/mergify/bp/version-16-hotfix/pr…
ljain112 Apr 28, 2026
2f88fa6
Merge pull request #54598 from frappe/mergify/bp/version-16-hotfix/pr…
ljain112 Apr 28, 2026
c6ee18b
Merge pull request #54599 from frappe/mergify/bp/version-16-hotfix/pr…
ljain112 Apr 28, 2026
deef169
refactor(`sms_center`): replaced raw SQL queries with `Query Builder`…
mergify[bot] Apr 28, 2026
0d498ba
refactor: bring back titles on sales transactions and make them optio…
trustedcomputer Apr 28, 2026
90b07b3
Merge branch 'version-16' into version-16-hotfix
diptanilsaha Apr 28, 2026
1111771
fix: duplicate entries being shown in batch exists in future transact…
mergify[bot] Apr 28, 2026
8f8bf13
fix: filter overdue purchase order items by company (backport #54099)…
mergify[bot] Apr 28, 2026
5de4b01
fix: avoid double reduction of pe reference outstanding (backport #54…
mergify[bot] Apr 28, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/server-tests-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
TZ: 'Asia/Kolkata'
NODE_ENV: "production"
WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}

Expand All @@ -56,6 +57,7 @@ jobs:
mysql:
image: mariadb:10.6
env:
TZ: 'Asia/Kolkata'
MARIADB_ROOT_PASSWORD: 'root'
ports:
- 3306:3306
Expand Down
22 changes: 20 additions & 2 deletions erpnext/accounts/doctype/account/account.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ frappe.ui.form.on("Account", {
setup: function (frm) {
frm.add_fetch("parent_account", "report_type", "report_type");
frm.add_fetch("parent_account", "root_type", "root_type");
},
onload: function (frm) {

frm.set_query("parent_account", function (doc) {
return {
filters: {
Expand All @@ -15,7 +14,18 @@ frappe.ui.form.on("Account", {
},
};
});

frm.set_query("account_category", function () {
if (!frm.doc.root_type) return;

return {
filters: {
root_type: ["in", [frm.doc.root_type, ""]],
},
};
});
},

refresh: function (frm) {
frm.toggle_display("account_name", frm.is_new());

Expand Down Expand Up @@ -58,12 +68,20 @@ frappe.ui.form.on("Account", {
}
}
},

account_type: function (frm) {
if (frm.doc.is_group == 0) {
frm.toggle_display(["tax_rate"], frm.doc.account_type == "Tax");
frm.toggle_display("warehouse", frm.doc.account_type == "Stock");
}
},

root_type: function (frm) {
if (frm.doc.account_category) {
frm.set_value("account_category", "");
}
},

add_toolbar_buttons: function (frm) {
frm.add_custom_button(
__("Chart of Accounts"),
Expand Down
19 changes: 17 additions & 2 deletions erpnext/accounts/doctype/account_category/account_category.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
"engine": "InnoDB",
"field_order": [
"account_category_name",
"root_type",
"column_break_qluu",
"description"
],
"fields": [
{
"fieldname": "account_category_name",
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Account Category Name",
"reqd": 1,
"unique": 1
Expand All @@ -22,6 +25,18 @@
"fieldname": "description",
"fieldtype": "Small Text",
"label": "Description"
},
{
"fieldname": "column_break_qluu",
"fieldtype": "Column Break"
},
{
"fieldname": "root_type",
"fieldtype": "Select",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Root Type",
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity"
}
],
"grid_page_length": 50,
Expand All @@ -32,7 +47,7 @@
"link_fieldname": "account_category"
}
],
"modified": "2026-02-23 01:19:49.589393",
"modified": "2026-03-05 06:49:34.430723",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account Category",
Expand Down Expand Up @@ -69,7 +84,7 @@
}
],
"row_format": "Dynamic",
"search_fields": "account_category_name, description",
"search_fields": "account_category_name, root_type",
"sort_field": "creation",
"sort_order": "DESC",
"states": []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class AccountCategory(Document):

account_category_name: DF.Data
description: DF.SmallText | None
root_type: DF.Literal["", "Asset", "Liability", "Income", "Expense", "Equity"]
# end: auto-generated types

def after_rename(self, old_name, new_name, merge):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"invoicing_features_section",
"check_supplier_invoice_uniqueness",
"automatically_fetch_payment_terms",
"enable_subscription",
"column_break_17",
"enable_common_party_accounting",
"allow_multi_currency_invoices_against_single_party_account",
Expand Down
11 changes: 11 additions & 0 deletions erpnext/accounts/doctype/accounts_settings/accounts_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class AccountsSettings(Document):
enable_immutable_ledger: DF.Check
enable_loyalty_point_program: DF.Check
enable_party_matching: DF.Check
enable_subscription: DF.Check
exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
fetch_payment_schedule_in_payment_request: DF.Check
fetch_valuation_rate_for_internal_transaction: DF.Check
Expand Down Expand Up @@ -142,6 +143,10 @@ def validate(self):
toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
clear_cache = True

if old_doc.enable_subscription != self.enable_subscription:
toggle_subscription_sections(not self.enable_subscription)
clear_cache = True

if clear_cache:
frappe.clear_cache()

Expand Down Expand Up @@ -234,6 +239,12 @@ def toggle_loyalty_point_program_section(hide):
create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)


def toggle_subscription_sections(hide):
subscription_doctypes = frappe.get_hooks("subscription_doctypes")
for doctype in subscription_doctypes:
create_property_setter_for_hiding_field(doctype, "subscription_section", hide)


def create_property_setter_for_hiding_field(doctype, field_name, hide):
make_property_setter(
doctype,
Expand Down
Loading
Loading