[update] export journal

controllers/main.py

@@ -46,30 +46,16 @@ class ExportJournalCg(http.Controller):
         """
         # Get accounts variables
         company_id = request.env["res.company"].browse(int(company_id))
-        default_receivable_account_id = request.env.ref("l10n_fr.1_fr_pcg_recv")
+        request.env.ref("l10n_fr.1_fr_pcg_recv")
         contribution_cg_id = company_id.contribution_cg_id
 
-        # Journaux des UR et Fédé
         # TODO: vérifier l'export des comptes de banque en sortie pour UR et Fédé
-        journal_fede_com_id = company_id.company_id.journal_fede_com_id
-        journal_fede_cae_id = company_id.company_id.journal_fede_cae_id
-        journal_ur_hdf_id = company_id.company_id.journal_ur_hdf_id
-        journal_ur_med_id = company_id.company_id.journal_ur_med_id
-        journal_ids = [
-            journal_fede_com_id.id,
-            journal_fede_cae_id.id,
-            journal_ur_hdf_id.id,
-            journal_ur_med_id.id,
-        ]
-
         product_adhesion_id = company_id.product_adhesion_id
         journal_adhesion_id = company_id.journal_adhesion_id
-        contribution_journal_id = company_id.contribution_journal_id
 
         # Selection des dates + pas d'export du journal UR / FEDE
         domain = [
             ("partner_id", "!=", False),
-            ("journal_id", "not in", journal_ids),
         ]
         if date_start and date_end:
             domain += [
@@ -173,11 +159,11 @@ class ExportJournalCg(http.Controller):
                     )
                 )
             # Compte client CG Scop - Adhésion & Cotisation journaux de vente
-            elif line.account_id == default_receivable_account_id:
+            else:
                 if line.journal_id == journal_adhesion_id:
                     journal = "VE"
-                elif line.journal_id == contribution_journal_id:
-                    journal = "CO"
+                elif line.journal_id.type == "sale":
+                    journal = line.journal_id.code
                 else:
                     journal = "EF"
                 # Compte général
@@ -191,17 +177,6 @@ class ExportJournalCg(http.Controller):
                         journal=journal,
                     )
                 )
-            # Banque
-            else:
-                lines_to_export.append(
-                    self._export_row(
-                        line=line,
-                        amount=amount,
-                        direction=direction,
-                        account=line.account_id.code,
-                        journal="EF",
-                    )
-                )
 
             line.write({"date_export": datetime.now()})