Products.urban 2.7.38__tar.gz → 2.7.40__tar.gz

{Products.urban-2.7.38/src/Products.urban.egg-info → Products.urban-2.7.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.38
+Version: 2.7.40
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -53,6 +53,45 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.40 (2025-06-10)
+-------------------
+
+Bug fixes:
+
+
+- Revert "URB-3293 - Add RoadDecree to URBAN_TYPES (#340)"
+  [mpeeters] (URB-3293)
+
+
+2.7.39 (2025-06-07)
+-------------------
+
+New features:
+
+
+- Add way to easily hide licence type
+  [jchandelle] (SUP-33793)
+- Change display of inquiry view
+  [jchandelle] (SUP-44199)
+- Add a message in case we can't link pod template
+  [jchandelle] (SUP-44861)
+
+
+Bug fixes:
+
+
+- Fix history parcel view when missing capakey
+  [jchandelle] (SUP-36370)
+- Fix filename encoding in mail sending
+  [jchandelle] (SUP-43946)
+- Fix recipient import in inquiry event
+  [jchandelle] (SUP-44583)
+- Fix 220 viewlet house number encoding
+  jchandelle (SUP-44642)
+- Fix link pod template in import config
+  [jchandelle] (SUP-44861)
+
+
 2.7.38 (2025-05-27)
 -------------------
 

{Products.urban-2.7.38 → Products.urban-2.7.40}/docs/CHANGES.rst

@@ -8,6 +8,45 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.40 (2025-06-10)
+-------------------
+
+Bug fixes:
+
+
+- Revert "URB-3293 - Add RoadDecree to URBAN_TYPES (#340)"
+  [mpeeters] (URB-3293)
+
+
+2.7.39 (2025-06-07)
+-------------------
+
+New features:
+
+
+- Add way to easily hide licence type
+  [jchandelle] (SUP-33793)
+- Change display of inquiry view
+  [jchandelle] (SUP-44199)
+- Add a message in case we can't link pod template
+  [jchandelle] (SUP-44861)
+
+
+Bug fixes:
+
+
+- Fix history parcel view when missing capakey
+  [jchandelle] (SUP-36370)
+- Fix filename encoding in mail sending
+  [jchandelle] (SUP-43946)
+- Fix recipient import in inquiry event
+  [jchandelle] (SUP-44583)
+- Fix 220 viewlet house number encoding
+  jchandelle (SUP-44642)
+- Fix link pod template in import config
+  [jchandelle] (SUP-44861)
+
+
 2.7.38 (2025-05-27)
 -------------------
 

{Products.urban-2.7.38 → Products.urban-2.7.40}/setup.py

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

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/RecipientCadastre.py

@@ -171,6 +171,11 @@ class RecipientCadastre(BaseFolder, BrowserDefaultMixin):
         return self.getAdr1() + " " + self.getAdr2()
 
     def Title(self):
+        if (
+            (not self.getName() or self.getName().strip() == "")
+            and (not self.getFirstname() or self.getFirstname().strip() == "")
+        ):
+            return "{} {}".format(self.getStreet(), self.getNumber())
         return "{} {}".format(self.getName(), self.getFirstname())
 
 

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/UrbanTool.py

@@ -950,7 +950,7 @@ class UrbanTool(UniqueObject, OrderedBaseFolder, BrowserDefaultMixin):
                 for l in self.getDivisionsRenaming()
             ]
         )
-        name = mapping[str(int(division_code))]
+        name = mapping.get(str(int(division_code)), None)
         return name
 
     def get_all_licence_configs(self):

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/browser/exportimport/import_config.py

@@ -154,8 +154,10 @@ class ConfigImportContent(ImportContent):
             obj = brain.getObject()
             merge_templates = obj.merge_templates
             for template in merge_templates:
+                if template["template"] == "--NOVALUE--":
+                    continue
                 template_obj = api.content.get(UID=template["template"])
-                if template_obj.id == id:
+                if template_obj and template_obj.id == id:
                     return template["template"]
             ignore_uid.append(brain_uid)
         if ILicenceConfig.providedBy(context):
@@ -197,6 +199,12 @@ class ConfigImportContent(ImportContent):
         for template in merge_templates:
             uid = self.get_template_uid(item, template)
             if uid is None:
+                msg = "Can't link the pod template : {}, in document : {}".format(
+                    template.get("pod_context_name", "unknown"),
+                    item.get("@id", "unknown").split("portal_urban")[-1]
+                )
+                logger.warning(msg)
+                api.portal.show_message(msg, self.request, type="warning")
                 uid = "--NOVALUE--"
             template["template"] = uid
             output_template.append(template)

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/browser/licence/licenceview.py

@@ -350,7 +350,36 @@ class LicenceView(BrowserView):
         return self.getSchemataFields("urban_inquiry", exclude)
 
     def getBoundInquiryFields(self, exclude=[], bound_context=None):
-        return self.getSchemataFields("urban_inquiry", exclude, bound_context)
+        fields_display = {
+            "none": [
+                "divergence",
+                "investigation_radius",
+                "divergenceDetails",
+                "announcementArticles",
+                "announcementArticlesText",
+                "investigationDetails",
+                "derogation",
+                "derogationDetails",
+                "investigationArticles",
+                "investigationArticlesText",
+                "roadModificationSubject",
+                "demandDisplay",
+                "investigationReasons",
+            ],
+            "announcement" : [
+                "derogation",
+                "derogationDetails",
+                "investigationArticles",
+                "investigationArticlesText",
+                "roadModificationSubject",
+                "demandDisplay",
+                "investigationReasons",
+            ],
+        }
+        exclude_fields = []
+        if hasattr(bound_context, "getInquiry_type"):
+            exclude_fields = fields_display.get(bound_context.getInquiry_type(), [])
+        return self.getSchemataFields("urban_inquiry", list(set(exclude_fields + exclude)), bound_context)
 
     def getDefaultFields(self, exclude=[], context=None):
         base_exclude = ["id", "title"]

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/browser/parcelrecordsview.py

@@ -21,6 +21,7 @@ class ParcelRecordsView(BrowserView):
         parcel_id = self.request.get("id", "")
         parcel = getattr(context, parcel_id, None)
         self.capakey = parcel and parcel.get_capakey() or ""
+        self.capakeys = []
         if not self.capakey:
             plone_utils = api.portal.get_tool("plone_utils")
             plone_utils.addPortalMessage(_("Nothing to show !!!"), type="error")
@@ -29,7 +30,7 @@ class ParcelRecordsView(BrowserView):
         """
         Returns the licences related to a parcel
         """
-        licence_brains, capakeys, historic = self.search_licences(
+        licence_brains, self.capakeys, historic = self.search_licences(
             capakey or self.capakey
         )
         display = self.get_display(licence_brains)
@@ -92,3 +93,11 @@ class ParcelRecordsView(BrowserView):
                 licences = self.get_display(licence_brains, short=True)
                 setattr(parcel, "licences", licences)
         return table
+
+    def get_missing_capakey(self):
+        interface = "Products.urban.interfaces.IMissingCapakey"
+        registry = api.portal.get_registry_record(interface)
+        if len(registry) == 0:
+            return []
+        missing_capakey = [capakey for capakey in self.capakeys if capakey in registry]
+        return missing_capakey

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/browser/templates/parcelrecordsview.pt

@@ -14,10 +14,16 @@
 
     <tal:display define="displays view/get_related_licences_displays;
                          licences python: displays[0];
-                         parcel_historic python: displays[1];">
+                         parcel_historic python: displays[1];
+                         missing_capakey view/get_missing_capakey;">
        <tal:no_result condition="python: not licences">
           <h1 i18n:translate="">No related licences</h1>
        </tal:no_result>
+       <tal:missing_capakeys condition="missing_capakey">
+            <h1 i18n:translate="missing_capakey_single" tal:condition="python: len(missing_capakey) == 1">This plot cannot be found, perhaps it belong to a neighboring municipality.</h1>
+            <h1 i18n:translate="missing_capakey_plural" tal:condition="python: len(missing_capakey) > 1">These plots cannot be found, perhaps they belong to a neighboring municipality.</h1>
+            <span tal:content="python: ', '.join(missing_capakey)">List</span>
+       </tal:missing_capakeys>
        <tal:result condition="licences">
           <h1 i18n:translate="">Related licences</h1>
           <br />

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/browser/urbaneventviews.py

@@ -1083,12 +1083,12 @@ class UrbanEventInquiryView(UrbanEventInquiryBaseView):
 
     def create_recipient_cadastre(self, location, parcel, street_uid, zip_scope=None):
         context = aq_inner(self.context)
-        number = location.get("number", "")
+        number = location.get("number", "").encode("utf-8")
         street_obj = api.content.get(UID=street_uid)
         street = street_obj.streetName.encode("utf-8")
         city_obj = street_obj.getCity()
-        city = city_obj.title
-        zipcode = city_obj.zipCode
+        city = city_obj.title.encode("utf-8")
+        zipcode = city_obj.zipCode.encode("utf-8")
         if zip_scope is not None and zipcode not in zip_scope:
             zip_scope.append(zipcode)
         normalizer = getUtility(IIDNormalizer)
@@ -1121,11 +1121,6 @@ class UrbanEventInquiryView(UrbanEventInquiryBaseView):
     def get_investigation_adress(self, radius=0, force=False):
         context = aq_inner(self.context)
         urban_tool = api.portal.get_tool("portal_urban")
-        recipients = context.getRecipients()
-        if recipients:
-            context.manage_delObjects(
-                [recipient.getId() for recipient in recipients if recipient.Title()]
-            )
 
         licence = context.aq_inner.aq_parent
         cadastre = services.cadastre.new_session()
@@ -1225,13 +1220,8 @@ class UrbanEventInquiryView(UrbanEventInquiryBaseView):
         # remove every RecipientCadastre
         context = aq_inner(self.context)
         urban_tool = api.portal.get_tool("portal_urban")
-        recipients = context.getRecipients()
         if self.is_planned_inquiry and not force:
             return self.request.response.redirect(self.context.absolute_url())
-        if recipients:
-            context.manage_delObjects(
-                [recipient.getId() for recipient in recipients if recipient.Title()]
-            )
 
         licence = context.aq_inner.aq_parent
         cadastre = services.cadastre.new_session()

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/config.py

@@ -223,7 +223,7 @@ URBAN_TYPES = [
     "CODT_NotaryLetter",
     "ProjectMeeting",
     "ExplosivesPossession",
-    'RoadDecree',
+    # 'RoadDecree',
     "Inspection",
     "Ticket",
 ]

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/content/CODT_Inquiry.py

@@ -40,6 +40,11 @@ full_inquiry_slave_fields = (
         "action": "hide",
         "hide_values": ("none",),
     },
+    {
+        "name": "investigation_radius",
+        "action": "hide",
+        "hide_values": ("none",),
+    },
     {
         "name": "divergenceDetails",
         "action": "hide",
@@ -407,7 +412,8 @@ def finalizeSchema(schema):
     schema.moveField("announcementArticles", before="announcementArticlesText")
     schema.moveField("divergenceDetails", before="announcementArticles")
     schema.moveField("divergence", before="divergenceDetails")
-    schema.moveField("inquiry_type", before="divergence")
+    schema.moveField("investigation_radius", before="divergence")
+    schema.moveField("inquiry_type", before="investigation_radius")
     return schema
 
 

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/contentrules/mail_with_attachment.py

@@ -2,6 +2,7 @@
 
 from Acquisition import aq_inner
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.utils import safe_unicode
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.MailHost.MailHost import MailHostError
 from Products.statusmessages.interfaces import IStatusMessage
@@ -152,12 +153,13 @@ execute this action"
             item = serializer(include_items=False)
             data = item["file"]["data"].encode()
             content = base64.b64decode(data)
+            filename = item["file"]["filename"].encode("utf-8")
             if item["@type"] in ["ATFile", "File"]:
-                part = MIMEApplication(content, name=item["file"]["filename"])
-                part.add_header("Content-Disposition", 'attachment; filename="{}"'.format(item["file"]["filename"]))
+                part = MIMEApplication(content, name=filename)
+                part.add_header("Content-Disposition", 'attachment; filename="{}"'.format(filename))
                 message.attach(part)
             if item["@type"] in ["ATImage", "Image"]:
-                message.attach(MIMEImage(content, name=item["file"]["filename"]))
+                message.attach(MIMEImage(content, name=filename))
 
 
         return message

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/dashboard/vocabularies.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from Acquisition import aq_parent
 from collective.eeafaceted.collectionwidget.vocabulary import CachedCollectionVocabulary
 
 from plone import api
+from plone.memoize import ram
 
 from Products.urban import UrbanMessage as _
 from Products.urban.config import URBAN_TYPES
@@ -11,6 +13,7 @@ from Products.urban.config import URBAN_CODT_TYPES
 from Products.urban.config import URBAN_ENVIRONMENT_TYPES
 from Products.urban.dashboard import utils
 from Products.urban.UrbanVocabularyTerm import UrbanVocabulary
+from Products.urban.utils import cache_key_5min
 
 from zope.globalrequest import getRequest
 from zope.i18n import translate
@@ -119,7 +122,10 @@ class DashboardCollections(CachedCollectionVocabulary):
         filtered_terms = [
             t
             for t in terms
-            if t.value.split("/")[-1] in self.get_collection_ids(context)
+            if (
+                t.value.split("/")[-1] in self.get_collection_ids(context)
+                and DashboardCollections.check_display(t.token)
+            )
         ]
         return SimpleVocabulary(filtered_terms)
 
@@ -141,6 +147,16 @@ class DashboardCollections(CachedCollectionVocabulary):
         """Format a UrbanType to the collection id"""
         return "collection_{0}".format(type.lower())
 
+    @staticmethod
+    @ram.cache(cache_key_5min)
+    def check_display(uid):
+        collection = api.content.get(UID=uid)
+        licences_folder = aq_parent(collection)
+        getRawExcludeFromNav = getattr(licences_folder, "getRawExcludeFromNav", None)
+        if not getRawExcludeFromNav:
+            return True
+        return not getRawExcludeFromNav()
+
     def get_collection_ids(self, context):
         ids = ["collection_all_licences"]
         ids.extend(map(self._format_id, URBAN_ENVIRONMENT_TYPES))

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/interfaces.py

@@ -736,3 +736,7 @@ class IProductUrbanLayer(IDefaultBrowserLayer):
 
 class IIntentionToSubmitAmendedPlans(Interface):
     __doc__ = _("""IIntentionToSubmitAmendedPlans type marker interface""")
+
+
+class IMissingCapakey(Interface):
+    """ """

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/locales/fr/LC_MESSAGES/urban.po

@@ -2113,6 +2113,16 @@ msgstr "Paramètres des 'divers'"
 msgid "miscdemands"
 msgstr "Divers"
 
+#. Default: "These plots cannot be found, perhaps they belong to a neighboring municipality."
+#: ../browser/templates/parcelrecordsview.pt:23
+msgid "missing_capakey_plural"
+msgstr "Ces parcelles sont introuvables, peut-être qu'elles appartiennent à une commune voisine."
+
+#. Default: "This plot cannot be found, perhaps it belong to a neighboring municipality."
+#: ../browser/templates/parcelrecordsview.pt:22
+msgid "missing_capakey_single"
+msgstr "Cette parcelle est introuvable, peut-être qu'elle appartient à une commune voisine."
+
 msgid "missingparts_folder_title"
 msgstr "Liste des pièces nécessaires pour gérer les pièces manquantes"
 

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/locales/urban.pot

@@ -2085,6 +2085,16 @@ msgstr ""
 msgid "miscdemands"
 msgstr ""
 
+#. Default: "These plots cannot be found, perhaps they belong to a neighboring municipality."
+#: ../browser/templates/parcelrecordsview.pt:23
+msgid "missing_capakey_plural"
+msgstr ""
+
+#. Default: "This plot cannot be found, perhaps it belong to a neighboring municipality."
+#: ../browser/templates/parcelrecordsview.pt:22
+msgid "missing_capakey_single"
+msgstr ""
+
 msgid "missingparts_folder_title"
 msgstr ""
 

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/migration/update_270.py

@@ -30,6 +30,8 @@ from imio.schedule.events.zope_registration import (
 from plone import api
 from plone.registry import Record
 from plone.registry.field import Dict
+from plone.registry.field import TextLine
+from plone.registry.field import List
 from plone.registry.interfaces import IRegistry
 from plone.restapi.interfaces import ISerializeToJson
 from zope.component import getMultiAdapter
@@ -461,3 +463,22 @@ def hide_habitation_tab_in_licence_config(context):
                 licence_config.setTabsConfig(updated_config)
 
     logger.info("upgrade step done!")
+
+
+def add_new_registry_for_missing_capakey(context):
+    logger = logging.getLogger("urban: Add new registry for missing capakey")
+    logger.info("starting migration steps")
+
+    registry = getUtility(IRegistry)
+    key = "Products.urban.interfaces.IMissingCapakey"
+    registry_field = List(
+        title=u"Missing capakey",
+        description=u"List of missing capakey",
+        value_type=TextLine(),
+    )
+    registry_record = Record(registry_field)
+    registry_record.value = []
+    registry.records[key] = registry_record
+
+    logger.info("migration done!")
+    

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/migration/upgrades.zcml

@@ -773,5 +773,14 @@
         handler=".update_270.add_new_registry_profil"
         profile="Products.urban:default"
         />
+
+    <gs:upgradeStep
+        title="Add new registry for missing capakey"
+        description=""
+        source="1164"
+        destination="1165"
+        handler=".update_270.add_new_registry_for_missing_capakey"
+        profile="Products.urban:default"
+        />
   
 </configure>

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/profiles/default/metadata.xml

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

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/services/cadastral.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from Products.urban.utils import add_missing_capakey_in_registry
 from Products.urban.services.base import SQLService
 from Products.urban.services.base import SQLSession
 from plone import api
@@ -589,6 +590,8 @@ class Parcel(object):
         ]
         portal_urban = api.portal.get_tool("portal_urban")
         self.divname = portal_urban.get_division_name(capakey[:5])
+        if self.divname is None:
+            add_missing_capakey_in_registry(capakey)
         self._init_reference(capakey)
         self.capakey = capakey
         self.locations = {}

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/utils.py

@@ -285,4 +285,17 @@ def cache_key_30min(func, *args, **kwargs):
     return (func.__name__, time.time() // (60 * 30), args, kwargs)
 
 
+def cache_key_5min(func, *args, **kwargs):
+    return (func.__name__, time.time() // (60 * 5), args, kwargs)
+
+
 WIDGET_DATE_END_YEAR = datetime.now().year + 25
+
+
+def add_missing_capakey_in_registry(capakey):
+    interface = "Products.urban.interfaces.IMissingCapakey"
+    registry = api.portal.get_registry_record(interface)
+    if capakey in registry:
+        return
+    registry.append(capakey.decode("utf-8"))
+    api.portal.set_registry_record(interface, registry)

{Products.urban-2.7.38 → Products.urban-2.7.40}/src/Products/urban/viewlets/urbain_220.py

@@ -298,7 +298,7 @@ class UrbainXMLExport(BrowserView):
                         u"        <straatnaam>%s</straatnaam>"
                         % safe_unicode(applicantObj.getStreet())
                     )
-                    xml.append(u"        <huisnr>%s</huisnr>" % applicantObj.getNumber())
+                    xml.append(u"        <huisnr>%s</huisnr>" % safe_unicode(applicantObj.getNumber()))
                     xml.append(
                         u"        <postcode>%s</postcode>" % applicantObj.getZipcode()
                     )
@@ -335,7 +335,7 @@ class UrbainXMLExport(BrowserView):
                                 % safe_unicode(applicantObj.getStreet())
                             )
                             xml.append(
-                                u"        <huisnr>%s</huisnr>" % applicantObj.getNumber()
+                                u"        <huisnr>%s</huisnr>" % safe_unicode(applicantObj.getNumber())
                             )
                             xml.append(
                                 u"        <postcode>%s</postcode>"
@@ -361,7 +361,7 @@ class UrbainXMLExport(BrowserView):
                                 % safe_unicode(architectObj.getStreet())
                             )
                             xml.append(
-                                u"        <huisnr>%s</huisnr>" % architectObj.getNumber()
+                                u"        <huisnr>%s</huisnr>" % safe_unicode(architectObj.getNumber())
                             )
                             xml.append(
                                 u"        <postcode>%s</postcode>"

{Products.urban-2.7.38 → Products.urban-2.7.40/src/Products.urban.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.38
+Version: 2.7.40
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -53,6 +53,45 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.40 (2025-06-10)
+-------------------
+
+Bug fixes:
+
+
+- Revert "URB-3293 - Add RoadDecree to URBAN_TYPES (#340)"
+  [mpeeters] (URB-3293)
+
+
+2.7.39 (2025-06-07)
+-------------------
+
+New features:
+
+
+- Add way to easily hide licence type
+  [jchandelle] (SUP-33793)
+- Change display of inquiry view
+  [jchandelle] (SUP-44199)
+- Add a message in case we can't link pod template
+  [jchandelle] (SUP-44861)
+
+
+Bug fixes:
+
+
+- Fix history parcel view when missing capakey
+  [jchandelle] (SUP-36370)
+- Fix filename encoding in mail sending
+  [jchandelle] (SUP-43946)
+- Fix recipient import in inquiry event
+  [jchandelle] (SUP-44583)
+- Fix 220 viewlet house number encoding
+  jchandelle (SUP-44642)
+- Fix link pod template in import config
+  [jchandelle] (SUP-44861)
+
+
 2.7.38 (2025-05-27)
 -------------------