[MIG] stock_request_analytic : Migration to version 18.0

Author: Ricardo-MC

stock_request_analytic/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Stock Request Analytic",
     "summary": "Internal request for stock",
-    "version": "15.0.1.1.1",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "author": "ForgeFlow, Odoo Community Association (OCA)",

stock_request_analytic/models/stock_request.py

@@ -18,10 +18,11 @@ class StockRequest(models.Model):
         check_company=True,
         compute_sudo=True,
     )
-    analytic_tag_ids = fields.Many2many(
-        comodel_name="account.analytic.tag",
-        string="Analytic Tags",
-        check_company=True,
+    analytic_distribution_ids = fields.Many2many(
+        comodel_name="account.analytic.distribution",
+        inverse_name="res_id",
+        domain=lambda self: [("res_model", "=", self._name)],
+        string="Analytic Distribution",
     )
 
     @api.depends("order_id")

stock_request_analytic/models/stock_request_order.py

@@ -6,15 +6,12 @@
 
 MAP_ACTIONS = {
     "analytic_account": "analytic.action_account_analytic_account_form",
-    "analytic_tag": "analytic.account_analytic_tag_action",
 }
 MAP_FIELDS = {
     "analytic_account": "analytic_account_ids",
-    "analytic_tag": "analytic_tag_ids",
 }
 MAP_VIEWS = {
     "analytic_account": "analytic.view_account_analytic_account_form",
-    "analytic_tag": "analytic.account_analytic_tag_form_view",
 }
 
 
@@ -26,24 +23,19 @@ class StockRequestOrder(models.Model):
         readonly=True,
         compute_sudo=True,
     )
-    analytic_tag_count = fields.Integer(
-        compute="_compute_analytic_ids",
-        readonly=True,
-        compute_sudo=True,
-    )
     analytic_account_ids = fields.One2many(
         comodel_name="account.analytic.account",
         compute="_compute_analytic_ids",
         string="Analytic Accounts",
         readonly=True,
         compute_sudo=True,
     )
-    analytic_tag_ids = fields.One2many(
-        comodel_name="account.analytic.tag",
-        compute="_compute_analytic_ids",
-        string="Analytic Tags",
+    analytic_distribution_ids = fields.One2many(
+        comodel_name="account.analytic.distribution",
+        inverse_name="res_id",
+        domain=lambda self: [("res_model", "=", self._name)],
+        string="Analytic Distributions",
         readonly=True,
-        compute_sudo=True,
     )
     default_analytic_account_id = fields.Many2one(
         comodel_name="account.analytic.account",
@@ -57,9 +49,7 @@ def _compute_analytic_ids(self):
             req.analytic_account_ids = req.stock_request_ids.mapped(
                 "analytic_account_id"
             )
-            req.analytic_tag_ids = req.stock_request_ids.mapped("analytic_tag_ids")
             req.analytic_count = len(req.analytic_account_ids)
-            req.analytic_tag_count = len(req.analytic_tag_ids)
 
     def action_view_analytic(self):
         self.ensure_one()

stock_request_analytic/tests/test_stock_request_analytic.py

@@ -78,17 +78,11 @@ def setUpClass(cls):
         new_test_user(
             cls.env,
             login="stock_request_user",
-            groups="%s,%s,%s"
-            % (
-                "stock_request.group_stock_request_user",
-                "analytic.group_analytic_accounting",
-                "stock.group_stock_user",
-            ),
+            groups="stock_request.group_stock_request_user,analytic.group_analytic_accounting,stock.group_stock_user",
             company_ids=[(6, 0, [cls.main_company.id, cls.company_2.id])],
         )
 
     def prepare_order_request_analytic(self, analytic, company, analytic_tags=None):
-        analytic_tags = analytic_tags or self.AccountAnalyticTag
         vals = {
             "company_id": company.id,
             "warehouse_id": self.warehouse.id,
@@ -103,7 +97,6 @@ def prepare_order_request_analytic(self, analytic, company, analytic_tags=None):
                         "product_uom_id": self.product.uom_id.id,
                         "product_uom_qty": 5.0,
                         "analytic_account_id": analytic.id,
-                        "analytic_tag_ids": [(4, tag.id) for tag in analytic_tags],
                         "company_id": company.id,
                         "warehouse_id": self.warehouse.id,
                         "location_id": self.demand_loc.id,
@@ -156,7 +149,8 @@ def prepare_order_request_multi_analytic(self, analytic1, analytic2, company):
     def test_stock_analytic(self):
         analytic_tag = self.env.ref("analytic.tag_contract")
         vals = self.prepare_order_request_analytic(
-            self.analytic1, self.main_company, analytic_tags=analytic_tag
+            self.analytic1,
+            self.main_company,
         )
         order = self.StockRequestOrder.create(vals)
         req = order.stock_request_ids

stock_request_analytic/views/stock_request_order_views.xml

@@ -62,9 +62,9 @@
                     groups="analytic.group_analytic_accounting"
                 />
                 <field
-                    name="analytic_tag_ids"
-                    widget="many2many_tags"
-                    groups="analytic.group_analytic_tags"
+                    name="analytic_distribution_ids"
+                    context="{'default_res_model': 'stock.request.order', 'default_res_id': active_id}"
+                    groups="analytic.group_analytic_accounting"
                 />
             </xpath>
         </field>

stock_request_analytic/views/stock_request_views.xml

@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017-2020 ForgeFlow, S.L. (https://www.forgeflow.com)
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="view_stock_request_form" model="ir.ui.view">
         <field name="name">stock.request.form</field>
         <field name="model">stock.request</field>
         <field name="inherit_id" ref="stock_request.view_stock_request_form" />
-        <field
-            name="groups_id"
-            eval="[(4, ref('analytic.group_analytic_accounting')),(4, ref('analytic.group_analytic_tags'))]"
-        />
         <field name="arch" type="xml">
             <field name="procurement_group_id" position="after">
                 <field
                     name="analytic_account_id"
                     groups="analytic.group_analytic_accounting"
                 />
                 <field
-                    name="analytic_tag_ids"
-                    widget="many2many_tags"
-                    groups="analytic.group_analytic_tags"
+                    name="analytic_distribution_ids"
+                    context="{'default_res_model': 'stock.request', 'default_res_id': active_id}"
+                    groups="analytic.group_analytic_accounting"
                 />
             </field>
         </field>