moogli-erp 2025.5.4__tar.gz → 2025.5.5__tar.gz

moogli_erp-2025.5.5/CURRENT_VERSION

@@ -0,0 +1 @@
+2025.5.5

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: moogli_erp
-Version: 2025.5.4
+Version: 2025.5.5
 Summary: Progiciel de gestion pour CAE
 Home-page: https://framagit.org/caerp/caerp
 Author: Majerti/Kilya

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/caerp/panels/task/pdf.py

@@ -2,24 +2,21 @@
 Weasyprint pdf task panel
 """
 import logging
+
 from sqla_inspect.py3o import SqlaContext
 
-from caerp.models.project import BusinessType
-from caerp.models.task import (
-    Invoice,
-    Estimation,
-    CancelInvoice,
-)
 from caerp.models.company import Company
-
 from caerp.models.form_options import FormFieldDefinition
-from caerp.utils.html import split_rich_text_in_blocks
-from caerp.utils.strings import (
-    format_quantity,
-    is_hours,
-)
+from caerp.models.project import BusinessType
+from caerp.models.task import CancelInvoice, Estimation, Invoice
 from caerp.panels import BasePanel
-
+from caerp.utils.html import (
+    split_rich_text_in_blocks,
+    strip_html,
+    strip_linebreaks,
+    strip_void_lines,
+)
+from caerp.utils.strings import format_quantity, is_hours
 
 logger = logging.getLogger(__name__)
 CompanySerializer = SqlaContext(Company)
@@ -166,7 +163,9 @@ class PdfContentPanel(BasePanel):
         result["columns"] = self._columns_options()
         result["columns"]["first_column_colspan"] = self.first_column_colspan
         result["custom_labels"] = FormFieldDefinition.get_form_labels("task")
-
+        result["notes"] = None
+        if self.context.notes:
+            result["notes"] = strip_html(self.context.notes).replace("\n", "")
         return result
 
 

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/caerp/static/css/pdf.css

@@ -423,6 +423,11 @@ th.progress_invoicing {
     padding: var(--print-padding-r) var(--print-padding-m); }
   .pdf_mention_block.notes {
     break-inside: auto; }
+    .pdf_mention_block.notes h5, .pdf_mention_block.notes h3, .pdf_mention_block.notes h2 {
+      margin: 0;
+      padding: 0 var(--print-padding-m); }
+    .pdf_mention_block.notes p {
+      padding: var(--print-padding-s) var(--print-padding-m); }
 
 .document_help {
   font-size: 7pt; }

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/caerp/static/release_notes.json

@@ -18,6 +18,21 @@
         ]
     },
     "release_notes": [
+        {
+            "version": "2025.5.5",
+            "date": "23/09/2025",
+            "changelog": [
+                {
+                    "title": "Corrections diverses suite à la mise à jour 2025.5",
+                    "description": [
+                        "Notes complémentaires : Suppression de sauts de ligne qui étaient rajoutés automatiquement par l'éditeur."
+                    ],
+                    "category": "bugfix",
+                    "target": "all",
+                    "sponsors": ["CPE", "Collectif MoOGLi"]
+                }
+            ]
+        },
         {
             "version": "2025.5.4",
             "date": "22/09/2025",

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/caerp/templates/panels/task/pdf/content.mako

@@ -238,8 +238,8 @@ ${request.layout_manager.render_panel("task_pdf_header", context=task)}
 
     <div class='pdf_spacer'><br></div>
 
-    %if task.notes:
-        ${table("Notes", task.notes, block_css="notes")}
+    %if notes:
+        ${table("Notes", notes, block_css="notes")}
     %endif
     <%block name="notes_and_conditions">
     ## All infos beetween document lines and footer text (notes, payment conditions ...)

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/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 = "2025.5.4"
+package_version = "2025.5.5"
 # Le nom du paquet installé via pip (moogli/endi....)
 egg_name = "moogli-erp"
 # Le nom du package python

{moogli_erp-2025.5.4 → moogli_erp-2025.5.5}/moogli_erp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: moogli_erp
-Version: 2025.5.4
+Version: 2025.5.5
 Summary: Progiciel de gestion pour CAE
 Home-page: https://framagit.org/caerp/caerp
 Author: Majerti/Kilya