Products.urban 2.7.4__tar.gz → 2.7.6__tar.gz

{Products.urban-2.7.4 → Products.urban-2.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.4
+Version: 2.7.6
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -52,6 +52,38 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.6 (2024-03-25)
+------------------
+
+Bug fixes:
+
+
+- Fix an issue with upgrade step numbers
+  [mpeeters] (URB-3002)
+
+
+2.7.5 (2024-03-24)
+------------------
+
+New features:
+
+
+- Add caduc workflow state
+  [jchandelle] (URB-3007)
+- Add `getIntentionToSubmitAmendedPlans` method for documents
+  [mpeeters] (URB-3008)
+- Add a link field on CODT build licences
+  [mpeeters] (URB-3046)
+
+
+Bug fixes:
+
+
+- Move methods to be available for every events.
+  Change `is_CODT2024` to be true if there is no deposit but current date is greater than 2024-03-31.
+  [mpeeters] (URB-3008)
+
+
 2.7.4 (2024-03-20)
 ------------------
 

{Products.urban-2.7.4 → Products.urban-2.7.6}/docs/CHANGES.rst

@@ -8,6 +8,38 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.6 (2024-03-25)
+------------------
+
+Bug fixes:
+
+
+- Fix an issue with upgrade step numbers
+  [mpeeters] (URB-3002)
+
+
+2.7.5 (2024-03-24)
+------------------
+
+New features:
+
+
+- Add caduc workflow state
+  [jchandelle] (URB-3007)
+- Add `getIntentionToSubmitAmendedPlans` method for documents
+  [mpeeters] (URB-3008)
+- Add a link field on CODT build licences
+  [mpeeters] (URB-3046)
+
+
+Bug fixes:
+
+
+- Move methods to be available for every events.
+  Change `is_CODT2024` to be true if there is no deposit but current date is greater than 2024-03-31.
+  [mpeeters] (URB-3008)
+
+
 2.7.4 (2024-03-20)
 ------------------
 

{Products.urban-2.7.4 → Products.urban-2.7.6}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "2.7.4"
+version = "2.7.6"
 
 setup(
     name="Products.urban",

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/content/licence/CODT_BaseBuildLicence.py

@@ -18,6 +18,9 @@ from Products.urban.widget.select2widget import MultiSelect2Widget
 from Products.Archetypes.atapi import *
 from zope.interface import implements
 from Products.MasterSelectWidget.MasterBooleanWidget import MasterBooleanWidget
+from Products.ATReferenceBrowserWidget.ATReferenceBrowserWidget import (
+    ReferenceBrowserWidget,
+)
 from Products.urban import interfaces
 from Products.urban.content.licence.BaseBuildLicence import BaseBuildLicence
 from Products.urban.content.CODT_Inquiry import CODT_Inquiry
@@ -518,6 +521,35 @@ schema = Schema(
             ),
             schemata="urban_analysis",
         ),
+        ReferenceField(
+            name="bound_licences",
+            widget=ReferenceBrowserWidget(
+                allow_search=True,
+                allow_browse=False,
+                force_close_on_insert=True,
+                startup_directory="urban",
+                show_indexes=False,
+                wild_card_search=True,
+                restrict_browsing_to_startup_directory=True,
+                label=_("urban_label_bound_licences", default="Bound licences"),
+            ),
+            allowed_types=[
+                t
+                for t in URBAN_TYPES
+                if t
+                not in [
+                    "Inspection",
+                    "Ticket",
+                    "ProjectMeeting",
+                    "PatrimonyCertificate",
+                    "CODT_UrbanCertificateOne",
+                    "UrbanCertificateOne",
+                ]
+            ],
+            schemata="urban_description",
+            multiValued=True,
+            relationship="bound_licences",
+        ),
     ),
 )
 
@@ -700,6 +732,7 @@ def finalizeSchema(schema):
     schema.moveField("roadAdaptation", before="roadTechnicalAdvice")
     schema.moveField("representativeContacts", after="workLocations")
     schema.moveField("foldermanagers", after="representativeContacts")
+    schema.moveField("bound_licences", after="foldermanagers")
     schema.moveField("workType", after="folderCategory")
     schema.moveField("financial_caution", after="workType")
     schema.moveField("parcellings", after="isInSubdivision")

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/content/licence/GenericLicence.py

@@ -27,6 +27,7 @@ from Products.Archetypes.atapi import *
 from zope.interface import implements
 from Products.urban import interfaces
 from Products.urban.utils import is_attachment
+from Products.urban import utils
 
 from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
 
@@ -1728,6 +1729,9 @@ class GenericLicence(OrderedBaseFolder, UrbanBase, BrowserDefaultMixin):
     def getAllSuspensionEvents(self):
         return self.getAllEvents(interfaces.ISuspensionEvent)
 
+    def getIntentionToSubmitAmendedPlans(self):
+        return self.getLastEvent(interfaces.IIntentionToSubmitAmendedPlans)
+
     def getAllEvents(self, eventInterface=IUrbanEvent):
         return self.getAllEventsByObjectValues(eventInterface)
 
@@ -1793,7 +1797,10 @@ class GenericLicence(OrderedBaseFolder, UrbanBase, BrowserDefaultMixin):
 
     def is_CODT2024(self):
         """Return if we are in the new reform of CODT"""
+        now = utils.now()
         deposit = self.getFirstDeposit()
+        if not deposit and now >= datetime(2024, 4, 1):
+            return True
         if not deposit:
             return False
         if not deposit.eventDate:

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/locales/fr/LC_MESSAGES/plone.po

@@ -508,3 +508,9 @@ msgstr "Veuillez indiquer d'avantages de termes de recherche"
 
 msgid "workLocationStreet"
 msgstr "Rue"
+
+msgid "obsolete"
+msgstr "Caduc"
+
+msgid "make_obsolete"
+msgstr "Rendre caduc"

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/locales/plone.pot

@@ -505,3 +505,9 @@ msgstr ""
 
 msgid "receive_college_decision"
 msgstr ""
+
+msgid "obsolete"
+msgstr ""
+
+msgid "make_obsolete"
+msgstr ""

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/migration/update_codt_2024.py

@@ -2,6 +2,7 @@
 
 from Products.urban import URBAN_TYPES
 from Products.urban.setuphandlers import createFolderDefaultValues
+from Products.urban.migration.utils import refresh_workflow_permissions
 from datetime import datetime
 from plone import api
 from zope.event import notify
@@ -253,3 +254,14 @@ def sort_delay_vocabularies(context):
                 folderdelays.moveObjectsToBottom(["inconnu"])
 
     logger.info("upgrade done!")
+
+
+def add_new_workfow_state(context):
+    logger.info("starting : Add new workflow state")
+    setup_tool = api.portal.get_tool('portal_setup')
+    setup_tool.runImportStepFromProfile('profile-Products.urban:preinstall', 'workflow')
+    refresh_workflow_permissions(
+        "codt_buildlicence_workflow",
+        for_states=["deposit", "complete", "incomplete"],
+    )
+    logger.info("upgrade done!")

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/migration/upgrades.zcml

@@ -526,8 +526,8 @@
     <gs:upgradeStep
         title="Migrate vocabulary terms to include validity date"
         description="Set validity end date for vocabulary that are deactivate"
-        source="1036"
-        destination="1037"
+        source="1136"
+        destination="1137"
         handler=".update_codt_2024.migrate_vocabulary_validity_date"
         profile="Products.urban:default"
         />
@@ -558,4 +558,13 @@
         profile="Products.urban:default"
         />
 
+    <gs:upgradeStep
+        title="Add new workflow state"
+        description=""
+        source="1140"
+        destination="1141"
+        handler=".update_codt_2024.add_new_workfow_state"
+        profile="Products.urban:default"
+        />
+
 </configure>

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/migration/utils.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from Products.urban.events import licenceEvents
+from plone import api
 from imio.schedule import utils
 from imio.schedule.events.zope_registration import (
     unsubscribe_task_configs_for_content_type,
@@ -58,3 +59,28 @@ def disable_schedule():
     for schedule_cfg in utils.get_all_schedule_configs():
         for task_cfg in schedule_cfg.get_all_task_configs():
             unsubscribe_task_configs_for_content_type(task_cfg, None)
+
+
+def refresh_workflow_permissions(workflow_id, folder_path=None, for_states=None):
+    if not folder_path:
+        folder_path = '/'.join(api.portal.get().getPhysicalPath())
+    portal_workflow = api.portal.get_tool('portal_workflow')
+    portal_catalog = api.portal.get_tool('portal_catalog')
+
+    for at_type, wf_ids in portal_workflow._chains_by_type.items():
+        if len(wf_ids) < 1:
+            continue
+        if wf_ids[0] == workflow_id:
+            workflow = portal_workflow.getWorkflowById(wf_ids[0])
+            query = {
+                'path': {'query': folder_path},
+                'portal_type': at_type,
+            }
+            if for_states is not None:
+                query["review_state"] = for_states
+            results = portal_catalog.unrestrictedSearchResults(query)
+            for brain in results:
+                obj = brain.getObject()
+                workflow.updateRoleMappingsFor(obj)
+                obj.reindexObjectSecurity()
+                obj.reindexObject(idxs=['allowedRolesAndUsers'])

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/profiles/default/metadata.xml

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

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/profiles/preinstall/workflows/codt_buildlicence_workflow/definition.xml

@@ -93,6 +93,7 @@
   <exit-transition transition_id="iscomplete"/>
   <exit-transition transition_id="isinacceptable"/>
   <exit-transition transition_id="retire"/>
+  <exit-transition transition_id="make_obsolete"/>
   <permission-map name="Acces contents information"
                   acquired="False">
    <permission-role>Reader</permission-role>
@@ -237,6 +238,7 @@
   <exit-transition transition_id="isinacceptable"/>
   <exit-transition transition_id="reopen_incomplete"/>
   <exit-transition transition_id="retire"/>
+  <exit-transition transition_id="make_obsolete"/>
   <permission-map name="Acces contents information"
                   acquired="False">
    <permission-role>Reader</permission-role>
@@ -311,6 +313,7 @@
   <exit-transition transition_id="accept"/>
   <exit-transition transition_id="retire"/>
   <exit-transition transition_id="isinacceptable"/>
+  <exit-transition transition_id="make_obsolete"/>
   <permission-map name="Acces contents information"
                   acquired="False">
    <permission-role>Reader</permission-role>
@@ -518,6 +521,155 @@
    <permission-role>Manager</permission-role>
   </permission-map>
  </state>
+ <state state_id="obsolete" title="obsolete">
+   <exit-transition transition_id="reopen"/>
+   <permission-map name="ATContentTypes: Add File" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="ATContentTypes: Add Image" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="Access contents information" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>ExternalReader</permission-role>
+    <permission-role>InternalReader</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>Reader</permission-role>
+    <permission-role>RoadEditor</permission-role>
+    <permission-role>RoadReader</permission-role>
+   </permission-map>
+   <permission-map name="Add portal content" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>Reader</permission-role>
+   </permission-map>
+   <permission-map name="Delete objects" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="List folder contents" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>ExternalReader</permission-role>
+    <permission-role>InternalReader</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>Reader</permission-role>
+    <permission-role>RoadEditor</permission-role>
+    <permission-role>RoadReader</permission-role>
+   </permission-map>
+   <permission-map name="Modify portal content" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>AddressEditor</permission-role>
+   </permission-map>
+   <permission-map name="View" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>ExternalReader</permission-role>
+    <permission-role>InternalReader</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>Reader</permission-role>
+    <permission-role>RoadReader</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: External Reader" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>ExternalReader</permission-role>
+    <permission-role>InternalReader</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>Reader</permission-role>
+    <permission-role>RoadReader</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Internal Editor" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Internal Reader" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>InternalReader</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Description Editor" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>AddressEditor</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Habitation Editor" acquired="False">
+    <permission-role>Manager</permission-role>
+    <permission-role>AddressEditor</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Road Editor" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>RoadEditor</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Road Reader" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+    <permission-role>Reader</permission-role>
+    <permission-role>RoadEditor</permission-role>
+    <permission-role>RoadReader</permission-role>
+   </permission-map>
+   <permission-map name="liege.urban: Validate" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add Applicant" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add Couple" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add Contact" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add Corporation" acquired="True">
+   </permission-map>
+   <permission-map name="urban: Add CODT_Inquiry" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add PortionOut" acquired="False">
+    <permission-role>AddressEditor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add UrbanEvent" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+   <permission-map name="urban: Add UrbanEventOpinionRequest" acquired="False">
+    <permission-role>Contributor</permission-role>
+    <permission-role>Editor</permission-role>
+    <permission-role>Manager</permission-role>
+   </permission-map>
+ </state>
+ <transition transition_id="make_obsolete" title="make_obsolete" new_state="obsolete" trigger="USER" before_script="" after_script="">
+  <action url="" category="workflow" icon="">make_obsolete</action>
+  <guard>
+   <guard-permission>Modify portal content</guard-permission>
+  </guard>
+ </transition>
  <transition transition_id="accept"
              title="accept"
              new_state="accepted"

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products/urban/utils.py

@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
 
 from Acquisition import aq_inner
-
-from imio.schedule.utils import tuple_to_interface
-
 from HTMLParser import HTMLParser
-
 from Products.ATContentTypes.interfaces.file import IATFile
-from Products.urban.config import URBAN_TYPES
 from Products.urban.config import URBAN_ENVIRONMENT_TYPES
+from Products.urban.config import URBAN_TYPES
 from Products.urban.interfaces import IUrbanDoc
-
+from datetime import datetime
+from imio.schedule.utils import tuple_to_interface
 from plone import api
-
 from zope.annotation import IAnnotations
 from zope.component import getMultiAdapter
 
@@ -251,3 +247,7 @@ def convert_to_utf8(string):
         return string.encode("utf-8")
     except UnicodeDecodeError:
         return string
+
+
+def now():
+    return datetime.now()

{Products.urban-2.7.4 → Products.urban-2.7.6}/src/Products.urban.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.4
+Version: 2.7.6
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -52,6 +52,38 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.6 (2024-03-25)
+------------------
+
+Bug fixes:
+
+
+- Fix an issue with upgrade step numbers
+  [mpeeters] (URB-3002)
+
+
+2.7.5 (2024-03-24)
+------------------
+
+New features:
+
+
+- Add caduc workflow state
+  [jchandelle] (URB-3007)
+- Add `getIntentionToSubmitAmendedPlans` method for documents
+  [mpeeters] (URB-3008)
+- Add a link field on CODT build licences
+  [mpeeters] (URB-3046)
+
+
+Bug fixes:
+
+
+- Move methods to be available for every events.
+  Change `is_CODT2024` to be true if there is no deposit but current date is greater than 2024-03-31.
+  [mpeeters] (URB-3008)
+
+
 2.7.4 (2024-03-20)
 ------------------