From 6083a966234881fba1cc013bc3ae210dfbc4bc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Houz=C3=A9fa=20Abbasbhay?= <houzefa.abba@xcg-consulting.fr>
Date: Mon, 15 Jan 2024 18:57:59 +0100
Subject: [PATCH] [MIG] contract_price_revision: Migration to 16.0

Fix views in the process; variation % was not showing inside line list
embedded into contract forms.
---
 contract_price_revision/__manifest__.py       |  5 +--
 .../models/contract_line.py                   | 11 +++----
 .../readme/CONTRIBUTORS.rst                   |  4 +++
 .../views/contract_contract.xml               | 16 ++++++++++
 .../views/contract_line.xml                   | 31 ++++++++-----------
 .../odoo/addons/contract_price_revision       |  1 +
 setup/contract_price_revision/setup.py        |  6 ++++
 7 files changed, 48 insertions(+), 26 deletions(-)
 create mode 100644 contract_price_revision/views/contract_contract.xml
 create mode 120000 setup/contract_price_revision/odoo/addons/contract_price_revision
 create mode 100644 setup/contract_price_revision/setup.py

diff --git a/contract_price_revision/__manifest__.py b/contract_price_revision/__manifest__.py
index 85e3ce33e91..bcbd1efb775 100644
--- a/contract_price_revision/__manifest__.py
+++ b/contract_price_revision/__manifest__.py
@@ -6,14 +6,15 @@
 {
     "name": "Contract Price Revision",
     "summary": "Easy revision of contract prices",
-    "version": "15.0.1.0.0",
-    "category": "Contract",
+    "version": "16.0.1.0.0",
+    "category": "Contract Management",
     "author": "ACSONE SA/NV, Tecnativa, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "website": "https://github.com/OCA/contract",
     "depends": ["contract"],
     "data": [
         "security/ir.model.access.csv",
+        "views/contract_contract.xml",
         "views/contract_line.xml",
         "wizards/contract_price_revision_views.xml",
     ],
diff --git a/contract_price_revision/models/contract_line.py b/contract_price_revision/models/contract_line.py
index 54d566c583d..2a46853b9bf 100644
--- a/contract_price_revision/models/contract_line.py
+++ b/contract_price_revision/models/contract_line.py
@@ -8,7 +8,7 @@
 class ContractLine(models.Model):
     _inherit = "contract.line"
 
-    previous_price = fields.Float(
+    previous_price = fields.Monetary(
         string="Previous price",
         related="predecessor_contract_line_id.price_unit",
         readonly=True,
@@ -55,12 +55,11 @@ def _compute_variation_percent(self):
     def _prepare_value_for_plan_successor_price(
         self, date_start, date_end, is_auto_renew, price, recurring_next_date=False
     ):
-        """
-        Override contract function to prepare values for new contract line
+        """Wrap contract function to prepare values for new contract line
         adding the new price as parameter
         """
-        res = super()._prepare_value_for_plan_successor(
+        values = self._prepare_value_for_plan_successor(
             date_start, date_end, is_auto_renew, recurring_next_date=recurring_next_date
         )
-        res.update({"price_unit": price})
-        return res
+        values["price_unit"] = price
+        return values
diff --git a/contract_price_revision/readme/CONTRIBUTORS.rst b/contract_price_revision/readme/CONTRIBUTORS.rst
index 8308dec890c..4d04c28cfa6 100644
--- a/contract_price_revision/readme/CONTRIBUTORS.rst
+++ b/contract_price_revision/readme/CONTRIBUTORS.rst
@@ -3,3 +3,7 @@
   * Vicent Cubells
   * Carlos Dauden
   * Carolina Fernandez
+
+* `XCG Consulting <https://xcg-consulting.fr>`_:
+
+  * Houzéfa Abbasbhay
diff --git a/contract_price_revision/views/contract_contract.xml b/contract_price_revision/views/contract_contract.xml
new file mode 100644
index 00000000000..5c11d247c0c
--- /dev/null
+++ b/contract_price_revision/views/contract_contract.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!-- Add into contract line list view embedded into contract forms. -->
+    <record id="contract_contract_form_view" model="ir.ui.view">
+        <field name="model">contract.contract</field>
+        <field name="inherit_id" ref="contract.contract_contract_form_view" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//field[@name='contract_line_ids']/tree/field[@name='last_date_invoiced']"
+                position="after"
+            >
+                <field name="variation_percent" groups="base.group_no_one" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/contract_price_revision/views/contract_line.xml b/contract_price_revision/views/contract_line.xml
index 05a816c2257..54ecd29bd7c 100644
--- a/contract_price_revision/views/contract_line.xml
+++ b/contract_price_revision/views/contract_line.xml
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <record id="contract_line_tree_view" model="ir.ui.view">
-        <field name="model">contract.line</field>
-        <field name="inherit_id" ref="contract.contract_line_tree_view" />
-        <field name="arch" type="xml">
-            <field name="last_date_invoiced" position="after">
-                <field name="never_revise_price" />
-                <field name="variation_percent" groups="base.group_no_one" />
-            </field>
-        </field>
-    </record>
+    <!-- Add our fields within contract line views.
+        Note: We do not add them within their parent contract.abstract.contract.line views as
+        price revision only works on contracts with recurrence at line level. -->
     <record id="contract_line_form_view" model="ir.ui.view">
         <field name="model">contract.line</field>
         <field name="inherit_id" ref="contract.contract_line_form_view" />
         <field name="arch" type="xml">
-            <field name="discount" position="after">
-                <field name="never_revise_price" />
-                <field
-                    name="variation_percent"
-                    groups="base.group_no_one"
-                    attrs="{'invisible': [('predecessor_contract_line_id', '=', False)]}"
-                />
-            </field>
+            <label for="name" position="before">
+                <group>
+                    <field name="never_revise_price" />
+                    <field
+                        name="variation_percent"
+                        groups="base.group_no_one"
+                        attrs="{'invisible': [('predecessor_contract_line_id', '=', False)]}"
+                    />
+                </group>
+            </label>
         </field>
     </record>
 </odoo>
diff --git a/setup/contract_price_revision/odoo/addons/contract_price_revision b/setup/contract_price_revision/odoo/addons/contract_price_revision
new file mode 120000
index 00000000000..a8fc75502ac
--- /dev/null
+++ b/setup/contract_price_revision/odoo/addons/contract_price_revision
@@ -0,0 +1 @@
+../../../../contract_price_revision
\ No newline at end of file
diff --git a/setup/contract_price_revision/setup.py b/setup/contract_price_revision/setup.py
new file mode 100644
index 00000000000..28c57bb6403
--- /dev/null
+++ b/setup/contract_price_revision/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)