Products.urban 2.7.23__tar.gz → 2.7.25__tar.gz

{Products.urban-2.7.23 → Products.urban-2.7.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.23
+Version: 2.7.25
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -46,6 +46,57 @@ Description: *********
         
         .. towncrier release notes start
         
+        2.7.25 (2025-01-21)
+        -------------------
+        
+        Bug fixes:
+        
+        
+        - Fix upgrade step
+          [jchandelle] (URB-2680)
+        
+        
+        2.7.24 (2024-12-03)
+        -------------------
+        
+        New features:
+        
+        
+        - Add merge field for rubric description
+          [jchandelle] (SUP-38659)
+        - Create new trigger for decision date reindex
+          [jchandelle] (URB-2366)
+        - Add bound licences field to patrimony certificates
+          [daggelpop] (URB-3046)
+        - Add latest new vocabulary terms for form_composition
+          [dmshd] (URB-3126)
+        - Use imio.pm.wsclient 2.x version (REST).
+          [aduchene]
+          Add `get_last_plonemeeting_date`, `get_last_college_date` and `get_last_college_date` to CODT_BaseBuildLicence.
+          [aduchene] (URB-3151)
+        - Implement `.getSecondDeposit()`
+          [dmshd] (URB-3152)
+        - Remove permission to create integrated licences
+          [daggelpop] (URB-3165)
+        
+        
+        Bug fixes:
+        
+        
+        - Allow corporate tenant in inspections
+          [daggelpop] (SUP-33621)
+        - Fix follup event creation in ticket
+          [jchandelle] (SUP-36493)
+        - Fix missing getLastAcknowledgment for division
+          [jchandelle] (SUP-37911)
+        - Add centrality to every licence & make it a multiselect
+          [daggelpop] (URB-3017)
+        - Add patrimony fieldset to patrimony certificate
+          [daggelpop]
+          Migrate patrimony certificates to their correct object class (instead of misc demand)
+          [daggelpop] (URB-3121)
+        
+        
         2.7.23 (2024-11-15)
         -------------------
         

{Products.urban-2.7.23 → Products.urban-2.7.25}/docs/CHANGES.rst

@@ -8,6 +8,57 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.25 (2025-01-21)
+-------------------
+
+Bug fixes:
+
+
+- Fix upgrade step
+  [jchandelle] (URB-2680)
+
+
+2.7.24 (2024-12-03)
+-------------------
+
+New features:
+
+
+- Add merge field for rubric description
+  [jchandelle] (SUP-38659)
+- Create new trigger for decision date reindex
+  [jchandelle] (URB-2366)
+- Add bound licences field to patrimony certificates
+  [daggelpop] (URB-3046)
+- Add latest new vocabulary terms for form_composition
+  [dmshd] (URB-3126)
+- Use imio.pm.wsclient 2.x version (REST).
+  [aduchene]
+  Add `get_last_plonemeeting_date`, `get_last_college_date` and `get_last_college_date` to CODT_BaseBuildLicence.
+  [aduchene] (URB-3151)
+- Implement `.getSecondDeposit()`
+  [dmshd] (URB-3152)
+- Remove permission to create integrated licences
+  [daggelpop] (URB-3165)
+
+
+Bug fixes:
+
+
+- Allow corporate tenant in inspections
+  [daggelpop] (SUP-33621)
+- Fix follup event creation in ticket
+  [jchandelle] (SUP-36493)
+- Fix missing getLastAcknowledgment for division
+  [jchandelle] (SUP-37911)
+- Add centrality to every licence & make it a multiselect
+  [daggelpop] (URB-3017)
+- Add patrimony fieldset to patrimony certificate
+  [daggelpop]
+  Migrate patrimony certificates to their correct object class (instead of misc demand)
+  [daggelpop] (URB-3121)
+
+
 2.7.23 (2024-11-15)
 -------------------
 

{Products.urban-2.7.23 → Products.urban-2.7.25}/setup.py

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

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/EnvironmentRubricTerm.py

@@ -114,6 +114,9 @@ class EnvironmentRubricTerm(BaseContent, UrbanVocabularyTerm, BrowserDefaultMixi
         portal_urban = getToolByName(self, "portal_urban")
         return "/".join(portal_urban.exploitationconditions.getPhysicalPath())
 
+    def getObservations(self):
+        return self.description.getRaw()
+
 
 registerType(EnvironmentRubricTerm, PROJECTNAME)
 # end of class EnvironmentRubricTerm

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/LicenceConfig.py

@@ -499,6 +499,13 @@ class LicenceConfig(BaseFolder, BrowserDefaultMixin, OrderedContainer):
             "road",
         ]
         inspection_tabs_config = ["description", "advices", "inspection", "location"]
+        patrimonycertificate_tabs_config = [
+            "description",
+            "analysis",
+            "location",
+            "road",
+            "patrimony",
+        ]
         ticket_tabs_config = ["description", "inspection", "location"]
 
         types = {
@@ -528,6 +535,7 @@ class LicenceConfig(BaseFolder, BrowserDefaultMixin, OrderedContainer):
             ],
             "envclassbordering": env_inquiry_tabs_config,
             "inspection": inspection_tabs_config,
+            "patrimonycertificate": patrimonycertificate_tabs_config,
             "ticket": ticket_tabs_config,
             "roaddecree": buildlicence_tabs_config,
             "division": certificatebase_tabs_config,

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/browser/licence/configure.zcml

@@ -413,7 +413,7 @@
   />
 
   <browser:page
-     for="Products.urban.interfaces.IMiscDemand"
+     for="Products.urban.interfaces.IPatrimonyCertificate"
      name="patrimonycertificateview"
      class=".patrimonycertificateview.PatrimonyCertificateView"
      template="templates/patrimonycertificateview.pt"
@@ -422,7 +422,7 @@
 
   <browser:page
      name="patrimonycertificate-macros"
-     for="Products.urban.interfaces.IMiscDemand"
+     for="Products.urban.interfaces.IPatrimonyCertificate"
      template="templates/patrimonycertificatemacros.pt"
      permission="zope2.View"
   />

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/browser/licence/patrimonycertificateview.py

@@ -21,3 +21,19 @@ class PatrimonyCertificateView(LicenceView):
 
     def getMacroViewName(self):
         return "patrimonycertificate-macros"
+
+    def getPatrimonyFields(self):
+        return self.getSchemataFields(schemata="urban_patrimony")
+
+    def getRankingOrdinanceLink(self):
+        liendoc = "http://spw.wallonie.be/dgo4/index.php?thema=bc_pat&details=57081-CLT-0239-01"
+        return liendoc
+
+    def getRankingOrdinanceTitle(self):
+        code_dgo4 = "code dgo4"
+        libelle = "libelle"
+        historique_dossier = "historique_dossier"
+        liendoc = "liendoc"
+        return "{} - {} - {} - {}".format(
+            code_dgo4, libelle, historique_dossier, liendoc
+        )

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/browser/licence/templates/patrimonycertificatemacros.pt

@@ -33,3 +33,8 @@
     <metal:parent_call use-macro="here/@@licencetabs-macros/location_macro">
     </metal:parent_call>
 </metal:location>
+
+<metal:patrimony define-macro="patrimony_macro" i18n:domain="urban">
+    <metal:parent_call use-macro="here/@@licencetabs-macros/patrimony_macro">
+    </metal:parent_call>
+</metal:patrimony>

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/content/licence/CODT_BaseBuildLicence.py

@@ -14,30 +14,30 @@ __author__ = """Gauthier BASTIEN <gbastien@commune.sambreville.be>, Stephan GEUL
 __docformat__ = "plaintext"
 
 from AccessControl import ClassSecurityInfo
-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
-from Products.urban.content.licence.GenericLicence import GenericLicence
+from Products.Archetypes.atapi import *
 from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
-
-from Products.urban.config import *
-from Products.urban import UrbanMessage as _
+from Products.MasterSelectWidget.MasterBooleanWidget import MasterBooleanWidget
 
 ##code-section module-header #fill in your manual code here
 from Products.MasterSelectWidget.MasterMultiSelectWidget import MasterMultiSelectWidget
+from Products.MasterSelectWidget.MasterSelectWidget import MasterSelectWidget
+from Products.urban import interfaces
+from Products.urban import UrbanMessage as _
+from Products.urban.UrbanVocabularyTerm import UrbanVocabulary
+from Products.urban.config import *
+from Products.urban.content.CODT_Inquiry import CODT_Inquiry
+from Products.urban.content.licence.BaseBuildLicence import BaseBuildLicence
+from Products.urban.content.licence.GenericLicence import GenericLicence
 from Products.urban.utils import setOptionalAttributes
 from Products.urban.utils import setSchemataForCODT_Inquiry
-from Products.urban.UrbanVocabularyTerm import UrbanVocabulary
-from Products.MasterSelectWidget.MasterSelectWidget import MasterSelectWidget
-
+from Products.urban.widget.select2widget import MultiSelect2Widget
 from plone import api
+from zope.component import getMultiAdapter
+from zope.interface import implements
+
 
 ##/code-section module-header
 
@@ -656,7 +656,9 @@ class CODT_BaseBuildLicence(
         prorogated_delay = ""
         prorogation_delay = self.getProrogationDelay(text_format=False)
         if base_delay:
-            prorogated_delay = "{}j".format(str(int(base_delay[:-1]) + prorogation_delay))
+            prorogated_delay = "{}j".format(
+                str(int(base_delay[:-1]) + prorogation_delay)
+            )
 
         return prorogated_delay
 
@@ -748,6 +750,49 @@ class CODT_BaseBuildLicence(
         )
         return DisplayList(vocabulary)
 
+    def get_last_plonemeeting_date(
+        self,
+        event=interfaces.ISimpleCollegeEvent,
+        item_portal_type="MeetingItemCollege",
+        decided_states=("accepted", "accepted_but_modified", "accepted_and_returned"),
+    ):
+        """
+        Get the last date of a PloneMeeting meeting for a given event.
+        """
+        meeting_event = self.getLastEvent(event)
+        if not meeting_event:
+            return
+        ws4pmSettings = getMultiAdapter(
+            (api.portal.get(), self.REQUEST), name="ws4pmclient-settings"
+        )
+        return ws4pmSettings._rest_getDecidedMeetingDate(
+            {"externalIdentifier": meeting_event.UID()},
+            item_portal_type=item_portal_type,
+            decided_states=decided_states,
+        )
+
+    def get_last_college_date(
+        self,
+        event=interfaces.ISimpleCollegeEvent,
+        decided_states=("accepted", "accepted_but_modified", "accepted_and_returned"),
+    ):
+        return self.get_last_plonemeeting_date(
+            event=event,
+            item_portal_type="MeetingItemCollege",
+            decided_states=decided_states,
+        )
+
+    def get_last_council_date(
+        self,
+        event=interfaces.ISimpleCollegeEvent,
+        decided_states=("accepted", "accepted_but_modified", "accepted_and_returned"),
+    ):
+        return self.get_last_plonemeeting_date(
+            event=event,
+            item_portal_type="MeetingItemCouncil",
+            decided_states=decided_states,
+        )
+
 
 # end of class CODT_BaseBuildLicence
 

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/content/licence/CODT_CommercialLicence.py

@@ -32,14 +32,6 @@ optional_fields = ["limitedImpact", "SDC_divergence"]
 
 schema = Schema(
     (
-        StringField(
-            name="centrality",
-            widget=SelectionWidget(
-                label=_("urban_label_centrality", default="Centrality"),
-            ),
-            schemata="urban_location",
-            vocabulary="listCentralities",
-        ),
         IntegerField(
             name="surfaceFoodBusiness",
             default=0,
@@ -140,16 +132,6 @@ class CODT_CommercialLicence(BaseFolder, CODT_UniqueLicence, BrowserDefaultMixin
 
         return "{}j".format(str(delay))
 
-    def listCentralities(self):
-        vocab = (
-            ("ukn", "Non determiné"),
-            ("villageoise", "villageoise"),
-            ("urbaine", "urbaine"),
-            ("urbaine_de_pole", "urbaine de pôle"),
-            ("bordure_de_centralite", "bordure de centralité"),
-        )
-        return DisplayList(vocab)
-
 
 registerType(CODT_CommercialLicence, PROJECTNAME)
 # end of class CODT_CommercialLicence

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/content/licence/Division.py

@@ -394,6 +394,9 @@ class Division(BaseFolder, GenericLicence, BrowserDefaultMixin):
     def getLastTheLicence(self):
         return self.getLastEvent(interfaces.ITheLicenceEvent)
 
+    def getLastAcknowledgment(self, state=None):
+        return self.getLastEvent(interfaces.IAcknowledgmentEvent, state)
+
     def list_patrimony_types(self):
         """ """
         vocabulary = (

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/content/licence/GenericLicence.py

@@ -1317,6 +1317,16 @@ schema = Schema(
             default_content_type="text/html",
             default_output_type="text/x-html-safe",
         ),
+        LinesField(
+            name="centrality",
+            widget=MasterMultiSelectWidget(
+                format="checkbox",
+                label=_("urban_label_centrality", default="Centrality"),
+            ),
+            schemata="urban_location",
+            multiValued=1,
+            vocabulary="listCentralities",
+        ),
     ),
 )
 
@@ -1508,6 +1518,18 @@ class GenericLicence(OrderedBaseFolder, UrbanBase, BrowserDefaultMixin):
 
         return DisplayList(vocab)
 
+    security.declarePublic("listCentralities")
+
+    def listCentralities(self):
+        vocab = (
+            ("villageoise", "villageoise"),
+            ("urbaine", "urbaine"),
+            ("urbaine_de_pole", "urbaine de pôle"),
+            ("bordure_de_centralite", "bordure de centralité"),
+        )
+        return DisplayList(vocab)
+
+
     security.declarePublic("foldermanagersBaseQuery")
 
     def foldermanagersBaseQuery(self):
@@ -1708,6 +1730,9 @@ class GenericLicence(OrderedBaseFolder, UrbanBase, BrowserDefaultMixin):
 
     def getFirstDeposit(self):
         return self.getFirstEvent(interfaces.IDepositEvent)
+    
+    def getSecondDeposit(self):
+        return self.getSecondEvent(interfaces.IDepositEvent)
 
     def getLastDeposit(self):
         return self.getLastEvent(interfaces.IDepositEvent)
@@ -1764,6 +1789,11 @@ class GenericLicence(OrderedBaseFolder, UrbanBase, BrowserDefaultMixin):
         events = self.getAllEvents(eventInterface)
         if events:
             return events[0]
+        
+    def getSecondEvent(self, eventInterface=None):
+        events = self.getAllEvents(eventInterface)
+        if len(events) > 1:
+            return events[1]
 
     def getLastEventWithValidityDate(self):
         events = [

{Products.urban-2.7.23 → Products.urban-2.7.25}/src/Products/urban/content/licence/Inspection.py

@@ -246,8 +246,20 @@ class Inspection(BaseFolder, GenericLicence, Inquiry, BrowserDefaultMixin):
         tenants = [
             app for app in self.objectValues("Applicant") if app.portal_type == "Tenant"
         ]
+        corporations = self.getCorporationTenants()
+        tenants.extend(corporations)
         return tenants
 
+    security.declarePublic("getCorporationTenants")
+
+    def getCorporationTenants(self):
+        corporations = [
+            corp
+            for corp in self.objectValues("Corporation")
+            if corp.portal_type == "CorporationTenant"
+        ]
+        return corporations
+
     security.declarePublic("getPlaintiffs")
 
     def getPlaintiffs(self):