diff --git a/wizard/scop_invoice_idf_wizard.py b/wizard/scop_invoice_idf_wizard.py index e09ed648bba69c596893d0f516c50a8bde99eac4..07a6e0c011b945ace6312dab15df77af1aaebcb0 100644 --- a/wizard/scop_invoice_idf_wizard.py +++ b/wizard/scop_invoice_idf_wizard.py @@ -80,7 +80,7 @@ class ScopImportIDFWizard(models.TransientModel): raise UserError('This file does not seem to be a CSV file') file = StringIO(base64.b64decode(self.file).decode('ISO-8859-1')) - reader = csv.reader(file, delimiter=';') + reader = csv.DictReader(file, delimiter=';') company_id = self.env.user.company_id line = 0 @@ -97,10 +97,10 @@ class ScopImportIDFWizard(models.TransientModel): for row in reader: line += 1 - journal = row[2] + journal = row['Journal'] if journal in ["VE", "BFC"]: tried_lines += 1 - compte = row[0] + compte = row['Compte'] partner_id = self.env['res.partner'].search([ ['member_number_int', '=', int(compte[2:7])], ['member_number_int', '!=', 0] @@ -112,20 +112,20 @@ class ScopImportIDFWizard(models.TransientModel): + compte \ + "</li>" else: - line_date = row[3] - libelle = row[5] + writing_date = row['Date écriture'] + libelle = row['Libellé écriture'] existing_import_line = self.env[model].search( [ ['partner_id', '=', partner_id.id], - ['date', '=', line_date], + ['writing_date', '=', writing_date], ['journal', '=', journal], ['name', '=', libelle] ]) if len(existing_import_line) > 0: logs += "<li> Ligne " + str(line) + ": Doublon</li>" else: - debit = int(row[8]) - credit = int(row[9]) + debit = int(row['Débit euro']) + credit = int(row['Crédit euro']) if journal == "VE" and debit > 0: line_type = "inv" elif journal == "BFC" and debit == 0: @@ -133,10 +133,8 @@ class ScopImportIDFWizard(models.TransientModel): else: line_type = "refund" - writing_date = row[3] - lettrage = row[10] - amount = debit if debit > 0 else credit - year = int(row[14]) + lettrage = row['Lettrage N'] + year = int(row['Année']) values = { 'company_id': company_id.id,