From 8e5a6db78784ea61f0b3c1202128e7f88c7e5eef Mon Sep 17 00:00:00 2001
From: miguels73 <55379877+miguels73@users.noreply.github.com>
Date: Wed, 25 Jan 2023 16:43:07 +0100
Subject: [PATCH] [MIG] stock_picking_report_valued: Migration to 16.0

---
 stock_picking_report_valued/__manifest__.py   |  2 +-
 .../models/stock_move_line.py                 |  2 +-
 .../readme/CONTRIBUTORS.rst                   |  4 +++
 .../report/stock_picking_report_valued.xml    | 32 +++++++++----------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/stock_picking_report_valued/__manifest__.py b/stock_picking_report_valued/__manifest__.py
index ee54968..0b18232 100644
--- a/stock_picking_report_valued/__manifest__.py
+++ b/stock_picking_report_valued/__manifest__.py
@@ -8,7 +8,7 @@
 {
     "name": "Valued Picking Report",
     "summary": "Adding Valued Picking on Delivery Slip report",
-    "version": "15.0.1.5.0",
+    "version": "16.0.1.0.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-reporting",
     "category": "Warehouse Management",
diff --git a/stock_picking_report_valued/models/stock_move_line.py b/stock_picking_report_valued/models/stock_move_line.py
index 49ed075..0540c0f 100644
--- a/stock_picking_report_valued/models/stock_move_line.py
+++ b/stock_picking_report_valued/models/stock_move_line.py
@@ -45,7 +45,7 @@ class StockMoveLine(models.Model):
     )
 
     def _get_report_valued_quantity(self):
-        return self.qty_done or self.product_qty
+        return self.qty_done or self.reserved_qty
 
     def _compute_sale_order_line_fields(self):
         """This is computed with sudo for avoiding problems if you don't have
diff --git a/stock_picking_report_valued/readme/CONTRIBUTORS.rst b/stock_picking_report_valued/readme/CONTRIBUTORS.rst
index 72bec11..089b069 100644
--- a/stock_picking_report_valued/readme/CONTRIBUTORS.rst
+++ b/stock_picking_report_valued/readme/CONTRIBUTORS.rst
@@ -19,3 +19,7 @@
 * `Landoo <https://www.landoo.es>`_:
 
   * Aritz Olea <ao@landoo.es>
+
+* `Studio73 <https://www.studio73.es>`_:
+
+  * Miguel Gandia <miguel@studio73.es>
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 711b3c2..7fa49a9 100644
--- a/stock_picking_report_valued/report/stock_picking_report_valued.xml
+++ b/stock_picking_report_valued/report/stock_picking_report_valued.xml
@@ -11,14 +11,14 @@
         >
             <t t-if="o.valued and o.sale_id and o.move_line_ids and is_outgoing">
                 <t t-if="o.state != 'done'">
-                    <th class="text-right"><strong>Qty Reserved</strong></th>
+                    <th class="text-end"><strong>Qty Reserved</strong></th>
                 </t>
-                <th class="text-right"><strong>Unit Price</strong></th>
-                <th class="text-right" groups="product.group_discount_per_so_line">
+                <th class="text-end"><strong>Unit Price</strong></th>
+                <th class="text-end" groups="product.group_discount_per_so_line">
                     <strong>Discount</strong>
                 </th>
-                <th class="text-right"><strong>Subtotal</strong></th>
-                <th class="text-right"><strong>Taxes</strong></th>
+                <th class="text-end"><strong>Subtotal</strong></th>
+                <th class="text-end"><strong>Taxes</strong></th>
             </t>
         </xpath>
         <xpath expr="//th[@name='th_sml_qty_ordered']" position="attributes">
@@ -66,20 +66,20 @@
                 <table class="table table-sm mt32">
                     <thead>
                         <tr>
-                            <th class="text-right"><strong>Untaxed Amount</strong></th>
-                            <th class="text-right"><strong>Taxes</strong></th>
-                            <th class="text-right"><strong>Total</strong></th>
+                            <th class="text-end"><strong>Untaxed Amount</strong></th>
+                            <th class="text-end"><strong>Taxes</strong></th>
+                            <th class="text-end"><strong>Total</strong></th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr>
-                            <td class="text-right">
+                            <td class="text-end">
                                 <span t-field="o.amount_untaxed" />
                             </td>
-                            <td class="text-right">
+                            <td class="text-end">
                                 <span t-field="o.amount_tax" />
                             </td>
-                            <td class="text-right">
+                            <td class="text-end">
                                 <span t-field="o.amount_total" />
                             </td>
                         </tr>
@@ -95,7 +95,7 @@
     >
         <xpath expr="//td[@name='move_line_lot_qty_done']" position="after">
             <t t-if="move_line.picking_id.state != 'done'">
-                    <td class="text-right">
+                    <td class="text-end">
                         <span t-field="move_line.product_uom_qty" />
                         <span t-field="move_line.product_uom_id" /></td>
                 </t>
@@ -105,14 +105,14 @@
                         <span t-field="move_line.product_uom_id" /></td>
                 </t>
             <t t-if="o.valued and o.sale_id and o.move_line_ids and is_outgoing">
-                <td class="text-right"><span t-field="move_line.sale_price_unit" /></td>
-                <td class="text-right" groups="product.group_discount_per_so_line">
+                <td class="text-end"><span t-field="move_line.sale_price_unit" /></td>
+                <td class="text-end" groups="product.group_discount_per_so_line">
                     <span t-field="move_line.sale_discount" />
                 </td>
-                <td class="text-right"><span
+                <td class="text-end"><span
                         t-field="move_line.sale_price_subtotal"
                     /></td>
-                <td class="text-right"><span
+                <td class="text-end"><span
                         t-field="move_line.sale_tax_description"
                     /></td>
             </t>