endi 2025.4.1__tar.gz → 2025.4.2__tar.gz

endi-2025.4.2/CURRENT_VERSION

@@ -0,0 +1 @@
+2025.4.2

{endi-2025.4.1 → endi-2025.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: endi
-Version: 2025.4.1
+Version: 2025.4.2
 Summary: Progiciel de gestion pour CAE
 Home-page: https://framagit.org/caerp/caerp
 Author: Coopérer pour entreprendre
@@ -112,6 +112,17 @@ Requires-Dist: freezegun<1.1,>=1.0.0; extra == "dev"
 Requires-Dist: Faker<5.0,>=4.1.3; extra == "dev"
 Requires-Dist: WebTest<2.1,>=2.0.35; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ==========
 CAERP

endi-2025.4.2/caerp/controllers/smtp/settings.py

@@ -0,0 +1,120 @@
+import os
+import logging
+from pyramid_mailer.message import Message
+from pyramid.httpexceptions import HTTPNotFound
+from caerp.models.smtp import SmtpSettings
+from caerp.services.smtp import (
+    get_fernet_for_smtp_password,
+    get_mailer_from_smtp_settings,
+    get_smtp_by_id,
+    get_company_smtp,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def _hash_smtp_password(request, derivation_salt, smtp_password):
+    """Hash the given SMTP password for db storage"""
+    fernet = get_fernet_for_smtp_password(request, derivation_salt)
+    hashed_password = fernet.encrypt(smtp_password.encode())
+    return hashed_password.decode()
+
+
+def create_smtp_settings(
+    request,
+    smtp_host,
+    smtp_port,
+    smtp_user,
+    smtp_password,
+    sender_email,
+    smtp_ssl=False,
+    smtp_tls=False,
+    company_id=None,
+):
+    """Create a new SmtpSettings instance."""
+    settings = get_company_smtp(request, company_id)
+    if settings:
+        return update_smtp_settings(
+            request,
+            settings.id,
+            smtp_host,
+            smtp_port,
+            smtp_user,
+            smtp_password,
+            sender_email,
+            smtp_ssl,
+            smtp_tls,
+        )
+
+    smtp_salt = os.urandom(16).hex()
+    hashed_smtp_password = _hash_smtp_password(request, smtp_salt, smtp_password)
+
+    smtp_settings = SmtpSettings(
+        smtp_host=smtp_host,
+        smtp_port=smtp_port,
+        smtp_user=smtp_user,
+        smtp_password_salt=smtp_salt,
+        smtp_password_hash=hashed_smtp_password,
+        smtp_ssl=smtp_ssl,
+        smtp_tls=smtp_tls,
+        sender_email=sender_email,
+        company_id=company_id,
+    )
+    request.dbsession.add(smtp_settings)
+
+    request.dbsession.flush()
+    return smtp_settings
+
+
+def update_smtp_settings(
+    request,
+    smtp_settings_id,
+    smtp_host,
+    smtp_port,
+    smtp_user,
+    sender_email,
+    smtp_password=None,
+    smtp_ssl=False,
+    smtp_tls=False,
+):
+    setting = get_smtp_by_id(request, smtp_settings_id)
+    if setting:
+        setting.smtp_host = smtp_host
+        setting.smtp_port = smtp_port
+        setting.smtp_user = smtp_user
+        setting.smtp_ssl = smtp_ssl
+        setting.smtp_tls = smtp_tls
+        setting.sender_email = sender_email
+
+        if smtp_password:
+            smtp_salt = setting.smtp_password_salt
+            hashed_smtp_password = _hash_smtp_password(
+                request, smtp_salt, smtp_password
+            )
+            setting.smtp_password_hash = hashed_smtp_password
+        request.dbsession.merge(setting)
+        request.dbsession.flush()
+    else:
+        raise HTTPNotFound("Smtp settings not found")
+    return setting
+
+
+def send_test_email(request, smtp_settings: SmtpSettings, recipient_email: str):
+    """
+    Envoi un email de test à l'aide des smtpsettings fournies
+
+    :raises: Exception si une erreur survient lors de l'envoi du mail
+    """
+
+    mailer = get_mailer_from_smtp_settings(request, smtp_settings)
+    message = Message(
+        subject="Test d'envoi d'email depuis enDI",
+        sender=f"enDI<{smtp_settings.sender_email}",
+        recipients=[recipient_email],
+        body="Ceci est un e-mail de test envoyé depuis enDI.",
+    )
+    try:
+        mailer.send_immediately(message)
+    except Exception as e:
+        logger.exception(f"Error sending test email to {recipient_email}")
+        raise e

endi-2025.4.2/caerp/controllers/smtp/task.py

@@ -0,0 +1,173 @@
+import logging
+
+from typing import Union
+from pyramid_mailer.mailer import Mailer
+from pyramid_mailer.debug import DebugMailer
+from pyramid_mailer.message import Message, Attachment
+
+from caerp.export.task_pdf import ensure_task_pdf_persisted
+from caerp.models.files import File
+from caerp.models.smtp import NodeSmtpHistory, SmtpSettings
+from caerp.models.status import StatusLogEntry
+from caerp.models.task.estimation import Estimation
+from caerp.models.task.invoice import Invoice
+from caerp.services.smtp import (
+    get_mailer_from_smtp_settings,
+    get_smtp_by_company_id,
+)
+
+
+logger = logging.getLogger(__name__)
+
+
+def make_attachment_from_file(request, pdf_file: File) -> Attachment:
+    return Attachment(
+        pdf_file.name,
+        content_type="application/pdf",
+        data=pdf_file.data_obj,
+    )
+
+
+def get_message_from_task(
+    request,
+    sender_email: str,
+    task: Union[Estimation, Invoice],
+    subject: str,
+    body: str,
+    recipient_email: str,
+) -> Message:
+
+    extra_headers = {}
+    company = task.company
+    if company.email:
+        extra_headers["reply-to"] = f"{company.name}<{company.email}>"
+
+    ensure_task_pdf_persisted(task, request)
+    attachments = [make_attachment_from_file(request, task.pdf_file)]
+    return Message(
+        subject=subject,
+        sender=f"{task.company.name}<{sender_email}>",
+        recipients=[recipient_email],
+        body=body,
+        extra_headers=extra_headers,
+        attachments=attachments,  # type: List[Attachment]
+    )
+
+
+def _record_mail_sent(
+    request,
+    node,
+    smtp_settings: SmtpSettings,
+    mailer: Union[Mailer, DebugMailer],
+    message: Message,
+):
+    """
+    Generate a status log entry for successfull email
+    And generate a new NodeSmtpHistory entry
+    """
+    comment = (
+        f"Envoyé par e-mail au client à l'adresse {message.recipients[0]} "
+        f"depuis l'adresse {message.sender}\n"
+    )
+
+    status_record = StatusLogEntry(
+        node=node,
+        status="sent",
+        label="Envoyé par e-mail au client",
+        user=request.identity,
+        comment=comment,
+        state_manager_key="signed_status",
+    )
+    request.dbsession.add(status_record)
+
+    history = NodeSmtpHistory(
+        smtp_settings=str(smtp_settings),
+        status="success",
+        node_id=node.id,
+        subject=message.subject,
+        body=message.body,
+        recipient=message.recipients[0],
+        sender_label=message.sender,
+    )
+    request.dbsession.add(history)
+
+    if isinstance(node, Estimation):
+        if node.signed_status == "waiting":
+            node.signed_status = "sent"
+            request.dbsession.merge(node)
+    request.dbsession.flush()
+    return node
+
+
+def _record_mail_error(
+    request,
+    node,
+    smtp_settings: SmtpSettings,
+    mailer: Union[Mailer, DebugMailer],
+    message: Message,
+    error: str,
+):
+    comment = (
+        f"Erreur d'envoi de l'e-mail au client à l'adresse {message.recipients[0]} "
+        f"depuis l'adresse {message.sender}\n"
+        f"<b>Erreur : </b>{error}\n"
+    )
+
+    status_record = StatusLogEntry(
+        node=node,
+        status="invalid",
+        label="Erreur d'envoi par e-mail au client",
+        user=request.identity,
+        comment=comment,
+        state_manager_key="signed_status",
+    )
+    request.dbsession.add(status_record)
+
+    history = NodeSmtpHistory(
+        smtp_settings=str(smtp_settings),
+        status="error",
+        node_id=node.id,
+        subject=message.subject,
+        body=message.body,
+        error=error,
+        recipient=message.recipients[0],
+        sender_label=message.sender,
+    )
+    request.dbsession.add(history)
+    request.dbsession.flush()
+    return node
+
+
+def send_task_to_customer(
+    request,
+    task: Union[Estimation, Invoice],
+    subject: str,
+    body: str,
+    recipient_email: str,
+):
+    """
+    Send a Task object (Invoice/Estimation) to the customer associated with it.
+    """
+
+    company = task.company
+    smtp_settings = get_smtp_by_company_id(request, company.id)
+    if smtp_settings is None:
+        raise Exception(
+            "No SMTP settings found nor for this company neither for the CAE"
+        )
+
+    mailer = get_mailer_from_smtp_settings(request, smtp_settings)
+    message = get_message_from_task(
+        request,
+        smtp_settings.sender_email,
+        task,
+        subject,
+        body,
+        recipient_email,
+    )
+    try:
+        mailer.send_immediately(message)
+        _record_mail_sent(request, task, smtp_settings, mailer, message)
+    except Exception as e:
+        logger.exception(f"Error sending task {task} to customer")
+        _record_mail_error(request, task, smtp_settings, mailer, message, str(e))

endi-2025.4.2/caerp/dataqueries/queries/param_enseignes.py

@@ -0,0 +1,115 @@
+from caerp.dataqueries.base import BaseDataQuery
+from caerp.models.company import Company
+from caerp.utils.dataqueries import dataquery_class
+from caerp.utils.strings import boolean_to_string
+
+
+@dataquery_class()
+class ParamEnseignesQuery(BaseDataQuery):
+
+    name = "param_enseignes"
+    label = "État du paramétrage des enseignes"
+    description = """
+    Liste de toutes les enseignes active à l'instant T avec le détail de leur 
+    paramétrage.
+    """
+
+    def headers(self):
+        headers = [
+            "Compte analytique",
+            "Nom de l'enseigne",
+            "Enseigne interne ?",
+            "Descriptif de l'activité",
+            "Activité principale",
+            "Antenne de rattachement",
+            "Accompagnateur",
+            "E-mail",
+            "Téléphone",
+            "Mobile",
+            "Adresse",
+            "Code postal",
+            "Ville",
+            "Pays",
+            "Position publiée dans l'annuaire ?",
+            "RIB",
+            "IBAN",
+            "-----",
+            "Logo chargé ?",
+            "Bannière chargée ?",
+            "CGV complémentaires ?",
+            "Nombre de décimales",
+            "Acompte par défaut",
+            "Détails du devis dans les factures ?",
+            "-----",
+            "Compte client général",
+            "Compte client tiers",
+            "Compte fournisseur général",
+            "Compte fournisseur tiers",
+            "Compte client interne général",
+            "Compte client interne tiers",
+            "Compte fournisseur interne général",
+            "Compte fournisseur interne tiers",
+            "Compte achat général",
+            "-----",
+            "Contribution à la CAE",
+            "Contribution à la CAE (interne)",
+            "Taux d'assurance pro",
+            "Taux d'assurance pro (interne)",
+            "Coef. frais généraux",
+            "Coef. marge",
+            "Coef. marge dans le catalogue ?",
+        ]
+        return headers
+
+    def data(self):
+        data = []
+        companies = (
+            Company.query().filter(Company.active == True).order_by(Company.name)
+        )
+        for c in companies:
+            company_data = [
+                c.code_compta,
+                c.name,
+                boolean_to_string(c.internal),
+                c.goal,
+                c.activities[0].label if c.activities else "",
+                c.antenne.label if c.antenne else "",
+                f"{c.follower.lastname} {c.follower.firstname}" if c.follower else "",
+                c.email,
+                c.phone,
+                c.mobile,
+                c.address,
+                c.zip_code,
+                c.city,
+                c.country,
+                boolean_to_string(c.latitude is not None),
+                c.RIB,
+                c.IBAN,
+                "",
+                boolean_to_string(c.logo_id is not None),
+                boolean_to_string(c.header_id is not None),
+                boolean_to_string(len(c.cgv) > 0),
+                c.decimal_to_display,
+                c.default_estimation_deposit,
+                boolean_to_string(c.default_add_estimation_details_in_invoice),
+                "",
+                c.general_customer_account,
+                c.third_party_customer_account,
+                c.general_supplier_account,
+                c.third_party_supplier_account,
+                c.internalgeneral_customer_account,
+                c.internalthird_party_customer_account,
+                c.internalgeneral_supplier_account,
+                c.internalthird_party_supplier_account,
+                c.general_expense_account,
+                "",
+                c.contribution,
+                c.internalcontribution,
+                c.insurance,
+                c.internalinsurance,
+                c.general_overhead,
+                c.margin_rate,
+                boolean_to_string(c.use_margin_rate_in_catalog),
+            ]
+            data.append(company_data)
+        return data

{endi-2025.4.1 → endi-2025.4.2}/caerp/models/__init__.py

@@ -23,6 +23,7 @@ from . import options
 from . import payments
 from . import progress_invoicing
 from . import project
+from . import smtp
 from . import statistics
 from . import supply
 from . import third_party

{endi-2025.4.1 → endi-2025.4.2}/caerp/models/config.py

@@ -7,6 +7,7 @@
 import logging
 import datetime
 import io
+import json
 from typing import Any, Type
 from sqlalchemy import (
     Column,
@@ -206,6 +207,8 @@ def _type_value(value, type_=str, default=_required):
             result = convert_to_float(result, **kwargs)
         elif type_ is bool:
             result = convert_to_bool(result, **kwargs)
+        elif type_ is dict:
+            result = json.loads(result)
     except ValueError as e:
         # Intercept the default value management
         if default != _required:

endi-2025.4.2/caerp/models/smtp.py

@@ -0,0 +1,99 @@
+from sqlalchemy import Column, Integer, String, Boolean, ForeignKey, Text
+from caerp_base.models.base import DBBASE, default_table_args
+from caerp_base.models.mixins import TimeStampedMixin
+
+
+class SmtpSettings(DBBASE, TimeStampedMixin):
+    """
+    Model storing SMTP settings
+    :param smtp_host: SMTP host
+    :param smtp_port: SMTP port
+    :param smtp_user: SMTP user
+    :param smtp_password: SMTP password
+    :param smtp_ssl: Use SSL for SMTP connection
+    :param smtp_tls: Use TLS for SMTP connection
+    :param sender_email: Sender email address
+    """
+
+    __tablename__ = "smtp_settings"
+    __table_args__ = default_table_args
+
+    id = Column(
+        Integer,
+        primary_key=True,
+        info={"colanderalchemy": {"exclude": True}},
+    )
+    smtp_host = Column(
+        String(255),
+        nullable=False,
+        info={"colanderalchemy": {"title": "Adresse du serveur smtp"}},
+    )
+    smtp_port = Column(
+        Integer,
+        nullable=False,
+        info={"colanderalchemy": {"title": "Port d'accès au serveur smtp"}},
+    )
+    smtp_user = Column(
+        String(255),
+        nullable=False,
+        info={"colanderalchemy": {"title": "Nom d'utilisateur (généralement l'email)"}},
+    )
+    smtp_password_salt = Column(
+        String(255),
+        nullable=False,
+        info={"colanderalchemy": {"exclude": True}},
+    )
+    smtp_password_hash = Column(
+        String(255),
+        nullable=False,
+        info={"colanderalchemy": {"exclude": True}},
+    )
+
+    smtp_ssl = Column(
+        Boolean,
+        default=False,
+        info={"colanderalchemy": {"title": "Activer SSL"}},
+    )
+    smtp_tls = Column(
+        Boolean,
+        default=False,
+        info={"colanderalchemy": {"title": "Activer Start/TLS"}},
+    )
+    sender_email = Column(String(255), nullable=False)
+    company_id = Column(
+        Integer, ForeignKey("company.id", ondelete="CASCADE"), nullable=True
+    )
+
+    def __repr__(self):
+        return (
+            f"<SmtpSettings({self.id}, {self.smtp_host}:{self.smtp_port} "
+            f"ssl: {self.smtp_ssl} tls: {self.smtp_tls} username: "
+            f"{self.smtp_user} company_id: {self.company_id})>"
+        )
+
+
+class NodeSmtpHistory(DBBASE, TimeStampedMixin):
+    """
+    Model storing SMTP history of sending Node data by email
+
+    :param smtp_settings_id: SMTP settings id
+    :param status: Status of the mail sending attempt
+
+    :param node_id: The node id
+    :param subject: Subject of the mail
+    :param body: Error body if the SMTP connection failed
+    :param recipient: Recipient email address
+    :param sender label: Sender label
+    """
+
+    __tablename__ = "node_smtp_history"
+    __table_args__ = default_table_args
+    id = Column(Integer, primary_key=True)
+    smtp_settings = Column(String(255), nullable=False)
+    status = Column(String(255), nullable=False)
+    node_id = Column(ForeignKey("node.id", ondelete="CASCADE"), nullable=False)
+    subject = Column(String(255), nullable=False)
+    body = Column(Text(), nullable=True)
+    error = Column(Text(), nullable=True)
+    recipient = Column(String(255), nullable=False)
+    sender_label = Column(String(255), nullable=False)

{endi-2025.4.1 → endi-2025.4.2}/caerp/models/task/estimation.py

@@ -68,7 +68,7 @@ PAYMENTDISPLAYCHOICES = (
 
 ESTIMATION_STATES = (
     ("waiting", "En attente"),
-    ("send", "Envoyé au client"),
+    ("sent", "Envoyé au client"),
     ("aborted", "Annulé"),
     ("signed", "Signé"),
 )

{endi-2025.4.1 → endi-2025.4.2}/caerp/panels/project/business_metrics_mixins.py

@@ -21,7 +21,7 @@ def business_metrics_totals(
         # total_expenses = instance.get_total_expenses(tva_on_margin=True)
         # total_margin = instance.get_total_margin(tva_on_margin=True)
         total_expenses = instance.get_total_expenses(mode="ttc")
-        total_margin = total_income - total_expenses
+        total_margin = total_income - (total_expenses * 1000)
 
         # if instance.get_total_expenses(tva_on_margin=False) > 0:
         #     expense_warnings.append("les dépenses hors TVA sur marge ont été ignorées")

{endi-2025.4.1 → endi-2025.4.2}/caerp/plugins/sap/views/estimations/rest_api.py

@@ -1,13 +1,16 @@
 from caerp.consts.permissions import PERMISSIONS
+from caerp.models.task.estimation import Estimation
 from caerp.views.estimations.rest_api import EstimationRestView
+
 from ..mixins import SAPTaskRestViewMixin
 
 
 class SAPEstimationRestView(SAPTaskRestViewMixin, EstimationRestView):
     def _more_form_sections(self, sections):
         sections = EstimationRestView._more_form_sections(self, sections)
-        sections["composition"]["classic"]["lines"]["date"] = {"edit": True}
-        # Pas de configuration de la présentation (affichage ttc ou affichage du détail en mode SAP)
+        # En fait pour les devis on ne veut pas demander les dates d'exécution
+        # sections["composition"]["classic"]["lines"]["date"] = {"edit": True}
+        # On cache les options d'affichage (obligatoires pour le SAP)
         sections["display_options"] = {}
         return sections
 
@@ -20,6 +23,7 @@ def add_views(config):
         renderer="json",
         request_param="form_config",
         permission=PERMISSIONS["company.view"],
+        context=Estimation,
     )
 
 

{endi-2025.4.1 → endi-2025.4.2}/caerp/plugins/sap/views/invoices/rest_api.py

@@ -1,10 +1,11 @@
+from caerp.consts.permissions import PERMISSIONS
 from caerp.models.task.invoice import Invoice
 from caerp.views.invoices.rest_api import (
     CancelInvoiceRestView,
     InvoiceRestView,
     InvoiceStatusRestView,
 )
-from caerp.consts.permissions import PERMISSIONS
+
 from ..mixins import SAPTaskRestViewMixin
 from ...forms.tasks.invoice import validate_sap_invoice
 
@@ -18,7 +19,7 @@ class SAPInvoiceRestView(SAPTaskRestViewMixin, InvoiceRestView):
     def _more_form_sections(self, sections):
         sections = InvoiceRestView._more_form_sections(self, sections)
         sections["composition"]["classic"]["lines"]["date"] = {"edit": True}
-        # Pas de configuration de la présentation (affichage ttc ou affichage du détail en mode SAP)
+        # On cache les options d'affichage (obligatoires pour le SAP)
         sections["display_options"] = {}
         return sections
 

{endi-2025.4.1 → endi-2025.4.2}/caerp/scripts/caerp_anonymize.py

@@ -682,6 +682,13 @@ pendant cette période.""",
         self.session.query(AccountingOperation).delete()
         self.session.flush()
 
+    def _an_smtp_settings(self):
+        from caerp.models.smtp import SmtpSettings, NodeSmtpHistory
+
+        self.session.query(SmtpSettings).delete()
+        self.session.query(NodeSmtpHistory).delete()
+        self.session.flush()
+
     def run_from(self, method_name):
         """
         Runs all anonymization methods following method_name