moogli-erp 2025.1.1__tar.gz → 2025.2.1__tar.gz

moogli_erp-2025.2.1/CURRENT_VERSION

@@ -0,0 +1 @@
+2025.2.1

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/PKG-INFO

@@ -1,13 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: moogli-erp
-Version: 2025.1.1
+Version: 2025.2.1
 Summary: Progiciel de gestion pour CAE
 Home-page: https://framagit.org/caerp/caerp
 Author: Majerti/Kilya
 Author-email: contact@moogli.coop
-License: UNKNOWN
 Keywords: pyramid,business,web
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pyramid
@@ -15,8 +13,116 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
-Provides-Extra: dev
 License-File: LICENSE.txt
+Requires-Dist: alembic==1.6.0
+Requires-Dist: Beaker==1.11.0
+Requires-Dist: Chameleon==3.9.0
+Requires-Dist: colander==1.8.3
+Requires-Dist: ColanderAlchemy
+Requires-Dist: Cython==0.29.14
+Requires-Dist: deform==2.0.14
+Requires-Dist: deform_extensions==0.9
+Requires-Dist: docopt==0.5.0
+Requires-Dist: caerp_base==2024.0.1
+Requires-Dist: caerp_celery==2024.2.5
+Requires-Dist: caerp_payment==2024.0.10
+Requires-Dist: caerp_sign_pdf==2024.2.1
+Requires-Dist: factur-x==2.3
+Requires-Dist: fanstatic==1.1
+Requires-Dist: filedepot==0.10.0
+Requires-Dist: httpagentparser==1.9.5
+Requires-Dist: setuptools==57.4.0
+Requires-Dist: nh3==0.2.14
+Requires-Dist: html5lib==1.1
+Requires-Dist: traitlets==4.3.3
+Requires-Dist: ipython==7.16.0
+Requires-Dist: jedi==0.17.2
+Requires-Dist: js.bootstrap==3.3.1
+Requires-Dist: js.chosen==0.9.14
+Requires-Dist: js.deform==2.0.14
+Requires-Dist: js.jquery==1.9.1
+Requires-Dist: js.jquery-form==3.09
+Requires-Dist: js.jquery-maskedinput==1.3.1
+Requires-Dist: js.jquery-maskmoney==3.0.2
+Requires-Dist: js.jquery_sortable==0.9.12
+Requires-Dist: js.jquery-timepicker-addon==1.3-1
+Requires-Dist: js.jqueryui==1.10.3
+Requires-Dist: js.tinymce==4.1.5
+Requires-Dist: Mako==1.1.4
+Requires-Dist: mysqlclient==2.0.3
+Requires-Dist: openpyxl==3.1.2
+Requires-Dist: PasteDeploy==2.1.1
+Requires-Dist: peppercorn==0.6
+Requires-Dist: pillow==9.5.0
+Requires-Dist: pi-heif==0.12.0
+Requires-Dist: plaster-pastedeploy==0.7
+Requires-Dist: paginate==0.5.6
+Requires-Dist: paginate-sqlalchemy==0.3.1
+Requires-Dist: py3o.template==0.10.0
+Requires-Dist: pyjwkest==1.3.6
+Requires-Dist: pyparsing==3.0.9
+Requires-Dist: pyramid==2.0
+Requires-Dist: pyramid-beaker==0.8
+Requires-Dist: pyramid-chameleon==0.3
+Requires-Dist: pyramid-deform==0.2
+Requires-Dist: pyramid_exclog==1.0
+Requires-Dist: pyramid_ipython
+Requires-Dist: pyramid-layout==1.0
+Requires-Dist: pyramid-mailer==0.15.1
+Requires-Dist: pyramid-mako==1.1.0
+Requires-Dist: pyramid-methodrewrite==0.2.3
+Requires-Dist: pyramid_services==2.2
+Requires-Dist: pyramid-tm==2.4
+Requires-Dist: pyramid_retry==2.1.1
+Requires-Dist: requests==2.32.3
+Requires-Dist: reportlab==3.1.44
+Requires-Dist: repoze.lru==0.6
+Requires-Dist: simplejson==3.3.1
+Requires-Dist: sqla_inspect==0.7.6
+Requires-Dist: SQLAlchemy==1.4.50
+Requires-Dist: transaction==2.1.2
+Requires-Dist: translationstring==1.2
+Requires-Dist: typing_extensions
+Requires-Dist: Unidecode==0.04.17
+Requires-Dist: venusian==1.0
+Requires-Dist: waitress==2.0.0
+Requires-Dist: WebHelpers2==2.0
+Requires-Dist: WebOb==1.8.7
+Requires-Dist: zope.component==5.0
+Requires-Dist: zope.deprecation==4.4.0
+Requires-Dist: zope.event==4.6
+Requires-Dist: zope.interface==5.5.2
+Requires-Dist: zope.sqlalchemy==1.6
+Requires-Dist: odfpy==1.3.6
+Requires-Dist: pyexcel-io==0.5.18
+Requires-Dist: WeasyPrint==52.5
+Requires-Dist: tinycss2==1.0.2
+Requires-Dist: cairocffi==1.1.0
+Requires-Dist: pyvat==1.3.17
+Requires-Dist: schwifty==2023.3.0
+Provides-Extra: dev
+Requires-Dist: ipdb==0.13.4; extra == "dev"
+Requires-Dist: libsass==0.20.1; extra == "dev"
+Requires-Dist: pyramid_debugtoolbar; extra == "dev"
+Requires-Dist: black==22.3.0; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: boussole==2.0; extra == "dev"
+Requires-Dist: pytest<7.0,>=6.0.2; extra == "dev"
+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
@@ -438,5 +544,3 @@ https://doc.endi.coop
 
 
 :Ce projet est testé avec: `BrowserStack <https://www.browserstack.com/>`_
-
-

moogli_erp-2025.2.1/caerp/alembic/versions/2025_1_1__b987d67518eb.py

@@ -0,0 +1,55 @@
+"""2025.1.1 : Droits d'accès aux états de gestion des enseignes
+
+Create Date: 2025-01-16 16:26:35.282952
+
+"""
+
+# revision identifiers, used by Alembic.
+
+# Revision ID:
+revision = "b987d67518eb"
+
+# Revises (previous revision or revisions):
+down_revision = "820a37d9c692"
+
+from alembic import op
+import sqlalchemy as sa
+
+from caerp.models.populate import populate_access_rights
+
+
+def migrate_datas():
+    from zope.sqlalchemy import mark_changed
+    from caerp_base.models.base import DBSESSION
+    from caerp.models.user.group import Group
+    from caerp.models.user.access_right import AccessRight
+
+    session = DBSESSION()
+
+    # On crée le nouvel access right dans la bdd
+    populate_access_rights(session)
+    session.flush()
+
+    new_access_right = session.execute(
+        sa.select(AccessRight).filter(
+            AccessRight.name == "global_company_access_accounting"
+        )
+    ).scalar_one()
+
+    for group in session.execute(
+        sa.select(Group).filter(
+            Group.access_rights.any(AccessRight.name == "global_company_supervisor")
+        )
+    ).scalars():
+        group.access_rights.append(new_access_right)
+        session.merge(group)
+    mark_changed(session)
+    session.flush()
+
+
+def upgrade():
+    migrate_datas()
+
+
+def downgrade():
+    pass

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/consts/access_rights.py

@@ -187,6 +187,7 @@ ACCESS_RIGHTS = {
             PERMISSIONS["global.list_invoices"],
             PERMISSIONS["global.validate_invoice"],
             PERMISSIONS["global.access_ea"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.validate_file"],
         ],
         "tags": ["factures", "validation", "ventes"],
@@ -201,6 +202,7 @@ ACCESS_RIGHTS = {
             PERMISSIONS["global.list_invoices"],
             PERMISSIONS["global.validate_cancelinvoice"],
             PERMISSIONS["global.access_ea"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.validate_file"],
         ],
         "tags": ["avoirs", "validation", "ventes"],
@@ -215,6 +217,7 @@ ACCESS_RIGHTS = {
             PERMISSIONS["global.list_estimations"],
             PERMISSIONS["global.validate_estimation"],
             PERMISSIONS["global.access_ea"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.validate_file"],
         ],
         "tags": ["devis", "validation", "ventes"],
@@ -228,6 +231,7 @@ ACCESS_RIGHTS = {
         "global_permissions": [
             PERMISSIONS["global.list_supplier_invoices"],
             PERMISSIONS["global.validate_supplier_invoice"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.access_ea"],
         ],
         "tags": [
@@ -245,6 +249,7 @@ ACCESS_RIGHTS = {
         "global_permissions": [
             PERMISSIONS["global.list_supplier_orders"],
             PERMISSIONS["global.validate_supplier_order"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.access_ea"],
         ],
         "tags": ["commandes fournisseurs", "validation", "achats"],
@@ -258,6 +263,7 @@ ACCESS_RIGHTS = {
         "global_permissions": [
             PERMISSIONS["global.list_expenses"],
             PERMISSIONS["global.validate_expensesheet"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.access_ea"],
         ],
         "tags": [
@@ -293,7 +299,7 @@ ACCESS_RIGHTS = {
         "name": "global_create_company",
         "global_permissions": [
             PERMISSIONS["global.create_company"],
-            PERMISSIONS["global.view_company"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.access_ea"],
         ],
         "tags": ["enseignes", "gestion"],
@@ -301,17 +307,34 @@ ACCESS_RIGHTS = {
         "category": CATEGORIES["Général"],
     },
     "global_company_supervisor": {
-        "label": "Consulter les enseignes",
-        "description": "Consulter les enseignes et toutes leurs données. ",
+        "label": "Accéder aux informations commerciales des enseignes",
+        "description": "Accéder aux informations commerciales des enseignes.",
         "name": "global_company_supervisor",
         "global_permissions": [
-            PERMISSIONS["global.view_company"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.access_ea"],
         ],
         "tags": ["enseignes", "consultation"],
         "account_type": "equipe_appui",
         "category": CATEGORIES["Gestion commerciale"],
     },
+    "global_company_access_accounting": {
+        "label": "Accéder aux informations comptables des enseignes",
+        "description": (
+            "Accéder aux états de gestion des enseignes (Compte de résultat, états de trésorerie) "
+            "ainsi qu'au bulletin de salaire. "
+        ),
+        "name": "global_company_access_accounting",
+        "tags": ["enseignes", "consultation", "comptabilité"],
+        "account_type": "equipe_appui",
+        "category": CATEGORIES["Comptabilité"],
+        "global_permissions": [
+            PERMISSIONS["global.company_view_accounting"],
+            PERMISSIONS["global.company_view_salarysheet"],
+            PERMISSIONS["global.company_view"],
+            PERMISSIONS["global.access_ea"],
+        ],
+    },
     "global_record_payment_invoice": {
         "label": "Saisir des encaissements",
         "description": "Saisir les encaissements. ",
@@ -365,7 +388,7 @@ ACCESS_RIGHTS = {
         "name": "global_accountant",
         "global_permissions": [
             PERMISSIONS["global.manage_accounting"],
-            PERMISSIONS["global.view_company"],
+            PERMISSIONS["global.company_view"],
             PERMISSIONS["global.generate_accounting_measures"],
             PERMISSIONS["global.access_ea"],
         ],

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/consts/permissions.py

@@ -3,7 +3,9 @@ PERMISSIONS = {
     "global.superadmin": "global.superadmin",
     "global.manage_competence": "global.manage_competence",
     "global.manage_accounting": "global.manage_accounting",
-    "global.view_company": "global.view_company",
+    "global.company_view": "global.company_view",
+    "global.company_view_accounting": "global.company_view_accounting",
+    "global.company_view_salarysheet": "global.company_view_salarysheet",
     "global.create_user": "global.create_user",
     "global.list_estimations": "global.list_estimations",
     "global.validate_estimation": "global.validate_estimation",
@@ -53,6 +55,8 @@ PERMISSIONS = {
     "global.config_sap": "global.config_sap",
     "global.view_sap": "global.view_sap",
     "company.view": "company.view",
+    "company.view_accounting": "company.view_accounting",
+    "company.view_salarysheet": "company.view_salarysheet",
     "context.view_file": "context.view_file",
     "context.add_file": "context.add_file",
     "context.edit_file": "context.edit_file",

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/consts/users.py

@@ -37,6 +37,7 @@ PREDEFINED_GROUPS = (
             ACCESS_RIGHTS["global_record_payment_supplier_invoice"],
             ACCESS_RIGHTS["global_record_payment_expensesheet"],
             ACCESS_RIGHTS["global_company_supervisor"],
+            ACCESS_RIGHTS["global_company_access_accounting"],
             ACCESS_RIGHTS["global_supervisor_salary"],
         ],
         "editable": True,

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/dataqueries/base.py

@@ -29,7 +29,9 @@ class BaseDataQuery(BaseView):
         super().__init__(*args, **kwargs)
         self.default_dates()
 
-    def set_dates(self, start: Union[date, str] = None, end: Union[date, str] = None):
+    def set_dates(
+        self, start: Union[date, str, None] = None, end: Union[date, str, None] = None
+    ):
         """
         Définit les dates de début et de fin de la requête si nécessaire
 

moogli_erp-2025.2.1/caerp/dataqueries/queries/affaire_bpf.py

@@ -0,0 +1,152 @@
+import logging
+
+from caerp.compute.math_utils import integer_to_amount
+from caerp.dataqueries.base import BaseDataQuery
+from caerp.services.business_bpf import (
+    get_training_businesses_with_invoices_query,
+    get_business_bpf_data_query,
+    get_training_goal,
+)
+from caerp.utils.dataqueries import dataquery_class
+from caerp.utils.strings import boolean_to_string
+
+logger = logging.getLogger(__name__)
+
+
+@dataquery_class()
+class BusinessBPFCheckQuery(BaseDataQuery):
+    """
+    Data query demandée par Suite 126.
+
+    TODO : Restreindre le filtre sur une année donnée.
+    Aujourd'hui on prend l'année de la date de départ comme référence,
+    ce qui peut induire l'utilisateur en erreur (on n'export qu'une année
+    alors qu'il peut en sélectionner deux).
+
+    Liste des affaires de formation sur une année donnée :
+        "Enseigne",
+        "Nom de l'affaire",
+        "Type d'affaire",
+        "Client",
+        "Année fiscale",
+        "Liste des numéros de factures/avoirs",
+        "Cette formation est-elle portée en direct par la CAE ?",
+        "Cette formation est-elle sous-traitée à un autre OF ?",
+        "Nombre de stagiaires",
+        "Nb. Heures total suivies par l'ensemble des stagiaires",
+        "Cette formation est-elle tout ou partie en distanciel ?",
+        "Objectif principal de formation",
+        "Spécialité de formation",
+        "Montant total des factures HT",
+        "Montant total des factures TTC",
+
+    Note sur les factures :
+     - On exporte les factures avoir rattachée à l'année fiscale que l'on exporte,
+     qu'elles soient renseignées comme source de revenu dans le BPF ou pas.
+
+    """
+
+    name = "business_bpf_check"
+    label = "Liste des affaires liées au BPF"
+    description = """
+    <p>Éléments permettant le contrôle des données saisies dans le cadre de l'activité 
+    de formation professionnelle.</p>
+    <p>La requête fonctionne sur année fiscale.</p>
+    """
+
+    def default_dates(self):
+        self.start_date = self.date_tools.previous_year_start()
+        self.end_date = self.date_tools.previous_year_end()
+
+    def get_financial_year(self) -> int:
+        return self.start_date.year
+
+    def headers(self):
+        headers = [
+            "Enseigne",
+            "Nom de l'affaire",
+            "Type d'affaire",
+            "Client",
+            "Année fiscale",
+            "Liste des numéros de factures/avoirs",
+            "Cette formation est-elle portée en direct par la CAE ?",
+            "Cette formation est-elle sous-traitée à un autre OF ?",
+            "Nombre de stagiaires",
+            "Nb. Heures total suivies par l'ensemble des stagiaires",
+            "Cette formation est-elle tout ou partie en distanciel ?",
+            "Objectif principal de formation",
+            "Spécialité de formation",
+            "Montant total des factures HT",
+            "Montant total des factures TTC",
+        ]
+        return headers
+
+    def data(self):
+        data = []
+        query = get_training_businesses_with_invoices_query(
+            self.start_date, self.end_date
+        )
+        financial_year = self.get_financial_year()
+        for business in self.request.dbsession.execute(query).scalars():
+            business_data = [
+                business.project.company.name,
+                business.name,
+                business.business_type.label,
+                business.get_customer().name,
+            ]
+            business_data.append(str(financial_year))
+
+            bpf_data = (
+                self.request.dbsession.execute(
+                    get_business_bpf_data_query(business.id, financial_year)
+                )
+                .scalars()
+                .first()
+            )
+            valid_invoices = [
+                invoice
+                for invoice in business.invoices
+                if invoice.status == "valid"
+                and invoice.financial_year == financial_year
+            ]
+            if valid_invoices:
+                business_data.append(
+                    "\n ".join(invoice.official_number for invoice in valid_invoices)
+                )
+            else:
+                business_data.append("")
+
+            if bpf_data:
+                logger.debug(f"Found BPF data for {business.id} in {financial_year}")
+                logger.debug(f"Data: {bpf_data}")
+                goal = get_training_goal(financial_year, bpf_data)
+                business_data.extend(
+                    [
+                        boolean_to_string(not bpf_data.is_subcontract),
+                        boolean_to_string(not bpf_data.has_subcontract),
+                        bpf_data.headcount if bpf_data.headcount else "",
+                        bpf_data.total_hours if bpf_data.total_hours else "",
+                        boolean_to_string(bpf_data.has_remote),
+                        goal if goal else "",
+                        bpf_data.training_speciality.label
+                        if bpf_data.training_speciality
+                        else "",
+                    ]
+                )
+            else:
+                business_data.extend([""] * 7)
+            business_data.append(
+                integer_to_amount(
+                    sum(invoice.ht for invoice in valid_invoices),
+                    5,
+                )
+            )
+            business_data.append(
+                integer_to_amount(
+                    sum(invoice.ttc for invoice in valid_invoices),
+                    5,
+                )
+            )
+
+            data.append(business_data)
+        return data

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/forms/user/__init__.py

@@ -236,13 +236,13 @@ issuer_filter_node_factory = forms.mk_filter_node_factory(
 antenne_filter_node_factory = forms.mk_filter_node_factory(
     antenne_node,
     empty_filter_msg="Toutes",
-    title="Antenne de rattachement de l'enseigne",
+    title="Antenne de rattachement",
 )
 
 follower_filter_node_factory = forms.mk_filter_node_factory(
     follower_node,
     empty_filter_msg="Tous",
-    title="Accompagnateur de l'enseigne",
+    title="Accompagnateur",
 )
 
 conseiller_choice_node = forms.mk_choice_node_factory(

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/forms/user/user.py

@@ -152,10 +152,8 @@ def get_list_schema(admin: bool = False):
             validator=deferred_company_datas_validator,
         ),
     )
+    schema.add_before("items_per_page", antenne_filter_node_factory(name="antenne_id"))
     if admin:
-        schema.add_before(
-            "items_per_page", antenne_filter_node_factory(name="antenne_id")
-        )
         schema.add_before(
             "items_per_page", follower_filter_node_factory(name="follower_id")
         )

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/forms/workshop.py

@@ -423,10 +423,10 @@ def get_list_schema(
     if user and include_open:
         if is_current_user:
             label = "Uniquement les ateliers où je suis inscrit"
-            default = True
+            default = False
         else:
             label = "Uniquement les ateliers où l’utilisateur est inscrit"
-            default = True
+            default = False
         only_subscribed_node = colander.SchemaNode(
             colander.Boolean(),
             name="onlysubscribed",

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/panels/company_index/__init__.py

@@ -1,3 +1,4 @@
 def includeme(config):
     config.include(".task")
     config.include(".event")
+    config.include(".workshops")

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/panels/company_index/event.py

@@ -1,14 +1,15 @@
+import datetime
+
 from paginate_sqlalchemy import SqlalchemyOrmPage
 from sqlalchemy import desc
+
+from caerp import resources
 from caerp.models.activity import (
     Event,
     Attendance,
     Activity,
 )
-from caerp.models.workshop import (
-    Timeslot,
-)
-from caerp import resources
+from caerp.models.workshop import Timeslot
 from caerp.panels.company_index import utils
 
 
@@ -22,6 +23,7 @@ def _user_events_query(user_ids):
     query = Event.query().with_polymorphic([Timeslot, Activity])
     query = query.filter(Event.type_.in_(["timeslot", "activity"]))
     query = query.filter(Event.attendances.any(Attendance.account_id.in_(user_ids)))
+    query = query.filter(Event.datetime >= datetime.datetime.now())
     query = query.order_by(desc(Event.datetime))
     return query
 
@@ -36,10 +38,10 @@ def coming_events_panel(context, request):
     current_user = request.identity
     if current_user in context.employees:
         query = _user_events_query(request.identity.id)
-        title = "Mes rendez-vous"
+        title = "Mes événements à venir"
     else:
         query = _user_events_query([u.id for u in context.employees])
-        title = "Rendez-vous de {}".format(context.name)
+        title = "Prochains événements de l'enseigne"
 
     page_nb = utils.get_page_number(request, "events_page_nb")
     items_per_page = utils.get_items_per_page(request, "events_per_page")

moogli_erp-2025.2.1/caerp/panels/company_index/workshops.py

@@ -0,0 +1,52 @@
+import datetime
+
+from paginate_sqlalchemy import SqlalchemyOrmPage
+from sqlalchemy import or_
+
+from caerp import resources
+from caerp.models.activity import Attendance
+from caerp.models.workshop import Workshop
+from caerp.panels.company_index import utils
+
+
+def coming_workshops_panel(context, request):
+    """
+    Return the list of the upcoming CAE workshops
+    where the user is or can ben registered
+    """
+    if not request.is_xhr:
+        resources.event_list_js.need()
+
+    title = "Prochains ateliers de la CAE"
+    current_user = request.identity
+
+    query = Workshop.query()
+    query = query.filter(Workshop.datetime >= datetime.datetime.now())
+    query = query.filter(
+        or_(
+            Workshop.attendances.any(Attendance.account_id == current_user.id),
+            Workshop.signup_mode == "open",
+        )
+    )
+    query = query.order_by(Workshop.datetime)
+
+    page_nb = utils.get_page_number(request, "workshops_page_nb")
+    items_per_page = utils.get_items_per_page(request, "workshops_per_page")
+
+    paginated_workshops = SqlalchemyOrmPage(
+        query,
+        page_nb,
+        items_per_page=items_per_page,
+        url_maker=utils.make_get_list_url("workshops"),
+    )
+
+    result_data = {"workshops": paginated_workshops, "title": title}
+    return result_data
+
+
+def includeme(config):
+    config.add_panel(
+        coming_workshops_panel,
+        "cae_coming_workshops",
+        renderer="panels/company_index/coming_workshops.mako",
+    )

{moogli-erp-2025.1.1 → moogli_erp-2025.2.1}/caerp/panels/menu.py

@@ -78,7 +78,7 @@ def get_companies(request, company=None):
     :rtype: list
     """
     companies = []
-    if request.has_permission(PERMISSIONS["global.view_company"]):
+    if request.has_permission(PERMISSIONS["global.company_view"]):
         if company is not None:
             companies = (
                 Company.label_datas_query(request)
@@ -137,7 +137,7 @@ def company_choice(request, companies, current_company=None):
             url = request.current_route_path(id=company_datas.id)
         else:
             url = request.route_path(COMPANY_ROUTE, id=company_datas.id)
-        if request.has_permission(PERMISSIONS["global.view_company"]):
+        if request.has_permission(PERMISSIONS["global.company_view"]):
             label = Company.format_label_from_datas(
                 company_datas, with_select_search_datas=True
             )
@@ -216,7 +216,7 @@ def submenu_panel(context, request):
         return {}
 
     # There are no submenus for non admins
-    if not request.has_permission(PERMISSIONS["global.view_company"]):
+    if not request.has_permission(PERMISSIONS["global.access_ea"]):
         return {}
 
     current_company = get_current_company(request, submenu=True)