endi 2025.5.0b5__tar.gz → 2025.5.1__tar.gz

endi-2025.5.1/CURRENT_VERSION

@@ -0,0 +1 @@
+2025.5.1

{endi-2025.5.0b5 → endi-2025.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: endi
-Version: 2025.5.0b5
+Version: 2025.5.1
 Summary: Progiciel de gestion pour CAE
 Home-page: https://framagit.org/caerp/caerp
 Author: Coopérer pour entreprendre

endi-2025.5.1/caerp/alembic/versions/2025_5_0_ajout_business_type_forbid_self_validation_2afc8ac82521.py

@@ -0,0 +1,24 @@
+"""
+2025.5.0 Ajout de business_type.forbid_self_validation
+"""
+
+revision = "2afc8ac82521"
+down_revision = "1fcb2b2e231e"
+
+import sqlalchemy as sa
+from alembic import op
+
+
+def update_database_structure():
+    op.add_column(
+        "business_type",
+        sa.Column("forbid_self_validation", sa.Boolean(), nullable=False),
+    )
+
+
+def upgrade():
+    update_database_structure()
+
+
+def downgrade():
+    op.drop_column("business_type", "forbid_self_validation")

endi-2025.5.0b5/caerp/alembic/versions/2025.5.0_suppression_de_company_bank_account_1fcb2b2e231e.py → endi-2025.5.1/caerp/alembic/versions/2025_5_0_suppression_de_company_bank_account_1fcb2b2e231e.py

@@ -1,4 +1,4 @@
-"""2025.5.0b5 suppression de company.bank_account
+"""2025.5.0 suppression de company.bank_account
 
 Create Date: 2025-09-09 14:28:13.364578
 

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/controllers/smtp/settings.py

@@ -44,8 +44,8 @@ def create_smtp_settings(
             smtp_host,
             smtp_port,
             smtp_user,
-            smtp_password,
             sender_email,
+            smtp_password,
             smtp_ssl,
             smtp_tls,
         )
@@ -121,8 +121,9 @@ def send_test_email(request, smtp_settings: SmtpSettings, recipient_email: str):
 
     :raises: Exception si une erreur survient lors de l'envoi du mail
     """
-
     mailer = get_mailer_from_smtp_settings(request, smtp_settings)
+    logger.info(f"Sending test email to {smtp_settings}")
+    logger.info(f"Current mailer : {mailer}")
     message = Message(
         subject="Test d’envoi d’e-mail depuis enDI",
         sender=f"enDI<{smtp_settings.sender_email}",

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/forms/admin/sale/business_cycle/project_type.py

@@ -2,20 +2,16 @@ import colander
 import deform
 import deform_extensions
 from colanderalchemy import SQLAlchemySchemaNode
-
 from sqlalchemy import not_
 
 from caerp import forms
-from caerp.models.project.types import (
-    ProjectType,
-    BusinessType,
-)
 from caerp.forms import (
     customize_field,
     get_deferred_model_select,
-    get_sequence_child_item,
     get_deferred_model_select_checkbox,
+    get_sequence_child_item,
 )
+from caerp.models.project.types import BusinessType, ProjectType
 
 
 def _build_unique_label_validator(class_, type_id=None):
@@ -171,6 +167,7 @@ def remove_attrs_on_private_business_type(schema, kw):
             del schema["label"]
             del schema["bpf_related"]
             del schema["tva_on_margin"]
+            del schema["forbid_self_validation"]
 
 
 def get_admin_business_type_schema(edit=False):
@@ -182,6 +179,7 @@ def get_admin_business_type_schema(edit=False):
             "other_project_types",
             "bpf_related",
             "tva_on_margin",
+            "forbid_self_validation",
             "coop_cgv_override",
         ),
     )

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/forms/smtp/settings.py

@@ -1,8 +1,6 @@
 import colander
-from caerp.forms import (
-    lower_string_preparer,
-    strip_string_preparer,
-)
+
+from caerp.forms import lower_string_preparer, strip_string_preparer
 
 
 class SmtpSettingsSchema(colander.MappingSchema):
@@ -45,10 +43,16 @@ class SmtpSettingsSchema(colander.MappingSchema):
         validator=colander.Length(max=255),
     )
     smtp_ssl = colander.SchemaNode(
-        colander.Boolean(), title="Activer SSL", missing=False
+        colander.Boolean(),
+        title="Activer SSL",
+        missing=False,
+        description="Parfois nommé SSL/TLS",
     )
     smtp_tls = colander.SchemaNode(
-        colander.Boolean(), title="Activer TLS", missing=False
+        colander.Boolean(),
+        title="Activer TLS",
+        missing=False,
+        description="Parfois nommé STARTTLS",
     )
 
 

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/forms/third_party/base.py

@@ -1,16 +1,17 @@
 """
 Third party handling forms schemas and related widgets
 """
-import deform
-import colander
 from collections import OrderedDict
+
+import colander
+import deform
+import pyvat
+from caerp_base.consts import CIVILITE_OPTIONS
 from pyramid_deform import CSRFSchema
+
 from caerp import forms
-from caerp.consts.permissions import PERMISSIONS
-from caerp_base.consts import CIVILITE_OPTIONS
-from caerp.models.third_party import ThirdParty
 from caerp.models.company import Company
-import pyvat
+from caerp.models.third_party import ThirdParty
 
 
 def _build_third_party_select_value(third_party):
@@ -58,33 +59,6 @@ def build_admin_third_party_options(query):
     return values
 
 
-def third_party_after_bind(node, kw):
-    """
-    After bind method for the third_party model schema
-
-    removes nodes if the user have no rights to edit them
-
-    :param obj node: SchemaNode corresponding to the ThirdParty
-    :param dict kw: The bind parameters
-    """
-    request = kw["request"]
-    if not request.has_permission(
-        PERMISSIONS["global.manage_accounting"], request.context
-    ):
-        if "compte_tiers" in node:
-            del node["compte_tiers"]
-        if "compte_cg" in node:
-            del node["compte_cg"]
-
-        if "bank_account_bic" in node:
-            del node["bank_account_bic"]
-        if "bank_account_iban" in node:
-            del node["bank_account_iban"]
-
-        if "bank_account_owner" in node:
-            del node["bank_account_owner"]
-
-
 @colander.deferred
 def deferred_default_type(node, kw):
     """

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/forms/third_party/customer.py

@@ -14,6 +14,7 @@ from sqlalchemy.orm import contains_eager
 
 from caerp import forms
 from caerp.compute.math_utils import convert_to_int
+from caerp.consts.permissions import PERMISSIONS
 from caerp.forms.company import company_choice_node
 from caerp.forms.lists import BaseListsSchema
 from caerp.forms.project import project_node_factory
@@ -21,7 +22,6 @@ from caerp.forms.third_party.base import (
     build_admin_third_party_options,
     build_third_party_values,
     customize_third_party_schema,
-    third_party_after_bind,
 )
 from caerp.models.company import Company
 from caerp.models.project import Project
@@ -421,6 +421,24 @@ def _customize_schema(schema):
     return schema
 
 
+def customer_after_bind(node, kw):
+    """
+    After bind method for the customers
+
+    removes nodes if the user have no rights to edit them
+
+    :param obj node: SchemaNode corresponding to the ThirdParty
+    :param dict kw: The bind parameters
+    """
+    request = kw["request"]
+    if not request.has_permission(
+        PERMISSIONS["global.manage_accounting"], request.context
+    ):
+        for key in ("compte_tiers", "compte_cg"):
+            if key in node:
+                del node[key]
+
+
 def get_company_customer_schema():
     """
     return the schema for user add/edit regarding the current user's role
@@ -434,13 +452,15 @@ def get_company_customer_schema():
         "<strong>Obligatoire pour pouvoir facturer ce client</strong>"
     )
     schema["registration"].missing = colander.required
-    schema.after_bind = third_party_after_bind
+    schema.after_bind = customer_after_bind
     return schema
 
 
-def get_individual_customer_schema() -> SQLAlchemySchemaNode:
+def get_individual_customer_schema(with_bank_account=False) -> SQLAlchemySchemaNode:
     """
     Build an individual customer form schema
+    :param with_bank_account: Whether to include bank account fields in the schema
+    or not (sap mode only)
 
     :return: The schema
     """
@@ -451,13 +471,17 @@ def get_individual_customer_schema() -> SQLAlchemySchemaNode:
         "function",
         "registration",
     ]
+    if not with_bank_account:
+        excludes.append("bank_account_bic")
+        excludes.append("bank_account_owner")
+        excludes.append("bank_account_number")
 
     schema = SQLAlchemySchemaNode(Customer, excludes=excludes)
     schema = _customize_schema(schema)
     schema["firstname"].title = "Prénom"
     schema["lastname"].title = "Nom"
     schema["lastname"].missing = colander.required
-    schema.after_bind = third_party_after_bind
+    schema.after_bind = customer_after_bind
     return schema
 
 
@@ -562,7 +586,7 @@ def get_internal_customer_editschema():
     schema = SQLAlchemySchemaNode(Customer, excludes=excludes)
     schema = _customize_schema(schema)
     schema["company_name"].missing = colander.required
-    schema.after_bind = third_party_after_bind
+    schema.after_bind = customer_after_bind
     return schema
 
 

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/forms/third_party/supplier.py

@@ -2,31 +2,26 @@
 Supplier handling forms schemas and related widgets
 """
 import functools
+
 import colander
 import deform
 from colanderalchemy import SQLAlchemySchemaNode
 from sqlalchemy.orm import contains_eager
 
-from caerp.models.expense.sheet import (
-    ExpenseLine,
-    ExpenseSheet,
-)
-from caerp.models.supply import (
-    SupplierInvoice,
-    SupplierOrder,
-)
-from caerp.models.third_party.supplier import Supplier
-from caerp.models.company import Company
-from caerp.models.project import Project
-from caerp.compute.math_utils import convert_to_int
 from caerp import forms
+from caerp.compute.math_utils import convert_to_int
+from caerp.consts.permissions import PERMISSIONS
 from caerp.forms.lists import BaseListsSchema
 from caerp.forms.third_party.base import (
-    build_third_party_values,
     build_admin_third_party_options,
-    third_party_after_bind,
+    build_third_party_values,
     customize_third_party_schema,
 )
+from caerp.models.company import Company
+from caerp.models.expense.sheet import ExpenseLine, ExpenseSheet
+from caerp.models.project import Project
+from caerp.models.supply import SupplierInvoice, SupplierOrder
+from caerp.models.third_party.supplier import Supplier
 
 
 def get_company_suppliers_from_request(request):
@@ -380,6 +375,30 @@ def _customize_schema(schema):
     return schema
 
 
+def supplier_after_bind(node, kw):
+    """
+    Les informations bancaires des fournisseurs ne sont modifiables
+    que par la compta alors que pour les clients (en mode urssaf),
+    elles sont modifiables par les entrepreneurs.
+
+    :param obj node: SchemaNode corresponding to the ThirdParty
+    :param dict kw: The bind parameters
+    """
+    request = kw["request"]
+    if not request.has_permission(
+        PERMISSIONS["global.manage_accounting"], request.context
+    ):
+        for key in (
+            "compte_cg",
+            "compte_tiers",
+            "bank_account_bic",
+            "bank_account_iban",
+            "bank_account_owner",
+        ):
+            if key in node:
+                del node[key]
+
+
 def get_supplier_schema():
     """
     return the schema for user add/edit regarding the current user's role
@@ -392,7 +411,7 @@ def get_supplier_schema():
     schema[
         "registration"
     ].description = "SIRET de préférence (sinon SIREN, RCS, RNA, ou autre)"
-    schema.after_bind = third_party_after_bind
+    schema.after_bind = supplier_after_bind
     return schema
 
 

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/forms/user/userdatas.py

@@ -1,64 +1,58 @@
 """
 Userdatas related form informations
 """
-import colander
-import logging
-import deform
-import deform_extensions
 import functools
 import json
-from sqlalchemy import select, distinct
+import logging
 
+import colander
+import deform
+import deform_extensions
+from caerp_base.consts import CIVILITE_OPTIONS, SEX_OPTIONS
 from colanderalchemy import SQLAlchemySchemaNode
+from sqlalchemy import distinct, select
 
-from caerp_base.consts import (
-    SEX_OPTIONS,
-    CIVILITE_OPTIONS,
-)
 from caerp.consts.permissions import PERMISSIONS
-from caerp.models.config import Config
-from caerp.models.user.login import ACCOUNT_TYPES
-from caerp.models.user.userdatas import (
-    CaeSituationOption,
-    UserDatas,
-    AntenneOption,
-    ZoneOption,
-    ZoneQualificationOption,
-    StudyLevelOption,
-    SocialStatusOption,
-    ActivityTypeOption,
-    PcsOption,
-    PrescripteurOption,
-    NonAdmissionOption,
-    ParcoursStatusOption,
-    STATUS_OPTIONS,
-    CONTRACT_OPTIONS,
-    UserDatasSocialDocTypes,
-    CareContractOption,
-    AidOrganismOption,
-    UserDatasCustomFields,
-)
-from caerp.models.company import CompanyActivity
-from caerp.forms.widgets import CleanMappingWidget
-from caerp.forms.lists import BaseListsSchema
-from caerp.forms.user import (
-    conseiller_filter_node_factory,
-    get_deferred_user_choice,
-)
 from caerp.forms import (
+    bic_validator,
     customize_field,
     get_deferred_select,
     get_deferred_select_validator,
     get_select,
     get_select_validator,
-    mail_validator,
     iban_validator,
-    bic_validator,
+    mail_validator,
+)
+from caerp.forms.lists import BaseListsSchema
+from caerp.forms.user import conseiller_filter_node_factory, get_deferred_user_choice
+from caerp.forms.widgets import CleanMappingWidget
+from caerp.models.company import CompanyActivity
+from caerp.models.config import Config
+from caerp.models.user.login import ACCOUNT_TYPES
+from caerp.models.user.userdatas import (
+    CONTRACT_OPTIONS,
+    STATUS_OPTIONS,
+    ActivityTypeOption,
+    AidOrganismOption,
+    AntenneOption,
+    CaeSituationOption,
+    CareContractOption,
+    NonAdmissionOption,
+    ParcoursStatusOption,
+    PcsOption,
+    PrescripteurOption,
+    SocialStatusOption,
+    StudyLevelOption,
+    UserDatas,
+    UserDatasCustomFields,
+    UserDatasSocialDocTypes,
+    ZoneOption,
+    ZoneQualificationOption,
 )
 from caerp.utils.colanderalchemy import (
-    get_model_columns_list,
     get_colanderalchemy_model_sections,
     get_model_columns_by_colanderalchemy_section,
+    get_model_columns_list,
 )
 
 logger = logging.getLogger(__name__)
@@ -326,8 +320,8 @@ def customize_schema(schema):
     if "statut_bank_accounts" in schema:
         child_schema = schema["statut_bank_accounts"].children[0]
         child_schema.widget = CleanMappingWidget()
-        customize_field(child_schema, "bic", validator=iban_validator)
-        customize_field(child_schema, "iban", validator=bic_validator)
+        customize_field(child_schema, "bic", validator=bic_validator)
+        customize_field(child_schema, "iban", validator=iban_validator)
 
     if "statut_aid_organisms" in schema:
         schema["statut_aid_organisms"].missing = colander.drop

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/models/project/types.py

@@ -1,32 +1,26 @@
 """
 Project Type management
 """
+from caerp_base.models.base import DBBASE, DBSESSION, default_table_args
 from sqlalchemy import (
-    Table,
+    Boolean,
     Column,
+    ForeignKey,
     Integer,
     String,
-    Boolean,
-    ForeignKey,
+    Table,
     Text,
-    not_,
     desc,
+    not_,
 )
-from sqlalchemy.orm import (
-    relationship,
-    load_only,
-)
-from caerp_base.models.base import (
-    DBBASE,
-    default_table_args,
-    DBSESSION,
-)
+from sqlalchemy.orm import load_only, relationship
+
 from caerp.consts.permissions import PERMISSIONS
 from caerp.models.task.mentions import TaskMention
+
 from .business import Business
 from .mentions import BusinessTypeTaskMention
 
-
 ProjectTypeBusinessType = Table(
     "project_type_business_type",
     DBBASE.metadata,
@@ -368,25 +362,6 @@ class BusinessType(BaseProjectType):
         },
     )
 
-    project_type = relationship(
-        "ProjectType",
-        primaryjoin="ProjectType.id==BusinessType.project_type_id",
-        info={"colanderalchemy": {"exclude": True}},
-        back_populates="default_business_type",
-    )
-
-    other_project_types = relationship(
-        "ProjectType",
-        secondary=ProjectTypeBusinessType,
-        back_populates="other_business_types",
-        info={
-            "colanderalchemy": {
-                "title": "Ce type d'affaire peut également être utilisé "
-                "dans les dossiers de type : "
-            }
-        },
-    )
-
     bpf_related = Column(
         Boolean(),
         default=False,
@@ -398,7 +373,6 @@ class BusinessType(BaseProjectType):
             }
         },
     )
-
     tva_on_margin = Column(
         Boolean(),
         default=False,
@@ -428,7 +402,37 @@ class BusinessType(BaseProjectType):
             ),
         ),
     )
+    forbid_self_validation = Column(
+        Boolean(),
+        default=False,
+        nullable=False,
+        info={
+            "colanderalchemy": {
+                "title": "Interdire l'auto-validation",
+                "description": (
+                    "Si activé, les affaires de ce type ne pourront jamais être auto-validées"
+                ),
+            }
+        },
+    )
 
+    project_type = relationship(
+        "ProjectType",
+        primaryjoin="ProjectType.id==BusinessType.project_type_id",
+        info={"colanderalchemy": {"exclude": True}},
+        back_populates="default_business_type",
+    )
+    other_project_types = relationship(
+        "ProjectType",
+        secondary=ProjectTypeBusinessType,
+        back_populates="other_business_types",
+        info={
+            "colanderalchemy": {
+                "title": "Ce type d'affaire peut également être utilisé "
+                "dans les dossiers de type : "
+            }
+        },
+    )
     label_overrides = relationship(
         "LabelOverride",
         info={"colanderalchemy": {"exclude": True}},

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/plugins/sap_urssaf3p/forms/customer.py

@@ -13,7 +13,15 @@ from caerp.utils.colanderalchemy import patched_objectify
 
 
 def get_urssaf_data_schema() -> SQLAlchemySchemaNode:
-    result = SQLAlchemySchemaNode(UrssafCustomerData)
+    # Ces champs ne sont plus utilisés, ils ont été maintenus pour la migration
+    # vers la version 2025.5.0
+    # Ils pourront être supprimés ensuite.
+    excludes = (
+        "bank_account_bic",
+        "bank_account_iban",
+        "bank_account_owner",
+    )
+    result = SQLAlchemySchemaNode(UrssafCustomerData, excludes=excludes)
 
     result.objectify = MethodType(patched_objectify, result)
     return result
@@ -23,7 +31,7 @@ def get_urssaf_individual_customer_schema() -> SQLAlchemySchemaNode:
     """
     Build the customer form schema specific to Urssaf related data
     """
-    schema = get_individual_customer_schema()
+    schema = get_individual_customer_schema(with_bank_account=True)
     schema.objectify = MethodType(patched_objectify, schema)
     schema["urssaf_data"] = get_urssaf_data_schema()
 
@@ -61,6 +69,7 @@ def get_urssaf_individual_customer_schema() -> SQLAlchemySchemaNode:
         "bank_account_owner",
     ):
         schema[field].missing = colander.required
+        schema[field].preparer = forms.strip_string_preparer
 
     for field in (
         "street_type",

{endi-2025.5.0b5 → endi-2025.5.1}/caerp/services/smtp/smtp.py

@@ -1,12 +1,14 @@
 import base64
 import os
 from typing import Optional, Union
-from sqlalchemy import select
+
 from cryptography.fernet import Fernet
-from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 from cryptography.hazmat.primitives import hashes
-from pyramid_mailer.mailer import Mailer
+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 from pyramid_mailer.debug import DebugMailer
+from pyramid_mailer.mailer import Mailer
+from sqlalchemy import select
+
 from caerp.models.company import Company
 from caerp.models.smtp import SmtpSettings
 from caerp.services import get_model_by_id