odoo-addon-shipment-advice 16.0.1.5.0__py3-none-any.whl → 16.0.1.6.0.1__py3-none-any.whl

odoo/addons/shipment_advice/README.rst

@@ -7,7 +7,7 @@ Shipment Advice
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:60951d59c7ca7c14de9a7e490200a900d1aec0483212ef3f936e724c5f06e98a
+   !! source digest: sha256:34e6a179b9a0304d4d12e6a1ec5e161d7ad127fec1463f2061c083e562a5f789
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -61,6 +61,7 @@ Contributors
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
+* Michael Tietz (MT Software) <mtietz@mt-software.de>
 
 Design
 ~~~~~~

odoo/addons/shipment_advice/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Shipment Advice",
     "summary": "Manage your (un)loading process through shipment advices.",
-    "version": "16.0.1.5.0",
+    "version": "16.0.1.6.0",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-transport",
     "category": "Warehouse Management",

odoo/addons/shipment_advice/i18n/es.po

@@ -1038,6 +1038,12 @@ msgstr ""
 msgid "Shipment Advice"
 msgstr "Aviso de envío"
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid "Shipment Advice: Auto Close Incoming Advices"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_outgoing_backorder_policy
 #: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_outgoing_backorder_policy
@@ -1138,6 +1144,22 @@ msgstr ""
 msgid "This Week"
 msgstr "Esta semana"
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid ""
+"This flag indicates if an incoming shipment advice\n"
+"                            will be automatically set to done\n"
+"                            if all related moves are done or canceled"
+msgstr ""
+
+#. module: shipment_advice
+#: model:ir.model.fields,help:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,help:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid ""
+"This flag indicates if an incoming shipment advice will be automatically set "
+"to done if all related moves are done or canceled"
+msgstr ""
+
 #. module: shipment_advice
 #. odoo-python
 #: code:addons/shipment_advice/models/stock_move_line.py:0
@@ -1370,6 +1392,11 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_stock_picking__loaded_waiting_quantity
+msgid "Waiting Quantity"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__warehouse_id
 #: model_terms:ir.ui.view,arch_db:shipment_advice.shipment_advice_view_search
@@ -1489,6 +1516,11 @@ msgstr ""
 "No puedes descargar solo este movimiento, debes descargar todo el contenido "
 "del paquete."
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid "shipment_advice_auto_close_incoming"
+msgstr ""
+
 #. module: shipment_advice
 #: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
 msgid "shipment_advice_run_in_queue_job"

odoo/addons/shipment_advice/i18n/fr.po

@@ -1029,6 +1029,12 @@ msgstr ""
 msgid "Shipment Advice"
 msgstr "Note d'envoi"
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid "Shipment Advice: Auto Close Incoming Advices"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_outgoing_backorder_policy
 #: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_outgoing_backorder_policy
@@ -1128,6 +1134,22 @@ msgstr ""
 msgid "This Week"
 msgstr "Cette semaine"
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid ""
+"This flag indicates if an incoming shipment advice\n"
+"                            will be automatically set to done\n"
+"                            if all related moves are done or canceled"
+msgstr ""
+
+#. module: shipment_advice
+#: model:ir.model.fields,help:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,help:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid ""
+"This flag indicates if an incoming shipment advice will be automatically set "
+"to done if all related moves are done or canceled"
+msgstr ""
+
 #. module: shipment_advice
 #. odoo-python
 #: code:addons/shipment_advice/models/stock_move_line.py:0
@@ -1356,6 +1378,11 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_stock_picking__loaded_waiting_quantity
+msgid "Waiting Quantity"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__warehouse_id
 #: model_terms:ir.ui.view,arch_db:shipment_advice.shipment_advice_view_search
@@ -1465,6 +1492,11 @@ msgstr ""
 "Vous ne pouvez pas décharger ce mouvement seul, vous devez décharger le "
 "contenu du pack entier."
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid "shipment_advice_auto_close_incoming"
+msgstr ""
+
 #. module: shipment_advice
 #: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
 msgid "shipment_advice_run_in_queue_job"

odoo/addons/shipment_advice/i18n/it.po

@@ -1037,6 +1037,12 @@ msgstr "Esegue l'avviso di spedizione nella coda lavoro"
 msgid "Shipment Advice"
 msgstr "Avviso spedizione"
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid "Shipment Advice: Auto Close Incoming Advices"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_outgoing_backorder_policy
 #: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_outgoing_backorder_policy
@@ -1135,6 +1141,22 @@ msgstr "L'azienda è impostata automaticamente in base alle preferenze utente."
 msgid "This Week"
 msgstr "Questa settimana"
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid ""
+"This flag indicates if an incoming shipment advice\n"
+"                            will be automatically set to done\n"
+"                            if all related moves are done or canceled"
+msgstr ""
+
+#. module: shipment_advice
+#: model:ir.model.fields,help:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,help:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid ""
+"This flag indicates if an incoming shipment advice will be automatically set "
+"to done if all related moves are done or canceled"
+msgstr ""
+
 #. module: shipment_advice
 #. odoo-python
 #: code:addons/shipment_advice/models/stock_move_line.py:0
@@ -1375,6 +1397,11 @@ msgstr ""
 msgid "Validate"
 msgstr "Valida"
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_stock_picking__loaded_waiting_quantity
+msgid "Waiting Quantity"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__warehouse_id
 #: model_terms:ir.ui.view,arch_db:shipment_advice.shipment_advice_view_search
@@ -1496,6 +1523,11 @@ msgstr ""
 "Non si può scaricare questa riga da sola, bisogna scaricare l'intero "
 "contenuto del collo."
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid "shipment_advice_auto_close_incoming"
+msgstr ""
+
 #. module: shipment_advice
 #: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
 msgid "shipment_advice_run_in_queue_job"

odoo/addons/shipment_advice/i18n/shipment_advice.pot

@@ -973,6 +973,12 @@ msgstr ""
 msgid "Shipment Advice"
 msgstr ""
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid "Shipment Advice: Auto Close Incoming Advices"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_outgoing_backorder_policy
 #: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_outgoing_backorder_policy
@@ -1068,6 +1074,22 @@ msgstr ""
 msgid "This Week"
 msgstr ""
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid ""
+"This flag indicates if an incoming shipment advice\n"
+"                            will be automatically set to done\n"
+"                            if all related moves are done or canceled"
+msgstr ""
+
+#. module: shipment_advice
+#: model:ir.model.fields,help:shipment_advice.field_res_company__shipment_advice_auto_close_incoming
+#: model:ir.model.fields,help:shipment_advice.field_res_config_settings__shipment_advice_auto_close_incoming
+msgid ""
+"This flag indicates if an incoming shipment advice will be automatically set"
+" to done if all related moves are done or canceled"
+msgstr ""
+
 #. module: shipment_advice
 #. odoo-python
 #: code:addons/shipment_advice/models/stock_move_line.py:0
@@ -1285,6 +1307,11 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_stock_picking__loaded_waiting_quantity
+msgid "Waiting Quantity"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__warehouse_id
 #: model_terms:ir.ui.view,arch_db:shipment_advice.shipment_advice_view_search
@@ -1388,6 +1415,11 @@ msgid ""
 " content."
 msgstr ""
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid "shipment_advice_auto_close_incoming"
+msgstr ""
+
 #. module: shipment_advice
 #: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
 msgid "shipment_advice_run_in_queue_job"

odoo/addons/shipment_advice/models/res_company.py

@@ -1,4 +1,5 @@
 # Copyright 2021 Camptocamp SA
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import fields, models
@@ -29,3 +30,11 @@ class ResCompany(models.Model):
         "shipment advice validation through a queued jobs. Each picking will be "
         "validated in a separate job.",
     )
+    shipment_advice_auto_close_incoming = fields.Boolean(
+        string="Shipment Advice: Auto Close Incoming Advices",
+        help=(
+            "This flag indicates if an incoming shipment advice "
+            "will be automatically set to done "
+            "if all related moves are done or canceled"
+        ),
+    )

odoo/addons/shipment_advice/models/res_config_settings.py

@@ -1,4 +1,5 @@
 # Copyright 2021 Camptocamp SA
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import fields, models
@@ -13,3 +14,6 @@ class ResConfigSettings(models.TransientModel):
     shipment_advice_run_in_queue_job = fields.Boolean(
         related="company_id.shipment_advice_run_in_queue_job", readonly=False
     )
+    shipment_advice_auto_close_incoming = fields.Boolean(
+        related="company_id.shipment_advice_auto_close_incoming", readonly=False
+    )

odoo/addons/shipment_advice/models/shipment_advice.py

@@ -1,4 +1,5 @@
 # Copyright 2021 Camptocamp SA
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import _, api, fields, models
@@ -58,7 +59,6 @@ class ShipmentAdvice(models.Model):
         string="Type",
         default="outgoing",
         required=True,
-        states={"draft": [("readonly", False)]},
         readonly=True,
         help="Use incoming to plan receptions, use outgoing for deliveries.",
     )
@@ -254,7 +254,7 @@ class ShipmentAdvice(models.Model):
 
     @api.model_create_multi
     def create(self, vals_list):
-        defaults = self.default_get(["name"])
+        defaults = self.default_get(["name", "shipment_type"])
         outgoing_sequence = self.env.ref(
             "shipment_advice.shipment_advice_outgoing_sequence"
         )
@@ -263,7 +263,7 @@ class ShipmentAdvice(models.Model):
         )
         for vals in vals_list:
             sequence = outgoing_sequence
-            if vals["shipment_type"] == "incoming":
+            if vals.get("shipment_type", defaults["shipment_type"]) == "incoming":
                 sequence = incomig_sequence
             if vals.get("name", "/") == "/" and defaults.get("name", "/") == "/":
                 vals["name"] = sequence.next_by_id()
@@ -314,6 +314,7 @@ class ShipmentAdvice(models.Model):
 
     def action_done(self):
         self._check_action_done_allowed()
+        self = self.with_context(shipment_advice_ignore_auto_close=True)
         for shipment in self:
             shipment._action_done()
         return True
@@ -417,8 +418,12 @@ class ShipmentAdvice(models.Model):
                 }
             )
             return
-        if not self.departure_date:
-            self.departure_date = fields.Datetime.now()
+        self._close_shipments()
+
+    def _close_shipments(self):
+        for shipment in self:
+            if not shipment.departure_date:
+                shipment.departure_date = fields.Datetime.now()
         self.write({"state": "done", "error_message": False})
 
     @api.model
@@ -429,6 +434,25 @@ class ShipmentAdvice(models.Model):
             error=str(error),
         )
 
+    def auto_close_incoming_shipment_advices(self):
+        """Set incoming shipment advice to done when all planned moves are processed"""
+        if self.env.context.get("shipment_advice_ignore_auto_close"):
+            return
+        shipment_ids_to_close = []
+        for shipment in self:
+            if (
+                shipment.shipment_type != "incoming"
+                or not shipment.company_id.shipment_advice_auto_close_incoming
+                or any(
+                    move.state not in ("cancel", "done")
+                    for move in shipment.planned_move_ids
+                )
+            ):
+                continue
+            shipment_ids_to_close.append(shipment.id)
+        if shipment_ids_to_close:
+            self.browse(shipment_ids_to_close)._close_shipments()
+
     def action_cancel(self):
         for shipment in self:
             if shipment.state not in ("confirmed", "in_progress"):

odoo/addons/shipment_advice/models/stock_move.py

@@ -1,4 +1,5 @@
 # Copyright 2021 Camptocamp SA
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import fields, models
@@ -18,3 +19,19 @@ class StockMove(models.Model):
     def _plan_in_shipment(self, shipment_advice):
         """Plan the moves into the given shipment advice."""
         self.shipment_advice_id = shipment_advice
+
+    def _prepare_merge_moves_distinct_fields(self):
+        res = super()._prepare_merge_moves_distinct_fields()
+        # Avoid having stock move assign to different shipment merged together
+        res.append("shipment_advice_id")
+        return res
+
+    def _action_done(self, cancel_backorder=False):
+        res = super()._action_done(cancel_backorder=cancel_backorder)
+        res.shipment_advice_id.auto_close_incoming_shipment_advices()
+        return res
+
+    def _action_cancel(self):
+        res = super()._action_cancel()
+        self.shipment_advice_id.auto_close_incoming_shipment_advices()
+        return res

odoo/addons/shipment_advice/models/stock_picking.py

@@ -68,6 +68,9 @@ class StockPicking(models.Model):
         "shipment.advice",
         compute="_compute_loaded_in_shipment",
     )
+    loaded_waiting_quantity = fields.Float(
+        "Waiting Quantity", compute="_compute_shipment_loaded_progress"
+    )
 
     @api.depends("move_line_ids.shipment_advice_id")
     def _compute_loaded_in_shipment(self):
@@ -157,6 +160,12 @@ class StockPicking(models.Model):
                 picking.loaded_weight_progress = (
                     f"{picking.loaded_weight} / {total_weight}"
                 )
+            waiting_moves = picking.move_ids.filtered(
+                lambda ml: ml.state not in ["done", "cancel"]
+            )
+            picking.loaded_waiting_quantity = sum(
+                waiting_moves.mapped("product_qty")
+            ) - sum(waiting_moves.mapped("reserved_availability"))
             # Overall progress based on the operation type
             if picking.picking_type_id.show_entire_packs:
                 picking.loaded_progress_f = picking.loaded_packages_progress_f

odoo/addons/shipment_advice/readme/CONTRIBUTORS.rst

@@ -3,6 +3,7 @@
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
+* Michael Tietz (MT Software) <mtietz@mt-software.de>
 
 Design
 ~~~~~~

odoo/addons/shipment_advice/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:60951d59c7ca7c14de9a7e490200a900d1aec0483212ef3f936e724c5f06e98a
+!! source digest: sha256:34e6a179b9a0304d4d12e6a1ec5e161d7ad127fec1463f2061c083e562a5f789
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/OCA/stock-logistics-transport/tree/16.0/shipment_advice"><img alt="OCA/stock-logistics-transport" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--transport-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-transport-16-0/stock-logistics-transport-16-0-shipment_advice"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-transport&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Manage your (un)loading process through shipment advices.</p>
@@ -409,6 +409,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
 <li><a class="reference external" href="https://trobz.com">Trobz</a>:
 * Dung Tran &lt;<a class="reference external" href="mailto:dungtd&#64;trobz.com">dungtd&#64;trobz.com</a>&gt;</li>
+<li>Michael Tietz (MT Software) &lt;<a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="design">

odoo/addons/shipment_advice/tests/__init__.py

@@ -2,5 +2,7 @@ from . import test_shipment_advice
 from . import test_shipment_advice_async
 from . import test_shipment_advice_plan
 from . import test_shipment_advice_load
+from . import test_shipment_advice_picking_values
 from . import test_shipment_advice_unload
 from . import test_shipment_advice_stock_user
+from . import test_shipment_advice_auto_close

odoo/addons/shipment_advice/tests/common.py

@@ -1,8 +1,9 @@
 # Copyright 2021 Camptocamp SA
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import fields
-from odoo.tests.common import TransactionCase, new_test_user
+from odoo.tests.common import Form, TransactionCase, new_test_user
 
 
 class Common(TransactionCase):
@@ -124,30 +125,33 @@ class Common(TransactionCase):
         else:
             self.assertIn("IN", shipment_advice.name)
 
-    def _confirm_shipment_advice(self, shipment_advice, arrival_date=None):
+    @classmethod
+    def confirm_shipment_advice(cls, shipment_advice, arrival_date=None):
         if shipment_advice.state != "draft":
             return
         if arrival_date is None:
             arrival_date = fields.Datetime.now()
         shipment_advice.arrival_date = arrival_date
         shipment_advice.action_confirm()
-        self.assertEqual(shipment_advice.state, "confirmed")
 
-    def _in_progress_shipment_advice(self, shipment_advice, dock=None):
-        self._confirm_shipment_advice(shipment_advice)
+    @classmethod
+    def progress_shipment_advice(cls, shipment_advice, dock=None):
+        cls.confirm_shipment_advice(shipment_advice)
         if shipment_advice.state != "confirmed":
             return
-        shipment_advice.dock_id = dock or self.dock
+        shipment_advice.dock_id = dock or cls.dock
         shipment_advice.action_in_progress()
-        self.assertEqual(shipment_advice.state, "in_progress")
 
-    def _cancel_shipment_advice(self, shipment_advice, dock=None):
-        self._confirm_shipment_advice(shipment_advice)
+    @classmethod
+    def cancel_shipment_advice(cls, shipment_advice, dock=None):
+        cls.confirm_shipment_advice(shipment_advice)
+        if shipment_advice.state != "confirmed":
+            return
         shipment_advice.action_cancel()
-        self.assertEqual(shipment_advice.state, "cancel")
 
-    def _plan_records_in_shipment(self, shipment_advice, records, user=None):
-        wiz_model = self.env["wizard.plan.shipment"].with_context(
+    @classmethod
+    def plan_records_in_shipment(cls, shipment_advice, records, user=None):
+        wiz_model = cls.env["wizard.plan.shipment"].with_context(
             active_model=records._name,
             active_ids=records.ids,
         )
@@ -157,9 +161,22 @@ class Common(TransactionCase):
         wiz.action_plan()
         return wiz
 
-    def _load_records_in_shipment(self, shipment_advice, records, user=None):
+    @classmethod
+    def unplan_records_from_shipment(cls, records, user=None):
+        wiz_model = cls.env["wizard.unplan.shipment"].with_context(
+            active_model=records._name,
+            active_ids=records.ids,
+        )
+        wiz = wiz_model.create({})
+        if user:
+            wiz = wiz.with_user(user)
+        wiz.action_unplan()
+        return wiz
+
+    @classmethod
+    def load_records_in_shipment(cls, shipment_advice, records, user=None):
         """Load pickings, move lines or package levels in the givent shipment."""
-        wiz_model = self.env["wizard.load.shipment"].with_context(
+        wiz_model = cls.env["wizard.load.shipment"].with_context(
             active_model=records._name,
             active_ids=records.ids,
         )
@@ -169,12 +186,29 @@ class Common(TransactionCase):
         wiz.action_load()
         return wiz
 
-    def _unload_records_from_shipment(self, shipment_advice, records):
+    @classmethod
+    def unload_records_from_shipment(cls, shipment_advice, records):
         """Unload pickings, move lines or package levels from the givent shipment."""
-        wiz_model = self.env["wizard.unload.shipment"].with_context(
+        wiz_model = cls.env["wizard.unload.shipment"].with_context(
             active_model=records._name,
             active_ids=records.ids,
         )
         wiz = wiz_model.create({})
         wiz.action_unload()
         return wiz
+
+    @classmethod
+    def validate_picking(cls, picking, qty_done=None):
+        picking.ensure_one()
+        for ml in picking.move_line_ids:
+            ml.qty_done = qty_done or ml.reserved_uom_qty
+        action_data = picking.button_validate()
+        if action_data is True:
+            return cls.env["stock.picking"]
+        backorder_wizard = Form(
+            cls.env["stock.backorder.confirmation"].with_context(
+                **action_data["context"]
+            )
+        ).save()
+        backorder_wizard.process()
+        return cls.env["stock.picking"].search([("backorder_id", "=", picking.id)])

odoo/addons/shipment_advice/tests/test_shipment_advice.py

@@ -24,7 +24,7 @@ class TestShipmentAdvice(Common):
             self.shipment_advice_out.action_confirm()
 
     def test_shipment_advice_in_progress(self):
-        self._confirm_shipment_advice(self.shipment_advice_out)
+        self.confirm_shipment_advice(self.shipment_advice_out)
         with self.assertRaises(UserError):
             self.shipment_advice_out.action_in_progress()
         self.shipment_advice_out.dock_id = self.dock
@@ -41,8 +41,8 @@ class TestShipmentAdvice(Common):
         with self.assertRaises(UserError):
             self.shipment_advice_in.action_done()
         self._check_sequence(self.shipment_advice_in)
-        self._plan_records_in_shipment(self.shipment_advice_in, picking)
-        self._in_progress_shipment_advice(self.shipment_advice_in)
+        self.plan_records_in_shipment(self.shipment_advice_in, picking)
+        self.progress_shipment_advice(self.shipment_advice_in)
         for ml in picking.move_line_ids:
             ml.qty_done = ml.reserved_uom_qty
         picking._action_done()
@@ -62,8 +62,8 @@ class TestShipmentAdvice(Common):
         """
         picking = self.move_product_in1.picking_id
         # Plan a move
-        self._plan_records_in_shipment(self.shipment_advice_in, self.move_product_in1)
-        self._in_progress_shipment_advice(self.shipment_advice_in)
+        self.plan_records_in_shipment(self.shipment_advice_in, self.move_product_in1)
+        self.progress_shipment_advice(self.shipment_advice_in)
         # Receive it (making its related transfer partially received)
         for ml in self.move_product_in1.move_line_ids:
             ml.qty_done = ml.reserved_uom_qty
@@ -82,8 +82,8 @@ class TestShipmentAdvice(Common):
         validate all fully loaded transfers.
         """
         picking = self.move_product_out1.picking_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, picking)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, picking)
         self.shipment_advice_out.action_done()
         self.assertEqual(self.shipment_advice_out.state, "done")
         self.assertTrue(
@@ -103,8 +103,8 @@ class TestShipmentAdvice(Common):
         company.shipment_advice_outgoing_backorder_policy = "leave_open"
         # Load a transfer partially (here a package)
         package_level = self.move_product_out2.move_line_ids.package_level_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, package_level)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, package_level)
         # Validate the shipment => the transfer is still open
         self.shipment_advice_out.action_done()
         picking = package_level.picking_id
@@ -127,8 +127,8 @@ class TestShipmentAdvice(Common):
         company.shipment_advice_outgoing_backorder_policy = "create_backorder"
         # Load a transfer partially (here a package)
         package_level = self.move_product_out2.move_line_ids.package_level_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, package_level)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, package_level)
         self.assertEqual(package_level.picking_id, self.move_product_out1.picking_id)
         # Validate the shipment => the transfer is validated, creating a backorder
         self.shipment_advice_out.action_done()
@@ -148,7 +148,7 @@ class TestShipmentAdvice(Common):
         self.assertEqual(picking2.state, "assigned")
 
     def test_shipment_advice_cancel(self):
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         self.shipment_advice_out.action_cancel()
         self.assertEqual(self.shipment_advice_out.state, "cancel")
 
@@ -160,6 +160,10 @@ class TestShipmentAdvice(Common):
     def test_shipment_advice_draft(self):
         with self.assertRaises(UserError):
             self.shipment_advice_out.action_draft()
-        self._cancel_shipment_advice(self.shipment_advice_out)
+        self.cancel_shipment_advice(self.shipment_advice_out)
         self.shipment_advice_out.action_draft()
         self.assertEqual(self.shipment_advice_out.state, "draft")
+
+    def test_shipment_name(self):
+        self.assertTrue("OUT" in self.shipment_advice_out.name)
+        self.assertTrue("IN" in self.shipment_advice_in.name)

odoo/addons/shipment_advice/tests/test_shipment_advice_async.py

@@ -50,8 +50,8 @@ class TestShipmentAdvice(Common):
         transfers. Here the planned transfers have been fully received.
         """
         picking = self.move_product_in1.picking_id
-        self._plan_records_in_shipment(self.shipment_advice_in, picking)
-        self._in_progress_shipment_advice(self.shipment_advice_in)
+        self.plan_records_in_shipment(self.shipment_advice_in, picking)
+        self.progress_shipment_advice(self.shipment_advice_in)
         for ml in picking.move_line_ids:
             ml.qty_done = ml.reserved_uom_qty
         picking._action_done()
@@ -79,8 +79,8 @@ class TestShipmentAdvice(Common):
         """
         picking = self.move_product_in1.picking_id
         # Plan a move
-        self._plan_records_in_shipment(self.shipment_advice_in, self.move_product_in1)
-        self._in_progress_shipment_advice(self.shipment_advice_in)
+        self.plan_records_in_shipment(self.shipment_advice_in, self.move_product_in1)
+        self.progress_shipment_advice(self.shipment_advice_in)
         # Receive it (making its related transfer partially received)
         for ml in self.move_product_in1.move_line_ids:
             ml.qty_done = ml.reserved_uom_qty
@@ -107,8 +107,8 @@ class TestShipmentAdvice(Common):
         validate all fully loaded transfers.
         """
         pickings = self.move1.picking_id | self.move2.picking_id | self.move3.picking_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, pickings)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, pickings)
         with trap_jobs() as trap:
             self.shipment_advice_out.action_done()
             trap.assert_jobs_count(5)  # 3 pickings + 1 for unplan + 1 for postprocess
@@ -135,8 +135,8 @@ class TestShipmentAdvice(Common):
         company.shipment_advice_outgoing_backorder_policy = "leave_open"
         # Load a transfer partially (here a package)
         package_level = self.move_product_out2.move_line_ids.package_level_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, package_level)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, package_level)
         # Validate the shipment => the transfer is still open
         with trap_jobs() as trap:
             self.shipment_advice_out.action_done()
@@ -167,8 +167,8 @@ class TestShipmentAdvice(Common):
         company.shipment_advice_outgoing_backorder_policy = "create_backorder"
         # Load a transfer partially (here a package)
         package_level = self.move_product_out2.move_line_ids.package_level_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, package_level)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, package_level)
         self.assertEqual(package_level.picking_id, self.move_product_out1.picking_id)
         # Validate the shipment => the transfer is validated, creating a backorder
         with trap_jobs() as trap:
@@ -202,8 +202,8 @@ class TestShipmentAdvice(Common):
             - the shipment advice moves to the "error" state
         """
         pickings = self.move1.picking_id | self.move2.picking_id | self.move3.picking_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._load_records_in_shipment(self.shipment_advice_out, pickings)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.load_records_in_shipment(self.shipment_advice_out, pickings)
         # provoke validation error by setting internal package as destination
         pickings[0].move_line_ids.result_package_id = self.package
         with trap_jobs() as trap:
@@ -279,10 +279,10 @@ class TestShipmentAdvice(Common):
         # Load a transfer partially (here a package)
         package_level = self.move_product_out2.move_line_ids.package_level_id
         picking = package_level.picking_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        self._plan_records_in_shipment(self.shipment_advice_out, picking)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.plan_records_in_shipment(self.shipment_advice_out, picking)
         self.assertEqual(len(self.shipment_advice_out.planned_move_ids), 3)
-        self._load_records_in_shipment(self.shipment_advice_out, package_level)
+        self.load_records_in_shipment(self.shipment_advice_out, package_level)
         self.assertEqual(len(package_level.move_line_ids.move_id), 2)
         # Validate the shipment => the transfer is validated, creating a backorder
         with trap_jobs() as trap:

odoo/addons/shipment_advice/tests/test_shipment_advice_auto_close.py

@@ -0,0 +1,46 @@
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+from .common import Common
+
+
+class TestShipmentAdviceAutoClose(Common):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.shipment_advice_in.company_id.shipment_advice_auto_close_incoming = True
+        cls.picking1 = cls.move_product_in1.picking_id
+        group = cls.env["procurement.group"].create({})
+        cls.move_product_in21 = cls._create_move(
+            cls.picking_type_in, cls.product_in, 5, group
+        )
+        cls.picking2 = cls.move_product_in21.picking_id
+        cls.pickings = cls.picking1 | cls.picking2
+        cls.plan_records_in_shipment(cls.shipment_advice_in, cls.pickings)
+        cls.progress_shipment_advice(cls.shipment_advice_in)
+
+    def test_auto_close_incoming_on_done(self):
+        self.validate_picking(self.picking1)
+        self.assertEqual(self.shipment_advice_in.state, "in_progress")
+        self.validate_picking(self.picking2)
+        self.assertEqual(self.shipment_advice_in.state, "done")
+
+    def test_auto_close_incoming_on_cancel(self):
+        self.validate_picking(self.picking1)
+        self.assertEqual(self.shipment_advice_in.state, "in_progress")
+        self.picking2.action_cancel()
+        self.assertEqual(self.shipment_advice_in.state, "done")
+
+    def test_no_auto_close_on_outgoing(self):
+        picking = self.move_product_out1.picking_id
+        self.plan_records_in_shipment(self.shipment_advice_out, picking)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        self.validate_picking(picking)
+        self.assertEqual(picking.state, "done")
+        self.assertEqual(self.shipment_advice_out.state, "in_progress")
+
+    def test_no_auto_close_context(self):
+        pickings = self.pickings.with_context(shipment_advice_ignore_auto_close=True)
+        for picking in pickings:
+            self.validate_picking(picking)
+        self.assertEqual(self.shipment_advice_in.state, "in_progress")

odoo/addons/shipment_advice/tests/test_shipment_advice_load.py

@@ -8,7 +8,7 @@ from .common import Common
 
 class TestShipmentAdviceLoad(Common):
     def test_shipment_advice_load_picking_not_planned(self):
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         picking = self.move_product_out1.picking_id
         wiz_model = self.env["wizard.load.shipment"].with_context(
             active_model=picking._name,
@@ -42,9 +42,9 @@ class TestShipmentAdviceLoad(Common):
 
     def test_shipment_advice_load_picking_already_planned(self):
         picking = self.move_product_out1.picking_id
-        self._plan_records_in_shipment(self.shipment_advice_out, picking)
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        wiz = self._load_records_in_shipment(self.shipment_advice_out, picking)
+        self.plan_records_in_shipment(self.shipment_advice_out, picking)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        wiz = self.load_records_in_shipment(self.shipment_advice_out, picking)
         self.assertEqual(wiz.picking_ids, picking)
         self.assertFalse(wiz.move_line_ids)
         # Check planned entries
@@ -73,7 +73,7 @@ class TestShipmentAdviceLoad(Common):
         self.assertEqual(wiz.shipment_advice_id.loaded_package_ids, self.package)
 
     def test_shipment_advice_load_move_line_not_planned(self):
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         move = self.move_product_out1
         wiz_model = self.env["wizard.load.shipment"].with_context(
             active_model=move.move_line_ids._name,
@@ -101,9 +101,9 @@ class TestShipmentAdviceLoad(Common):
 
     def test_shipment_advice_load_move_line_already_planned(self):
         move = self.move_product_out1
-        self._plan_records_in_shipment(self.shipment_advice_out, move)
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        wiz = self._load_records_in_shipment(
+        self.plan_records_in_shipment(self.shipment_advice_out, move)
+        self.progress_shipment_advice(self.shipment_advice_out)
+        wiz = self.load_records_in_shipment(
             self.shipment_advice_out, move.move_line_ids
         )
         self.assertEqual(wiz.move_line_ids, move.move_line_ids)
@@ -127,8 +127,8 @@ class TestShipmentAdviceLoad(Common):
     def test_shipment_advice_load_moves_different_pack(self):
         move = self.move_product_out1
         move_package_ids = self.move_product_out2 + self.move_product_out3
-        self._plan_records_in_shipment(self.shipment_advice_out, move)
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.plan_records_in_shipment(self.shipment_advice_out, move)
+        self.progress_shipment_advice(self.shipment_advice_out)
         wiz_model = self.env["wizard.load.shipment"].with_context(
             active_model=move.move_line_ids._name,
             active_ids=move.move_line_ids.ids + move_package_ids.move_line_ids.ids,
@@ -140,12 +140,12 @@ class TestShipmentAdviceLoad(Common):
     def test_shipment_advice_already_planned_load_move_line_not_planned(self):
         # Plan the first move
         move1 = self.move_product_out1
-        self._plan_records_in_shipment(self.shipment_advice_out, move1)
+        self.plan_records_in_shipment(self.shipment_advice_out, move1)
         # But load something else => error
         package_level = self.move_product_out2.move_line_ids.package_level_id
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         with self.assertRaisesRegex(UserError, "planned already"):
-            self._load_records_in_shipment(
+            self.load_records_in_shipment(
                 self.shipment_advice_out,
                 package_level,
             )

odoo/addons/shipment_advice/tests/test_shipment_advice_picking_values.py

@@ -0,0 +1,20 @@
+# Copyright 2024 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+from .common import Common
+
+
+class TestShipmentPickingValues(Common):
+    def test_picking_loaded_waiting_quantity_no(self):
+        move = self.move_product_out1
+        picking = move.picking_id
+        self.load_records_in_shipment(self.shipment_advice_out, picking)
+        self.assertEqual(picking.loaded_waiting_quantity, 0)
+
+    def test_picking_loaded_waiting_quantity_yes(self):
+        move = self.move_product_out1
+        picking = move.picking_id
+        quantity = move.product_qty
+        move.move_line_ids.reserved_uom_qty = quantity - 3
+        self.load_records_in_shipment(self.shipment_advice_out, picking)
+        self.assertEqual(picking.loaded_waiting_quantity, 3)

odoo/addons/shipment_advice/tests/test_shipment_advice_plan.py

@@ -7,7 +7,7 @@ from .common import Common
 class TestShipmentAdvicePlan(Common):
     def test_shipment_advice_plan_picking(self):
         picking = self.move_product_out1.picking_id
-        wiz = self._plan_records_in_shipment(self.shipment_advice_out, picking)
+        wiz = self.plan_records_in_shipment(self.shipment_advice_out, picking)
         self.assertEqual(wiz.picking_ids, picking)
         self.assertFalse(wiz.move_ids)
         self.assertEqual(wiz.shipment_advice_id, self.shipment_advice_out)
@@ -18,7 +18,7 @@ class TestShipmentAdvicePlan(Common):
 
     def test_shipment_advice_plan_move(self):
         picking = self.move_product_out1.picking_id
-        wiz = self._plan_records_in_shipment(
+        wiz = self.plan_records_in_shipment(
             self.shipment_advice_out, self.move_product_out1
         )
         self.assertEqual(wiz.move_ids, self.move_product_out1)

odoo/addons/shipment_advice/tests/test_shipment_advice_stock_user.py

@@ -80,13 +80,13 @@ class TestShipmentAdviceStockUser(Common):
 
     def test_wizard_plan_and_load_shipment(self):
         move = self.move_product_out1
-        self._plan_records_in_shipment(
+        self.plan_records_in_shipment(
             self.shipment_advice_out,
             move,
             user=self.stock_user,
         )
-        self._in_progress_shipment_advice(self.shipment_advice_out)
-        wiz = self._load_records_in_shipment(
+        self.progress_shipment_advice(self.shipment_advice_out)
+        wiz = self.load_records_in_shipment(
             self.shipment_advice_out,
             move.move_line_ids,
             user=self.stock_user,

odoo/addons/shipment_advice/tests/test_shipment_advice_unload.py

@@ -6,10 +6,10 @@ from .common import Common
 
 class TestShipmentAdviceUnload(Common):
     def test_shipment_advice_unload_picking(self):
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         # Load picking
         picking = self.move_product_out1.picking_id
-        self._load_records_in_shipment(self.shipment_advice_out, picking)
+        self.load_records_in_shipment(self.shipment_advice_out, picking)
         self.assertEqual(self.shipment_advice_out.loaded_picking_ids, picking)
         self.assertEqual(
             self.shipment_advice_out.loaded_move_line_ids,
@@ -18,29 +18,29 @@ class TestShipmentAdviceUnload(Common):
             | self.move_product_out3.move_line_ids,
         )
         # Unload it
-        self._unload_records_from_shipment(self.shipment_advice_out, picking)
+        self.unload_records_from_shipment(self.shipment_advice_out, picking)
         self.assertFalse(self.shipment_advice_out.loaded_picking_ids)
         self.assertFalse(self.shipment_advice_out.loaded_move_line_ids)
 
     def test_shipment_advice_unload_move_line(self):
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         # Load move line
         move_line = self.move_product_out1.move_line_ids
-        self._load_records_in_shipment(self.shipment_advice_out, move_line)
+        self.load_records_in_shipment(self.shipment_advice_out, move_line)
         self.assertEqual(move_line.qty_done, 20)
         self.assertEqual(
             self.shipment_advice_out.loaded_move_line_without_package_ids, move_line
         )
         # Unload it
-        self._unload_records_from_shipment(self.shipment_advice_out, move_line)
+        self.unload_records_from_shipment(self.shipment_advice_out, move_line)
         self.assertFalse(move_line.qty_done)
         self.assertFalse(self.shipment_advice_out.loaded_move_line_without_package_ids)
 
     def test_shipment_advice_unload_package_level(self):
-        self._in_progress_shipment_advice(self.shipment_advice_out)
+        self.progress_shipment_advice(self.shipment_advice_out)
         # Load package level
         package_level = self.move_product_out2.move_line_ids.package_level_id
-        self._load_records_in_shipment(self.shipment_advice_out, package_level)
+        self.load_records_in_shipment(self.shipment_advice_out, package_level)
         self.assertTrue(package_level.is_done)
         self.assertEqual(self.move_product_out2.move_line_ids.qty_done, 10)
         self.assertEqual(self.move_product_out3.move_line_ids.qty_done, 10)

odoo/addons/shipment_advice/views/res_config_settings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2021 Camptocamp SA
+     Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="res_config_settings_view_form" model="ir.ui.view">
@@ -44,6 +45,23 @@
                         </div>
                     </div>
                 </div>
+                <div
+                    class="col-12 col-lg-6 o_setting_box"
+                    id="shipment_advice_auto_close_incoming"
+                    title="shipment_advice_auto_close_incoming"
+                >
+                    <div class="o_setting_left_pane">
+                        <field name="shipment_advice_auto_close_incoming" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="shipment_advice_auto_close_incoming" />
+                        <div class="text-muted">
+                            This flag indicates if an incoming shipment advice
+                            will be automatically set to done
+                            if all related moves are done or canceled
+                        </div>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>

odoo/addons/shipment_advice/views/shipment_advice.xml

@@ -186,7 +186,10 @@
                                 groups="!base.group_multi_company"
                                 invisible="1"
                             />
-                            <field name="shipment_type" />
+                            <field
+                                name="shipment_type"
+                                attrs="{'readonly': [('name', '!=', '/')]}"
+                            />
                         </group>
                         <group name="info2">
                             <field

odoo/addons/shipment_advice/views/stock_picking.xml

@@ -120,6 +120,7 @@
                 <field name="loaded_move_lines_progress" />
                 <field name="loaded_weight_progress" />
                 <field name="state" />
+                <field name="loaded_waiting_quantity" />
             </tree>
         </field>
     </record>

{odoo_addon_shipment_advice-16.0.1.5.0.dist-info → odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shipment_advice
-Version: 16.0.1.5.0
+Version: 16.0.1.6.0.1
 Summary: Manage your (un)loading process through shipment advices.
 Home-page: https://github.com/OCA/stock-logistics-transport
 Author: Camptocamp, Odoo Community Association (OCA)
@@ -11,9 +11,9 @@ Classifier: Framework :: Odoo
 Classifier: Framework :: Odoo :: 16.0
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Requires-Python: >=3.10
-Requires-Dist: odoo-addon-queue-job <16.1dev,>=16.0dev
-Requires-Dist: odoo-addon-stock-dock <16.1dev,>=16.0dev
-Requires-Dist: odoo <16.1dev,>=16.0a
+Requires-Dist: odoo-addon-queue-job<16.1dev,>=16.0dev
+Requires-Dist: odoo-addon-stock-dock<16.1dev,>=16.0dev
+Requires-Dist: odoo<16.1dev,>=16.0a
 
 ===============
 Shipment Advice
@@ -24,7 +24,7 @@ Shipment Advice
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:60951d59c7ca7c14de9a7e490200a900d1aec0483212ef3f936e724c5f06e98a
+   !! source digest: sha256:34e6a179b9a0304d4d12e6a1ec5e161d7ad127fec1463f2061c083e562a5f789
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -78,6 +78,7 @@ Contributors
 * Simone Orsi <simahawk@gmail.com>
 * `Trobz <https://trobz.com>`_:
   * Dung Tran <dungtd@trobz.com>
+* Michael Tietz (MT Software) <mtietz@mt-software.de>
 
 Design
 ~~~~~~

{odoo_addon_shipment_advice-16.0.1.5.0.dist-info → odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info}/RECORD

@@ -1,44 +1,46 @@
-odoo/addons/shipment_advice/README.rst,sha256=fTPLxZpccDpUydPVvZnIWVBT4qFdMFRheK6LVOCEX2Y,3389
+odoo/addons/shipment_advice/README.rst,sha256=4BR9JuVlUKKlqzSsM79Ku7OCNRF3FFW825zld4qXVoo,3443
 odoo/addons/shipment_advice/__init__.py,sha256=0XNpxETgFdVxFDEw03O8oL3NtTSk3we-HEZW2sPKzIU,43
-odoo/addons/shipment_advice/__manifest__.py,sha256=Tvr3KkRQd0cV_Xs2BfU2Vv7tvSGltqsKKtvvYDH_4x0,1301
+odoo/addons/shipment_advice/__manifest__.py,sha256=pdIxMoAVumfKpxQYTj_KRRtZTIsN6NsY7PWXEV02RdM,1301
 odoo/addons/shipment_advice/data/ir_sequence.xml,sha256=7y13W1xPr3o_deB6s5a_UHSJGMpFGCA8JTc7xI5L0-c,1066
 odoo/addons/shipment_advice/data/queue_job_channel.xml,sha256=wZSQNo7aAknlMpTC-mxXRvYf0rXSF53B3hI7NXwKciA,350
 odoo/addons/shipment_advice/data/queue_job_function.xml,sha256=cEy-z8znwYUB8GDNjouWgwS-Rbfn1zl7nbpLvdXRD_U,1151
 odoo/addons/shipment_advice/demo/stock_dock.xml,sha256=hhwcQa6JGbN-oQYrkrrgPmH1hbH1p7YEGuKZY9NGMT0,267
-odoo/addons/shipment_advice/i18n/es.po,sha256=qhiD9JC2UyeRo2xs6I0JHvd9C-xy-dZBKFXB-Sc2ln8,56392
-odoo/addons/shipment_advice/i18n/fr.po,sha256=zjcmIhOGCnvZLOxJiV9qPlvRW45ufR-hGRSB9qCn-4w,54240
-odoo/addons/shipment_advice/i18n/it.po,sha256=qjB8UWhsxReSrKww7W224JtKqdVXxi0595SbgC-b7Lg,57275
-odoo/addons/shipment_advice/i18n/shipment_advice.pot,sha256=F8VfgXnUV9kgaYcs0CB4FX62wvaE_rFzNZLn8ctIwvw,46856
+odoo/addons/shipment_advice/i18n/es.po,sha256=fCAPUSRzmG-Fgl0t27SFa0NUf9j0AdpVBCwCRoxppOE,57757
+odoo/addons/shipment_advice/i18n/fr.po,sha256=AaOAmmENm2Qcd-eu7SF-UbDtHXx-JvCeMMU-Wl8JCnU,55605
+odoo/addons/shipment_advice/i18n/it.po,sha256=177BtK1BtuZ0UXaJOe5tdprtKTUzmHK64QZeKYsSt44,58640
+odoo/addons/shipment_advice/i18n/shipment_advice.pot,sha256=Rw4a6mSDBSWYieFLAlPquPeVaIg8M6y44JVcPgzh640,48221
 odoo/addons/shipment_advice/models/__init__.py,sha256=kvmDs7RDo8Tnvv0w_2GcxgVcw9nATFSixZ1tFlVNNz8,207
-odoo/addons/shipment_advice/models/res_company.py,sha256=fXtG4UK67RJNoRRXsdL3el5hxsGBLx_lqUKaylg6LEs,1276
-odoo/addons/shipment_advice/models/res_config_settings.py,sha256=XsOdwRyr3_L07kEoabJN2InBQ6aVXSq0qHtTn-OG8r8,513
-odoo/addons/shipment_advice/models/shipment_advice.py,sha256=FIR1uVoU9KlDMdqmc6KG0EWM1eFKgnSXpTyE0XqTTJs,20305
-odoo/addons/shipment_advice/models/stock_move.py,sha256=76z93nLjxFO3et79ogYALXsZadBBz-wqnpwENyDPtbY,543
+odoo/addons/shipment_advice/models/res_company.py,sha256=PXjmBwOvjDagL2xLA0JBD40E1cBJVyh_lVQc3R1I5tk,1669
+odoo/addons/shipment_advice/models/res_config_settings.py,sha256=VGgAvuRnmaN2EoV3fZPdqW3gOJeKtFJX5w3R8cLHYeE,727
+odoo/addons/shipment_advice/models/shipment_advice.py,sha256=EQDsyXfVBvdeaXtazV3pQSokzi-07qYKhRX7icec7sU,21352
+odoo/addons/shipment_advice/models/stock_move.py,sha256=P6dman_04CcGZkQmfzcAn0O7DgR0FLrugCuVPW4IMtA,1237
 odoo/addons/shipment_advice/models/stock_move_line.py,sha256=gkGBrDFJ1BZC8uY9wwwFSuk_xw__HdRTW2DTGk2WdxI,5378
 odoo/addons/shipment_advice/models/stock_package_level.py,sha256=0_S4KRBy02kkmBu5Pbcw6g-etJtATveTZh42Srz1R_o,1431
-odoo/addons/shipment_advice/models/stock_picking.py,sha256=EPZ-DNhMWDraIThBveOUBiCBel86ea_uAGuKO-z-QeE,8438
-odoo/addons/shipment_advice/readme/CONTRIBUTORS.rst,sha256=IWUYnivo0DXa4JN3euivIwPkudMEjRYeoY4qPiUvHSw,319
+odoo/addons/shipment_advice/models/stock_picking.py,sha256=K1BbrAXPyKeIg_sPbxhwgdBkjND_FanjszY1DrMj8zw,8861
+odoo/addons/shipment_advice/readme/CONTRIBUTORS.rst,sha256=BCvWvogVfa_k5j5jF5fkxv-ooTo_LjcBKSI-mas-HT0,373
 odoo/addons/shipment_advice/readme/CREDITS.rst,sha256=CuObn3b483zExCIho2SzTKfTU3M7H3vMQNHdTAc7UV4,138
 odoo/addons/shipment_advice/readme/DESCRIPTION.rst,sha256=m5Xql8e7i_F_7AMLc-1lBRGVCHUca9kJ78ZRxOUaOl8,58
 odoo/addons/shipment_advice/report/report_shipment_advice.xml,sha256=hKMUP7iuRLpeBOB7-bNr38d83WB5aet76mElIoTS_5Q,7696
 odoo/addons/shipment_advice/report/reports.xml,sha256=8LeKVB1M0a4gsLyrwd68RMnxoUw0xCYIn2KN4jlCuLA,1523
 odoo/addons/shipment_advice/security/ir.model.access.csv,sha256=FeiNV6yP6OOOwJw2MHyo1B3TQQ-umOz75A7QAlCTPZs,657
 odoo/addons/shipment_advice/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/shipment_advice/static/description/index.html,sha256=0QYesWG-4W4P01Z2zBa29sDLbiUBcSQ2bq_rcEuHO18,13650
-odoo/addons/shipment_advice/tests/__init__.py,sha256=NAs_27I19CYFy1t_xuuUDGuuyd0hoa7q1uHRydzdgRY,244
-odoo/addons/shipment_advice/tests/common.py,sha256=ry1jywQT7E5Rim0l732BRyEIfxBm0fvNH5XKQGFkVNg,7132
-odoo/addons/shipment_advice/tests/test_shipment_advice.py,sha256=GO7AV4O2Js8cZ9a7EmZY5-4n1uMWF6zhQwORZxsj5YY,7540
-odoo/addons/shipment_advice/tests/test_shipment_advice_async.py,sha256=PVWm8Gxn17l_DbZWIF_VFme34cn826uxKhxPbRUQLGM,14617
-odoo/addons/shipment_advice/tests/test_shipment_advice_load.py,sha256=DUvZ_yBJRj75XPaLecibA1vp-k7TPaUFYMF4XxXM1wc,8093
-odoo/addons/shipment_advice/tests/test_shipment_advice_plan.py,sha256=7hUY4RRYi8-6_ovmYFA7DH85KP_kfy1J3O14beKG0hk,1550
-odoo/addons/shipment_advice/tests/test_shipment_advice_stock_user.py,sha256=7fd0AqX-OrCQH2zGB4L2SO4UUzjcSgzxHOdhmsWgDLw,4334
-odoo/addons/shipment_advice/tests/test_shipment_advice_unload.py,sha256=2BEJUEVSsh1MW_ke8-LK4vLsi7Sb3Ijs0T794yQdwdE,2727
-odoo/addons/shipment_advice/views/res_config_settings.xml,sha256=KTNRG9hBnkeJGTjVpF3Bs4ScU512TaPwTSFh6yQjFmU,2501
-odoo/addons/shipment_advice/views/shipment_advice.xml,sha256=ME_BnA3sIgpbxKSHDDI_-tO8NFLgUHyd-nvMCBtyZjE,16723
+odoo/addons/shipment_advice/static/description/index.html,sha256=YIGWG2hxw-d50PbRVFCDOMF_0COWvRhF3d2O6zlQf4A,13795
+odoo/addons/shipment_advice/tests/__init__.py,sha256=nWHgeD6l3judyJhGVx996KU99UMvDI0TIl0QhG3LqLQ,340
+odoo/addons/shipment_advice/tests/common.py,sha256=dEpqCye2-xBP8dPy5ftIX9ZY8w56F3pshUgR0qg0jXY,8159
+odoo/addons/shipment_advice/tests/test_shipment_advice.py,sha256=tC1S1XsCZ1PauKplUjoMfa2EUbwhVFCz-iwzfMQ6JOo,7670
+odoo/addons/shipment_advice/tests/test_shipment_advice_async.py,sha256=w-vBtm1771G4E_AD75iBNYgQikqLc7TASbVpRHMX3Yg,14581
+odoo/addons/shipment_advice/tests/test_shipment_advice_auto_close.py,sha256=QHSAPsJH9p2NPMEo7gEAHrMBwRbPcr6RyG5bhsXNU38,2047
+odoo/addons/shipment_advice/tests/test_shipment_advice_load.py,sha256=frf8-XkZyGwM-h21CZtec4ISLxodOcUkDWjkr69yFPM,8062
+odoo/addons/shipment_advice/tests/test_shipment_advice_picking_values.py,sha256=VsQUqr0gwdqo8ppEoTOD6ii9hBmp3amNDa5xOV07-WU,784
+odoo/addons/shipment_advice/tests/test_shipment_advice_plan.py,sha256=6-ArD_3ZjYo0q_TM8YLcRbEkEv3Y8bag6cz_F8WyCao,1548
+odoo/addons/shipment_advice/tests/test_shipment_advice_stock_user.py,sha256=FrJCnl8jCytkuvN70H1_hmEN-QdLSTVqSAY5FsqZsHQ,4328
+odoo/addons/shipment_advice/tests/test_shipment_advice_unload.py,sha256=FAkgou08zSIfBXY9t0-XOC8zGk-fuq8OQh7CfsXeq8s,2710
+odoo/addons/shipment_advice/views/res_config_settings.xml,sha256=gFGVuzb54xVOJ22Poz9Q8vfvHzWfgNzJO4DBQCv3A0A,3425
+odoo/addons/shipment_advice/views/shipment_advice.xml,sha256=Bz3gG4Mra1K_U86y9vzPUmV4npDrdkadsfIgrIYcE50,16859
 odoo/addons/shipment_advice/views/stock_move.xml,sha256=sQNoEgFOYNT4lUc4GRhDO9xWznjk-pPJqPVfzKoClnI,2275
 odoo/addons/shipment_advice/views/stock_move_line.xml,sha256=RJ-MCrapTt2uRhxHnEm7KFJmgz_ecQtsaHk_ah9RMos,3250
 odoo/addons/shipment_advice/views/stock_package_level.xml,sha256=0smz8ZWu9p6GsFn5Px3fSmFUZJgPif8wUJQBR1GFJoc,2171
-odoo/addons/shipment_advice/views/stock_picking.xml,sha256=R0TLnr9SE3s9-cN6KgIllvJSAMxFOGdeVQo3m5Vkgg4,8005
+odoo/addons/shipment_advice/views/stock_picking.xml,sha256=gQh7ABERuDe6BU53eykYAJe2r11-p0zCJF7UkL6hXQ8,8062
 odoo/addons/shipment_advice/wizards/__init__.py,sha256=PWEljvfDbqYr3SrKAVpmaE25XvKFjuW2NCACSkyQzao,116
 odoo/addons/shipment_advice/wizards/load_shipment.py,sha256=eeoDAaYBDE94ZFb1NGcJhwAiW73zizUHbS5jvd7WK6w,8541
 odoo/addons/shipment_advice/wizards/load_shipment.xml,sha256=1kb49KAO08qWmYYGyskFojDvuUO11EuLMCK-XRpMx54,2734
@@ -48,7 +50,7 @@ odoo/addons/shipment_advice/wizards/unload_shipment.py,sha256=J0GtSHeykr5YsJH48a
 odoo/addons/shipment_advice/wizards/unload_shipment.xml,sha256=xYL7hKrlH11PfRPOV9uTGDeafSA7KlmZbm5AZ8icqyQ,1562
 odoo/addons/shipment_advice/wizards/unplan_shipment.py,sha256=zdzK3vRbZW0eY3iw9eOGxXhs5YDTjZhT9JBSyRoqqoM,4163
 odoo/addons/shipment_advice/wizards/unplan_shipment.xml,sha256=KX4lF5O-HOwcylK3odlqfQd-TDvQLTYtfsxptinIsIQ,1832
-odoo_addon_shipment_advice-16.0.1.5.0.dist-info/METADATA,sha256=vqICVKDSqw05KusAAzB1ZHR7VeB9HBkRnSa0-ifDK8M,4061
-odoo_addon_shipment_advice-16.0.1.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-odoo_addon_shipment_advice-16.0.1.5.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_shipment_advice-16.0.1.5.0.dist-info/RECORD,,
+odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info/METADATA,sha256=dVTHgcLwraXhPo5ARu_l9kQ0C8GpBS1Mg6D5ZNClLpE,4114
+odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info/RECORD,,

{odoo_addon_shipment_advice-16.0.1.5.0.dist-info → odoo_addon_shipment_advice-16.0.1.6.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any