From 7f4d2b707a545377da8e981795c232f926c6f433 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 13:30:15 +0530 Subject: [PATCH] refactor: Simpler log settings setup (backport #38449) (#38451) refactor: Simpler log settings setup (#38449) Depends on https://github.com/frappe/frappe/pull/23507 (cherry picked from commit 1da9087cc4e0a411a820b817d0a1c657981be84e) Co-authored-by: Ankush Menat --- erpnext/hooks.py | 5 +++++ erpnext/patches.txt | 1 - erpnext/patches/v14_0/setup_clear_repost_logs.py | 8 -------- erpnext/setup/install.py | 8 -------- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 erpnext/patches/v14_0/setup_clear_repost_logs.py diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 857471f1fd..60ec49587c 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -638,3 +638,8 @@ additional_timeline_content = { extend_bootinfo = [ "erpnext.support.doctype.service_level_agreement.service_level_agreement.add_sla_doctypes", ] + + +default_log_clearing_doctypes = { + "Repost Item Valuation": 60, +} diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 55f79143bd..44df23c785 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -303,7 +303,6 @@ erpnext.patches.v13_0.drop_unused_sle_index_parts erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization erpnext.patches.v14_0.update_partial_tds_fields erpnext.patches.v14_0.create_incoterms_and_migrate_shipment -erpnext.patches.v14_0.setup_clear_repost_logs erpnext.patches.v14_0.create_accounting_dimensions_for_payment_request erpnext.patches.v14_0.update_entry_type_for_journal_entry erpnext.patches.v14_0.change_autoname_for_tax_withheld_vouchers diff --git a/erpnext/patches/v14_0/setup_clear_repost_logs.py b/erpnext/patches/v14_0/setup_clear_repost_logs.py deleted file mode 100644 index be9ddcab7a..0000000000 --- a/erpnext/patches/v14_0/setup_clear_repost_logs.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors -# License: MIT. See LICENSE - -from erpnext.setup.install import setup_log_settings - - -def execute(): - setup_log_settings() diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index b106cfcc1a..5b993fa64b 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -31,7 +31,6 @@ def after_install(): add_company_to_session_defaults() add_standard_navbar_items() add_app_name() - setup_log_settings() hide_workspaces() update_roles() frappe.db.commit() @@ -221,13 +220,6 @@ def add_app_name(): frappe.db.set_single_value("System Settings", "app_name", "ERPNext") -def setup_log_settings(): - log_settings = frappe.get_single("Log Settings") - log_settings.append("logs_to_clear", {"ref_doctype": "Repost Item Valuation", "days": 60}) - - log_settings.save(ignore_permissions=True) - - def hide_workspaces(): for ws in ["Integration", "Settings"]: frappe.db.set_value("Workspace", ws, "public", 0)