[IMP] stock_release_channel_shipment_lead_time

Exclude deliveries planned after shipment date

Author: jbaudoux

stock_release_channel_shipment_lead_time/__manifest__.py

@@ -1,3 +1,4 @@
+# Copyright 2023 Jacques-Etienne Baudoux (BCIM) <[email protected]>
 # Copyright 2023 Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
@@ -11,7 +12,6 @@
     "maintainers": ["jbaudoux"],
     "website": "https://github.com/OCA/wms",
     "depends": [
-        "web",
         "stock_release_channel",  # OCA/wms
         "stock_release_channel_process_end_time",  # OCA/wms
         "stock_warehouse_calendar",  # OCA/stock-logistics-warehouse

stock_release_channel_shipment_lead_time/models/stock_picking.py

@@ -1,32 +1,55 @@
+# Copyright 2023 Jacques-Etienne Baudoux (BCIM) <[email protected]>
 # Copyright 2023 Camptocamp
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class StockPicking(models.Model):
-
     _inherit = "stock.picking"
 
     def _get_release_channel_possible_candidate_domain(self):
-        """
-        override to exclude deliveries (OUT pickings) where
-        the date_deadline is after the shipment date.
-        """
-        self.ensure_one()
+        # Exclude deliveries (OUT pickings) when the date_deadline is after the shipment date
         domain = super()._get_release_channel_possible_candidate_domain()
 
-        # date_deadline is datetime UTC => convert to timezone user to compare
-        # with shipment_date is date
-        if self.date_deadline:
-            date_deadline = fields.Datetime.context_timestamp(
-                self, self.date_deadline
+        date = self.date_deadline
+        if date:
+            # date is datetime UTC => convert to local time to compare
+            # with shipment_date which is local date
+            tz = (
+                self.picking_type_id.warehouse_id.partner_id.tz
+                or self.company_id.partner_id.tz
+            )
+            date = fields.Datetime.context_timestamp(
+                self.with_context(tz=tz), date
             ).date()
 
             domain.extend(
                 [
                     "|",
                     ("shipment_date", "=", False),
-                    ("shipment_date", ">=", date_deadline),
+                    ("shipment_date", ">=", date),
                 ]
             )
         return domain
+
+    @api.model
+    def _search_scheduled_date_prior_to_channel_end_date_condition(self):
+        self.env["stock.release.channel"].flush_model(
+            ["process_end_date", "shipment_date", "shipment_lead_time"]
+        )
+        self.env["stock.picking"].flush_model(["scheduled_date"])
+        end_date = "stock_release_channel.shipment_date"
+        # We don't consider warehouse calendar when there is no process end date
+        lead_time = (
+            "interval '1 day' * coalesce(stock_release_channel.shipment_lead_time, 0)"
+        )
+        now = fields.Datetime.now()
+        cond = f"""
+            CASE WHEN stock_release_channel.process_end_date is not null
+            THEN date(stock_picking.scheduled_date at time zone 'UTC' at time zone wh.tz)
+            < {end_date} + interval '1 day'
+            ELSE date(stock_picking.scheduled_date at time zone 'UTC' at time zone wh.tz)
+            < date(TIMESTAMP %s at time zone wh.tz) + {lead_time} + interval '1 day'
+            END
+        """
+        return cond, [now]

stock_release_channel_shipment_lead_time/readme/CONTRIBUTORS.rst

@@ -1,3 +1,4 @@
+* Jacques-Etienne Baudoux (BCIM) <[email protected]>
 * `Trobz <https://trobz.com>`_:
 
     * Hoang Diep <[email protected]>

stock_release_channel_shipment_lead_time/readme/DESCRIPTION.rst

@@ -1,5 +1,14 @@
-This module allows to set delivery lead time for release channel.
-When setting on shipment lead time on release channel, the shipment date is computed automatically base on
-lead time days or warehouse calendar. There are 2 main enhanced features with this module:
-- Filter deliveries base on shipment date defined on a channel
-- Set delivery date for shipment advice if picking is linked to a channel
+Manage shipment date and delivery lead time on release channel.
+The shipment date is computed automatically base on process end date + shipment
+lead time days and warehouse calendar.
+
+Exclude deliveries promised after shipment date. A delivery with a deadline
+won't be assigned to a channel with a shipment date prior to the deadline. This
+allows to prevent to deliver a sales order with a commitment date in the
+future.
+
+Adapt computation of release ready to take into account the shipment lead time.
+A delivery part of a release channel won't be counted as release ready if the
+scheduled date is after the shipment date.
+
+Add the delivery date on the shipment advice.

stock_release_channel_shipment_lead_time/tests/__init__.py

@@ -1,2 +1,3 @@
 from . import test_assign_channel_shipment_date
 from . import test_release_shipment_date
+from . import test_release_end_date

stock_release_channel_shipment_lead_time/tests/test_release_end_date.py

@@ -0,0 +1,55 @@
+# Copyright 2024 Jacques-Etienne Baudoux (BCIM) <[email protected]>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from freezegun import freeze_time
+
+from odoo import fields
+
+from odoo.addons.stock_release_channel.tests.common import ChannelReleaseCase
+
+
+class ReleaseChannelEndDateCase(ChannelReleaseCase):
+    @freeze_time("2023-01-27 10:00:00")
+    def test_channel_counter_release_ready(self):
+        self.env["ir.config_parameter"].sudo().set_param(
+            "stock_release_channel_process_end_time.stock_release_use_channel_end_date",
+            True,
+        )
+        # Remove existing jobs as some already exists to assign pickings to channel
+        jobs_before = self.env["queue.job"].search([])
+        jobs_before.unlink()
+        # Set the end time
+        self.channel.process_end_time = 23.0
+        # Set picking scheduled date
+        pickings = self.picking | self.picking2 | self.picking3
+        pickings.write({"scheduled_date": fields.Datetime.now()})
+
+        # Asleep the release channel to void the process end date
+        self.channel.action_sleep()
+        self.channel.invalidate_recordset()
+        # Execute the picking channel assignations
+        self.channel.with_context(test_queue_job_no_delay=True).action_wake_up()
+
+        self.assertEqual(pickings, self.channel.picking_ids)
+        # at this stage, the pickings are not ready to be released as the
+        # qty available is not enough
+        self.assertFalse(self.channel._get_pickings_to_release())
+
+        self._update_qty_in_location(self.loc_bin1, self.product1, 100.0)
+        self._update_qty_in_location(self.loc_bin1, self.product2, 100.0)
+
+        self.assertEqual(pickings, self.channel._get_pickings_to_release())
+        # if the scheduled date of one picking is changed to be on a time after the
+        # process end date but on the same day, it should still be releasable
+        pickings[0].scheduled_date = fields.Datetime.from_string("2023-01-27 23:30:00")
+        self.assertEqual(pickings, self.channel._get_pickings_to_release())
+        # if the scheduled date of one picking is changed to be on a date after the
+        # process end date, it should not be releasable anymore
+        pickings[0].scheduled_date = fields.Datetime.from_string("2023-01-28 00:00:00")
+        self.assertEqual(pickings[1:], self.channel._get_pickings_to_release())
+
+        # Now set channel lead time. It back releasable
+        self.channel.shipment_lead_time = 1
+        self.assertEqual(pickings, self.channel._get_pickings_to_release())
+        # Set date after lead time, it is excluded
+        pickings[0].scheduled_date = fields.Datetime.from_string("2023-01-29 00:00:00")
+        self.assertEqual(pickings[1:], self.channel._get_pickings_to_release())