endi 2024.5.1__tar.gz → 2024.5.3__tar.gz

endi-2024.5.3/CURRENT_VERSION

@@ -0,0 +1 @@
+2024.5.3

{endi-2024.5.1 → endi-2024.5.3}/PKG-INFO

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

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/__init__.py

@@ -3,16 +3,16 @@ Main deferreds functions used in enDI
 
 The widgets provided here are model agnostic
 """
-from typing import List, Optional
 import logging
 import colander
 import datetime
 import deform
 import deform_extensions
-from sqlalchemy.sql.elements import ColumnElement
-from sqlalchemy.orm import load_only
-from sqlalchemy import select
 
+from typing import List, Optional
+
+from sqlalchemy import select, func
+from sqlalchemy.sql.elements import ColumnElement
 
 from caerp.utils import strings
 from caerp.utils.html import (
@@ -1292,3 +1292,26 @@ def get_deferred_global_default_value(
         return result
 
     return deferred
+
+
+def add_antenne_option_field(request, schema, index=0):
+    """
+    Add antenne_option field to a schema.
+
+    :param request: The request context
+    :param schema: The colander schema to add the field to
+    :param int index: The index where the field should be inserted
+    """
+    from caerp.models.user.userdatas import AntenneOption
+
+    if request.dbsession.execute(select(func.count(AntenneOption.id))).scalar_one() > 0:
+        schema.insert(
+            index,
+            colander.SchemaNode(
+                colander.Integer(),
+                name="antenne_id",
+                title="Antenne",
+                widget=get_deferred_select(AntenneOption, mandatory=False),
+                missing=None,
+            ),
+        )

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/business/business.py

@@ -2,19 +2,21 @@
 Schema used for businesses manipulation
 """
 
-from caerp.consts.permissions import PERMISSIONS
-from caerp.controllers.business import get_invoices_without_deadline
 import colander
 import deform
 import deform_extensions
 from colanderalchemy import SQLAlchemySchemaNode
 
+from caerp.consts.permissions import PERMISSIONS
+from caerp.controllers.business import get_invoices_without_deadline
+
 from caerp.forms.custom_types import AmountType
 from caerp.forms.lists import BaseListsSchema
 from caerp.forms import (
     get_date_input,
     get_deferred_global_default_value,
     year_filter_node,
+    add_antenne_option_field,
 )
 
 from caerp.forms.company import company_filter_node_factory
@@ -25,7 +27,7 @@ from caerp.models.task.invoice import get_invoice_years
 from caerp.forms.tasks.task import business_type_filter_node
 
 
-def get_business_list_schema(is_global, is_customer_list=False):
+def get_business_list_schema(request, is_global, is_customer_list=False):
     """
     Build the Business list filter schema
     """
@@ -135,6 +137,8 @@ def get_business_list_schema(is_global, is_customer_list=False):
             missing=True,
         ),
     )
+    if is_global:
+        add_antenne_option_field(request, schema, index=2)
     return schema
 
 

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/expense.py

@@ -401,7 +401,7 @@ class BookMarkSchema(colander.MappingSchema):
     business_id = colander.SchemaNode(colander.Integer(), missing=colander.drop)
 
 
-def get_list_schema():
+def get_list_schema(request):
     """
     Build a form schema for expensesheet listing
     """
@@ -440,6 +440,7 @@ def get_list_schema():
     )
 
     schema.insert(2, contractor_filter_node_factory(name="owner_id"))
+    forms.add_antenne_option_field(request, schema)
 
     return schema
 

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/supply/__init__.py

@@ -34,7 +34,7 @@ def get_add_edit_line_schema(model_class, internal=False, **kwargs):
     return schema
 
 
-def get_list_schema(years_func, is_global=False):
+def get_list_schema(request, years_func, is_global=False):
     """
     Common to SupplierOrder and SupplierInvoice views
 
@@ -55,6 +55,12 @@ def get_list_schema(years_func, is_global=False):
     )
     # For now, we use task STATUS_OPTIONS
     schema.insert(0, forms.status_filter_node(STATUS_OPTIONS))
+    if is_global:
+        schema.insert(
+            0, company_filter_node_factory(name="company_id", title="Enseigne")
+        )
+        forms.add_antenne_option_field(request, schema)
+
     schema.insert(
         0,
         forms.year_filter_node(
@@ -63,9 +69,5 @@ def get_list_schema(years_func, is_global=False):
             query_func=years_func,
         ),
     )
-    if is_global:
-        schema.insert(
-            0, company_filter_node_factory(name="company_id", title="Enseigne")
-        )
 
     return schema

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/supply/supplier_invoice.py

@@ -41,13 +41,13 @@ from caerp.forms.widgets import (
     CleanMappingWidget,
 )
 from caerp.models.supply import (
-    get_supplier_invoices_years,
     BaseSupplierInvoicePayment,
     SupplierOrder,
     SupplierInvoice,
     SupplierInvoiceLine,
 )
 from caerp.utils.renderer import get_json_dict_repr
+from caerp.services.supplier_invoice import get_supplier_invoices_years
 
 
 logger = logging.getLogger(__name__)
@@ -228,13 +228,14 @@ def validate_supplier_invoice(supplier_invoice_object: SupplierInvoice, request)
 
 
 # LIST SCHEMA
-def get_supplier_invoice_list_schema(is_global=False):
+def get_supplier_invoice_list_schema(request, is_global=False):
     schema = get_list_schema(
+        request,
         years_func=get_supplier_invoices_years,
         is_global=is_global,
     )
     schema.insert(
-        2,
+        3,
         forms.status_filter_node(
             COMBINED_PAID_STATUS_OPTIONS,
             name="combined_paid_status",
@@ -253,8 +254,9 @@ def get_supplier_invoice_list_schema(is_global=False):
             default="both",
         ),
     )
-    schema.insert(
-        -1,
+
+    schema.add_before(
+        "items_per_page",
         colander.SchemaNode(
             colander.String(),
             title="N° de pièce",
@@ -264,8 +266,8 @@ def get_supplier_invoice_list_schema(is_global=False):
             default="",
         ),
     )
-    schema.insert(
-        -1,
+    schema.add_before(
+        "items_per_page",
         colander.SchemaNode(
             colander.String(),
             title="N° de facture du fournisseur",

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/supply/supplier_order.py

@@ -12,10 +12,10 @@ from caerp.forms.third_party.supplier import (
 )
 from caerp.forms.supply import get_list_schema
 from caerp.models.supply import (
-    get_supplier_orders_years,
     SupplierOrder,
 )
 from caerp.utils.renderer import get_json_dict_repr
+from caerp.services.supplier_order import get_supplier_orders_years
 
 
 INVOICE_STATUS_OPTIONS = [
@@ -117,13 +117,14 @@ def validate_supplier_order(supplier_order_object: SupplierOrder, request):
     return cstruct
 
 
-def get_supplier_orders_list_schema(is_global=False):
+def get_supplier_orders_list_schema(request, is_global=False):
     schema = get_list_schema(
+        request,
         years_func=get_supplier_orders_years,
         is_global=is_global,
     )
     schema.insert(
-        2,
+        4,
         colander.SchemaNode(
             colander.String(),
             name="invoice_status",
@@ -135,7 +136,7 @@ def get_supplier_orders_list_schema(is_global=False):
         ),
     )
     schema.insert(
-        3,
+        4,
         colander.SchemaNode(
             colander.String(),
             name="doctype",

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/tasks/estimation.py

@@ -51,7 +51,7 @@ TYPE_OPTIONS = (
 )
 
 
-def get_list_schema(is_global=False, excludes=()):
+def get_list_schema(request, is_global=False, excludes=()):
     """
     Return the estimation list schema
 
@@ -77,10 +77,11 @@ def get_list_schema(is_global=False, excludes=()):
             ),
         )
 
-    if "company_id" not in excludes:
+    if is_global:
         schema.insert(
             0, company_filter_node_factory(name="company_id", title="Enseigne")
         )
+        forms.add_antenne_option_field(request, schema)
 
     schema.insert(
         0,
@@ -147,14 +148,15 @@ def get_list_schema(is_global=False, excludes=()):
         schema.insert(0, node)
 
     if "auto_validated" not in excludes:
-        schema.add(
+        schema.add_before(
+            "items_per_page",
             colander.SchemaNode(
                 colander.Boolean(),
                 name="auto_validated",
                 label="Documents auto-validés",
                 arialabel="Activer pour afficher seulement les documents auto-validés",
                 missing=colander.drop,
-            )
+            ),
         )
 
     schema["search"].title = "Numéro de devis"

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/tasks/invoice.py

@@ -227,18 +227,27 @@ def get_year_options(kw):
     return values
 
 
-def get_list_schema(is_global=False, excludes=()):
+def get_list_schema(request, is_global=False, excludes=()):
     """
-    Return a schema for invoice listing
+    Renvoie un schéma pour lister les factures
+
+    1- Est-ce une liste au niveau global ?
+    2- Quels champs supplémentaires exclure ?
 
     is_global
 
-        If False, customer select is only related to the current context
+        Liste de factures globales ?
+        Si non on exclue les filtres d'enseigne, d'autovalidation et d'année fiscale de ref
+        On restreint aussi le filtre client
+
+    excludes
+
+        Permet d'exclure plus de champs (pour les vues au niveau des enseignes)
+        On exclue le client pour les factures d'une affaire par exemple
+
     """
     schema = forms.lists.BaseListsSchema().clone()
 
-    schema.insert(0, business_type_filter_node())
-
     schema.insert(
         0,
         colander.SchemaNode(
@@ -252,19 +261,21 @@ def get_list_schema(is_global=False, excludes=()):
         ),
     )
 
-    if "paid_status" not in excludes:
-        schema.insert(
-            0,
-            forms.status_filter_node(
-                PAID_STATUS_OPTIONS,
-                name="paid_status",
-                title="Statut de paiement",
-            ),
-        )
+    schema.insert(
+        0,
+        forms.status_filter_node(
+            PAID_STATUS_OPTIONS,
+            name="paid_status",
+            title="Statut de paiement",
+        ),
+    )
 
-    if "status" not in excludes:
+    if not is_global:
         schema.insert(0, forms.status_filter_node(STATUS_OPTIONS))
 
+    if "business_type" not in excludes:
+        schema.insert(0, business_type_filter_node())
+
     schema.insert(
         0,
         colander.SchemaNode(
@@ -278,14 +289,6 @@ def get_list_schema(is_global=False, excludes=()):
         ),
     )
 
-    if "financial_year" not in excludes:
-        node = forms.year_filter_node(
-            name="financial_year",
-            query_func=get_year_options,
-            title="Année fiscale",
-        )
-        schema.insert(0, node)
-
     schema.insert(
         0,
         AmountRangeSchema(
@@ -313,11 +316,17 @@ def get_list_schema(is_global=False, excludes=()):
                 with_invoice=True,
             ),
         )
-
-    if "company_id" not in excludes:
+    if is_global:
         schema.insert(
             0, company_filter_node_factory(name="company_id", title="Enseigne")
         )
+        forms.add_antenne_option_field(request, schema)
+        node = forms.year_filter_node(
+            name="financial_year",
+            query_func=get_year_options,
+            title="Année fiscale",
+        )
+        schema.insert(0, node)
 
     schema.insert(
         0,
@@ -343,28 +352,28 @@ def get_list_schema(is_global=False, excludes=()):
 
     schema["search"].title = "Numéro de facture"
 
-    if "validator_id" not in excludes:
-        schema.add(
+    if is_global:
+        schema.add_before(
+            "items_per_page",
             validator_filter_node_factory(
                 name="validator_id",
-            )
+            ),
         )
-
-    if "auto_validated" not in excludes:
-        schema.add(
+        schema.add_before(
+            "items_per_page",
             colander.SchemaNode(
                 colander.Boolean(),
                 name="auto_validated",
                 label="Documents auto-validés",
                 arialabel="Activer pour afficher seulement les documents auto-validés",
                 missing=colander.drop,
-            )
+            ),
         )
 
     return schema
 
 
-def get_pdf_export_schema():
+def get_pdf_export_schema(request):
     title = "Exporter un ensemble de factures dans un fichier pdf"
     schema = colander.Schema(title=title)
     schema.add(
@@ -378,6 +387,7 @@ def get_pdf_export_schema():
             default="both",
         ),
     )
+    forms.add_antenne_option_field(request, schema)
     schema.add(company_filter_node_factory(name="company_id", title="Enseigne"))
     schema.add(
         customer_filter_node_factory(

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/tasks/task.py

@@ -525,9 +525,13 @@ def deferred_task_add_validator(node, kw):
 
         if customer.type == "company" and not customer.registration:
             url = request.route_url(
-                CUSTOMER_ITEM_ROUTE, id=customer_id, _query={"action": "edit"}
+                CUSTOMER_ITEM_ROUTE,
+                id=customer_id,
+                _query={
+                    "action": "edit",
+                    "come_from": f"{request.referrer}?customer_id={customer_id}",
+                },
             )
-            url = url + "&come_from=" + request.referrer
             raise colander.Invalid(
                 node["customer_id"],
                 "Le numéro d'immatriculation est obligatoire pour facturer ce client. "

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/validation/expenses.py

@@ -11,9 +11,12 @@ DOC_STATUS_OPTIONS = (
 )
 
 
-def get_list_schema():
+def get_list_schema(request):
     """
     Return a schema for invoice validation listing
+
+    Appelé depuis le contexte d'une request, on peut accéder à
+    la session de base de données
     """
     schema = forms.lists.BaseListsSchema().clone()
     del schema["search"]
@@ -43,6 +46,7 @@ def get_list_schema():
             query_func=get_expense_years,
         ),
     )
+    schema.insert(0, contractor_filter_node_factory(name="owner_id"))
     schema.insert(
         0,
         follower_filter_node_factory(
@@ -50,5 +54,5 @@ def get_list_schema():
             title="Accompagnateur",
         ),
     )
-    schema.insert(0, contractor_filter_node_factory(name="owner_id"))
+    forms.add_antenne_option_field(request, schema)
     return schema

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/validation/supplier_invoices.py

@@ -23,7 +23,7 @@ TYPE_OPTIONS = (
 )
 
 
-def get_list_schema():
+def get_list_schema(request):
     """
     Return a schema for invoice validation listing
     """
@@ -48,6 +48,7 @@ def get_list_schema():
             is_global=True,
         ),
     )
+    schema.insert(0, company_filter_node_factory(name="company_id", title="Enseigne"))
     schema.insert(
         0,
         follower_filter_node_factory(
@@ -55,5 +56,5 @@ def get_list_schema():
             title="Accompagnateur",
         ),
     )
-    schema.insert(0, company_filter_node_factory(name="company_id", title="Enseigne"))
+    forms.add_antenne_option_field(request, schema)
     return schema

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/validation/supplier_orders.py

@@ -23,7 +23,7 @@ TYPE_OPTIONS = (
 )
 
 
-def get_list_schema():
+def get_list_schema(request):
     """
     Return a schema for invoice validation listing
     """
@@ -48,6 +48,7 @@ def get_list_schema():
             is_global=True,
         ),
     )
+    schema.insert(0, company_filter_node_factory(name="company_id", title="Enseigne"))
     schema.insert(
         0,
         follower_filter_node_factory(
@@ -55,5 +56,5 @@ def get_list_schema():
             title="Accompagnateur",
         ),
     )
-    schema.insert(0, company_filter_node_factory(name="company_id", title="Enseigne"))
+    forms.add_antenne_option_field(request, schema)
     return schema

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/validation/tasks.py

@@ -37,9 +37,10 @@ TYPE_OPTIONS = (
 )
 
 
-def get_list_schema(excludes=()):
+def get_list_schema(request, excludes=()):
     """
     Return a schema for invoice validation listing
+    The schema is run on request so it can access db data directly
     """
     schema = forms.lists.BaseListsSchema().clone()
     del schema["search"]
@@ -66,6 +67,7 @@ def get_list_schema(excludes=()):
                 default="both",
             ),
         )
+    schema.insert(0, company_filter_node_factory(name="company_id", title="Enseigne"))
     schema.insert(
         0,
         follower_filter_node_factory(
@@ -73,5 +75,5 @@ def get_list_schema(excludes=()):
             title="Accompagnateur",
         ),
     )
-    schema.insert(0, company_filter_node_factory(name="company_id", title="Enseigne"))
+    forms.add_antenne_option_field(request, schema)
     return schema

{endi-2024.5.1 → endi-2024.5.3}/caerp/forms/workshop.py

@@ -51,7 +51,13 @@ accompagnateur_filter_node_factory = forms.mk_filter_node_factory(
     user_node,
     title="Animateur/Animatrice(s)",
     empty_filter_msg="Tous",
-    roles=["es_trainer", "global.manage_accompagnement"],
+    access_rights=["es_trainer", "global_accompagnement"],
+)
+accompagnateur_choice_node_factory = forms.mk_choice_node_factory(
+    user_node,
+    resource_name="un formateur ou un membre de l'équipe d'appui",
+    resource_name_plural="un ou plusieurs formateurs ou membres de l'équipe d'appui",
+    access_rights=["es_trainer", "global_accompagnement"],
 )
 
 company_manager_node_factory = forms.mk_choice_node_factory(
@@ -247,7 +253,7 @@ class WorkshopSchema(colander.Schema):
         missing=colander.drop,
     )
 
-    trainers = trainer_choice_node_factory(
+    trainers = accompagnateur_choice_node_factory(
         multiple=True,
         title="Animateur(s)/Animatrice(s)",
         preparer=forms.uniq_entries_preparer,
@@ -397,10 +403,10 @@ def get_list_schema(
         )
         schema.add_custom(company_manager)
 
-    if training:
-        schema.add_custom(trainer_filter_node_factory(name="trainer_id"))
-    else:
-        schema.add_custom(accompagnateur_filter_node_factory(name="trainer_id"))
+    # if training:
+    #     schema.add_custom(trainer_filter_node_factory(name="trainer_id"))
+    # else:
+    schema.add_custom(accompagnateur_filter_node_factory(name="trainer_id"))
 
     if not company and not user:
         schema.add_custom(participant_filter_node_factory(name="participant_id"))

{endi-2024.5.1 → endi-2024.5.3}/caerp/models/supply/__init__.py

@@ -1,10 +1,8 @@
 from .supplier_order import (
-    get_supplier_orders_years,
     SupplierOrder,
     SupplierOrderLine,
 )
 from .supplier_invoice import (
-    get_supplier_invoices_years,
     SupplierInvoice,
     SupplierInvoiceLine,
 )

{endi-2024.5.1 → endi-2024.5.3}/caerp/models/supply/supplier_invoice.py

@@ -1,6 +1,3 @@
-import datetime
-
-from beaker.cache import cache_region
 from sqlalchemy import (
     Boolean,
     Column,
@@ -8,7 +5,6 @@ from sqlalchemy import (
     Integer,
     DateTime,
     String,
-    extract,
 )
 from sqlalchemy.orm import (
     relationship,
@@ -16,7 +12,6 @@ from sqlalchemy.orm import (
 
 from caerp_base.models.base import (
     DBBASE,
-    DBSESSION,
     default_table_args,
 )
 from caerp_base.models.mixins import (
@@ -453,26 +448,3 @@ class SupplierInvoiceLine(
 
     def get_company_id(self):
         return self.supplier_invoice.company_id
-
-
-def get_supplier_invoices_years(kw=None):
-    """
-    Return a cached query for the years we have invoices configured
-
-    :param kw: is here only for API compatibility
-    """
-
-    @cache_region("long_term", "supplier_invoices_years")
-    def years():
-        """
-        return the distinct financial years available in the database
-        """
-        query = DBSESSION().query(extract("year", SupplierInvoice.date).distinct())
-        query = query.order_by(SupplierInvoice.date)
-        years = [year[0] for year in query]
-        current = datetime.date.today().year
-        if current not in years:
-            years.append(current)
-        return years
-
-    return years()