endi 2025.3.4a1__tar.gz → 2025.4.0a1__tar.gz

endi-2025.4.0a1/CURRENT_VERSION

@@ -0,0 +1 @@
+2025.4.0a1

{endi-2025.3.4a1 → endi-2025.4.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: endi
-Version: 2025.3.4a1
+Version: 2025.4.0a1
 Summary: Progiciel de gestion pour CAE
 Home-page: https://framagit.org/caerp/caerp
 Author: Coopérer pour entreprendre
@@ -473,6 +473,29 @@ Il est également possible de lancer black manuellement sur l'ensemble du projet
 (si vous n'utilisez pas black en local, l'intégration continue vous le rappelera 😁)
 
 
+Standards de codage Javascript Marionette
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Le code javascript Backbone/Marionette de CAERP (dans js_sources/src) doit être
+formatté à l'aide de prettier.
+
+.. code-block:: console
+
+    cd js_sources/
+    npm install -D
+    npm prettier --config=./.prettierrc --write src/
+
+Idéalement le code doit être vérifié à l'aide de eslint.
+
+.. code-block:: console
+
+    cd js_sources/
+    npm install -D
+    npm eslint -c ./.eslintrc src/
+
+Ces deux outils peuvent être intégrés dans la majorité des éditeurs de code.
+
+
 Base de données avec docker-compose (MariaDB + redis)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

{endi-2025.3.4a1 → endi-2025.4.0a1}/README.rst

@@ -347,6 +347,29 @@ Il est également possible de lancer black manuellement sur l'ensemble du projet
 (si vous n'utilisez pas black en local, l'intégration continue vous le rappelera 😁)
 
 
+Standards de codage Javascript Marionette
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Le code javascript Backbone/Marionette de CAERP (dans js_sources/src) doit être
+formatté à l'aide de prettier.
+
+.. code-block:: console
+
+    cd js_sources/
+    npm install -D
+    npm prettier --config=./.prettierrc --write src/
+
+Idéalement le code doit être vérifié à l'aide de eslint.
+
+.. code-block:: console
+
+    cd js_sources/
+    npm install -D
+    npm eslint -c ./.eslintrc src/
+
+Ces deux outils peuvent être intégrés dans la majorité des éditeurs de code.
+
+
 Base de données avec docker-compose (MariaDB + redis)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/__init__.py

@@ -101,6 +101,7 @@ CAERP_PANELS_MODULES = (
     "caerp.panels.activity",
     "caerp.panels.business",
     "caerp.panels.company_index",
+    "caerp.panels.expense",
     "caerp.panels.files",
     "caerp.panels.form",
     "caerp.panels.indicators",

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/compute/sage/expense.py

@@ -369,6 +369,7 @@ class ExpenseExportProducer:
     use_general = True
 
     def __init__(self, context, request):
+        self.request = request
         self.config = request.config
         self.modules = []
         for module in self._default_modules:

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/compute/sage/expense_payment.py

@@ -147,6 +147,7 @@ class ExpensePaymentExportProducer:
     use_general = True
 
     def __init__(self, context, request):
+        self.request = request
         self.config = request.config
         self.modules = []
         self.main_module = self.main_module_factory(context, request)

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/compute/sage/invoice.py

@@ -699,6 +699,7 @@ class InvoiceExportProducer:
     _custom_factory = CustomBookEntryFactory
 
     def __init__(self, context, request):
+        self.request = request
         self.config = request.config
         self.modules = []
         for module in self._default_modules:

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/compute/sage/payment.py

@@ -323,6 +323,7 @@ class PaymentExportProducer:
     }
 
     def __init__(self, context, request):
+        self.request = request
         self.config = request.config
         self.modules = []
         for module in self._default_modules:

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/compute/sage/supplier_invoice.py

@@ -300,6 +300,7 @@ class SupplierInvoiceExportProducer:
     use_general = True
 
     def __init__(self, context, request):
+        self.request = request
         self.config = request.config
         self.modules = []
         for module in self._default_modules:

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/compute/sage/supplier_invoice_payment.py

@@ -242,6 +242,7 @@ class BaseSupplierPaymentExport:
     main_module = None
 
     def __init__(self, context, request):
+        self.request = request
         self.config = request.config
         self.modules = []
         for module in self.get_modules(context):

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/dataqueries/queries/clients_factures.py

@@ -1,10 +1,10 @@
 from sqlalchemy import func
 
 from caerp_base.models.base import DBSESSION
+from caerp.compute.math_utils import integer_to_amount
 from caerp.models.task import Task, Payment
 from caerp.dataqueries.base import BaseDataQuery
 from caerp.utils.dataqueries import dataquery_class
-from caerp.utils.strings import format_amount
 
 
 @dataquery_class()
@@ -24,6 +24,8 @@ class ClientsFacturesQuery(BaseDataQuery):
 
     def headers(self):
         headers = [
+            "Enseigne",
+            "Code analytique",
             "Client",
             "Numéro d'immatriculation",
             "Contact principal",
@@ -67,6 +69,8 @@ class ClientsFacturesQuery(BaseDataQuery):
             if not paid_amount:
                 paid_amount = 0
             customer_data = [
+                c.company.name,
+                c.company.code_compta,
                 c.label,
                 c.registration,
                 c.get_name() if c.type == "company" else "",
@@ -77,8 +81,8 @@ class ClientsFacturesQuery(BaseDataQuery):
                 c.additional_address,
                 c.zip_code,
                 c.city,
-                format_amount(invoiced_amount[c.id], precision=5),
-                format_amount(paid_amount, precision=5),
+                integer_to_amount(invoiced_amount[c.id], precision=5, default=0),
+                integer_to_amount(paid_amount, precision=5, default=0),
             ]
             data.append(customer_data)
         data.sort(key=lambda i: (i[0], i[1]))

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/forms/accounting.py

@@ -297,8 +297,7 @@ def get_company_general_ledger_operations_list_schema():
             title="",
             validator=colander.Function(
                 forms.range_validator,
-                msg="Le montant de départ doit être inférieur ou égal \
-    à celui de la fin",
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
             ),
             widget=CleanMappingWidget(),
             missing=colander.drop,
@@ -311,8 +310,7 @@ def get_company_general_ledger_operations_list_schema():
             title="",
             validator=colander.Function(
                 forms.range_validator,
-                msg="Le montant de départ doit être inférieur ou égal \
-    à celui de la fin",
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
             ),
             widget=CleanMappingWidget(),
             missing=colander.drop,

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/forms/expense.py

@@ -10,6 +10,7 @@ import functools
 import logging
 
 from colanderalchemy import SQLAlchemySchemaNode
+from sqlalchemy import select
 
 from caerp import forms
 from caerp.forms.payments import (
@@ -40,48 +41,48 @@ from caerp.utils.strings import remove_newlines
 from .custom_types import AmountType
 from .third_party.supplier import get_deferred_supplier_select_validator
 
+
 STATUS_OPTIONS = (
-    (
-        "all",
-        "Tous",
-    ),
-    (
-        "wait",
-        "En attente de validation",
-    ),
-    (
-        "valid",
-        "Validées",
-    ),
-    (
-        "invalid",
-        "Invalidées",
-    ),
-    (
-        "paid",
-        "Partiellement payées",
-    ),
-    (
-        "resulted",
-        "Payées",
-    ),
-    (
-        "notpaid",
-        "Non payées",
-    ),
+    ("all", "Tous"),
+    ("wait", "En attente de validation"),
+    ("valid", "Validées"),
+    ("invalid", "Invalidées"),
+    ("paid", "Partiellement payées"),
+    ("resulted", "Payées"),
+    ("notpaid", "Non payées"),
 )
+
 DOC_STATUS_OPTIONS = (
-    (
-        "all",
-        "Tous",
-    ),
+    ("all", "Tous"),
     ("notjustified", "Justfificatifs en attente"),
     ("justified", "Justficatifs reçus"),
 )
 
+
 logger = logging.getLogger(__name__)
 
 
+def get_expense_types(dbsession):
+    return dbsession.execute(
+        select(ExpenseType.id, ExpenseType.label)
+        .filter(ExpenseType.type.in_(["expense", "expensetel"]))
+        .filter(ExpenseType.active == True)
+        .order_by(ExpenseType.label)
+    ).all()
+
+
+def get_deferred_select_expense_type(default=False):
+    @colander.deferred
+    def deferred_select_expense_type(node, kw):
+        dbsession = kw["request"].dbsession
+        values = [(a.id, a.label) for a in get_expense_types(dbsession)]
+        if default:
+            values.insert(0, (-1, "Tous les types de dépense"))
+        return deform.widget.SelectWidget(values=values)
+
+    return deferred_select_expense_type
+
+
 @colander.deferred
 def deferred_type_id_validator(node, kw):
     """
@@ -90,6 +91,7 @@ def deferred_type_id_validator(node, kw):
     from caerp.models.expense.types import ExpenseType
 
     ids = [t[0] for t in kw["request"].dbsession.query(ExpenseType.id)]
+    ids.append(-1)
     return colander.OneOf(ids)
 
 

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/forms/supply/supplier_invoice.py

@@ -15,6 +15,10 @@ from caerp.forms.company import (
     company_filter_node_factory,
 )
 from caerp.forms.custom_types import AmountType
+from caerp.forms.expense import (
+    get_deferred_select_expense_type,
+    deferred_type_id_validator,
+)
 from caerp.forms.files import FileNode
 from caerp.forms.payments import (
     deferred_payment_mode_widget,
@@ -30,6 +34,10 @@ from caerp.forms.supply.supplier_order import (
     get_deferred_supplier_order_select_validator,
     supplier_order_choice_node,
 )
+from caerp.forms.tasks.lists import (
+    PeriodSchema,
+    AmountRangeSchema,
+)
 from caerp.forms.third_party.supplier import (
     get_deferred_supplier_select_validator,
     globalizable_supplier_choice_node_factory,
@@ -234,6 +242,32 @@ def get_supplier_invoice_list_schema(request, is_global=False):
         years_func=get_supplier_invoices_years,
         is_global=is_global,
     )
+    schema.insert(
+        1,
+        PeriodSchema(
+            name="period",
+            title="",
+            validator=colander.Function(
+                forms.range_validator,
+                msg="La date de début doit précéder la date de fin",
+            ),
+            widget=CleanMappingWidget(),
+            missing=colander.drop,
+        ),
+    )
+    schema.insert(
+        3,
+        AmountRangeSchema(
+            name="ttc",
+            title="",
+            validator=colander.Function(
+                forms.range_validator,
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
+            ),
+            widget=CleanMappingWidget(),
+            missing=colander.drop,
+        ),
+    )
     schema.insert(
         3,
         forms.status_filter_node(
@@ -254,7 +288,6 @@ def get_supplier_invoice_list_schema(request, is_global=False):
             default="both",
         ),
     )
-
     schema.add_before(
         "items_per_page",
         colander.SchemaNode(
@@ -266,6 +299,18 @@ def get_supplier_invoice_list_schema(request, is_global=False):
             default="",
         ),
     )
+    schema.add_before(
+        "items_per_page",
+        colander.SchemaNode(
+            colander.Integer(),
+            name="expense_type_id",
+            title="Types de dépenses",
+            widget=get_deferred_select_expense_type(default=True),
+            validator=deferred_type_id_validator,
+            missing=-1,
+            default=-1,
+        ),
+    )
     schema.add_before(
         "items_per_page",
         colander.SchemaNode(
@@ -352,7 +397,7 @@ def get_supplier_invoice_add_by_supplier_schema():
     )
     schema["supplier_id"] = supplier_choice_node_factory(
         description="Si le fournisseur manque, l'ajouter d'abord "
-        "dans Tiers → Fournisseurs."
+        "dans Achats → Fournisseurs."
     )
     schema.validator = get_deferred_supplier_choice_validator()
     return schema

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/forms/supply/supplier_order.py

@@ -5,15 +5,22 @@ import functools
 from colanderalchemy import SQLAlchemySchemaNode
 
 from caerp import forms
+from caerp.forms.expense import (
+    get_deferred_select_expense_type,
+    deferred_type_id_validator,
+)
+from caerp.forms.tasks.lists import (
+    PeriodSchema,
+    AmountRangeSchema,
+)
 from caerp.forms.third_party.supplier import (
     supplier_choice_node_factory,
     get_deferred_supplier_select_validator,
     get_deferred_supplier_choice_validator,
 )
 from caerp.forms.supply import get_list_schema
-from caerp.models.supply import (
-    SupplierOrder,
-)
+from caerp.forms.widgets import CleanMappingWidget
+from caerp.models.supply import SupplierOrder
 from caerp.utils.renderer import get_json_dict_repr
 from caerp.services.supplier_order import get_supplier_orders_years
 
@@ -26,19 +33,11 @@ INVOICE_STATUS_OPTIONS = [
     ("valid", "facture validée"),
     ("resulted", "facture soldée"),
 ]
+
 TYPE_OPTIONS = (
-    (
-        "both",
-        "Tous",
-    ),
-    (
-        "supplier_order",
-        "Exclure les commandes internes",
-    ),
-    (
-        "internalsupplier_order",
-        "Seulement les commandes internes",
-    ),
+    ("both", "Tous"),
+    ("supplier_order", "Exclure les commandes internes"),
+    ("internalsupplier_order", "Seulement les commandes internes"),
 )
 
 
@@ -123,6 +122,32 @@ def get_supplier_orders_list_schema(request, is_global=False):
         years_func=get_supplier_orders_years,
         is_global=is_global,
     )
+    schema.insert(
+        1,
+        PeriodSchema(
+            name="period",
+            title="",
+            validator=colander.Function(
+                forms.range_validator,
+                msg="La date de début doit précéder la date de fin",
+            ),
+            widget=CleanMappingWidget(),
+            missing=colander.drop,
+        ),
+    )
+    schema.insert(
+        3,
+        AmountRangeSchema(
+            name="ttc",
+            title="",
+            validator=colander.Function(
+                forms.range_validator,
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
+            ),
+            widget=CleanMappingWidget(),
+            missing=colander.drop,
+        ),
+    )
     schema.insert(
         4,
         colander.SchemaNode(
@@ -147,6 +172,18 @@ def get_supplier_orders_list_schema(request, is_global=False):
             default="both",
         ),
     )
+    schema.add_before(
+        "items_per_page",
+        colander.SchemaNode(
+            colander.Integer(),
+            name="expense_type_id",
+            title="Types de dépenses",
+            widget=get_deferred_select_expense_type(default=True),
+            validator=deferred_type_id_validator,
+            missing=-1,
+            default=-1,
+        ),
+    )
     return schema
 
 
@@ -157,7 +194,7 @@ def get_supplier_order_add_schema():
     )
     schema["supplier_id"] = supplier_choice_node_factory(
         description="Si le fournisseur manque, l'ajouter d'abord "
-        "dans Tiers → Fournisseurs."
+        "dans Achats → Fournisseurs."
     )
     schema.validator = get_deferred_supplier_choice_validator()
     return schema

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/forms/tasks/estimation.py

@@ -103,10 +103,7 @@ def get_list_schema(request, is_global=False, excludes=()):
             title="",
             validator=colander.Function(
                 forms.range_validator,
-                msg=(
-                    "Le montant de départ doit être inférieur ou égale à celui de"
-                    " la fin"
-                ),
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
             ),
             widget=CleanMappingWidget(),
             missing=colander.drop,

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/forms/tasks/invoice.py

@@ -296,10 +296,7 @@ def get_list_schema(request, is_global=False, excludes=()):
             title="",
             validator=colander.Function(
                 forms.range_validator,
-                msg=(
-                    "Le montant de départ doit être inférieur ou égale à celui"
-                    " de la fin"
-                ),
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
             ),
             widget=CleanMappingWidget(),
             missing=colander.drop,
@@ -417,10 +414,7 @@ def get_pdf_export_schema(request):
             title="",
             validator=colander.Function(
                 forms.range_validator,
-                msg=(
-                    "Le montant de départ doit être inférieur ou égale à celui"
-                    " de la fin"
-                ),
+                msg=("Le montant minimal doit être inférieur ou égal au maximum"),
             ),
             widget=CleanMappingWidget(),
             missing=colander.drop,

{endi-2025.3.4a1 → endi-2025.4.0a1}/caerp/models/project/mixins.py

@@ -21,7 +21,7 @@ class BusinessMetricsMixin:
         BusinessLinkedModelMixin implementors
     """
 
-    def get_total_expenses(self, tva_on_margin: bool = None):
+    def get_total_expenses(self, tva_on_margin: bool = None, mode="ht"):
         """
         Total linked expenses, cumulating Expense Sheet lines and Supplier Invoice lines
 
@@ -34,10 +34,10 @@ class BusinessMetricsMixin:
         from caerp.models.supply import SupplierInvoiceLine
         from caerp.models.expense.sheet import BaseExpenseLine
 
-        if tva_on_margin is None:
-            column_name = "total_ht"
-        else:
+        if tva_on_margin is not None or mode == "ttc":
             column_name = "total"  # ttc
+        else:
+            column_name = "total_ht"
 
         return sum(
             Class.total_expense(

endi-2025.4.0a1/caerp/panels/expense/__init__.py

@@ -0,0 +1,2 @@
+def includeme(config):
+    config.include(".linked_expenses")

endi-2025.4.0a1/caerp/panels/expense/linked_expenses.py

@@ -0,0 +1,91 @@
+import logging
+
+from caerp.models.expense.sheet import BaseExpenseLine
+from caerp.models.project import Project, Business
+from caerp.models.supply.supplier_invoice import SupplierInvoiceLine
+from caerp.models.third_party import Customer
+
+
+logger = logging.getLogger(__name__)
+
+
+class LinkedExpensesListPanel:
+    """
+    List both expenses and supplier invoices related to context
+
+    Context can be either project, business, or customer
+    """
+
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+
+    def __call__(self):
+        if isinstance(self.context, Project):
+            filter_col = "project_id"
+        elif isinstance(self.context, Business):
+            filter_col = "business_id"
+        elif isinstance(self.context, Customer):
+            filter_col = "customer_id"
+        else:
+            raise Exception("Unsupported context type")
+
+        logger.info(f"Display linked expenses for {filter_col} {self.context.id}")
+
+        expense_lines = (
+            BaseExpenseLine.query()
+            .filter(getattr(BaseExpenseLine, filter_col) == self.context.id)
+            .order_by(BaseExpenseLine.date.desc())
+            .all()
+        )
+        supplier_invoice_lines = (
+            SupplierInvoiceLine.query()
+            .filter(getattr(SupplierInvoiceLine, filter_col) == self.context.id)
+            .order_by(SupplierInvoiceLine.id.desc())
+            .all()
+        )
+
+        # Compute summary
+        total_ht = 0
+        total_ttc = 0
+        with_tva_on_margin = False
+        total_tva_on_margin = 0
+        expenses_ht = 0
+        expenses_ttc = 0
+        for line in expense_lines:
+            if line.expense_type.tva_on_margin:
+                with_tva_on_margin = True
+                total_tva_on_margin += line.total
+            expenses_ht += line.ht
+            expenses_ttc += line.total
+        supplier_invoices_ht = 0
+        supplier_invoices_ttc = 0
+        for line in supplier_invoice_lines:
+            if line.expense_type.tva_on_margin:
+                with_tva_on_margin = True
+                total_tva_on_margin += line.total
+            supplier_invoices_ht += line.ht
+            supplier_invoices_ttc += line.total
+        total_ht = expenses_ht + supplier_invoices_ht
+        total_ttc = expenses_ttc + supplier_invoices_ttc
+
+        return {
+            "expense_lines": expense_lines,
+            "supplier_invoice_lines": supplier_invoice_lines,
+            "total_ht": total_ht,
+            "total_ttc": total_ttc,
+            "with_tva_on_margin": with_tva_on_margin,
+            "total_tva_on_margin": total_tva_on_margin,
+            "expenses_ht": expenses_ht,
+            "expenses_ttc": expenses_ttc,
+            "supplier_invoices_ht": supplier_invoices_ht,
+            "supplier_invoices_ttc": supplier_invoices_ttc,
+        }
+
+
+def includeme(config):
+    config.add_panel(
+        LinkedExpensesListPanel,
+        "linked_expenses",
+        renderer="panels/expense/linked_expenses.mako",
+    )