From 453619bfb4a5ad0136866288d5d1b9d9a9b4eea5 Mon Sep 17 00:00:00 2001
From: Lukas Tran <nhant@trobz.com>
Date: Fri, 29 Nov 2024 10:22:24 +0700
Subject: [PATCH] [MIG] sale_discount_display_amount: Migration to 18.0

---
 checklog-odoo.cfg                             |  3 ++
 sale_discount_display_amount/__manifest__.py  |  2 +-
 .../post-compute-subtotal-columns.py          | 36 -------------
 .../17.0.1.1.0/pre-add-subtotal-columns.py    | 17 ------
 .../report/sale_report_template.xml           |  2 +-
 .../views/sale_view.xml                       | 53 +++++++++----------
 6 files changed, 30 insertions(+), 83 deletions(-)
 create mode 100644 checklog-odoo.cfg
 delete mode 100644 sale_discount_display_amount/migrations/17.0.1.1.0/post-compute-subtotal-columns.py
 delete mode 100644 sale_discount_display_amount/migrations/17.0.1.1.0/pre-add-subtotal-columns.py

diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg
new file mode 100644
index 00000000000..78d596ac9b2
--- /dev/null
+++ b/checklog-odoo.cfg
@@ -0,0 +1,3 @@
+[checklog-odoo]
+ignore=
+    WARNING.* 0 failed, 0 error\(s\).*
\ No newline at end of file
diff --git a/sale_discount_display_amount/__manifest__.py b/sale_discount_display_amount/__manifest__.py
index e8312e8e103..1f6a97b3bf2 100644
--- a/sale_discount_display_amount/__manifest__.py
+++ b/sale_discount_display_amount/__manifest__.py
@@ -6,7 +6,7 @@
     "summary": """
         This addon intends to display the amount of the discount computed on
         sale_order_line and sale_order level""",
-    "version": "17.0.1.1.0",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sale-workflow",
diff --git a/sale_discount_display_amount/migrations/17.0.1.1.0/post-compute-subtotal-columns.py b/sale_discount_display_amount/migrations/17.0.1.1.0/post-compute-subtotal-columns.py
deleted file mode 100644
index 2628a22673c..00000000000
--- a/sale_discount_display_amount/migrations/17.0.1.1.0/post-compute-subtotal-columns.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import logging
-
-from odoo import SUPERUSER_ID
-from odoo.api import Environment
-
-_logger = logging.getLogger(__name__)
-
-
-def migrate(cr, version):
-    _logger.info("Compute discount columns")
-    env = Environment(cr, SUPERUSER_ID, {})
-
-    query = """
-    update sale_order_line
-    set
-        price_subtotal_no_discount = price_subtotal
-    where discount = 0.0
-    """
-    cr.execute(query)
-
-    query = """
-    update sale_order
-    set
-        price_subtotal_no_discount = amount_untaxed
-    """
-    cr.execute(query)
-
-    query = """
-    select distinct order_id from sale_order_line where discount > 0.0;
-    """
-
-    cr.execute(query)
-    order_ids = cr.fetchall()
-
-    orders = env["sale.order"].search([("id", "in", order_ids)])
-    orders.mapped("order_line")._update_discount_display_fields()
diff --git a/sale_discount_display_amount/migrations/17.0.1.1.0/pre-add-subtotal-columns.py b/sale_discount_display_amount/migrations/17.0.1.1.0/pre-add-subtotal-columns.py
deleted file mode 100644
index 053ce595e71..00000000000
--- a/sale_discount_display_amount/migrations/17.0.1.1.0/pre-add-subtotal-columns.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import logging
-
-from odoo.tools.sql import column_exists, create_column
-
-_logger = logging.getLogger(__name__)
-
-COLUMNS = (
-    ("sale_order", "price_subtotal_no_discount"),
-    ("sale_order_line", "price_subtotal_no_discount"),
-)
-
-
-def migrate(cr, version):
-    for table, column in COLUMNS:
-        if not column_exists(cr, table, column):
-            _logger.info("Create discount column %s in database", column)
-            create_column(cr, table, column, "numeric")
diff --git a/sale_discount_display_amount/report/sale_report_template.xml b/sale_discount_display_amount/report/sale_report_template.xml
index d2cc7689a67..bc16aeb2eb9 100644
--- a/sale_discount_display_amount/report/sale_report_template.xml
+++ b/sale_discount_display_amount/report/sale_report_template.xml
@@ -5,7 +5,7 @@
         inherit_id="sale.report_saleorder_document"
     >
         <xpath expr="//div[@id='total']//table" position="inside">
-            <t groups="product.group_discount_per_so_line" t-if="doc.discount_total">
+            <t groups="sale.group_discount_per_so_line" t-if="doc.discount_total">
                 <t
                     t-set="is_discount"
                     t-value="doc.company_id.report_total_without_discount and doc.price_total_no_discount != doc.amount_total"
diff --git a/sale_discount_display_amount/views/sale_view.xml b/sale_discount_display_amount/views/sale_view.xml
index 9e5f28edb23..7b8598257b2 100644
--- a/sale_discount_display_amount/views/sale_view.xml
+++ b/sale_discount_display_amount/views/sale_view.xml
@@ -5,7 +5,7 @@
         <field name="model">sale.order</field>
         <field name="arch" type="xml">
             <xpath
-                expr="//field[@name='order_line']//tree//field[@name='discount']"
+                expr="//field[@name='order_line']//list//field[@name='discount']"
                 position="after"
             >
                 <field name="price_subtotal_no_discount" optional="hide" />
@@ -14,37 +14,34 @@
         </field>
     </record>
     <record id="sale_order_view_form_display_discount" model="ir.ui.view">
-        <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="model">sale.order</field>
         <field name="priority">99</field>
         <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='tax_totals']" position="after">
-                    <field
-                        name="display_discount_with_tax"
-                        invisible="1"
-                        position="attributes"
-                    />
-                    <field
-                        name="price_subtotal_no_discount"
-                        invisible="display_discount_with_tax == True"
-                        position="attributes"
-                    />
-                    <field
-                        name="discount_subtotal"
-                        invisible="display_discount_with_tax == True"
-                        position="attributes"
-                    />
-                    <field
-                        name="price_total_no_discount"
-                        invisible="display_discount_with_tax == False"
-                        position="attributes"
-                    />
-                    <field
-                        name="discount_total"
-                        invisible="display_discount_with_tax == False"
-                        position="attributes"
-                    />
+                <xpath expr="//group[@name='sale_total']" position="after">
+                    <group
+                        class="oe_subtotal_footer d-flex order-0 order-lg-1 flex-column gap-0 gap-sm-3"
+                        colspan="2"
+                        name="sale_discount_total"
+                    >
+                        <div class="d-flex" invisible="display_discount_with_tax">
+                            <label for="price_subtotal_no_discount" />
+                            <field name="price_subtotal_no_discount" nolabel="1" />
+                        </div>
+                        <div class="d-flex" invisible="display_discount_with_tax">
+                            <label for="discount_subtotal" />
+                            <field name="discount_subtotal" nolabel="1" />
+                        </div>
+                        <div class="d-flex" invisible="not display_discount_with_tax">
+                            <label for="price_total_no_discount" />
+                            <field name="price_total_no_discount" nolabel="1" />
+                        </div>
+                        <div class="d-flex" invisible="not display_discount_with_tax">
+                            <label for="discount_total" />
+                            <field name="discount_total" nolabel="1" />
+                        </div>
+                    </group>
                 </xpath>
             </data>
         </field>