Apply review comments

Author: WBoudabous

src/Products/urban/locales/fr/LC_MESSAGES/urban.po

@@ -5930,4 +5930,13 @@ msgid "urban_label_buildingPart"
 msgstr "Partie de l'immeuble concernée"
 
 msgid "urban_label_buildingType"
-msgstr "Nature de l'immeuble"
+msgstr "Nature de l'immeuble"
+
+msgid "ABANDON_COMMUNE_MANUELLE"
+msgstr "Notification à la commune de l'abandon de la procédure"
+
+msgid "PM_ABANDON_COMMUNE_EP"
+msgstr "Plans modificatifs - Notification à la commune de l'abandon de la procédure"
+
+msgid "PM_ABANDON_COMMUNE_EP_FTFD"
+msgstr "Plans modificatifs - Notification à la commune de l'abandon de la procédure (AC=FTFD)"

src/Products/urban/locales/urban-manual.pot

@@ -1689,3 +1689,12 @@ msgstr ""
 
 msgid "DECISION_GESPER_2_EME_INSTANCE"
 msgstr ""
+
+msgid "ABANDON_COMMUNE_MANUELLE"
+msgstr ""
+
+msgid "PM_ABANDON_COMMUNE_EP"
+msgstr ""
+
+msgid "PM_ABANDON_COMMUNE_EP_FTFD"
+msgstr ""

src/Products/urban/locales/urban.pot

@@ -5922,3 +5922,12 @@ msgstr ""
 
 msgid "zip_folder_title"
 msgstr ""
+
+msgid "ABANDON_COMMUNE_MANUELLE"
+msgstr ""
+
+msgid "PM_ABANDON_COMMUNE_EP"
+msgstr ""
+
+msgid "PM_ABANDON_COMMUNE_EP_FTFD"
+msgstr ""

src/Products/urban/migration/update_290.py

@@ -538,43 +538,3 @@ def reindex_getDecisionDate(context):
     reindexIndexes(None, ["getDecisionDate"])
 
     logger.info("upgrade step done!")
-
-
-def add_dossier_abandonne_event(context):
-
-    logger = logging.getLogger("urban: Add dossier-abandonne event config")
-
-    CONFIGS = ["codt_uniquelicence", "envclassone", "envclasstwo"]
-    EVENT = {
-        "id": "dossier-abandonne",
-        "title": "Dossier abandonné",
-        "eventDateLabel": "Date de notification",
-        "eventType": ("Products.urban.interfaces.IForcedEndEvent",),
-        "isKeyEvent": True,
-        "keyDates": ("eventDate",),
-        "podTemplates": (),
-    }
-
-    tool = getToolByName(context, "portal_urban")
-    for config_id in CONFIGS:
-        try:
-            uet_folder = getattr(
-                tool.getLicenceConfig(None, urbanConfigId=config_id),
-                "eventconfigs",
-            )
-        except AttributeError:
-            logger.warning("Config %s not found, skipping", config_id)
-            continue
-
-        if getattr(uet_folder, EVENT["id"], None):
-            logger.info("Event %s already exists in %s, skipping",
-            EVENT["id"],
-            config_id,)
-            continue
-
-        uet_folder.invokeFactory("EventConfig", **EVENT)
-        new_event = uet_folder[EVENT["id"]]
-        api.content.transition(new_event, "disable")
-        logger.info("Added %s to %s", EVENT["id"], config_id)
-
-    logger.info("upgrade step done!")

src/Products/urban/migration/upgrades_290.zcml

@@ -124,12 +124,4 @@
         handler=".update_290.reindex_getDecisionDate"
         profile="Products.urban:default" />
 
-    <gs:upgradeStep
-        title="Add dossier-abandonne event config"
-        description=""
-        source="2915"
-        destination="2916"
-        handler=".update_290.add_dossier_abandonne_event"
-        profile="Products.urban:default" />
-
 </configure>

src/Products/urban/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2916</version>
+  <version>2915</version>
   <dependencies>
     <dependency>profile-Products.urban:preinstall</dependency>
   </dependencies>

src/Products/urban/profiles/extra/data.py

@@ -4433,15 +4433,6 @@
             "eventType": ("Products.urban.interfaces.IDecisionProjectFromSPWEvent",),
             "TALCondition": "python: licence.getProcedureChoice() != 'article65'",
         },
-        {
-            "id": "dossier-abandonne",
-            "title": "Dossier abandonné",
-            "eventDateLabel": "Date de notification",
-            "eventType": ("Products.urban.interfaces.IForcedEndEvent",),
-            "isKeyEvent": True,
-            "keyDates": ("eventDate",),
-            "podTemplates": (),
-        },
         {
             "id": "plans-modificatifs",
             "title": "Plans modificatifs",
@@ -10221,15 +10212,6 @@
             "eventType": ("Products.urban.interfaces.IDecisionProjectFromSPWEvent",),
             "TALCondition": "python: licence.getProcedureChoice() != 'article65'",
         },
-        {
-            "id": "dossier-abandonne",
-            "title": "Dossier abandonné",
-            "eventDateLabel": "Date de notification",
-            "eventType": ("Products.urban.interfaces.IForcedEndEvent",),
-            "isKeyEvent": True,
-            "keyDates": ("eventDate",),
-            "podTemplates": (),
-        },
         {
             "id": "modified-blueprints",
             "title": "Plans modificatifs",
@@ -11251,15 +11233,6 @@
             "eventType": ("Products.urban.interfaces.IDecisionProjectFromSPWEvent",),
             "TALCondition": "python: licence.getProcedureChoice() != 'article65'",
         },
-        {
-            "id": "dossier-abandonne",
-            "title": "Dossier abandonné",
-            "eventDateLabel": "Date de notification",
-            "eventType": ("Products.urban.interfaces.IForcedEndEvent",),
-            "isKeyEvent": True,
-            "keyDates": ("eventDate",),
-            "podTemplates": (),
-        },
         {
             "id": "modified-blueprints",
             "title": "Plans modificatifs",