Skip to content
Extraits de code Groupes Projets
Valider 2c7fbb9c rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[FIX] typo and super on wrong model

parent 8169d723
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -72,7 +72,7 @@ class AccountBankStatementImport(models.TransientModel): ...@@ -72,7 +72,7 @@ class AccountBankStatementImport(models.TransientModel):
parse_line_1 = re.compile( parse_line_1 = re.compile(
self.regexp_version[file_version]['line_1']).search(data_file[0]) self.regexp_version[file_version]['line_1']).search(data_file[0])
bank_group_code = parse_line_1.group('bank_group_code') bank_group_code = parse_line_1.group('bank_group_code')
openning_date = parse_line_1.group('opening_date') opening_date = parse_line_1.group('opening_date')
closing_date = parse_line_1.group('closing_date') closing_date = parse_line_1.group('closing_date')
parse_line_2 = re.compile( parse_line_2 = re.compile(
...@@ -86,7 +86,7 @@ class AccountBankStatementImport(models.TransientModel): ...@@ -86,7 +86,7 @@ class AccountBankStatementImport(models.TransientModel):
except Exception as e: except Exception as e:
_logger.debug(e) _logger.debug(e)
return False return False
return (file_version, bank_group_code, openning_date, closing_date, return (file_version, bank_group_code, opening_date, closing_date,
bank_account_number, opening_balance, closing_balance, bank_account_number, opening_balance, closing_balance,
currency) currency)
...@@ -95,10 +95,9 @@ class AccountBankStatementImport(models.TransientModel): ...@@ -95,10 +95,9 @@ class AccountBankStatementImport(models.TransientModel):
data_file_split = data_file.decode('iso-8859-1').splitlines() data_file_split = data_file.decode('iso-8859-1').splitlines()
result = self._check_file(data_file_split) result = self._check_file(data_file_split)
if not result: if not result:
return super(AccountStatementImport, self)._parse_file( return super()._parse_file(data_file)
data_file)
file_version, bank_group_code, openning_date, closing_date, bank_account_number, opening_balance, closing_balance, currency = result file_version, bank_group_code, opening_date, closing_date, bank_account_number, opening_balance, closing_balance, currency = result
transactions = [] transactions = []
total_amt = 0.00 total_amt = 0.00
try: try:
...@@ -134,8 +133,8 @@ class AccountBankStatementImport(models.TransientModel): ...@@ -134,8 +133,8 @@ class AccountBankStatementImport(models.TransientModel):
raise Warning(_("The following problem occurred during import. The file might not be valid.\n\n %s" % e.message)) raise Warning(_("The following problem occurred during import. The file might not be valid.\n\n %s" % e.message))
vals_bank_statement = { vals_bank_statement = {
'name': bank_account_number+"/"+openning_date, 'name': bank_account_number+"/"+opening_date,
'date': datetime.datetime.strptime(openning_date, '%d/%m/%Y').strftime('%Y-%m-%d'), 'date': datetime.datetime.strptime(opening_date, '%d/%m/%Y').strftime('%Y-%m-%d'),
'transactions': list(reversed(transactions)), 'transactions': list(reversed(transactions)),
'balance_start': opening_balance, 'balance_start': opening_balance,
'balance_end_real': closing_balance, 'balance_end_real': closing_balance,
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter