diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index f60038c46c3..6a7d8d995ba 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -55,7 +55,6 @@ "post_change_gl_entries", "assets_tab", "asset_settings_section", - "calculate_depr_using_total_days", "calculate_daily_depreciation_using", "column_break_gjcc", "book_asset_depreciation_entry_automatically", @@ -472,13 +471,6 @@ "fieldname": "column_break_gjcc", "fieldtype": "Column Break" }, - { - "default": "0", - "description": "Enable this option to calculate daily depreciation by considering the total number of days in the entire depreciation period, (including leap years) while using daily pro-rata based depreciation", - "fieldname": "calculate_depr_using_total_days", - "fieldtype": "Check", - "label": "Calculate daily depreciation using total days in depreciation period" - }, { "description": "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state.", "fieldname": "payment_request_settings", @@ -493,6 +485,7 @@ }, { "default": "Total years in depreciation period", + "description": "This field lets you select your preferred method for calculating pro rata depreciation. Each approach has different implication. For detailed explanations, please refer to the Documentation.", "fieldname": "calculate_daily_depreciation_using", "fieldtype": "Select", "label": "Calculate Daily Pro-rata Depreciation Using", @@ -504,7 +497,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-10-16 15:41:03.548766", + "modified": "2024-10-21 04:29:02.556355", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py index 9de049ec8d6..ab5e8e7e678 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -36,7 +36,6 @@ class AccountsSettings(Document): calculate_daily_depreciation_using: DF.Literal[ "Total days in depreciation period", "Total years in depreciation period" ] - calculate_depr_using_total_days: DF.Check check_supplier_invoice_uniqueness: DF.Check create_pr_in_draft_status: DF.Check credit_controller: DF.Link | None diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 352803e0cc7..a7f2fda7bfd 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -384,4 +384,3 @@ erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v15_0.link_purchase_item_to_asset_doc erpnext.patches.v15_0.migrate_to_utm_analytics erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter -erpnext.patches.v15_0.update_checkbox_to_select #1 diff --git a/erpnext/patches/v15_0/update_checkbox_to_select.py b/erpnext/patches/v15_0/update_checkbox_to_select.py deleted file mode 100644 index 85ba58fd904..00000000000 --- a/erpnext/patches/v15_0/update_checkbox_to_select.py +++ /dev/null @@ -1,13 +0,0 @@ -import frappe -from frappe.utils import cint - - -def execute(): - if cint(frappe.db.get_single_value("Accounts Settings", "calculate_depr_using_total_days")): - frappe.db.set_single_value( - "Accounts Settings", "calculate_daily_depreciation_using", "Total days in depreciation period" - ) - else: - frappe.db.set_single_value( - "Accounts Settings", "calculate_daily_depreciation_using", "Total years in depreciation period" - )