From 2813d4ee1212f06c4c60d267e1a500c6c247cbb0 Mon Sep 17 00:00:00 2001
From: Fernando La Chica <fernandolachica@gmail.com>
Date: Sat, 17 Sep 2022 12:50:27 +0200
Subject: [PATCH] [MIG] account_budget_oca 15.0 & dependencies:

    - Add analytic dependency
    - Add l10n_generic_coa dependency
    - Fix tags of tests
---
 account_budget_oca/__manifest__.py            |  4 +--
 account_budget_oca/readme/CONTRIBUTORS.rst    |  2 ++
 .../security/account_budget_security.xml      | 22 +++++++---------
 .../tests/test_account_budget.py              |  2 ++
 .../tests/test_theoreticalamount.py           |  2 ++
 .../views/account_budget_views.xml            |  1 -
 .../views/res_config_settings_views.xml       | 26 +++++++++----------
 7 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/account_budget_oca/__manifest__.py b/account_budget_oca/__manifest__.py
index d3458127..ae427cbe 100644
--- a/account_budget_oca/__manifest__.py
+++ b/account_budget_oca/__manifest__.py
@@ -2,12 +2,12 @@
 
 {
     "name": "Budgets Management",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Accounting",
     "license": "LGPL-3",
     "author": "Odoo S.A., Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/account-budgeting",
-    "depends": ["account"],
+    "depends": ["account", "analytic", "l10n_generic_coa"],
     "excludes": ["account_budget"],
     "data": [
         "security/ir.model.access.csv",
diff --git a/account_budget_oca/readme/CONTRIBUTORS.rst b/account_budget_oca/readme/CONTRIBUTORS.rst
index 1f00e914..c9d45749 100644
--- a/account_budget_oca/readme/CONTRIBUTORS.rst
+++ b/account_budget_oca/readme/CONTRIBUTORS.rst
@@ -3,3 +3,5 @@
 * Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
 * Alberto Martín Cortada <alberto.martin@guadaltech.es>
 * Freni Patel <fpatel@opensourceintegrators.com>
+* `Greenice <https://www.greenice.com>`_:
+  * Fernando La Chica <fernandolachica@gmail.com>
diff --git a/account_budget_oca/security/account_budget_security.xml b/account_budget_oca/security/account_budget_security.xml
index 596704d5..ea80968c 100644
--- a/account_budget_oca/security/account_budget_security.xml
+++ b/account_budget_oca/security/account_budget_security.xml
@@ -1,34 +1,32 @@
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
         <record id="budget_post_comp_rule" model="ir.rule">
             <field name="name">Budget post multi-company</field>
             <field name="model_id" ref="model_account_budget_post" />
             <field name="global" eval="True" />
             <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
         </record>
         <record id="budget_comp_rule" model="ir.rule">
             <field name="name">Budget multi-company</field>
             <field name="model_id" ref="model_crossovered_budget" />
             <field name="global" eval="True" />
             <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
         </record>
         <record id="budget_lines_comp_rule" model="ir.rule">
             <field name="name">Budget lines multi-company</field>
             <field name="model_id" ref="model_crossovered_budget_lines" />
             <field name="global" eval="True" />
             <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
         </record>
         <record id="base.user_root" model="res.users">
             <field
-                name="groups_id"
-                eval="[(4,ref('analytic.group_analytic_accounting'))]"
-            />
+            name="groups_id"
+            eval="[(4,ref('analytic.group_analytic_accounting'))]"
+        />
         </record>
-    </data>
 </odoo>
diff --git a/account_budget_oca/tests/test_account_budget.py b/account_budget_oca/tests/test_account_budget.py
index 2817d2d2..b6e10065 100644
--- a/account_budget_oca/tests/test_account_budget.py
+++ b/account_budget_oca/tests/test_account_budget.py
@@ -3,6 +3,7 @@
 import datetime
 
 from odoo.fields import Date
+from odoo.tests import tagged
 
 from .common import TestAccountBudgetCommon
 
@@ -10,6 +11,7 @@
 # ---------------------------------------------------------
 # Tests
 # ---------------------------------------------------------
+@tagged("post_install", "-at_install")
 class TestAccountBudget(TestAccountBudgetCommon):
     def test_account_budget(self):
         # Creating a crossovered.budget record
diff --git a/account_budget_oca/tests/test_theoreticalamount.py b/account_budget_oca/tests/test_theoreticalamount.py
index 2ddd8c80..a4e2c1d2 100644
--- a/account_budget_oca/tests/test_theoreticalamount.py
+++ b/account_budget_oca/tests/test_theoreticalamount.py
@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.fields import Datetime
+from odoo.tests import tagged
 
 from .common import TestAccountBudgetCommon
 
@@ -13,6 +14,7 @@
 # ---------------------------------------------------------
 # Tests
 # ---------------------------------------------------------
+@tagged("post_install", "-at_install")
 class TestTheoreticalAmount(TestAccountBudgetCommon):
     def setUp(self):
         super().setUp()
diff --git a/account_budget_oca/views/account_budget_views.xml b/account_budget_oca/views/account_budget_views.xml
index c09479e1..023f9e12 100644
--- a/account_budget_oca/views/account_budget_views.xml
+++ b/account_budget_oca/views/account_budget_views.xml
@@ -253,7 +253,6 @@
             <tree
                 decoration-info="state == 'draft'"
                 decoration-muted="state in ('done','cancel')"
-                string="Budget"
             >
                 <field name="name" colspan="1" />
                 <field name="date_from" />
diff --git a/account_budget_oca/views/res_config_settings_views.xml b/account_budget_oca/views/res_config_settings_views.xml
index 5c2703f5..57af1b3e 100644
--- a/account_budget_oca/views/res_config_settings_views.xml
+++ b/account_budget_oca/views/res_config_settings_views.xml
@@ -4,19 +4,19 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="account.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <div id="account_budget" position="replace">
-                <div class="content-group">
-                    <div class="mt16">
-                        <button
-                            name="%(account_budget_oca.open_budget_post_form)d"
-                            icon="fa-arrow-right"
-                            type="action"
-                            string="Budgetary Positions"
-                            class="btn-link"
-                        />
-                    </div>
-                </div>
-            </div>
+            <xpath
+                expr="//div[@id='analytic']/div/div[@class='o_setting_right_pane']"
+                position="inside"
+            >
+                <button
+                    name="%(account_budget_oca.open_budget_post_form)d"
+                    icon="fa-arrow-right"
+                    type="action"
+                    string="Budgetary Positions"
+                    class="btn-link"
+                    attrs="{'invisible': [('group_analytic_accounting','=',False)]}"
+                />
+            </xpath>
         </field>
     </record>
 </odoo>