[update] export format

controllers/main.py

@@ -87,7 +87,7 @@ class ExportJournalCg(http.Controller):
             else:
                 lines_to_export.append(self._export_row(
                     line=line, amount=amount, direction=direction,
-                    account=line.account_id.code)
+                    account=line.account_id.code, journal='EF')
                 )
 
             line.write({
@@ -105,18 +105,29 @@ class ExportJournalCg(http.Controller):
     # ------------------------------------------------------
     def _export_row(
             self, line, amount, direction, account=None,
-            adh_account=None, a_type='G', analytic=None):
+            adh_account=None, a_type='G', journal=None,
+            analytic=None,):
         # Sanitize N° Bordereau
-        inv_num = line.invoice_id.bordereau_id.name if line.invoice_id.bordereau_id.name else ''
+        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'):
+            line.full_reconcile_id.reconciled_line_ids.mapped('invoice_id')[0].bordereau_id.name
+        else:
+            inv_num = ''
         # Libellé
         description = line.partner_id.name.upper()
         if line.name:
             description += ' - ' + line.name.upper()
 
+        if journal:
+            journal_code = journal
+        else:
+            journal_code = line.journal_id.code
+
         return [
             line.move_id.name,      # N° pièce
-            line.date,              # Date
-            line.journal_id.code,   # Journal
+            line.date_maturity,     # Date
+            journal_code,           # Journal
             a_type,                 # Type d'écriture (général/analytique)
             account,                # Compte comptable
             adh_account,            # Num adh
@@ -124,7 +135,6 @@ class ExportJournalCg(http.Controller):
             direction,              # Sens
             amount,                 # Montant
             inv_num,                # N° Bordereau
-            line.date_maturity,     # Date d'échéance
             analytic,               # Code analytique
         ]
 
@@ -149,8 +159,7 @@ class ExportJournalCg(http.Controller):
         fp = StringIO()
         export_file = csv.writer(
             fp,
-            delimiter=';',
-            quoting=csv.QUOTE_ALL)
+            delimiter=';',)
         # Add header line
         for line in lines_to_export:
             # Format date value
@@ -163,9 +172,9 @@ class ExportJournalCg(http.Controller):
         data = fp.read()
         fp.close()
 
-        filename = filename_ + '.csv'
+        filename = filename_ + '.txt'
         csvhttpheaders = [
-            ('Content-Type', 'text/csv;charset=utf8'),
+            ('Content-Type', 'text/csv;charset=iso-8859-1'),
             ('Content-Disposition', content_disposition(filename)),
         ]
         return request.make_response(data, headers=csvhttpheaders)
\ No newline at end of file