From 5c215ff91a9c4a36855de93e79c56a6d003401c0 Mon Sep 17 00:00:00 2001
From: Alfredo <alfredodelafuente@avanzosc.es>
Date: Mon, 16 Dec 2024 11:46:37 +0100
Subject: [PATCH] [16.0][ADD] stock_picking_batch_package: New report "Picking
 Batch By Package".

---
 stock_picking_batch_package/README.rst        |   3 +-
 stock_picking_batch_package/__manifest__.py   |   3 +-
 stock_picking_batch_package/i18n/en_US.po     | 242 +++++++++++++++++
 stock_picking_batch_package/i18n/es.po        | 141 +++++++++-
 .../i18n/stock_picking_batch_package.pot      | 125 ++++++++-
 .../models/stock_picking_batch.py             |   2 +
 .../stock_picking_batch_by_package_report.xml | 252 ++++++++++++++++++
 .../views/stock_picking_batch_view.xml        |  16 ++
 8 files changed, 775 insertions(+), 9 deletions(-)
 create mode 100644 stock_picking_batch_package/i18n/en_US.po
 create mode 100644 stock_picking_batch_package/report/stock_picking_batch_by_package_report.xml

diff --git a/stock_picking_batch_package/README.rst b/stock_picking_batch_package/README.rst
index dc6e4e43cf..456509ecaf 100644
--- a/stock_picking_batch_package/README.rst
+++ b/stock_picking_batch_package/README.rst
@@ -8,7 +8,8 @@ Stock Picking Batch Package
 
 * Transporter field in the stock picking batch.
 * Number of packages and shipping weight compute fields in stock picking batch.
-* Report for stock picking batch.
+* New reports for stock picking batch: "Picking Batch With Package" and
+  "Picking Batch By Package".
 
 Bug Tracker
 ===========
diff --git a/stock_picking_batch_package/__manifest__.py b/stock_picking_batch_package/__manifest__.py
index c8cd512176..30d2173207 100644
--- a/stock_picking_batch_package/__manifest__.py
+++ b/stock_picking_batch_package/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "Stock Picking Batch Package",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.1.0",
     "author": "AvanzOSC",
     "category": "Inventory",
     "website": "https://github.com/avanzosc/odoo-addons",
@@ -16,6 +16,7 @@
         "views/stock_picking_view.xml",
         "report/batch_report.xml",
         "report/picking_report_template.xml",
+        "report/stock_picking_batch_by_package_report.xml",
     ],
     "license": "AGPL-3",
     "installable": True,
diff --git a/stock_picking_batch_package/i18n/en_US.po b/stock_picking_batch_package/i18n/en_US.po
new file mode 100644
index 0000000000..f269827bc0
--- /dev/null
+++ b/stock_picking_batch_package/i18n/en_US.po
@@ -0,0 +1,242 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_picking_batch_package
+#
+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"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,print_report_name:stock_picking_batch_package.action_report_picking_batch_by_packaging
+msgid "'Picking batch  - %s by package' % (object.name)"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,print_report_name:stock_picking_batch_package.action_report_pickingbatch
+msgid "'Picking batch  - %s' % (object.name)"
+msgstr ""
+
+#. 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> (</span>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid "<span> - </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
+msgid ""
+"<span>)</span>\n"
+"                <strong>\n"
+"                    <span style=\"margin-left:40px;\">Box weight: </span>\n"
+"                </strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid "<span>Box Number: </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
+msgid "<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
+msgid ""
+"<strong>\n"
+"                    <span>Box Measurements: </span>\n"
+"                </strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid ""
+"<strong>\n"
+"                    <span>Without Box</span>\n"
+"                </strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
+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>Gross weight:</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>Net weight:</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>Number of packages:</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>Responsible:</strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "<strong>Total:</strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
+msgid "<strong>Transporter:</strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "ADDRESSEE"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Barcode"
+msgstr ""
+
+#. 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 ""
+
+#. module: stock_picking_batch_package
+#: model:ir.model,name:stock_picking_batch_package.model_stock_picking_batch
+msgid "Batch Transfer"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "CITY"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "COUNTRY"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "DIRECTION"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.view_picking_tree_batch
+msgid "Delivery Address"
+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__number_of_packages
+msgid "Number of Packages"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Order"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "PACKAGES"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
+msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Picking"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,name:stock_picking_batch_package.action_report_picking_batch_by_packaging
+msgid "Picking Batch By Package"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,name:stock_picking_batch_package.action_report_pickingbatch
+msgid "Picking Batch With Package"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Product"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Product Code"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Quantity"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "STATE"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.view_picking_tree_batch
+msgid "Shipping Method"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__shipping_weight
+msgid "Shipping Weight"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
+msgid "TRANSFER"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model:ir.model.fields,field_description:stock_picking_batch_package.field_stock_picking_batch__partner_id
+msgid "Transporter"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: 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 b0e1eb9d73..e9ff58d317 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-09-27 09:49+0000\n"
-"PO-Revision-Date: 2024-09-27 09:49+0000\n"
+"POT-Creation-Date: 2024-12-16 10:22+0000\n"
+"PO-Revision-Date: 2024-12-16 10:22+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,20 +15,100 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,print_report_name:stock_picking_batch_package.action_report_picking_batch_by_packaging
+msgid "'Picking batch  - %s by package' % (object.name)"
+msgstr "'Agrupación albaranes  - %s por paquete' % (object.name)"
+
 #. module: stock_picking_batch_package
 #: model:ir.actions.report,print_report_name:stock_picking_batch_package.action_report_pickingbatch
 msgid "'Picking batch  - %s' % (object.name)"
 msgstr "'Agrupación de albaranes  - %s' % (object.name)"
 
+#. 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> (</span>"
+msgstr "<span> (</span>"
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid "<span> - </span>"
+msgstr "<span> - </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>)</span>\n"
+"                <strong>\n"
+"                    <span style=\"margin-left:40px;\">Box weight: </span>\n"
+"                </strong>"
+msgstr ""
+"<span>)</span>\n"
+"                <strong>\n"
+"                    <span style=\"margin-left:40px;\">Peso de la caja: </span>\n"
+"                </strong>"
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid "<span>Box Number: </span>"
+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>"
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_total_package
+msgid ""
+"<strong>\n"
+"                    <span>Box Measurements: </span>\n"
+"                </strong>"
+msgstr ""
+"<strong>\n"
+"                    <span>Medidas de la caja: </span>\n"
+"                </strong>"
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid ""
+"<strong>\n"
+"                    <span>Without Box</span>\n"
+"                </strong>"
+msgstr ""
+"<strong>\n"
+"                    <span>Sin caja</span>\n"
+"                </strong>"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
 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>Gross weight:</strong>"
+msgstr "<strong>Peso bruto:</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>Net weight:</strong>"
+msgstr "<strong>Peso neto:</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>Number of packages:</strong>"
+msgstr "<strong>Nº Bultos:</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>Responsible:</strong>"
+msgstr "<strong>Responsable:</strong>"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "<strong>Total:</strong>"
-msgstr ""
+msgstr "<strong>Total:</strong>"
 
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
@@ -40,10 +120,20 @@ msgstr "<strong>Transporte:</strong>"
 msgid "ADDRESSEE"
 msgstr "DESTINATARIO"
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Barcode"
+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: "
+
 #. module: stock_picking_batch_package
 #: model:ir.model,name:stock_picking_batch_package.model_stock_picking_batch
 msgid "Batch Transfer"
-msgstr "Agrupación de albarán"
+msgstr "Traslado por lote"
 
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
@@ -68,13 +158,18 @@ msgstr "Dirección de entrega"
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. 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"
 msgstr "Número de bultos"
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Order"
+msgstr "Pedido"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "PACKAGES"
@@ -85,11 +180,36 @@ msgstr "BULTOS"
 msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
 msgstr "Página: <span class=\"page\"/> / <span class=\"topage\"/>"
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Picking"
+msgstr "Albarán"
+
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,name:stock_picking_batch_package.action_report_picking_batch_by_packaging
+msgid "Picking Batch By Package"
+msgstr "Agrupación albarán por paquete"
+
 #. module: stock_picking_batch_package
 #: model:ir.actions.report,name:stock_picking_batch_package.action_report_pickingbatch
 msgid "Picking Batch With Package"
 msgstr "Agrupación de albaranes con paquetes"
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Product"
+msgstr "Producto"
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Product Code"
+msgstr "Código producto"
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Quantity"
+msgstr "Cantidad"
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "STATE"
@@ -119,3 +239,14 @@ 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 82f44be7c1..7abcee5531 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-09-27 09:49+0000\n"
-"PO-Revision-Date: 2024-09-27 09:49+0000\n"
+"POT-Creation-Date: 2024-12-16 10:21+0000\n"
+"PO-Revision-Date: 2024-12-16 10:21+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,16 +15,86 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,print_report_name:stock_picking_batch_package.action_report_picking_batch_by_packaging
+msgid "'Picking batch  - %s by package' % (object.name)"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model:ir.actions.report,print_report_name:stock_picking_batch_package.action_report_pickingbatch
 msgid "'Picking batch  - %s' % (object.name)"
 msgstr ""
 
+#. 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> (</span>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid "<span> - </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
+msgid ""
+"<span>)</span>\n"
+"                <strong>\n"
+"                    <span style=\"margin-left:40px;\">Box weight: </span>\n"
+"                </strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid "<span>Box Number: </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
+msgid "<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
+msgid ""
+"<strong>\n"
+"                    <span>Box Measurements: </span>\n"
+"                </strong>"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_package_info
+msgid ""
+"<strong>\n"
+"                    <span>Without Box</span>\n"
+"                </strong>"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.external_layout_standard_pickingbatch
 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>Gross weight:</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>Net weight:</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>Number of packages:</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>Responsible:</strong>"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "<strong>Total:</strong>"
@@ -40,6 +110,16 @@ msgstr ""
 msgid "ADDRESSEE"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Barcode"
+msgstr ""
+
+#. 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 ""
+
 #. module: stock_picking_batch_package
 #: model:ir.model,name:stock_picking_batch_package.model_stock_picking_batch
 msgid "Batch Transfer"
@@ -75,6 +155,11 @@ msgstr ""
 msgid "Number of Packages"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Order"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "PACKAGES"
@@ -85,11 +170,36 @@ msgstr ""
 msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Picking"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model:ir.actions.report,name:stock_picking_batch_package.action_report_picking_batch_by_packaging
+msgid "Picking Batch By Package"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model:ir.actions.report,name:stock_picking_batch_package.action_report_pickingbatch
 msgid "Picking Batch With Package"
 msgstr ""
 
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Product"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Product Code"
+msgstr ""
+
+#. module: stock_picking_batch_package
+#: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_picking_batch_by_packaging_document
+msgid "Quantity"
+msgstr ""
+
 #. module: stock_picking_batch_package
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_package.report_pickingbatch_document
 msgid "STATE"
@@ -119,3 +229,14 @@ 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/models/stock_picking_batch.py b/stock_picking_batch_package/models/stock_picking_batch.py
index e2b76350ac..98f031da46 100644
--- a/stock_picking_batch_package/models/stock_picking_batch.py
+++ b/stock_picking_batch_package/models/stock_picking_batch.py
@@ -23,6 +23,8 @@ def set_domain_for_partner_id(self):
         string="Number of Packages", compute="_compute_number_of_packages"
     )
     shipping_weight = fields.Float(compute="_compute_shipping_weight")
+    gross_weight_of_shipping = fields.Float()
+    net_weight_of_shipping = fields.Float()
 
     def _compute_number_of_packages(self):
         for transfer in self:
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
new file mode 100644
index 0000000000..b7968130bd
--- /dev/null
+++ b/stock_picking_batch_package/report/stock_picking_batch_by_package_report.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="report_picking_batch_by_packaging_package_info">
+        <tr t-if="package">
+            <td colspan="10">
+                <strong>
+                    <span>Box Number: </span>
+                    <span t-esc="num_packages" />
+                    <span> - </span>
+                    <span t-field="package.name" />
+                </strong>
+            </td>
+        </tr>
+        <tr t-else="">
+            <td colspan="10">
+                <strong>
+                    <span>Without Box</span>
+                </strong>
+            </td>
+        </tr>
+    </template>
+
+    <template id="report_picking_batch_by_packaging_total_package">
+        <tr>
+            <td colspan="10" t-if="package">
+                <strong>
+                    <span>Box Measurements: </span>
+                </strong>
+                <span t-field="package.pack_length" />
+                <span>x</span>
+                <span t-field="package.width" />
+                <span>x</span>
+                <span t-field="package.height" />
+                <span> (</span>
+                <span
+          t-if="package.length_uom_name"
+          t-field="package.length_uom_name"
+        />
+                <span>)</span>
+                <strong>
+                    <span style="margin-left:40px;">Box weight: </span>
+                </strong>
+                <span t-field="package.shipping_weight" />
+            </td>
+        </tr>
+    </template>
+
+    <template id="report_picking_batch_by_packaging_document2">
+        <tr>
+            <td name="order">
+                <span
+          t-if="line.move_id.sale_line_id"
+          t-field="line.move_id.sale_line_id.order_id.name"
+        />
+            </td>
+            <td name="picking">
+                <span t-if="line.picking_id" t-field="line.picking_id.name" />
+            </td>
+            <td name="product_code">
+                <span
+          t-if="line.product_id.default_code"
+          t-field="line.product_id.default_code"
+        />
+            </td>
+            <td name="product">
+                <span t-field="line.product_id.name" />
+            </td>
+            <td name="quantity" style="text-align: right;">
+                <span t-field="line.qty_done" />
+            </td>
+        </tr>
+    </template>
+
+    <template id="report_picking_batch_by_packaging_document">
+        <t t-call="web.external_layout">
+            <t
+        t-set="doc"
+        t-value="doc.with_context(lang=doc.user_id.partner_id.lang)"
+      />
+            <div class="page">
+                <div class="oe_structure" />
+                <div name="batch-info" class="d-flex">
+                    <div><h3>Batch : <span t-field="doc.name" /></h3></div>
+                    <div name="barcode" class="mr-auto">
+                        <img
+              alt="Barcode"
+              t-att-src="'/report/barcode/?barcode_type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', quote_plus(doc.name or ''), 600, 150)"
+              style="width:300px;height:50px"
+            />
+                    </div>
+                </div>
+                <div class="row mt-4 mb-4" id="informations">
+                    <div
+            name="responsible"
+            t-if="doc.user_id"
+            class="col-auto col-3 mw-100 mb-2"
+          >
+                        <strong>Responsible:</strong>
+                        <p class="m-0" t-field="doc.user_id" />
+                    </div>
+                </div>
+                <table class="table table-condensed">
+                    <thead>
+                        <tr>
+                            <th name="order">Order</th>
+                            <th name="picking">Picking</th>
+                            <th name="product_code">Product Code</th>
+                            <th name="product">Product</th>
+                            <th name="quantity" style="text-align: right;">Quantity</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <t
+              t-set="move_lines"
+              t-value="doc.move_line_ids.filtered(lambda x: x.state != 'cancel' and x.result_package_id).sorted(lambda line: (line.result_package_id.name, line.picking_id.name))"
+            />
+                        <t t-set="num_packages" t-value="0" />
+                        <t t-set="package" t-value="0" />
+                        <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" />>
+                                <!-- Llamar a los informes correspondientes -->
+                                <t t-if="not package">
+                                    <t
+                    t-set="package"
+                    t-value="line.result_package_id"
+                  />
+                                    <t
+                    t-call="stock_picking_batch_package.report_picking_batch_by_packaging_package_info"
+                  />
+                                </t>
+                                <t t-if="package != line.result_package_id">
+                                    <t
+                    t-call="stock_picking_batch_package.report_picking_batch_by_packaging_total_package"
+                  />
+                                    <t
+                    t-set="package"
+                    t-value="line.result_package_id"
+                  />
+                                    <t
+                    t-call="stock_picking_batch_package.report_picking_batch_by_packaging_package_info"
+                  />
+                                </t>
+                            </t>
+                            <t
+                t-call="stock_picking_batch_package.report_picking_batch_by_packaging_document2"
+              />
+                        </t>
+                        <t
+              t-call="stock_picking_batch_package.report_picking_batch_by_packaging_total_package"
+            />
+                        <!-- Trato move lines sin paquete -->
+                        <t
+              t-set="move_lines"
+              t-value="doc.move_line_ids.filtered(lambda x: x.state != 'cancel' and not x.result_package_id).sorted(lambda line: (line.picking_id.name))"
+            />
+                        <t t-set="package" t-value="False" />
+                        <t
+              t-if="move_lines"
+              t-call="stock_picking_batch_package.report_picking_batch_by_packaging_package_info"
+            />
+                        <t t-foreach="move_lines" t-as="line">
+                            <t
+                t-call="stock_picking_batch_package.report_picking_batch_by_packaging_document2"
+              />
+                        </t>
+                        <!-- Imprimo totales -->
+                    </tbody>
+                </table>
+                <table style="width: 10cm;border: none;">
+                    <tbody>
+                        <tr>
+                            <td
+                name="total_num_packages"
+                style="width: 5cm;border: none;"
+              >
+                                <strong>Number of packages:</strong>
+                            </td>
+                            <td
+                style="width: 5cm;border: none;background-color: transparent;"
+              >
+                                <strong><span t-esc="num_packages" /></strong>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td
+                name="total_gross_weight"
+                style="width: 5cm;border: none;"
+              >
+                                <strong>Gross weight:</strong>
+                            </td>
+                            <td
+                style="width: 5cm;border: none;background-color: transparent;"
+              >
+                                <strong><span
+                    t-field="doc.gross_weight_of_shipping"
+                  /></strong>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td
+                name="total_net_weight"
+                style="width: 5cm;border: none;"
+              >
+                                <strong>Net weight:</strong>
+                            </td>
+                            <td
+                style="width: 5cm;border: none;background-color: transparent;"
+              >
+                                <strong><span
+                    t-field="doc.net_weight_of_shipping"
+                  /></strong>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </t>
+    </template>
+
+    <template id="report_picking_batch_by_packaging">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="doc">
+                <t
+          t-call="stock_picking_batch_package.report_picking_batch_by_packaging_document"
+          t-lang="doc.user_id.partner_id.lang"
+        />
+            </t>
+        </t>
+    </template>
+
+    <record id="action_report_picking_batch_by_packaging" model="ir.actions.report">
+        <field name="name">Picking Batch By Package</field>
+        <field name="model">stock.picking.batch</field>
+        <field name="report_type">qweb-pdf</field>
+        <field
+      name="report_name"
+    >stock_picking_batch_package.report_picking_batch_by_packaging</field>
+        <field
+      name="report_file"
+    >stock_picking_batch_package.report_picking_batch_by_packaging</field>
+        <field
+      name="print_report_name"
+    >'Picking batch  - %s by package' % (object.name)</field>
+        <field
+      name="binding_model_id"
+      ref="stock_picking_batch.model_stock_picking_batch"
+    />
+        <field name="binding_type">report</field>
+    </record>
+</odoo>
diff --git a/stock_picking_batch_package/views/stock_picking_batch_view.xml b/stock_picking_batch_package/views/stock_picking_batch_view.xml
index 72969d6faf..c441fac102 100644
--- a/stock_picking_batch_package/views/stock_picking_batch_view.xml
+++ b/stock_picking_batch_package/views/stock_picking_batch_view.xml
@@ -9,6 +9,22 @@
                 <field name="number_of_packages" />
                 <field name="shipping_weight" />
             </field>
+            <field name="picking_type_id" position="after">
+                <br />
+                <field name="gross_weight_of_shipping" />
+                <field name="net_weight_of_shipping" />
+            </field>
+        </field>
+    </record>
+
+    <record id="stock_picking_batch_tree" model="ir.ui.view">
+        <field name="model">stock.picking.batch</field>
+        <field name="inherit_id" ref="stock_picking_batch.stock_picking_batch_tree" />
+        <field name="arch" type="xml">
+            <field name="picking_type_id" position="after">
+                <field name="gross_weight_of_shipping" optional="show" />
+                <field name="net_weight_of_shipping" optional="show" />
+            </field>
         </field>
     </record>
 </odoo>