endi 2024.5.1__tar.gz → 2024.5.2__tar.gz

endi-2024.5.2/CURRENT_VERSION

@@ -0,0 +1 @@
+2024.5.2

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: endi
-Version: 2024.5.1
+Version: 2024.5.2
 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.2}/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.2}/caerp/static/release_notes.json

@@ -18,6 +18,43 @@
         ]
     },
     "release_notes": [
+        {
+            "version": "2024.5.2",
+            "date": "19/12/2024",
+            "changelog": [
+                {
+                    "title": "Gestion de la TVA sur marge dans les factures fournisseur",
+                    "description": [
+                        "Les factures fournisseur ne géraient pas correctement les achats en mode TVA sur marge, indispensables au fonctionnement des CAE Voyage notamment.",
+                        "L'interface reste inchangée et ne propose pas encore une saisie directe en TTC, mais à l'enregistrement d'un achat, si le type de dépense est en TVA sur marge, les montants HT et TVA sont recalculés automatiquement."
+                    ],
+                    "category": "enhancement",
+                    "target": "all",
+                    "sponsors": ["CPE"]
+                },
+                {
+                    "title": "Correction du fil d'Ariane de la gestion commerciale",
+                    "description": [
+                        "Les modifications apportées par la version précédente sur le fil d'Ariane de la gestion commerciale n'ont pas donné le résultat escompté et ont posé de nombreux problèmes (notamment sur l'affichage des encaissements).",
+                        "Retour au fonctionnement précédent pour l'instant."
+                    ],
+                    "category": "bugfix",
+                    "target": "all",
+                    "sponsors": ["Collectif MoOGLi", "CPE"]
+                },
+                {
+                    "title": "Correction de nouvelles régressions suite à la refonte des droits d'accès",
+                    "description": [
+                        "Retour du raccourci vers le centre de validation des factures de vente sur la page d'accueil de l'équipe d'appui.",
+                        "Correction de l'import de chapitres ou d'ouvrages dans un devis depuis le catalogue produit.",
+                        "Correction de la modification et la suppression des mémos sur les notes de dépense."
+                    ],
+                    "category": "bugfix",
+                    "target": "all",
+                    "sponsors": ["Collectif MoOGLi", "CPE"]
+                }
+            ]
+        },
         {
             "version": "2024.5.1",
             "date": "18/12/2024",
@@ -56,7 +93,7 @@
                     "sponsors": ["Collectif MoOGLi", "CPE"]
                 },
                 {
-                    "title": "Corrections de plusieurs régressions suite à la refonte des droits d'accès",
+                    "title": "Correction de plusieurs régressions suite à la refonte des droits d'accès",
                     "description": [
                         "Version Solo : Correction d'une erreur à l'affichage de la page d'accueil.",
                         "Correction de la duplication des notes de dépenses.",

{endi-2024.5.1 → endi-2024.5.2}/caerp/utils/sys_environment.py

@@ -16,7 +16,7 @@ def _get_current_package_version():
 
 # En prod on écrit la version directement ici (car le CURRENT_VERSION n'est
 # pas inclu dans les sources)
-package_version = "2024.5.1"
+package_version = "2024.5.2"
 # Le nom du paquet installé via pip (moogli/endi....)
 egg_name = "endi"
 # Le nom du package python

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/business/business.py

@@ -18,7 +18,6 @@ from caerp.views import (
     BaseView,
     BaseEditView,
 )
-from caerp.views.business.lists import CompanyBusinessListView
 from caerp.views.business.routes import (
     BUSINESS_ITEM_FILE_ROUTE,
     BUSINESS_ITEM_ROUTE,
@@ -26,6 +25,7 @@ from caerp.views.business.routes import (
     BUSINESS_ITEM_ESTIMATION_ROUTE,
     BUSINESS_PAYMENT_DEADLINE_ITEM_ROUTE,
 )
+from caerp.views.project.project import ProjectEntryPointView
 from caerp.views.project.routes import PROJECT_ITEM_ROUTE
 
 
@@ -292,7 +292,7 @@ def includeme(config):
     )
     config.add_tree_view(
         BusinessOverviewView,
-        parent=CompanyBusinessListView,
+        parent=ProjectEntryPointView,
         renderer="caerp:templates/business/overview.mako",
         permission=PERMISSIONS["company.view"],
         layout="business",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/business/estimation.py

@@ -5,9 +5,9 @@ from caerp.forms.tasks.estimation import get_list_schema
 from caerp.models.task import Estimation
 from caerp.models.project.business import Business
 from caerp.views import TreeMixin
-from caerp.views.business.business import BusinessOverviewView
 from caerp.views.business.routes import BUSINESS_ITEM_ESTIMATION_ROUTE
 from caerp.views.estimations.lists import CompanyEstimationList
+from caerp.views.project.project import ProjectEntryPointView
 
 
 class BusinessEstimationList(CompanyEstimationList, TreeMixin):
@@ -60,7 +60,7 @@ def add_estimation_view(context, request):
 def includeme(config):
     config.add_tree_view(
         BusinessEstimationList,
-        parent=BusinessOverviewView,
+        parent=ProjectEntryPointView,
         renderer="project/estimations.mako",
         permission=PERMISSIONS["company.view"],
         layout="business",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/business/expense.py

@@ -20,11 +20,11 @@ from caerp.views import (
     BaseFormView,
     TreeMixin,
 )
-from caerp.views.business.business import BusinessOverviewView
 from caerp.views.business.routes import (
     BUSINESS_ITEM_EXPENSES_ROUTE,
     BUSINESS_ITEM_EXPENSES_UNLINK_ROUTE,
 )
+from caerp.views.project.project import ProjectEntryPointView
 
 
 class ExpenseSelectionSchema(colander.MappingSchema):
@@ -263,7 +263,7 @@ class BusinessExpensesHybridListView(BaseView, TreeMixin):
 def includeme(config):
     config.add_tree_view(
         BusinessExpensesHybridListView,
-        parent=BusinessOverviewView,
+        parent=ProjectEntryPointView,
         renderer="caerp:templates/business/expenses_hybrid.mako",
         permission=PERMISSIONS["company.view"],
         layout="business",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/business/files.py

@@ -4,6 +4,7 @@ from caerp.views.business.routes import (
     BUSINESS_ITEM_FILE_ROUTE,
     BUSINESS_ITEM_ADD_FILE_ROUTE,
 )
+from caerp.views.project.project import ProjectEntryPointView
 from caerp.views.project.files import (
     ProjectFileAddView,
     ProjectFilesView,
@@ -43,7 +44,7 @@ def includeme(config):
     )
     config.add_tree_view(
         BusinessFilesView,
-        parent=BusinessOverviewView,
+        parent=ProjectEntryPointView,
         permission=PERMISSIONS["company.view"],
         renderer="caerp:templates/business/files.mako",
         layout="business",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/business/invoice.py

@@ -18,7 +18,6 @@ from caerp.views import (
     TreeMixin,
     BaseFormView,
 )
-from caerp.views.business.business import BusinessOverviewView
 from caerp.views.business.routes import (
     BUSINESS_ITEM_INVOICE_ROUTE,
     BUSINESS_ITEM_INVOICE_EXPORT_ROUTE,
@@ -32,6 +31,7 @@ from caerp.views.invoices.lists import (
     CompanyInvoicesOdsView,
     filter_all_status,
 )
+from caerp.views.project.project import ProjectEntryPointView
 
 
 logger = logging.getLogger(__name__)
@@ -253,7 +253,7 @@ def gen_progress_sold_invoice_view(context, request):
 def includeme(config):
     config.add_tree_view(
         BusinessInvoicesListView,
-        parent=BusinessOverviewView,
+        parent=ProjectEntryPointView,
         renderer="caerp:templates/business/invoices.mako",
         permission=PERMISSIONS["company.view"],
         layout="business",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/business/py3o.py

@@ -10,9 +10,9 @@ from caerp.views import (
     BaseView,
     TreeMixin,
 )
-from caerp.views.business.business import BusinessOverviewView
 from caerp.views.business.routes import BUSINESS_ITEM_PY3O_ROUTE
 from caerp.views.business.controller import BusinessPy3oController
+from caerp.views.project.project import ProjectEntryPointView
 
 logger = logging.getLogger(__name__)
 
@@ -139,7 +139,7 @@ def includeme(config):
     config.add_tree_view(
         BusinessFileGeneration,
         route_name=BUSINESS_ITEM_PY3O_ROUTE,
-        parent=BusinessOverviewView,
+        parent=ProjectEntryPointView,
         permission=PERMISSIONS["context.py3o_template_business"],
         renderer="/business/py3o.mako",
         layout="business",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/estimations/rest_api.py

@@ -16,6 +16,7 @@ from caerp.forms.tasks.estimation import (
 )
 from caerp.models.config import Config
 from caerp.models.company import Company
+from caerp.models.status import StatusLogEntry
 from caerp.models.task import Estimation, PaymentLine
 from caerp.models.indicators import SaleFileRequirement
 from caerp.models.task.task import DiscountLine, PostTTCLine, TaskLine, TaskLineGroup
@@ -544,7 +545,7 @@ def add_views(config):
         request_method="POST",
         renderer="json",
         permission=PERMISSIONS["context.edit_estimation"],
-        context=TaskLineGroup,
+        context=Estimation,
     )
     # Task line views
     config.add_rest_service(
@@ -650,6 +651,8 @@ def add_views(config):
         "/api/v1/estimations/{eid}/statuslogentries/{id}",
         collection_route_name="/api/v1/estimations/{id}/statuslogentries",
         collection_view_rights=PERMISSIONS["company.view"],
+        collection_context=Estimation,
+        context=StatusLogEntry,
         add_rights=PERMISSIONS["company.view"],
         view_rights=PERMISSIONS["context.view_statuslogentry"],
         edit_rights=PERMISSIONS["context.edit_statuslogentry"],

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/expenses/rest_api.py

@@ -1,5 +1,6 @@
 from caerp.consts.permissions import PERMISSIONS
 from caerp.controllers.expense_types import ExpenseTypeQueryService
+from caerp.models.status import StatusLogEntry
 from caerp.utils.compat import Iterable
 import datetime
 import logging
@@ -860,7 +861,8 @@ def add_views(config):
         view_rights=PERMISSIONS["context.view_statuslogentry"],
         edit_rights=PERMISSIONS["context.edit_statuslogentry"],
         delete_rights=PERMISSIONS["context.delete_statuslogentry"],
-        context=ExpenseSheet,
+        collection_context=ExpenseSheet,
+        context=StatusLogEntry,
     )
 
 

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/manage.py

@@ -29,7 +29,7 @@ def _get_validation_shortcuts(request) -> list:
                 title="Voir les devis en attente de validation",
             )
         )
-    if request.has_permission(PERMISSIONS["context.validate_invoice"]):
+    if request.has_permission(PERMISSIONS["global.validate_invoice"]):
         buttons.append(
             ShortcutButton(
                 url="validation/invoices",

{endi-2024.5.1 → endi-2024.5.2}/caerp/views/supply/base_rest_api.py

@@ -1,30 +1,31 @@
+import colander
 import datetime
 import logging
-import colander
 
 from pyramid.csrf import get_csrf_token
-from pyramid.httpexceptions import (
-    HTTPForbidden,
-)
-from caerp.controllers.expense_types import ExpenseTypeQueryService
+from pyramid.httpexceptions import HTTPForbidden
 
-from caerp.models.node import Node
+from caerp.controllers.expense_types import ExpenseTypeQueryService
+from caerp.controllers.state_managers import (
+    get_validation_allowed_actions,
+    set_validation_status,
+    check_validation_allowed,
+)
+from caerp.compute.math_utils import (
+    compute_ht_from_ttc,
+    floor,
+)
+from caerp.forms.supply import get_add_edit_line_schema
 from caerp.forms.third_party.supplier import get_company_suppliers_from_request
+from caerp.models.expense.types import ExpenseType
+from caerp.models.node import Node
 from caerp.models.supply import (
     SupplierInvoiceLine,
     SupplierOrder,
     SupplierOrderLine,
 )
-from caerp.utils.rest import (
-    RestError,
-)
-from caerp.forms.supply import get_add_edit_line_schema
-from caerp.controllers.state_managers import (
-    get_validation_allowed_actions,
-    set_validation_status,
-    check_validation_allowed,
-)
-
+from caerp.models.tva import Tva
+from caerp.utils.rest import RestError
 from caerp.views import BaseRestView
 from caerp.views.status import StatusView
 from caerp.views.status.rest_api import (
@@ -32,6 +33,7 @@ from caerp.views.status.rest_api import (
     get_other_users_for_notification,
 )
 from caerp.views.status.utils import get_visibility_options
+
 from .utils import get_supplier_doc_url
 
 logger = logging.getLogger(__name__)
@@ -233,6 +235,18 @@ class BaseRestLineView(BaseRestView):
         """
         if not edit:
             setattr(entry, self.fk_field_to_container, self.context.id)
+            entry.expense_type = ExpenseType.get(entry.type_id)
+
+        if entry.expense_type.tva_on_margin:
+            logger.info("Re-computing line amounts for TVA on margin")
+            try:
+                tva_value = Tva.get_default().value
+            except AttributeError:
+                tva_value = 2000  # integer format of 20%
+            ttc = entry.ht + entry.tva
+            entry.ht = floor(compute_ht_from_ttc(ttc, tva_value))
+            entry.tva = ttc - entry.ht
+
         return entry
 
     def duplicate(self):

{endi-2024.5.1 → endi-2024.5.2}/endi.egg-info/PKG-INFO

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

endi-2024.5.1/CURRENT_VERSION

@@ -1 +0,0 @@
-2024.5.1