[UPD] ajout modifications sur export

controllers/export.py

@@ -50,21 +50,26 @@ def export_xlsx(data_by_sheet):
 
 class ApExportController(http.Controller):
 
-    def get_filename(self, type, saison):
+    @staticmethod
+    def get_filename(file_type, saison):
         prefix = {
             "order": "suivi_commande",
             "fin": "suivi_financeurs",
             "tech": "suivi_technique",
         }
 
-        return f"{prefix.get(type, 'fichier')}_{saison.name}.xlsx"
+        return f"{prefix.get(file_type, 'fichier')}_{saison.name}.xlsx"
 
-    def get_nb_staples(self, inter_id):
+    @staticmethod
+    def get_nb_staples(inter_id):
         staples = 0
         if inter_id.mulch_has_staples:
 
             if inter_id.mulch_id:
-                if inter_id.mulch_id.nb_accesories and inter_id.mulch_id.nb_accesories > 0.0:
+                if (
+                    inter_id.mulch_id.nb_accesories
+                    and inter_id.mulch_id.nb_accesories > 0.0
+                ):
                     mulch_qty = inter_id.mulch_id.nb_accesories
                 else:
                     mulch_qty = 2
@@ -73,7 +78,10 @@ class ApExportController(http.Controller):
         if inter_id.mulch2_has_staples:
 
             if inter_id.mulch2_id:
-                if inter_id.mulch2_id.nb_accesories and inter_id.mulch2_id.nb_accesories > 0.0:
+                if (
+                    inter_id.mulch2_id.nb_accesories
+                    and inter_id.mulch2_id.nb_accesories > 0.0
+                ):
                     mulch2_qty = inter_id.mulch2_id.nb_accesories
                 else:
                     mulch2_qty = 2
@@ -81,26 +89,38 @@ class ApExportController(http.Controller):
 
         return staples if staples > 0 else ""
 
-    def get_linked_contact(self, partner_id):
+    @staticmethod
+    def get_linked_contact(partner_id):
         if partner_id.child_ids:
             return ",".join([child.name for child in partner_id.child_ids])
         return ""
 
-    def get_financial_help(self, inter):
-        if inter.financial_help_ids:
-            return ",".join([h.name for h in inter.financial_help_ids])
+    @staticmethod
+    def get_financial_help(inter_id):
+        if inter_id.financial_help_ids:
+            return ",".join([h.name for h in inter_id.financial_help_ids])
         return ""
 
-    def get_nb_big_trees(self, inter_id):
+    @staticmethod
+    def get_nb_collarette(inter_id):
+        if inter_id.is_collarette:
+            return inter_id.collarette_qty
+        return ""
+
+    @staticmethod
+    def get_nb_big_trees(inter_id):
 
         nb_big = 0
         if inter_id.sequence_type == "list":
-            nb_big = sum(plant.qty for plant in inter_id.plant_list_ids if plant.scale =="big")
+            nb_big = sum(
+                plant.qty for plant in inter_id.plant_list_ids if plant.scale == "big"
+            )
 
         elif inter_id.sequence_type == "sequence":
             if inter_id.intervention_uom_name == "m" and inter_id.plant_interval != 0.0:
                 plants_qty = (
-                    math.ceil(inter_id.intervention_length / inter_id.plant_interval) + 1
+                    math.ceil(inter_id.intervention_length / inter_id.plant_interval)
+                    + 1
                 )
             elif inter_id.intervention_uom_name == "Unité(s)":
                 plants_qty = inter_id.plant_qty
@@ -108,13 +128,14 @@ class ApExportController(http.Controller):
             full_seq_qty = plants_qty // len(inter_id.plant_sequence_ids)
             nb_big_in_seq = 0
             for plant in inter_id.plant_sequence_ids:
-                if plant.scale == 'big':
+                if plant.scale == "big":
                     nb_big_in_seq += 1
             nb_big = nb_big_in_seq * full_seq_qty
 
         return nb_big if nb_big > 0 else ""
 
-    def get_order_data(self, saison):
+    @staticmethod
+    def get_order_data(saison):
         """
         export commande
         """
@@ -238,7 +259,7 @@ class ApExportController(http.Controller):
                             project._fields["online"].selection
                         ).get(project.online)
                         or "",
-                        "Longueur de haie": inter.intervention_length or "",
+                        "Longueur (en m)": inter.intervention_length or "",
                         "Nombre de plants": inter.plant_qty or "",
                         "Surface (en m²)": inter.surface or "",
                         "Dont nombre total d'arbres (grands)": self.get_nb_big_trees(
@@ -247,7 +268,7 @@ class ApExportController(http.Controller):
                         "Type d'intervention": inter.intervention_type_id.name or "",
                         "Implantation": inter.location_id.name or "",
                         "Objectif plantation": project.plant_goal_id.name or "",
-                        "Avancement": project.admin_state_id.name,
+                        "Avancement": ";".join([avancement.name for avancement in project.sale_project_advancement_ids]),
                         "Aides financières": self.get_financial_help(inter),
                     }
 
@@ -284,7 +305,7 @@ class ApExportController(http.Controller):
                         "Télephone": project.partner_id.phone or "",
                         "Email": project.partner_id.email or "",
                         "Commune intervention": inter.city or "",
-                        "Longueur de haie": inter.intervention_length or "",
+                        "Longueur (en m)": inter.intervention_length or "",
                         "Nombre de plants": inter.plant_qty or "",
                         "Surface (en m²)": inter.surface or "",
                         "Dont nombre total d'arbres (grands)": self.get_nb_big_trees(
@@ -301,8 +322,11 @@ class ApExportController(http.Controller):
                         "Qté protegée bas": inter.low_protection_qty or "",
                         "Qté bambous": inter.bamboo_qty or "",
                         "Nombre d'agrafes": self.get_nb_staples(inter),
-                        "Nombre de collerettes": inter.collarette_qty or "",
-                        "Mois livraison": project.delivery_month or "",
+                        "Nombre de collerettes": self.get_nb_collarette(inter),
+                        "Mois livraison": dict(
+                            project._fields["delivery_month"].selection
+                        ).get(project.delivery_month)
+                        or "",
                         "Accueil démo": dict(project._fields["demo"].selection).get(
                             project.demo
                         )