From 0df93da82309447f23912488fc71c56259d3da92 Mon Sep 17 00:00:00 2001 From: "Cedric Prieels (cpr)" Date: Thu, 2 Sep 2021 12:50:54 +0200 Subject: [PATCH] [IMP] account,analytic: move the track cost setting This commit moves the Track cost setting from account to analytic in order to use it in modules depending on analytic. This setting is based on a group defined in analytic (analytic.group_analytic_accounting), this group is not moved. PR : #72736 See odoo/upgrade#2706 task-2545084 --- addons/account/models/res_config_settings.py | 2 -- addons/analytic/models/__init__.py | 1 + addons/analytic/models/res_config_settings.py | 9 +++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 addons/analytic/models/res_config_settings.py diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index b434f4d20b2..e138e442bf4 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -71,8 +71,6 @@ class ResConfigSettings(models.TransientModel): domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)], help="Intermediary account used when moving from a liquidity account to another.") module_account_accountant = fields.Boolean(string='Accounting') - group_analytic_accounting = fields.Boolean(string='Analytic Accounting', - implied_group='analytic.group_analytic_accounting') group_analytic_tags = fields.Boolean(string='Analytic Tags', implied_group='analytic.group_analytic_tags') group_warning_account = fields.Boolean(string="Warnings in Invoices", implied_group='account.group_warning_account') group_cash_rounding = fields.Boolean(string="Cash Rounding", implied_group='account.group_cash_rounding') diff --git a/addons/analytic/models/__init__.py b/addons/analytic/models/__init__.py index d1fd64b96f8..c85a3b29ee3 100644 --- a/addons/analytic/models/__init__.py +++ b/addons/analytic/models/__init__.py @@ -2,3 +2,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import analytic_account +from . import res_config_settings diff --git a/addons/analytic/models/res_config_settings.py b/addons/analytic/models/res_config_settings.py new file mode 100644 index 00000000000..abe5e7e96a0 --- /dev/null +++ b/addons/analytic/models/res_config_settings.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + group_analytic_accounting = fields.Boolean(string='Analytic Accounting', implied_group='analytic.group_analytic_accounting')