[update] export cg

controllers/main.py

@@ -46,16 +46,30 @@ class ExportJournalCg(http.Controller):
         """
         # Get accounts variables
         company_id = request.env["res.company"].browse(int(company_id))
-        request.env.ref("l10n_fr.1_fr_pcg_recv")
+        default_receivable_account_id = 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.journal_fede_com_id
+        journal_fede_cae_id = company_id.journal_fede_cae_id
+        journal_ur_hdf_id = company_id.journal_ur_hdf_id
+        journal_ur_med_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
 
         # Selection des dates + pas d'export du journal UR / FEDE
         domain = [
             ("partner_id", "!=", False),
+            ("company_id", "=", company_id.id),
+            ("parent_state", "=", "posted"),
         ]
         if date_start and date_end:
             domain += [
@@ -166,14 +180,20 @@ class ExportJournalCg(http.Controller):
                     journal = line.journal_id.code
                 else:
                     journal = "EF"
+                if line.account_id == default_receivable_account_id:
+                    account = ("4112" + line.partner_id.ur_id.code_ur)
+                    adh_account = self._get_partner_number(line.partner_id)
+                else:
+                    account = line.account_id.code
+                    adh_account = ""
                 # Compte général
                 lines_to_export.append(
                     self._export_row(
                         line=line,
                         amount=amount,
                         direction=direction,
-                        account=("4112" + line.partner_id.ur_id.code_ur),
-                        adh_account=self._get_partner_number(line.partner_id),
+                        account=account,
+                        adh_account=adh_account,
                         journal=journal,
                     )
                 )
@@ -181,7 +201,7 @@ class ExportJournalCg(http.Controller):
             line.write({"date_export": datetime.now()})
 
         filename_ = "Export CG Scop - " + datetime.strftime(
-            datetime.now(), "%Y-%m-%d_%Hh%S"
+            datetime.now(), "%Y-%m-%d_%Hh%M"
         )
 
         return self.export_cg_csv(lines_to_export, filename_)
@@ -201,12 +221,12 @@ class ExportJournalCg(http.Controller):
         analytic=None,
     ):
         # Sanitize N° Bordereau
-        if line.invoice_id.bordereau_id.name:
-            inv_num = line.invoice_id.bordereau_id.name
-        elif line.full_reconcile_id.reconciled_line_ids.mapped("invoice_id"):
-            inv_num = line.full_reconcile_id.reconciled_line_ids.mapped("invoice_id")[
-                0
-            ].bordereau_id.name
+        reconciled_inv_ids = line.full_reconcile_id.reconciled_line_ids.mapped(
+            "move_id").filtered(lambda i: i.is_contribution)
+        if line.move_id.bordereau_id.name:
+            inv_num = line.move_id.bordereau_id.name
+        elif reconciled_inv_ids:
+            inv_num = reconciled_inv_ids[0].bordereau_id.name
         else:
             inv_num = ""
         # Libellé