[FIX] contract_brand: combine analytic distribution defined by analytic distribution models with analytic on brands

Before this commit the analytic distribution was always erased on contract lines: if the contract is linked to a brand,
only the analytic of the brand was considered. If the contract wasn't linked to a brand, the analytic was erased.

After this commit: we consider analytic distribution models, to define the analytic distribution. And we combine
it with the analytic distribution of the brand, if needed

Author: marielejeune

contract_brand/models/contract_line.py

@@ -18,4 +18,14 @@ def _get_analytic_distribution_arguments(self):
 
     @api.depends("contract_id.brand_id")
     def _compute_analytic_distribution(self):
-        return super()._compute_analytic_distribution()
+        res = super()._compute_analytic_distribution()
+        for rec in self.filtered(lambda line: line.contract_id.brand_id):
+            brand_analytic_distribution = (
+                rec.contract_id.brand_id.analytic_distribution or {}
+            )
+            if brand_analytic_distribution:
+                line_analytic_distribution = rec.analytic_distribution or {}
+                rec.analytic_distribution = (
+                    line_analytic_distribution | brand_analytic_distribution
+                )
+        return res

contract_brand/tests/test_contract.py

@@ -18,6 +18,15 @@ def setUpClass(cls):
                 "plan_id": cls.analytic_plan.id,
             }
         )
+        cls.analytic_plan2 = cls.env["account.analytic.plan"].create(
+            {"name": "analytic plan 2"}
+        )
+        cls.analytic_account2 = cls.env["account.analytic.account"].create(
+            {
+                "name": "analytic account 2",
+                "plan_id": cls.analytic_plan2.id,
+            }
+        )
 
     def test_contract_create_branded_move(self):
         """It should create a branded move based on the contract brand"""
@@ -39,3 +48,27 @@ def test_contract_analytic_account_onchange_brand(self):
         self.contract.brand_id = self.brand_id
         for line in self.contract.contract_line_ids:
             self.assertEqual(line.analytic_distribution, analytic_distribution)
+
+    def test_contract_analytic_distribution_combined(self):
+        """
+        Analytic distribution model for the product + analytic on the brand
+        -> Combine both
+        """
+        contract_line = self.contract.contract_line_ids[0]
+        product = contract_line.product_id
+        self.env["account.analytic.distribution.model"].create(
+            {
+                "product_id": product.id,
+                "analytic_distribution": {str(self.analytic_account.id): 100},
+            }
+        )
+        contract_line._compute_analytic_distribution()
+        self.assertEqual(
+            contract_line.analytic_distribution, {str(self.analytic_account.id): 100}
+        )
+        self.brand_id.analytic_distribution = {str(self.analytic_account2.id): 100}
+        self.contract.brand_id = self.brand_id
+        self.assertEqual(
+            contract_line.analytic_distribution,
+            {str(self.analytic_account.id): 100, str(self.analytic_account2.id): 100},
+        )