Products.urban 2.5.0.dev7__tar.gz → 2.5.0.dev9__tar.gz

{Products.urban-2.5.0.dev7/src/Products.urban.egg-info → Products.urban-2.5.0.dev9}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.5.0.dev7
+Version: 2.5.0.dev9
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
 Author-email: simon.delcourt@imio.be
 License: GPL
+Description: Introduction
+        ============
+        
+        
+        
+        This product may contain traces of nuts.
+        
+        
 Keywords: Urban IMIO
+Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2.7
-Provides-Extra: test
 Provides-Extra: templates
-
-Introduction
-============
-
-
-
-This product may contain traces of nuts.
-
+Provides-Extra: test

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/docs/CHANGES.rst

@@ -8,6 +8,37 @@ Changelog
 
 .. towncrier release notes start
 
+2.5.0.dev9 (2024-06-27)
+-----------------------
+
+New features:
+
+
+- Add recipient import to inquiries
+  [daggelpop] (SUP-36417)
+
+
+Internal:
+
+
+- Test checking opnion FD delay
+  [jchandelle]
+  Test completion due dates after amending plans
+  [daggelpop] (URB-3005)
+
+
+2.5.0.dev8 (2024-04-21)
+-----------------------
+
+Bug fixes:
+
+
+- Avoid to display disabled vocabulary entries with no start or end validity date
+  [mpeeters] (SUP-36742)
+- Fix logic on some methods to exclude invalid vocabulary entries
+  [mpeeters] (URB-3002)
+
+
 2.5.0.dev7 (2024-04-07)
 -----------------------
 

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '2.5.0.dev7'
+version = '2.5.0.dev9'
 
 setup(
     name="Products.urban",

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/src/Products/urban/UrbanVocabularyTerm.py

@@ -178,7 +178,7 @@ class UrbanVocabulary(object):
         value_to_use="title",
         sort_on="getObjPositionInParent",
         inUrbanConfig=True,
-        allowedStates=["enabled"],
+        allowedStates=["enabled", "disabled"],
         with_empty_value=False,
         datagridfield_key="street",
         _filter=None,
@@ -195,10 +195,14 @@ class UrbanVocabulary(object):
         self._filter = _filter
 
     def _validate_term(self, term, deposit_date):
-        if "startValidity" not in term or "endValidity" not in term:
-            return True
+        if isinstance(term, dict):
+            if "startValidity" not in term or "endValidity" not in term:
+                return term.get("enabled", True)
+        else:
+            if not hasattr(term, "startValidity") or not hasattr(term, "endValidity"):
+                return term.get("enabled", True)
         if term["startValidity"] is None and term["endValidity"] is None:
-            return True
+            return term.get("enabled", True)
         if term["startValidity"] and term["endValidity"]:
             return (
                 deposit_date >= term["startValidity"]
@@ -209,6 +213,17 @@ class UrbanVocabulary(object):
         if term["endValidity"]:
             return deposit_date <= term["endValidity"]
 
+    def _get_deposit_date(self, context):
+        deposit_date = None
+        if hasattr(context, "get_first_deposit_date"):
+            deposit_date = context.get_first_deposit_date()
+        if hasattr(context, "get_first_deposit_date") and not deposit_date:
+            deposit_date = context.creation_date
+        if not deposit_date:
+            # by default we use the current date
+            deposit_date = DateTime(*datetime.now().date().timetuple()[0:3])
+        return deposit_date
+
     def get_raw_voc(self, context, licence_type="", _filter=None):
         portal_urban = api.portal.get_tool("portal_urban")
         raw_voc = portal_urban.get_vocabulary(
@@ -218,12 +233,7 @@ class UrbanVocabulary(object):
             name=self.path,
         )
 
-        deposit_date = None
-        if hasattr(context, "get_first_deposit_date"):
-            deposit_date = context.get_first_deposit_date()
-        if not deposit_date:
-            # by default we use the current date
-            deposit_date = DateTime(*datetime.now().date().timetuple()[0:3])
+        deposit_date = self._get_deposit_date(context)
         voc = [
             v
             for v in raw_voc
@@ -261,21 +271,19 @@ class UrbanVocabulary(object):
 
     def getDisplayListForTemplate(self, content_instance):
         portal_urban = api.portal.get_tool("portal_urban")
-        result = DisplayList(
-            portal_urban.listVocabulary(
-                self.path,
-                content_instance,
-                vocType=self.vocType,
-                id_to_use=self.id_to_use,
-                value_to_use=self.value_to_use,
-                sort_on=self.sort_on,
-                inUrbanConfig=self.inUrbanConfig,
-                allowedStates=self.allowedStates,
-                with_empty_value=self.with_empty_value,
-                with_numbering=False,
-            )
+        voc_terms = portal_urban.listVocabulary(
+            self.path,
+            content_instance,
+            vocType=self.vocType,
+            id_to_use=self.id_to_use,
+            value_to_use=self.value_to_use,
+            sort_on=self.sort_on,
+            inUrbanConfig=self.inUrbanConfig,
+            allowedStates=self.allowedStates,
+            with_empty_value=self.with_empty_value,
+            with_numbering=False,
         )
-        return result
+        return DisplayList(voc_terms)
 
     def getObjectsSet(self, content_instance, values):
         if isinstance(values, str):
@@ -302,7 +310,12 @@ class UrbanVocabulary(object):
             allowedStates=self.allowedStates,
             with_empty_value=self.with_empty_value,
         )
-        return voc_terms
+        deposit_date = self._get_deposit_date(content_instance)
+        filtered_terms = {
+            k: v for k, v in voc_terms.items()
+            if self._validate_term(v, deposit_date)
+        }
+        return filtered_terms
 
     def listAllVocTerms(self, content_instance):
         portal_urban = api.portal.get_tool("portal_urban")
@@ -315,7 +328,12 @@ class UrbanVocabulary(object):
             allowedStates=self.allowedStates,
         )
         voc_terms = [brain.getObject() for brain in voc_brains]
-        return voc_terms
+        deposit_date = self._get_deposit_date(content_instance)
+        filtered_terms = [
+            v for v in voc_terms
+            if self._validate_term(v, deposit_date)
+        ]
+        return filtered_terms
 
 
 ##/code-section module-footer

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/src/Products/urban/browser/templates/urbaneventinquiryview.pt

@@ -205,6 +205,13 @@
                                 </form>
                                 <p>&nbsp;</p>
                             </tal:block>
+
+                            <tal:import_recipients_form define="form python: view.import_recipients_listing_form">
+                                <tal:with-form-as-view define="view nocall:form">
+                                    <metal:block use-macro="form/@@ploneform-macros/titlelessform"/>
+                                </tal:with-form-as-view>
+                            </tal:import_recipients_form>
+
                             <tal:block condition="python: context.REQUEST.get('template_uid') != None">
                                 <tal:block define="docObj python:context.uid_catalog(UID=context.REQUEST.get('template_uid'))[0]">
                                     <Script tal:content="python:'document.location = \''+docObj.getObject().absolute_url()+'/external_edit\';'" />

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/src/Products/urban/browser/urbaneventviews.py

@@ -2,6 +2,7 @@
 
 from Acquisition import aq_inner
 from DateTime import DateTime
+from Products.statusmessages.interfaces import IStatusMessage
 from Products.urban import utils
 from Products.Five import BrowserView
 from Products.urban import UrbanMessage as _
@@ -25,6 +26,7 @@ from zope.annotation import interfaces
 from zope.interface import Interface
 
 import csv
+import collections
 
 claimants_csv_fieldnames = [
     "numerotation",
@@ -245,7 +247,7 @@ class UrbanEventView(BrowserView):
 
 class IImportClaimantListingForm(Interface):
 
-    listing_file = NamedFile(title=_(u"Listing file"))
+    listing_file_claimants = NamedFile(title=_(u'Listing file (claimants)'))
 
 
 class ImportClaimantListingForm(form.Form):
@@ -254,7 +256,7 @@ class ImportClaimantListingForm(form.Form):
     fields = field.Fields(IImportClaimantListingForm)
     ignoreContext = True
 
-    @button.buttonAndHandler(_("Import"), name="import")
+    @button.buttonAndHandler(_('Import'), name='import-claimants')
     def handleImport(self, action):
         inquiry_UID = self.context.UID()
         planned_claimants_import = (
@@ -269,7 +271,7 @@ class ImportClaimantListingForm(form.Form):
             if inquiry_UID in planned_claimants_import:
                 planned_claimants_import.remove(inquiry_UID)
         else:
-            csv_file = data["listing_file"]
+            csv_file = data['listing_file_claimants']
             csv_integrity_error = self.validate_csv_integrity(csv_file)
             if csv_integrity_error:
                 api.portal.show_message(csv_integrity_error, self.request, "error")
@@ -312,6 +314,107 @@ class ImportClaimantListingForm(form.Form):
         return None
 
 
+class IImportRecipientListingForm(Interface):
+
+    listing_file_recipients = NamedFile(title=_(u"Listing file (recipients)"))
+
+
+class ImportRecipientListingForm(form.Form):
+
+    method = "post"
+    fields = field.Fields(IImportRecipientListingForm)
+    ignoreContext = True
+
+    @button.buttonAndHandler(_("Import"), name="import-recipients")
+    def handleImport(self, action):
+        self.import_recipients_from_csv()
+        self.request.response.redirect(
+            self.context.absolute_url()
+            + "/#fieldsetlegend-urbaneventinquiry_recipients"
+        )
+
+    def import_recipients_from_csv(self):
+        data, errors = self.extractData()
+        if errors:
+            return False
+
+        fieldnames = [
+            "name",
+            "firstname",
+            "street",
+            "number",
+            "number_index",
+            "zipcode",
+            "city",
+            "country",
+            "status",
+            "id",  # extra, is read as an empty column
+        ]
+
+        csv_file = data["listing_file_recipients"]
+        data = csv_file.data
+        if data:
+            reader = csv.DictReader(
+                StringIO(data), fieldnames, delimiter=",", quotechar='"'
+            )
+        else:
+            reader = []
+
+        try:
+            recipient_args = [row for row in reader if row["name"]][1:]
+        except csv.Error, error:
+            IStatusMessage(self.request).addStatusMessage(
+                _(
+                    u"The CSV file couldn't be read properly. Please verify its structure and try again."
+                ),
+                type="error",
+            )
+            return
+
+        portal_urban = api.portal.get_tool("portal_urban")
+        plone_utils = api.portal.get_tool("plone_utils")
+
+        country_mapping = {"": ""}
+        country_folder = portal_urban.country
+        for country_obj in country_folder.objectValues():
+            country_mapping[country_obj.Title()] = country_obj.id
+
+        for recipient_arg in recipient_args:
+
+            if not recipient_arg["id"]:
+                recipient_arg["id"] = plone_utils.normalizeString(
+                    " ".join([recipient_arg["name"], recipient_arg["firstname"]])
+                )
+                if recipient_arg["id"] in self.context.objectIds():
+                    count = 1
+                    new_id = "{0}-{1}".format(recipient_arg["id"], count)
+                    while new_id in self.context.objectIds():
+                        count += 1
+                        new_id = "{0}-{1}".format(recipient_arg["id"], count)
+                    recipient_arg["id"] = new_id
+
+            recipient_arg["country"] = country_mapping.get(
+                recipient_arg["country"], None
+            )  # ignore country if it's missing in the country vocabulary
+            recipient_arg["adr1"] = "{} {}".format(
+                recipient_arg["zipcode"], recipient_arg["city"]
+            )
+            adr2 = "{} {}".format(
+                recipient_arg["street"], recipient_arg["number"]
+            )
+            if recipient_arg["number_index"]:
+                adr2 = "{} ({})".format(adr2, recipient_arg["number_index"])
+            recipient_arg["adr2"] = adr2
+            # create recipient
+            with api.env.adopt_roles(["Manager"]):
+                recipient_id = self.context.invokeFactory(
+                    "RecipientCadastre", **recipient_arg
+                )
+                recipient_obj = getattr(self.context, recipient_id)
+
+        plone_utils.addPortalMessage(_("urban_imported_recipients"), type="info")
+
+
 class UrbanEventInquiryBaseView(UrbanEventView, MapView, LicenceView):
     """
     This manage the base view of UrbanEventInquiry
@@ -325,6 +428,8 @@ class UrbanEventInquiryBaseView(UrbanEventView, MapView, LicenceView):
         self.request.set("disable_plone.leftcolumn", 1)
         self.import_claimants_listing_form = ImportClaimantListingForm(context, request)
         self.import_claimants_listing_form.update()
+        self.import_recipients_listing_form = ImportRecipientListingForm(context, request)
+        self.import_recipients_listing_form.update()
 
     @property
     def has_planned_claimant_import(self):

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/src/Products/urban/locales/fr/LC_MESSAGES/urban.po

@@ -572,9 +572,13 @@ msgstr "Etat du permis"
 msgid "Licence types"
 msgstr "Type de permis"
 
-#: ../browser/urbaneventviews.py:224
-msgid "Listing file"
-msgstr ""
+#: ../browser/urbaneventviews.py:250
+msgid "Listing file (claimants)"
+msgstr "Importer un fichier de réclamants (csv)"
+
+#: ../browser/urbaneventviews.py:319
+msgid "Listing file (recipients)"
+msgstr "Importer un fichier de destinataires (csv)"
 
 #: ../interfaces.py:663
 msgid "Mailing limit"
@@ -759,7 +763,11 @@ msgstr ""
 msgid "Tests Extension profile for urban."
 msgstr ""
 
-#: ../browser/urbaneventviews.py:510
+#: ../browser/urbaneventviews.py:367
+msgid "The CSV file couldn't be read properly. Please verify its structure and try again."
+msgstr "Le fichier CSV n'a pas pu être lu correctement. Veuillez vérifier son contenu et réessayer."
+
+#: ../browser/urbaneventviews.py:636
 msgid "The claimants import will be ready tomorrow!"
 msgstr "L'import des réclamants a bien été enregistré et sera éxécuté cette nuit"
 
@@ -2751,6 +2759,10 @@ msgstr "Si ce champ n'est pas rempli, l'identifiant de ce terme sera utilisé"
 msgid "urban_help_townshipCouncilFolder"
 msgstr "Si coché, un paragraphe supplémentaire apparaîtra dans le permis"
 
+#: ../browser/urbaneventviews.py:412
+msgid "urban_imported_recipients"
+msgstr "Destinataires importés"
+
 #. Default: "Buildlicencenumerotation"
 #: UrbanTool.py
 msgid "urban_label_BuildLicenceNumerotation"

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/src/Products/urban/locales/urban.pot

@@ -555,8 +555,12 @@ msgstr ""
 msgid "Licence types"
 msgstr ""
 
-#: ../browser/urbaneventviews.py:224
-msgid "Listing file"
+#: ../browser/urbaneventviews.py:250
+msgid "Listing file (claimants)"
+msgstr ""
+
+#: ../browser/urbaneventviews.py:319
+msgid "Listing file (recipients)"
 msgstr ""
 
 #: ../interfaces.py:663
@@ -741,7 +745,11 @@ msgstr ""
 msgid "Tests Extension profile for urban."
 msgstr ""
 
-#: ../browser/urbaneventviews.py:510
+#: ../browser/urbaneventviews.py:367
+msgid "The CSV file couldn't be read properly. Please verify its structure and try again."
+msgstr ""
+
+#: ../browser/urbaneventviews.py:636
 msgid "The claimants import will be ready tomorrow!"
 msgstr ""
 
@@ -2718,6 +2726,10 @@ msgstr ""
 msgid "urban_help_townshipCouncilFolder"
 msgstr ""
 
+#: ../browser/urbaneventviews.py:412
+msgid "urban_imported_recipients"
+msgstr ""
+
 #. Default: "Buildlicencenumerotation"
 #: UrbanTool.py
 msgid "urban_label_BuildLicenceNumerotation"

{Products.urban-2.5.0.dev7 → Products.urban-2.5.0.dev9}/src/Products/urban/profiles/testsWithConfig/data.py

@@ -29,6 +29,15 @@ urbanEventTypes = {
             "podTemplates": (),
             "eventTypeType": "Products.urban.interfaces.IDepositEvent",
         },
+        {
+            "id": "transmis-2eme-dossier-rw",
+            "title": "Transmis 2eme dossier RW",
+            "eventDateLabel": "Date de transmis",
+            "activatedFields": ["decisionDate", "decision", "receiptDate"],
+            "deadLineDelay": 0,
+            "podTemplates": (),
+            "eventTypeType": "Products.urban.interfaces.IWalloonRegionOpinionRequestEvent",
+        },
     ),
     "buildlicence": (
         {

Products.urban-2.5.0.dev9/src/Products/urban/schedule/tests/test_amended_plans.py

@@ -0,0 +1,209 @@
+# -*- coding: utf-8 -*-
+
+from Products.urban.testing import URBAN_TESTS_CONFIG_FUNCTIONAL
+from datetime import datetime
+from plone import api
+from plone.app.testing import login
+from plone.app.testing import logout
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.event import notify
+
+import unittest
+
+
+class TestAmendedPlansStartDate(unittest.TestCase):
+
+    layer = URBAN_TESTS_CONFIG_FUNCTIONAL
+
+    def _get_due_date(self, task):
+        """"Return the due date for a given task"""
+        container = task.get_container()
+        config = task.get_task_config()
+        return config.compute_due_date(container, task)
+
+    def _create_recepisse_plans_modificatifs(self, licence, event_date):
+        event_config = self.portal_urban.codt_buildlicence.urbaneventtypes["recepisse-de-plans-modificatifs"]
+        event = licence.createUrbanEvent(event_config)
+        event.setEventDate(event_date)
+        notify(ObjectModifiedEvent(licence))
+
+    def setUp(self):
+        portal = self.layer["portal"]
+        self.portal = portal
+        api.user.grant_roles(username="urbanmanager", roles=["Member", "Manager"])
+        api.group.add_user(username="urbanmanager", groupname="urban_editors")
+        login(self.portal, "urbanmanager")
+        self.portal_urban = portal.portal_urban
+        event_config_deposit = self.portal_urban.codt_buildlicence.urbaneventtypes["depot-de-la-demande"]
+        event_config_intention = self.portal_urban.codt_buildlicence.urbaneventtypes["intention-de-depot-de-plans-modifies"]
+
+        # receipt date + ultimatum date
+        self.licence_1 = api.content.create(
+            type="CODT_BuildLicence",
+            container=self.portal.urban.codt_buildlicences,
+            title="Licence 1",
+        )
+        self.licence_1.setProcedureChoice("simple")
+
+        event = self.licence_1.createUrbanEvent(event_config_deposit)
+        event.setEventDate(datetime(2024, 4, 10))
+
+        event_config_intention = self.portal_urban.codt_buildlicence.urbaneventtypes["intention-de-depot-de-plans-modifies"]
+        event = self.licence_1.createUrbanEvent(event_config_intention)
+        event.setReceiptDate(datetime(2024, 4, 20))
+        event.setUltimeDate(datetime(2024, 6, 23))
+
+        self.licence_1.setHasModifiedBlueprints(True)
+
+        api.content.transition(self.licence_1, transition="ask_address_validation")
+        api.content.transition(self.licence_1, transition="validate_address")
+        api.content.transition(self.licence_1, transition="propose_complete")
+
+        api.content.transition(self.licence_1, transition="suspend")
+        notify(ObjectModifiedEvent(self.licence_1))
+
+        # receipt date only
+        self.licence_2 = api.content.create(
+            type="CODT_BuildLicence",
+            container=self.portal.urban.codt_buildlicences,
+            title="Licence 2",
+        )
+        self.licence_2.setProcedureChoice("simple")
+
+        event = self.licence_2.createUrbanEvent(event_config_deposit)
+        event.setEventDate(datetime(2024, 4, 10))
+        api.content.transition(event, to_state="closed")
+        event = self.licence_2.createUrbanEvent(event_config_intention)
+        event.setReceiptDate(datetime(2024, 4, 20))
+
+        self.licence_2.setHasModifiedBlueprints(True)
+
+        api.content.transition(self.licence_2, transition="ask_address_validation")
+        api.content.transition(self.licence_2, transition="validate_address")
+        api.content.transition(self.licence_2, transition="propose_complete")
+        api.content.transition(self.licence_2, transition="suspend")
+        notify(ObjectModifiedEvent(self.licence_2))
+
+        # no date
+        self.licence_3 = api.content.create(
+            type="CODT_BuildLicence",
+            container=self.portal.urban.codt_buildlicences,
+            title="Licence 3",
+        )
+        self.licence_3.setProcedureChoice("simple")
+        event = self.licence_3.createUrbanEvent(event_config_deposit)
+        event.setEventDate(datetime(2024, 4, 10))
+        event_config_intention = self.portal_urban.codt_buildlicence.urbaneventtypes["intention-de-depot-de-plans-modifies"]
+        event = self.licence_3.createUrbanEvent(event_config_intention)
+
+        self.licence_3.setHasModifiedBlueprints(True)
+
+        api.content.transition(self.licence_3, transition="ask_address_validation")
+        api.content.transition(self.licence_3, transition="validate_address")
+        api.content.transition(self.licence_3, transition="propose_complete")
+        api.content.transition(self.licence_3, transition="suspend")
+        notify(ObjectModifiedEvent(self.licence_3))
+
+
+        logout()
+        login(portal, "urbaneditor")
+
+    def tearDown(self):
+        login(self.portal, "urbanmanager")
+        api.content.delete(self.licence_1)
+        api.content.delete(self.licence_2)
+        api.content.delete(self.licence_3)
+
+    def test_start_date(self):
+        # receipt date + ultimatum date
+        self.assertTrue("TASK_attente_plans_modifies" in self.licence_1)
+        task = self.licence_1.TASK_attente_plans_modifies
+        self.assertEqual(datetime(2024, 6, 23).date(), self._get_due_date(task))
+
+        # receipt date only
+        self.assertTrue("TASK_attente_plans_modifies" in self.licence_2)
+        task = self.licence_2.TASK_attente_plans_modifies
+        self.assertEqual(datetime(2024, 10, 17).date(), self._get_due_date(task))
+
+        # no date
+        self.assertTrue("TASK_attente_plans_modifies" in self.licence_3)
+        task = self.licence_3.TASK_attente_plans_modifies
+        self.assertEqual(datetime(9999, 1, 1).date(), self._get_due_date(task))
+
+    def test_delay_amend_then_resume(self):
+        login(self.portal, "urbanmanager")
+
+        self._create_recepisse_plans_modificatifs(self.licence_1, datetime(2024, 5, 10))
+        api.content.transition(self.licence_1, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_1))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_1)
+        task = self.licence_1["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 6, 3).date(), self._get_due_date(task))
+
+        self._create_recepisse_plans_modificatifs(self.licence_2, datetime(2024, 5, 10))
+        api.content.transition(self.licence_2, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_2))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_2)
+        task = self.licence_2["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 6, 3).date(), self._get_due_date(task))
+
+        self._create_recepisse_plans_modificatifs(self.licence_3, datetime(2024, 5, 10))
+        api.content.transition(self.licence_3, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_3))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_3)
+        task = self.licence_3["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 6, 3).date(), self._get_due_date(task))
+
+    def test_delay_resume_only(self):
+        login(self.portal, "urbanmanager")
+
+        api.content.transition(self.licence_1, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_1))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_1)
+        task = self.licence_1["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 7, 17).date(), self._get_due_date(task))
+
+        api.content.transition(self.licence_2, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_2))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_2)
+        task = self.licence_2["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 11, 10).date(), self._get_due_date(task))
+
+        api.content.transition(self.licence_3, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_3))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_3)
+        task = self.licence_3["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 5, 4).date(), self._get_due_date(task))
+
+    def test_delay_resume_then_amend(self):
+        login(self.portal, "urbanmanager")
+        
+        api.content.transition(self.licence_1, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_1))
+        self._create_recepisse_plans_modificatifs(self.licence_1, datetime(2024, 5, 10))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_1)
+        task = self.licence_1["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 6, 3).date(), self._get_due_date(task))
+
+        api.content.transition(self.licence_2, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_2))
+        self._create_recepisse_plans_modificatifs(self.licence_2, datetime(2024, 5, 10))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_2)
+        task = self.licence_2["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 6, 3).date(), self._get_due_date(task))
+
+        api.content.transition(self.licence_3, transition="resume")
+        notify(ObjectModifiedEvent(self.licence_3))
+        self._create_recepisse_plans_modificatifs(self.licence_3, datetime(2024, 5, 10))
+        self.assertTrue("TASK_verif_complet-1" in self.licence_3)
+        task = self.licence_3["TASK_verif_complet-1"]
+        self.assertEqual(api.content.get_state(task), "to_do")
+        self.assertEqual(datetime(2024, 6, 3).date(), self._get_due_date(task))