From ad633c12d64bb71866ff6b66e054ea6783252fe4 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Thu, 7 Sep 2023 12:59:15 +0100
Subject: [PATCH] [IMP] stock_move_packaging_qty: display in PDF reports

Directly display qty on delivery slip.

In the case of picking operations report, compute the qty based on the
one found in the `stock.move.line` and the `product.packaging` ratio.

@moduon MT-3774
---
 stock_move_packaging_qty/__manifest__.py      |  6 ++-
 .../readme/DESCRIPTION.rst                    |  2 +-
 .../views/report_stock_picking.xml            | 44 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 stock_move_packaging_qty/views/report_stock_picking.xml

diff --git a/stock_move_packaging_qty/__manifest__.py b/stock_move_packaging_qty/__manifest__.py
index 428165b3d..d69e290f2 100644
--- a/stock_move_packaging_qty/__manifest__.py
+++ b/stock_move_packaging_qty/__manifest__.py
@@ -8,7 +8,11 @@
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "category": "Warehouse",
     "depends": ["stock"],
-    "data": ["views/stock_picking_form_view.xml", "views/stock_move_tree_view.xml"],
+    "data": [
+        "views/report_stock_picking.xml",
+        "views/stock_move_tree_view.xml",
+        "views/stock_picking_form_view.xml",
+    ],
     "license": "LGPL-3",
     "installable": True,
     "maintainers": ["yajo"],
diff --git a/stock_move_packaging_qty/readme/DESCRIPTION.rst b/stock_move_packaging_qty/readme/DESCRIPTION.rst
index 6de170dfd..0b1041118 100644
--- a/stock_move_packaging_qty/readme/DESCRIPTION.rst
+++ b/stock_move_packaging_qty/readme/DESCRIPTION.rst
@@ -1 +1 @@
-Add packaging fields in the stock moves
+Add packaging fields in the stock moves and their reports.
diff --git a/stock_move_packaging_qty/views/report_stock_picking.xml b/stock_move_packaging_qty/views/report_stock_picking.xml
new file mode 100644
index 000000000..f9183a7e2
--- /dev/null
+++ b/stock_move_packaging_qty/views/report_stock_picking.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2023 Moduon Team S.L.
+     License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0) -->
+<data>
+    <template id="report_picking" inherit_id="stock.report_picking">
+        <xpath expr="//span[@t-field='ml.product_uom_id']" position="after">
+            <div
+                t-if="ml.move_id.product_packaging_id"
+                class="text-secondary"
+                groups="product.group_stock_packaging"
+            >
+                <t
+                    t-set="ml_packaging_qty"
+                    t-value="(ml.qty_done if o.state == 'done' else ml.reserved_uom_qty) / ml.move_id.product_packaging_id.qty"
+                />
+                <span t-field="ml.move_id.product_packaging_id" />:
+                <span t-out="ml_packaging_qty" />
+            </div>
+        </xpath>
+    </template>
+
+    <template id="report_delivery_document" inherit_id="stock.report_delivery_document">
+        <!-- DOCS https://github.com/orgs/OCA/discussions/111 -->
+        <xpath
+            expr="//table[@name='stock_move_table']/tbody//td[
+                1 + count(
+                    //table[@name='stock_move_table']
+                    //th[@name='th_sm_ordered']
+                    /preceding-sibling::*
+                )
+            ]"
+            position="inside"
+        >
+            <div
+                t-if="move.product_packaging_id"
+                class="text-secondary"
+                groups="product.group_stock_packaging"
+            >
+                <span t-field="move.product_packaging_id" />:
+                <span t-field="move.product_packaging_qty" />
+            </div>
+        </xpath>
+    </template>
+</data>