odoo-addon-shipment-advice 16.0.1.3.1.3__py3-none-any.whl → 16.0.1.4.0__py3-none-any.whl

odoo/addons/shipment_advice/i18n/shipment_advice.pot

@@ -13,6 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: shipment_advice
+#. odoo-python
+#: code:addons/shipment_advice/models/shipment_advice.py:0
+#, python-format
+msgid "%(sa)s: %(pick)s background validation"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.actions.report,print_report_name:shipment_advice.action_report_shipment_advice
 msgid "'Shipment Advice - %s' % (object.name)"
@@ -63,6 +70,15 @@ msgstr ""
 msgid "Activity Type Icon"
 msgstr ""
 
+#. module: shipment_advice
+#. odoo-python
+#: code:addons/shipment_advice/models/shipment_advice.py:0
+#, python-format
+msgid ""
+"An error occurred while processing:\n"
+"- %(related_object_name)s: %(error)s"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__arrival_date
 msgid "Arrival Date"
@@ -236,6 +252,16 @@ msgstr ""
 msgid "Driver signature"
 msgstr ""
 
+#. module: shipment_advice
+#: model:ir.model.fields.selection,name:shipment_advice.selection__shipment_advice__state__error
+msgid "Error"
+msgstr ""
+
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__error_message
+msgid "Error Message"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__message_follower_ids
 msgid "Followers"
@@ -309,6 +335,11 @@ msgid ""
 "If you want to mark deliveries as done only when they are all loaded in a shipment advice choose 'Leave open'. This last option is useful when your deliveries will be shipped by several trucks."
 msgstr ""
 
+#. module: shipment_advice
+#: model:ir.model.fields.selection,name:shipment_advice.selection__shipment_advice__state__in_process
+msgid "In process"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields.selection,name:shipment_advice.selection__shipment_advice__state__in_progress
 msgid "In progress"
@@ -686,6 +717,13 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
+#. module: shipment_advice
+#. odoo-python
+#: code:addons/shipment_advice/models/shipment_advice.py:0
+#, python-format
+msgid "One of the pickings to process failed to validate"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.model.fields,field_description:shipment_advice.field_wizard_load_shipment__open_shipment
 msgid "Open Shipment"
@@ -913,6 +951,13 @@ msgstr ""
 msgid "Responsible User"
 msgstr ""
 
+#. module: shipment_advice
+#: model:ir.model.fields,field_description:shipment_advice.field_res_company__shipment_advice_run_in_queue_job
+#: model:ir.model.fields,field_description:shipment_advice.field_res_config_settings__shipment_advice_run_in_queue_job
+#: model:ir.model.fields,field_description:shipment_advice.field_shipment_advice__run_in_queue_job
+msgid "Run shipment advice in queue job"
+msgstr ""
+
 #. module: shipment_advice
 #: model:ir.actions.report,name:shipment_advice.action_report_shipment_advice
 #: model:ir.model,name:shipment_advice.model_shipment_advice
@@ -1034,6 +1079,24 @@ msgstr ""
 msgid "To plan in Shipment Advice"
 msgstr ""
 
+#. module: shipment_advice
+#: model_terms:ir.ui.view,arch_db:shipment_advice.res_config_settings_view_form
+msgid ""
+"To prevent timeouts for large shipments, enable this option to execute\n"
+"                            shipment advice validation through a queued job. Each picking will be\n"
+"                            validated in a separate jobs."
+msgstr ""
+
+#. module: shipment_advice
+#: model:ir.model.fields,help:shipment_advice.field_res_company__shipment_advice_run_in_queue_job
+#: model:ir.model.fields,help:shipment_advice.field_res_config_settings__shipment_advice_run_in_queue_job
+#: model:ir.model.fields,help:shipment_advice.field_shipment_advice__run_in_queue_job
+msgid ""
+"To prevent timeouts for large shipments, enable this option to execute "
+"shipment advice validation through a queued jobs. Each picking will be "
+"validated in a separate job."
+msgstr ""
+
 #. module: shipment_advice
 #: model_terms:ir.ui.view,arch_db:shipment_advice.shipment_advice_view_search
 msgid "Today"
@@ -1321,3 +1384,8 @@ msgid ""
 "You cannot unload this move line alone, you have to unload the whole package"
 " content."
 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"
+msgstr ""

odoo/addons/shipment_advice/models/res_company.py

@@ -23,3 +23,9 @@ class ResCompany(models.Model):
             "deliveries will be shipped by several trucks."
         ),
     )
+    shipment_advice_run_in_queue_job = fields.Boolean(
+        string="Run shipment advice in queue job",
+        help="To prevent timeouts for large shipments, enable this option to execute "
+        "shipment advice validation through a queued jobs. Each picking will be "
+        "validated in a separate job.",
+    )

odoo/addons/shipment_advice/models/res_config_settings.py

@@ -10,3 +10,6 @@ class ResConfigSettings(models.TransientModel):
     shipment_advice_outgoing_backorder_policy = fields.Selection(
         related="company_id.shipment_advice_outgoing_backorder_policy", readonly=False
     )
+    shipment_advice_run_in_queue_job = fields.Boolean(
+        related="company_id.shipment_advice_run_in_queue_job", readonly=False
+    )

odoo/addons/shipment_advice/models/shipment_advice.py

@@ -4,6 +4,9 @@
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 
+from odoo.addons.queue_job.delay import chain, group
+from odoo.addons.queue_job.job import identity_exact
+
 
 class ShipmentAdvice(models.Model):
     _name = "shipment.advice"
@@ -23,11 +26,14 @@ class ShipmentAdvice(models.Model):
             ("draft", "Draft"),
             ("confirmed", "Confirmed"),
             ("in_progress", "In progress"),
+            ("in_process", "In process"),
+            ("error", "Error"),
             ("done", "Done"),
             ("cancel", "Cancelled"),
         ],
         string="Status",
         default="draft",
+        tracking=True,
     )
     warehouse_id = fields.Many2one(
         comodel_name="stock.warehouse",
@@ -168,6 +174,10 @@ class ShipmentAdvice(models.Model):
             "(e.g. through the shopfloor application)."
         ),
     )
+    run_in_queue_job = fields.Boolean(
+        related="company_id.shipment_advice_run_in_queue_job"
+    )
+    error_message = fields.Text(tracking=True)
 
     _sql_constraints = [
         (
@@ -295,64 +305,121 @@ class ShipmentAdvice(models.Model):
         self.env.cr.execute(sql, (tuple(records.ids),), log_exceptions=False)
 
     def action_done(self):
-        wiz_model = self.env["stock.backorder.confirmation"]
+        self._check_action_done_allowed()
+        for shipment in self:
+            shipment._action_done()
+        return True
+
+    def _get_picking_to_process(self):
+        self.ensure_one()
+        if self.shipment_type == "incoming":
+            return self.planned_picking_ids
+        return self.loaded_picking_ids
+
+    def _action_done(self):
+        # Validate transfers (create backorders for unprocessed lines)
+        self.ensure_one()
+        self.write({"state": "in_process", "error_message": False})
+
+        if self.shipment_type == "incoming":
+            backorder_policy = "create_backorder"
+        else:
+            backorder_policy = self.company_id.shipment_advice_outgoing_backorder_policy
+        pickings = self._get_picking_to_process().filtered(
+            lambda p: p.state not in ("cancel", "done")
+        )
+        if self.run_in_queue_job:
+            chain(
+                group(
+                    *[
+                        self.delayable(
+                            identity_key=identity_exact,
+                            description=_(
+                                "%(sa)s: %(pick)s background validation",
+                                sa=self.name,
+                                pick=picking.name,
+                            ),
+                        )._validate_picking(picking, backorder_policy)
+                        for picking in pickings
+                    ]
+                ),
+                group(self.delayable(description=self.name)._unplan_undone_moves()),
+                group(self.delayable(description=self.name)._postprocess_action_done()),
+            ).delay()
+            return
+        for picking in pickings:
+            self._validate_picking(picking, backorder_policy)
+        self._unplan_undone_moves()
+        self._postprocess_action_done()
+
+    def _check_action_done_allowed(self):
         for shipment in self:
-            if shipment.state != "in_progress":
+            if shipment.state not in ("in_progress", "error"):
                 raise UserError(
                     _("Shipment {} is not started, operation aborted.").format(
                         shipment.name
                     )
                 )
-            # Validate transfers (create backorders for unprocessed lines)
-            if shipment.shipment_type == "incoming":
-                self._lock_records(self.planned_picking_ids)
-                for picking in self.planned_picking_ids:
-                    if picking.state in ("cancel", "done"):
-                        continue
-                    if picking._check_backorder():
-                        wiz = wiz_model.create({})
-                        wiz.pick_ids = picking
-                        wiz.with_context(
-                            button_validate_picking_ids=picking.ids
-                        ).process()
-                    else:
-                        picking._action_done()
-            else:
-                backorder_policy = (
-                    shipment.company_id.shipment_advice_outgoing_backorder_policy
-                )
-                self._lock_records(self.loaded_picking_ids)
-                if backorder_policy == "create_backorder":
-                    for picking in self.loaded_picking_ids:
-                        if picking.state in ("cancel", "done"):
-                            continue
-                        if picking._check_backorder():
-                            wiz = wiz_model.create({})
-                            wiz.pick_ids = picking
-                            wiz.with_context(
-                                button_validate_picking_ids=picking.ids
-                            ).process()
-                        else:
-                            picking._action_done()
-                else:
-                    for picking in self.loaded_picking_ids:
-                        if picking.state in ("cancel", "done"):
-                            continue
-                        if not picking._check_backorder():
-                            # no backorder needed means that all qty_done are
-                            # set to fullfill the need => validate
-                            picking._action_done()
-                # Unplan moves that were not loaded and validated
-                moves_to_unplan = (
-                    self.loaded_move_line_ids.move_id | self.planned_move_ids
-                ).filtered(
-                    lambda m: m.state not in ("cancel", "done") and not m.quantity_done
-                )
-                moves_to_unplan.shipment_advice_id = False
-            if not shipment.departure_date:
-                shipment.departure_date = fields.Datetime.now()
-            shipment.state = "done"
-        return True
+
+    def _validate_picking(self, picking, backorder_policy="create_backorder"):
+        self.ensure_one()
+        self._lock_records(picking)
+        try:
+            with self.env.cr.savepoint():
+                if (
+                    picking._check_backorder()
+                    and backorder_policy == "create_backorder"
+                ):
+                    wiz = self.env["stock.backorder.confirmation"].create({})
+                    wiz.pick_ids = picking
+                    wiz.with_context(button_validate_picking_ids=picking.ids).process()
+                elif not picking._check_backorder():
+                    picking._action_done()
+        except UserError as error:
+            self.write(
+                {
+                    "state": "error",
+                    "error_message": self._get_error_message(error, picking),
+                }
+            )
+
+    def _unplan_undone_moves(self):
+        """Unplan moves that were not loaded and validated"""
+        self.ensure_one()
+        if self.state != "in_process" or self.shipment_type != "outgoing":
+            return
+        moves_to_unplan = (
+            self.loaded_move_line_ids.move_id | self.planned_move_ids
+        ).filtered(lambda m: m.state not in ("cancel", "done") and not m.quantity_done)
+        moves_to_unplan.shipment_advice_id = False
+
+    def _postprocess_action_done(self):
+        self.ensure_one()
+        if self.state != "in_process":
+            return
+        if self._get_picking_to_process().filtered(
+            lambda p: p.state not in ("done", "cancel")
+        ):
+            self.write(
+                {
+                    "state": "error",
+                    "error_message": _(
+                        "One of the pickings to process failed to validate"
+                    ),
+                }
+            )
+            return
+        if not self.departure_date:
+            self.departure_date = fields.Datetime.now()
+        self.write({"state": "done", "error_message": False})
+
+    @api.model
+    def _get_error_message(self, error, related_object):
+        return _(
+            "An error occurred while processing:\n- %(related_object_name)s: %(error)s",
+            related_object_name=related_object.display_name,
+            error=str(error),
+        )
 
     def action_cancel(self):
         for shipment in self:

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

@@ -366,7 +366,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2ce9096e86385f60cb183efb0745bb01324df6f1dee67604801fd7b364a0a68e
+!! source digest: sha256:d15a08534108c95673383be523fd4d221150eb3270f749dad244c6f2504036b0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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>

odoo/addons/shipment_advice/tests/__init__.py

@@ -1,4 +1,5 @@
 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_unload

odoo/addons/shipment_advice/tests/test_shipment_advice.py

@@ -108,7 +108,7 @@ class TestShipmentAdvice(Common):
         # Validate the shipment => the transfer is still open
         self.shipment_advice_out.action_done()
         picking = package_level.picking_id
-        self.assertEqual(self.shipment_advice_out.state, "done")
+        self.assertEqual(self.shipment_advice_out.state, "error")
         # Check the transfer
         self.assertTrue(
             all(