From 676fb568e47df9e8d4539b0e09721b93bba26467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= <ivan.todorovich@gmail.com>
Date: Wed, 15 Feb 2023 12:25:32 -0300
Subject: [PATCH] [MIG] delivery_line_sale_line_position: Migration to 16.0

---
 .../__manifest__.py                           |  2 +-
 .../readme/DESCRIPTION.rst                    |  2 +-
 .../report/report_deliveryslip.xml            | 27 ++++++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/delivery_line_sale_line_position/__manifest__.py b/delivery_line_sale_line_position/__manifest__.py
index cb27e60..ab0755a 100644
--- a/delivery_line_sale_line_position/__manifest__.py
+++ b/delivery_line_sale_line_position/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Delivery Line Sale Line Position",
     "summary": "Adds the sale line position to the delivery report lines",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Delivery",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "license": "AGPL-3",
diff --git a/delivery_line_sale_line_position/readme/DESCRIPTION.rst b/delivery_line_sale_line_position/readme/DESCRIPTION.rst
index 7ad226d..baf0107 100644
--- a/delivery_line_sale_line_position/readme/DESCRIPTION.rst
+++ b/delivery_line_sale_line_position/readme/DESCRIPTION.rst
@@ -1,6 +1,6 @@
 This module is build on top of the module `sale_order_line_position`.
 
-On the delivery report it adds a column with the `Postion` from the related
+On the delivery report it adds a column with the `Position` from the related
 sale order line.
 
 The `Position` can also made visible int the stock picking view.
diff --git a/delivery_line_sale_line_position/report/report_deliveryslip.xml b/delivery_line_sale_line_position/report/report_deliveryslip.xml
index 1627fc3..0263859 100644
--- a/delivery_line_sale_line_position/report/report_deliveryslip.xml
+++ b/delivery_line_sale_line_position/report/report_deliveryslip.xml
@@ -8,14 +8,11 @@
                 t-value="any(o.move_lines.filtered(lambda x: x.position_sale_line and x.product_uom_qty))"
             />
         </xpath>
-        <xpath expr="//th[@name='th_sm_product']" position="before">
+        <xpath expr="//table[@name='stock_move_table']/thead//th[1]" position="before">
             <th t-if="has_line_position" name="th_sm_pos"><strong>Pos</strong></th>
         </xpath>
-        <!-- The star in the selector may seem not very specific, but it is done -->
-        <!-- in purpose so it works with some other module that change this report. -->
-        <!-- Looking at you stock_picking_group_by_partner_by_carrier -->
-        <xpath expr="//table[@name='stock_move_table']/tbody/tr/*[1]" position="before">
-            <td t-if="has_line_position">
+        <xpath expr="//table[@name='stock_move_table']/tbody//td[1]" position="before">
+            <td t-if="has_line_position" name="td_sm_pos">
                 <span t-field="move.position_sale_line" />
             </td>
         </xpath>
@@ -26,18 +23,28 @@
                 t-value="any(o.move_line_ids.mapped('position_sale_line'))"
             />
         </xpath>
-        <xpath expr="//th[@name='th_sml_product']" position="before">
-            <th t-if="has_line_position" name="th_sml_pos"><strong>Pos</strong></th>
+        <xpath
+            expr="//table[@name='stock_move_line_table']/thead//th[1]"
+            position="before"
+        >
+            <th t-if="has_line_position and has_serial_number" name="th_sml_pos"><strong
+                >Pos</strong></th>
         </xpath>
+        <!--
+            NOTE: The rows are rendered by other templates.
+            `stock_report_delivery_has_serial_move_line` if the lines have lots/serials
+            `stock_report_delivery_aggregated_move_lines` if they don't. In this case the lines are
+            aggregated, and so we don't display the position.
+        -->
     </template>
 
     <template
         id="stock_report_delivery_has_serial_move_line"
         inherit_id="stock.stock_report_delivery_has_serial_move_line"
     >
-        <xpath expr="//span[@t-field='move_line.product_id']/.." position="before">
+        <xpath expr="//td[1]" position="before">
             <td t-if="has_line_position">
-                <span t-field="move_line.move_id.position_sale_line" />
+                <span t-field="move_line.position_sale_line" />
             </td>
         </xpath>
     </template>