From 3787657e4c5efd6a1909662074bbeafd136c388a Mon Sep 17 00:00:00 2001
From: Alfredo <alfredodelafuente@avanzosc.es>
Date: Wed, 15 Jan 2025 08:16:01 +0100
Subject: [PATCH] [16.0][IMP] stock_picking_batch_package: Modified "Picking
 Batch By Package" report.

---
 stock_picking_batch_package/i18n/en_US.po     | 37 +++++++++------
 stock_picking_batch_package/i18n/es.po        | 45 ++++++++++++-------
 .../i18n/stock_picking_batch_package.pot      | 37 +++++++++------
 .../stock_picking_batch_by_package_report.xml | 16 ++++++-
 4 files changed, 92 insertions(+), 43 deletions(-)

diff --git a/stock_picking_batch_package/i18n/en_US.po b/stock_picking_batch_package/i18n/en_US.po
index f269827bc0..33cdc8f36c 100644
--- a/stock_picking_batch_package/i18n/en_US.po
+++ b/stock_picking_batch_package/i18n/en_US.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-16 10:22+0000\n"
-"PO-Revision-Date: 2024-12-16 10:22+0000\n"
+"POT-Creation-Date: 2025-01-14 12:49+0000\n"
+"PO-Revision-Date: 2025-01-14 12:49+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -75,6 +75,13 @@ msgstr ""
 msgid "<strong>Date:</strong>"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid ""
+"<strong>Date:</strong>\n"
+"                        <br/>"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
 msgid "<strong>Gross weight:</strong>"
@@ -135,6 +142,11 @@ msgstr ""
 msgid "COUNTRY"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Customer Order"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "DIRECTION"
@@ -145,11 +157,21 @@ msgstr ""
 msgid "Delivery Address"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__gross_weight_of_shipping
+msgid "Gross Weight Of Shipping"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
 msgid "Logo"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__net_weight_of_shipping
+msgid "Net Weight Of Shipping"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__number_of_packages
 msgid "Number of Packages"
@@ -229,14 +251,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "WEIGHT/KG"
 msgstr ""
-
-#. module: stock_picking_batch_package
-#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__gross_weight_of_shipping
-msgid "Gross Weight Of Shipping"
-msgstr ""
-
-#. module: stock_picking_batch_package
-#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__net_weight_of_shipping
-msgid "Net Weight Of Shipping"
-msgstr ""
-
diff --git a/stock_picking_batch_package/i18n/es.po b/stock_picking_batch_package/i18n/es.po
index e9ff58d317..a12615ddec 100644
--- a/stock_picking_batch_package/i18n/es.po
+++ b/stock_picking_batch_package/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-16 10:22+0000\n"
-"PO-Revision-Date: 2024-12-16 10:22+0000\n"
+"POT-Creation-Date: 2025-01-14 12:49+0000\n"
+"PO-Revision-Date: 2025-01-14 12:49+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "<span>Nº Caja: </span>"
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_total_package
 msgid "<span>x</span>"
-msgstr "<span>x</span>"
+msgstr ""
 
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_total_package
@@ -85,6 +85,15 @@ msgstr ""
 msgid "<strong>Date:</strong>"
 msgstr "<strong>Fecha:</strong>"
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid ""
+"<strong>Date:</strong>\n"
+"                        <br/>"
+msgstr ""
+"<strong>Fecha:</strong>\n"
+"                        <br/>"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
 msgid "<strong>Gross weight:</strong>"
@@ -128,12 +137,12 @@ msgstr "Cód. Barras"
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
 msgid "Batch :"
-msgstr "Batch: "
+msgstr "Batch:"
 
 #. module: stock_picking_batch_package
 #: model:ir.model,name:stock_picking_batch_package.model_stock_picking_batch
 msgid "Batch Transfer"
-msgstr "Traslado por lote"
+msgstr "Agrupación de albarán"
 
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
@@ -145,6 +154,11 @@ msgstr "POBLACIÓN"
 msgid "COUNTRY"
 msgstr "PAÍS"
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Customer Order"
+msgstr "Nº Ped. Cliente"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "DIRECTION"
@@ -155,11 +169,21 @@ msgstr "DIRECCIÓN"
 msgid "Delivery Address"
 msgstr "Dirección de entrega"
 
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__gross_weight_of_shipping
+msgid "Gross Weight Of Shipping"
+msgstr "Peso bruto del envío"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
 msgid "Logo"
 msgstr "Logo"
 
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__net_weight_of_shipping
+msgid "Net Weight Of Shipping"
+msgstr "Peso neto del envío"
+
 #. module: stock_picking_batch_package
 #: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__number_of_packages
 msgid "Number of Packages"
@@ -239,14 +263,3 @@ msgstr "Transportista"
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "WEIGHT/KG"
 msgstr "PESO/KG"
-
-#. module: stock_picking_batch_package
-#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__gross_weight_of_shipping
-msgid "Gross Weight Of Shipping"
-msgstr "Peso bruto del envío"
-
-#. module: stock_picking_batch_package
-#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__net_weight_of_shipping
-msgid "Net Weight Of Shipping"
-msgstr "Peso neto del envío"
-
diff --git a/stock_picking_batch_package/i18n/stock_picking_batch_package.pot b/stock_picking_batch_package/i18n/stock_picking_batch_package.pot
index 7abcee5531..76dcb8bfdf 100644
--- a/stock_picking_batch_package/i18n/stock_picking_batch_package.pot
+++ b/stock_picking_batch_package/i18n/stock_picking_batch_package.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-16 10:21+0000\n"
-"PO-Revision-Date: 2024-12-16 10:21+0000\n"
+"POT-Creation-Date: 2025-01-14 12:50+0000\n"
+"PO-Revision-Date: 2025-01-14 12:50+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -75,6 +75,13 @@ msgstr ""
 msgid "<strong>Date:</strong>"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid ""
+"<strong>Date:</strong>\n"
+"                        <br/>"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
 msgid "<strong>Gross weight:</strong>"
@@ -135,6 +142,11 @@ msgstr ""
 msgid "COUNTRY"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Customer Order"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "DIRECTION"
@@ -145,11 +157,21 @@ msgstr ""
 msgid "Delivery Address"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__gross_weight_of_shipping
+msgid "Gross Weight Of Shipping"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
 msgid "Logo"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__net_weight_of_shipping
+msgid "Net Weight Of Shipping"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__number_of_packages
 msgid "Number of Packages"
@@ -229,14 +251,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "WEIGHT/KG"
 msgstr ""
-
-#. module: stock_picking_batch_package
-#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__gross_weight_of_shipping
-msgid "Gross Weight Of Shipping"
-msgstr ""
-
-#. module: stock_picking_batch_package
-#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__net_weight_of_shipping
-msgid "Net Weight Of Shipping"
-msgstr ""
-
diff --git a/stock_picking_batch_package/report/stock_picking_batch_by_package_report.xml b/stock_picking_batch_package/report/stock_picking_batch_by_package_report.xml
index b7968130bd..560c7d9414 100644
--- a/stock_picking_batch_package/report/stock_picking_batch_by_package_report.xml
+++ b/stock_picking_batch_package/report/stock_picking_batch_by_package_report.xml
@@ -51,6 +51,12 @@
                 <span
           t-if="line.move_id.sale_line_id"
           t-field="line.move_id.sale_line_id.order_id.name"
+        />
+            </td>
+            <td name="customer_order">
+                <span
+          t-if="line.move_id.sale_line_id"
+          t-field="line.move_id.sale_line_id.order_id.client_order_ref"
         />
             </td>
             <td name="picking">
@@ -98,11 +104,19 @@
                         <strong>Responsible:</strong>
                         <p class="m-0" t-field="doc.user_id" />
                     </div>
+                    <div name="date" class="col-auto col-3 mw-100 mb-2">
+                        <strong>Date:</strong>
+                        <br />
+                        <span
+              t-out="context_timestamp(datetime.datetime.now()).strftime('%d-%m-%Y')"
+            />
+                    </div>
                 </div>
                 <table class="table table-condensed">
                     <thead>
                         <tr>
                             <th name="order">Order</th>
+                            <th name="customer_order">Customer Order</th>
                             <th name="picking">Picking</th>
                             <th name="product_code">Product Code</th>
                             <th name="product">Product</th>
@@ -119,7 +133,7 @@
                         <t t-foreach="move_lines" t-as="line">
                             <t t-if="not package or package != line.result_package_id">
                                 <!-- Actualiza los valores solo cuando la condición se cumple -->
-                                <t t-set="num_packages" t-value="num_packages + 1" />>
+                                <t t-set="num_packages" t-value="num_packages + 1" />
                                 <!-- Llamar a los informes correspondientes -->
                                 <t t-if="not package">
                                     <t