From 2780d535d9a7b4908afbf5e554b807c28fc3e840 Mon Sep 17 00:00:00 2001 From: Corentin Forler <8860073-cforler_dokos@users.noreply.gitlab.com> Date: Thu, 24 Oct 2024 15:53:34 +0000 Subject: [PATCH] Revert "Merge branch 'backport/v4-dev/3978' into 'v4-dev' (dokos/dokos!3987)" This reverts merge request !3987 --- .../accounts_settings/accounts_settings.json | 19 +++++++++---------- .../accounts_settings/accounts_settings.py | 4 +--- .../asset_depreciation_schedule.py | 5 +---- .../test_asset_depreciation_schedule.py | 16 ++++------------ 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 0e2d02ce044..ea08b973e45 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -58,7 +58,7 @@ "post_change_gl_entries", "assets_tab", "asset_settings_section", - "calculate_daily_depreciation_using", + "calculate_depr_using_total_days", "column_break_gjcc", "book_asset_depreciation_entry_automatically", "closing_settings_tab", @@ -490,6 +490,13 @@ "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" + }, { "fieldname": "france_section", "fieldtype": "Section Break", @@ -501,14 +508,6 @@ "fieldname": "use_supplier_invoice_number_in_fec", "fieldtype": "Check", "label": "Use supplier invoice number in FEC" - }, - { - "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", - "options": "Total days in depreciation period\nTotal years in depreciation period" } ], "icon": "uil uil-setting", @@ -516,7 +515,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-10-21 04:29:02.556355", + "modified": "2024-09-12 16:15:48.241124", "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 c11406dff88..ea8511b92db 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -33,9 +33,7 @@ class AccountsSettings(Document): book_deferred_entries_based_on: DF.Literal["Days", "Months"] book_deferred_entries_via_journal_entry: DF.Check book_tax_discount_loss: DF.Check - 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 credit_controller: DF.Link | None default_payment_days: DF.Int diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index 164e7027beb..6ebed219e6c 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -730,10 +730,7 @@ def get_daily_prorata_based_straight_line_depr( def get_daily_depr_amount(asset, row, schedule_idx, amount): - if ( - frappe.db.get_single_value("Accounts Settings", "calculate_daily_depreciation_using") - == "Total days in depreciation period" - ): + if cint(frappe.db.get_single_value("Accounts Settings", "calculate_depr_using_total_days")): total_days = ( date_diff( get_last_day( diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py index c25a9faec67..c9fa0ba59da 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py @@ -76,9 +76,7 @@ class TestAssetDepreciationSchedule(FrappeTestCase): self.assertEqual(schedules, expected_schedules) def test_schedule_for_slm_for_existing_asset_daily_pro_rata_enabled(self): - frappe.db.set_single_value( - "Accounts Settings", "calculate_daily_depreciation_using", "Total days in depreciation period" - ) + frappe.db.set_single_value("Accounts Settings", "calculate_depr_using_total_days", 1) asset = create_asset( calculate_depreciation=1, depreciation_method="Straight Line", @@ -116,9 +114,7 @@ class TestAssetDepreciationSchedule(FrappeTestCase): for d in get_depr_schedule(asset.name, "Draft") ] self.assertEqual(schedules, expected_schedules) - frappe.db.set_single_value( - "Accounts Settings", "calculate_daily_depreciation_using", "Total years in depreciation period" - ) + frappe.db.set_single_value("Accounts Settings", "calculate_depr_using_total_days", 0) def test_schedule_for_slm_for_existing_asset(self): asset = create_asset( @@ -191,9 +187,7 @@ class TestAssetDepreciationSchedule(FrappeTestCase): # Enable Checkbox to Calculate depreciation using total days in depreciation period def test_daily_prorata_based_depr_after_enabling_configuration(self): - frappe.db.set_single_value( - "Accounts Settings", "calculate_daily_depreciation_using", "Total days in depreciation period" - ) + frappe.db.set_single_value("Accounts Settings", "calculate_depr_using_total_days", 1) asset = create_asset( calculate_depreciation=1, @@ -251,9 +245,7 @@ class TestAssetDepreciationSchedule(FrappeTestCase): for d in get_depr_schedule(asset.name, "Draft") ] self.assertEqual(schedules, expected_schedule) - frappe.db.set_single_value( - "Accounts Settings", "calculate_daily_depreciation_using", "Total years in depreciation period" - ) + frappe.db.set_single_value("Accounts Settings", "calculate_depr_using_total_days", 0) # Test for Written Down Value Method # Frequency of deprciation = 3 -- GitLab