From 37405ef8d788770b6168cbfd69c6997821e1a9a2 Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Thu, 6 Oct 2022 22:41:20 +0200
Subject: [PATCH] [FIX] stock_picking_report_valued: Fix display columns when
 display lots in delivery slip

---
 .../report/stock_picking_report_valued.xml     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/stock_picking_report_valued/report/stock_picking_report_valued.xml b/stock_picking_report_valued/report/stock_picking_report_valued.xml
index b74a331..b6d2270 100644
--- a/stock_picking_report_valued/report/stock_picking_report_valued.xml
+++ b/stock_picking_report_valued/report/stock_picking_report_valued.xml
@@ -18,6 +18,13 @@
                 <th class="text-right"><strong>Taxes</strong></th>
             </t>
         </xpath>
+        <xpath expr="//th[@name='th_sml_qty_ordered']" position="attributes">
+            <attribute
+                name="t-if"
+                add="and not (o.valued or o.sale_id or o.move_line_ids)"
+                separator=" "
+            />
+        </xpath>
         <xpath
             expr="//t[@t-foreach='packages']//t[@t-if='has_serial_number']"
             position="attributes"
@@ -83,7 +90,7 @@
         id="valued_report_picking_has_serial_move_line"
         inherit_id="stock.stock_report_delivery_has_serial_move_line"
     >
-        <xpath expr="//span[@t-field='move_line.qty_done']/.." position="after">
+        <xpath expr="//td[@name='move_line_lot_qty_done']" position="after">
             <t t-if="o.valued and o.sale_id and o.move_line_ids">
                 <t t-if="move_line.picking_id.state != 'done'">
                     <td class="text-right">
@@ -91,7 +98,7 @@
                         <span t-field="move_line.product_uom_id" /></td>
                 </t>
                 <t t-elif="move_line.picking_id.state == 'done'">
-                    <td class="text-right">
+                    <td class="text-center">
                         <span t-field="move_line.qty_done" />
                         <span t-field="move_line.product_uom_id" /></td>
                 </t>
@@ -107,6 +114,13 @@
                     /></td>
             </t>
         </xpath>
+        <xpath expr="//td[@name='move_line_lot_qty_done']" position="attributes">
+            <attribute
+                name="t-if"
+                add="not (o.valued or o.sale_id or o.move_line_ids)"
+                separator=" "
+            />
+        </xpath>
     </template>
 
 </odoo>