mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-13 17:53:49 +00:00
Merge pull request #51458 from aerele/default-age-range
feat: add default-age-range in accounts settings
(cherry picked from commit f8f82ccf31)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sowmya <106989392+SowmyaArunachalam@users.noreply.github.com>
This commit is contained in:
@@ -93,6 +93,7 @@
|
|||||||
"receivable_payable_remarks_length",
|
"receivable_payable_remarks_length",
|
||||||
"accounts_receivable_payable_tuning_section",
|
"accounts_receivable_payable_tuning_section",
|
||||||
"receivable_payable_fetch_method",
|
"receivable_payable_fetch_method",
|
||||||
|
"default_ageing_range",
|
||||||
"column_break_ntmi",
|
"column_break_ntmi",
|
||||||
"drop_ar_procedures",
|
"drop_ar_procedures",
|
||||||
"legacy_section",
|
"legacy_section",
|
||||||
@@ -657,6 +658,12 @@
|
|||||||
"fieldname": "show_party_balance",
|
"fieldname": "show_party_balance",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Show Party Balance"
|
"label": "Show Party Balance"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "30, 60, 90, 120",
|
||||||
|
"fieldname": "default_ageing_range",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"label": "Default Ageing Range"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
@@ -664,7 +671,7 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2025-11-06 17:48:07.682837",
|
"modified": "2025-12-26 19:46:55.093717",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Accounts Settings",
|
"name": "Accounts Settings",
|
||||||
@@ -694,4 +701,4 @@
|
|||||||
"sort_order": "ASC",
|
"sort_order": "ASC",
|
||||||
"states": [],
|
"states": [],
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ class AccountsSettings(Document):
|
|||||||
check_supplier_invoice_uniqueness: DF.Check
|
check_supplier_invoice_uniqueness: DF.Check
|
||||||
create_pr_in_draft_status: DF.Check
|
create_pr_in_draft_status: DF.Check
|
||||||
credit_controller: DF.Link | None
|
credit_controller: DF.Link | None
|
||||||
|
default_ageing_range: DF.Data | None
|
||||||
delete_linked_ledger_entries: DF.Check
|
delete_linked_ledger_entries: DF.Check
|
||||||
determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
|
determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
|
||||||
enable_common_party_accounting: DF.Check
|
enable_common_party_accounting: DF.Check
|
||||||
|
|||||||
@@ -165,6 +165,10 @@ frappe.query_reports["Accounts Payable"] = {
|
|||||||
var filters = report.get_values();
|
var filters = report.get_values();
|
||||||
frappe.set_route("query-report", "Accounts Payable Summary", { company: filters.company });
|
frappe.set_route("query-report", "Accounts Payable Summary", { company: filters.company });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (frappe.boot.sysdefaults.default_ageing_range) {
|
||||||
|
report.set_filter_value("range", frappe.boot.sysdefaults.default_ageing_range);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -114,6 +114,10 @@ frappe.query_reports["Accounts Payable Summary"] = {
|
|||||||
var filters = report.get_values();
|
var filters = report.get_values();
|
||||||
frappe.set_route("query-report", "Accounts Payable", { company: filters.company });
|
frappe.set_route("query-report", "Accounts Payable", { company: filters.company });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (frappe.boot.sysdefaults.default_ageing_range) {
|
||||||
|
report.set_filter_value("range", frappe.boot.sysdefaults.default_ageing_range);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -192,6 +192,10 @@ frappe.query_reports["Accounts Receivable"] = {
|
|||||||
var filters = report.get_values();
|
var filters = report.get_values();
|
||||||
frappe.set_route("query-report", "Accounts Receivable Summary", { company: filters.company });
|
frappe.set_route("query-report", "Accounts Receivable Summary", { company: filters.company });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (frappe.boot.sysdefaults.default_ageing_range) {
|
||||||
|
report.set_filter_value("range", frappe.boot.sysdefaults.default_ageing_range);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -137,6 +137,10 @@ frappe.query_reports["Accounts Receivable Summary"] = {
|
|||||||
var filters = report.get_values();
|
var filters = report.get_values();
|
||||||
frappe.set_route("query-report", "Accounts Receivable", { company: filters.company });
|
frappe.set_route("query-report", "Accounts Receivable", { company: filters.company });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (frappe.boot.sysdefaults.default_ageing_range) {
|
||||||
|
report.set_filter_value("range", frappe.boot.sysdefaults.default_ageing_range);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -64,6 +64,9 @@ def boot_session(bootinfo):
|
|||||||
bootinfo.party_account_types = frappe._dict(party_account_types)
|
bootinfo.party_account_types = frappe._dict(party_account_types)
|
||||||
|
|
||||||
bootinfo.sysdefaults.demo_company = frappe.db.get_single_value("Global Defaults", "demo_company")
|
bootinfo.sysdefaults.demo_company = frappe.db.get_single_value("Global Defaults", "demo_company")
|
||||||
|
bootinfo.sysdefaults.default_ageing_range = frappe.db.get_single_value(
|
||||||
|
"Accounts Settings", "default_ageing_range"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def update_page_info(bootinfo):
|
def update_page_info(bootinfo):
|
||||||
|
|||||||
Reference in New Issue
Block a user