From 980f35e5768bae377ec27be3bd87e56ca8fdc980 Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Fri, 5 Aug 2022 07:01:17 -0400
Subject: [PATCH] [MIG] stock_picking_report_custom_description: Migration to
 14.0

---
 .../README.rst                                | 17 ++++----
 .../__manifest__.py                           |  4 +-
 .../readme/CONTRIBUTORS.rst                   |  7 +++-
 .../static/description/index.html             | 16 ++++---
 .../views/report_deliveryslip.xml             | 38 +++++++++++++++--
 .../views/stock_report.xml                    | 42 ++++++++++++-------
 6 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/stock_picking_report_custom_description/README.rst b/stock_picking_report_custom_description/README.rst
index cc114fe..2ea2605 100644
--- a/stock_picking_report_custom_description/README.rst
+++ b/stock_picking_report_custom_description/README.rst
@@ -14,13 +14,13 @@ Stock Picking Report Custom Description
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_picking_report_custom_description
+    :target: https://github.com/OCA/stock-logistics-reporting/tree/14.0/stock_picking_report_custom_description
     :alt: OCA/stock-logistics-reporting
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-12-0/stock-logistics-reporting-12-0-stock_picking_report_custom_description
+    :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-14-0/stock-logistics-reporting-14-0-stock_picking_report_custom_description
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/151/12.0
+    :target: https://runbot.odoo-community.org/runbot/151/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -47,7 +47,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-reporting/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-reporting/issues/new?body=module:%20stock_picking_report_custom_description%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-reporting/issues/new?body=module:%20stock_picking_report_custom_description%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -62,8 +62,11 @@ Authors
 Contributors
 ~~~~~~~~~~~~
 
-* Carlos Dauden <carlos.dauden@tecnativa.com>
-* Sergio Teruel <sergio.teruel@tecnativa.com>
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Carlos Dauden
+  * Sergio Teruel
+  * Ernesto Tejeda
 
 Maintainers
 ~~~~~~~~~~~
@@ -86,6 +89,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-carlosdauden| 
 
-This module is part of the `OCA/stock-logistics-reporting <https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_picking_report_custom_description>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-reporting <https://github.com/OCA/stock-logistics-reporting/tree/14.0/stock_picking_report_custom_description>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_picking_report_custom_description/__manifest__.py b/stock_picking_report_custom_description/__manifest__.py
index 0391e64..121fbe4 100644
--- a/stock_picking_report_custom_description/__manifest__.py
+++ b/stock_picking_report_custom_description/__manifest__.py
@@ -6,10 +6,10 @@
 {
     "name": "Stock Picking Report Custom Description",
     "summary": "Show moves description in picking reports",
-    "version": "12.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Warehouse",
     "website": "https://github.com/OCA/stock-logistics-reporting",
-    "author": "Tecnativa, " "Odoo Community Association (OCA)",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
     "development_status": "Production/Stable",
     "maintainers": ["carlosdauden"],
     "license": "AGPL-3",
diff --git a/stock_picking_report_custom_description/readme/CONTRIBUTORS.rst b/stock_picking_report_custom_description/readme/CONTRIBUTORS.rst
index b919cb7..0bcd809 100644
--- a/stock_picking_report_custom_description/readme/CONTRIBUTORS.rst
+++ b/stock_picking_report_custom_description/readme/CONTRIBUTORS.rst
@@ -1,2 +1,5 @@
-* Carlos Dauden <carlos.dauden@tecnativa.com>
-* Sergio Teruel <sergio.teruel@tecnativa.com>
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Carlos Dauden
+  * Sergio Teruel
+  * Ernesto Tejeda
diff --git a/stock_picking_report_custom_description/static/description/index.html b/stock_picking_report_custom_description/static/description/index.html
index c4be9ea..e7d7694 100644
--- a/stock_picking_report_custom_description/static/description/index.html
+++ b/stock_picking_report_custom_description/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Stock Picking Report Custom Description</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_picking_report_custom_description"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-12-0/stock-logistics-reporting-12-0-stock_picking_report_custom_description"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/151/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/14.0/stock_picking_report_custom_description"><img alt="OCA/stock-logistics-reporting" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-reporting-14-0/stock-logistics-reporting-14-0-stock_picking_report_custom_description"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/151/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to print moves description in picking reports.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -396,7 +396,7 @@ instead product name.</li>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/issues/new?body=module:%20stock_picking_report_custom_description%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/issues/new?body=module:%20stock_picking_report_custom_description%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -410,8 +410,12 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
-<li>Carlos Dauden &lt;<a class="reference external" href="mailto:carlos.dauden&#64;tecnativa.com">carlos.dauden&#64;tecnativa.com</a>&gt;</li>
-<li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Carlos Dauden</li>
+<li>Sergio Teruel</li>
+<li>Ernesto Tejeda</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -423,7 +427,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/carlosdauden"><img alt="carlosdauden" src="https://github.com/carlosdauden.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_picking_report_custom_description">OCA/stock-logistics-reporting</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-reporting/tree/14.0/stock_picking_report_custom_description">OCA/stock-logistics-reporting</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/stock_picking_report_custom_description/views/report_deliveryslip.xml b/stock_picking_report_custom_description/views/report_deliveryslip.xml
index 138951a..4931ab4 100644
--- a/stock_picking_report_custom_description/views/report_deliveryslip.xml
+++ b/stock_picking_report_custom_description/views/report_deliveryslip.xml
@@ -7,15 +7,47 @@
         priority="99"
         primary="True"
     >
-        <xpath expr="//tr/td/span[@t-field='move.product_id']" position="attributes">
+        <xpath
+            expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']"
+            position="attributes"
+        >
             <attribute name="t-field">move.name</attribute>
         </xpath>
         <xpath
-            expr="//tr/td/span[@t-field='move_line.product_id']"
+            expr="//t[@t-foreach='packages']//t[@t-call='stock.stock_report_delivery_has_serial_move_line']"
             position="attributes"
         >
-            <attribute name="t-field">move_line.move_id.name</attribute>
+            <attribute
+                name="t-call"
+            >stock_picking_report_custom_description.stock_report_delivery_has_serial_move_line_description</attribute>
         </xpath>
+        <xpath
+            expr="//tr[@t-foreach='move_lines']//t[@t-call='stock.stock_report_delivery_has_serial_move_line']"
+            position="attributes"
+        >
+            <attribute
+                name="t-call"
+            >stock_picking_report_custom_description.stock_report_delivery_has_serial_move_line_description</attribute>
+        </xpath>
+        <xpath
+            expr="//t[@name='aggregated_move_lines']/..//t[@t-call='stock.stock_report_delivery_has_serial_move_line']"
+            position="attributes"
+        >
+            <attribute
+                name="t-call"
+            >stock_picking_report_custom_description.stock_report_delivery_has_serial_move_line_description</attribute>
+        </xpath>
+    </template>
+
+    <template
+        id="stock_report_delivery_has_serial_move_line_description"
+        inherit_id="stock.stock_report_delivery_has_serial_move_line"
+        priority="99"
+        primary="True"
+    >
+        <span t-field="move_line.product_id" position="attributes">
+            <attribute name="t-field">move_line.move_id.name</attribute>
+        </span>
     </template>
 
     <template id="report_deliveryslip_description">
diff --git a/stock_picking_report_custom_description/views/stock_report.xml b/stock_picking_report_custom_description/views/stock_report.xml
index 9109c5d..1465285 100644
--- a/stock_picking_report_custom_description/views/stock_report.xml
+++ b/stock_picking_report_custom_description/views/stock_report.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <report
-        string="Picking Operations (Description)"
-        id="action_report_picking_description"
-        model="stock.picking"
-        report_type="qweb-pdf"
-        name="stock_picking_report_custom_description.report_picking_description"
-        file="stock_picking_report_custom_description.report_picking_operations_description"
-    />
-    <report
-        string="Delivery Slip (Description)"
-        id="action_report_delivery_description"
-        model="stock.picking"
-        report_type="qweb-pdf"
-        name="stock_picking_report_custom_description.report_deliveryslip_description"
-        file="stock_picking_report_custom_description.report_deliveryslip_description"
-    />
+    <record id="action_report_picking_description" model="ir.actions.report">
+        <field name="name">Picking Operations (Description)</field>
+        <field name="model">stock.picking</field>
+        <field name="report_type">qweb-pdf</field>
+        <field
+            name="report_name"
+        >stock_picking_report_custom_description.report_picking_description</field>
+        <field
+            name="report_file"
+        >stock_picking_report_custom_description.report_picking_operations_description</field>
+        <field name="binding_model_id" ref="stock.model_stock_picking" />
+        <field name="binding_type">report</field>
+    </record>
+    <record id="action_report_delivery_description" model="ir.actions.report">
+        <field name="name">Delivery Slip (Description)</field>
+        <field name="model">stock.picking</field>
+        <field name="report_type">qweb-pdf</field>
+        <field
+            name="report_name"
+        >stock_picking_report_custom_description.report_deliveryslip_description</field>
+        <field
+            name="report_file"
+        >stock_picking_report_custom_description.report_deliveryslip_description</field>
+        <field name="binding_model_id" ref="stock.model_stock_picking" />
+        <field name="binding_type">report</field>
+    </record>
 </odoo>