From d6c9c287f6eea39a7d10163d808558a7e801fea1 Mon Sep 17 00:00:00 2001
From: fkantelberg <florian.kantelberg@initos.com>
Date: Tue, 7 Nov 2023 13:27:37 +0100
Subject: [PATCH] [FIX] Show analytic distribution and hide analytic account

---
 contract/models/contract_line.py | 14 +++++++++++++-
 contract/views/contract.xml      | 12 ++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/contract/models/contract_line.py b/contract/models/contract_line.py
index 6e3e1cae2..1e830d868 100644
--- a/contract/models/contract_line.py
+++ b/contract/models/contract_line.py
@@ -559,12 +559,24 @@ class ContractLine(models.Model):
             self.last_date_invoiced, self.recurring_next_date
         )
         name = self._insert_markers(dates[0], dates[1])
+
+        analytic_distribution = self.analytic_distribution
+        analytic_account_id = self.analytic_account_id.id
+        if analytic_account_id:
+            analytic_account_id = str(analytic_account_id)
+            if analytic_distribution:
+                analytic_distribution[analytic_account_id] = (
+                    analytic_distribution.get(analytic_account_id, 0) + 100
+                )
+            else:
+                analytic_distribution = {analytic_account_id: 100}
+
         return {
             "quantity": self._get_quantity_to_invoice(*dates),
             "product_uom_id": self.uom_id.id,
             "discount": self.discount,
             "contract_line_id": self.id,
-            "analytic_distribution": self.analytic_distribution,
+            "analytic_distribution": analytic_distribution,
             "sequence": self.sequence,
             "name": name,
             "price_unit": self.price_unit,
diff --git a/contract/views/contract.xml b/contract/views/contract.xml
index 0c6482236..d7ae9478c 100644
--- a/contract/views/contract.xml
+++ b/contract/views/contract.xml
@@ -219,6 +219,12 @@
                                     <field
                                         name="analytic_account_id"
                                         groups="analytic.group_analytic_accounting"
+                                        optional="hide"
+                                    />
+                                    <field
+                                        name="analytic_distribution"
+                                        widget="analytic_distribution"
+                                        groups="analytic.group_analytic_accounting"
                                     />
                                     <field name="quantity" />
                                     <field name="uom_id" />
@@ -318,6 +324,12 @@
                                     <field
                                         name="analytic_account_id"
                                         groups="analytic.group_analytic_accounting"
+                                        optional="hide"
+                                    />
+                                    <field
+                                        name="analytic_distribution"
+                                        widget="analytic_distribution"
+                                        groups="analytic.group_analytic_accounting"
                                     />
                                     <field name="quantity" />
                                     <field name="uom_id" />