audrius/bank-statement-import
1
0
Fork 1
mirror of https://github.com/OCA/bank-statement-import.git synced 2025-01-20 12:37:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] *_adyen: Check merchant account as early as possible

Browse Source
This commit is contained in:
Ronald Portier
2022-03-28 12:46:39 +02:00
committed by Ronald Portier (Therp BV)
parent 2d85ab34aa
commit a3f5847791
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
account_bank_statement_import_adyen/models/account_bank_statement_import.py
View File

@@ -61,24 +61,6 @@ class AccountBankStatementImport(models.TransientModel):
_logger.debug(message, exc_info=True)
return super()._parse_file(data_file)
def _find_additional_data(self, currency_code, account_number):
"""Check if journal passed in the context matches Adyen Merchant Account."""
if account_number:
journal = self.env["account.journal"].search(
[("adyen_merchant_account", "=", account_number)], limit=1
)
if journal:
if self._context.get("journal_id", journal.id) != journal.id:
raise UserError(
_(
"Selected journal Merchant Account does not match "
"the import file Merchant Account "
"column: %s"
)
% account_number
)
return super()._find_additional_data(currency_code, account_number)
def _parse_adyen_file(self, data_file):
"""Parse file assuming it is an Adyen file.
@@ -111,10 +93,11 @@ class AccountBankStatementImport(models.TransientModel):
"less then minimum of 24" % len(row)
)
if not statement:
merchant_account = self._get_value(row, "Merchant Account")
self._validate_merchant_account(merchant_account)
batch_number = self._get_value(row, "Batch Number")
statement = self._make_statement(row)
currency_code = self._get_value(row, "Net Currency")
merchant_id = self._get_value(row, "Merchant Account")
else:
self._update_statement(statement, row)
row_type = self._get_value(row, "Type").strip()
@@ -147,7 +130,26 @@ class AccountBankStatementImport(models.TransientModel):
num_rows,
num_transactions,
)
return currency_code, merchant_id, [statement]
return currency_code, merchant_account, [statement]
def _validate_merchant_account(self, merchant_account):
"""Check wether merchant account exist, and belongs to the correct journal."""
journal = self.env["account.journal"].search(
[("adyen_merchant_account", "=", merchant_account)], limit=1
)
if not journal:
raise UserError(
_("No journal refers to Merchant Account %s") % merchant_account
)
if self._context.get("journal_id", journal.id) != journal.id:
raise UserError(
_(
"Selected journal Merchant Account does not match "
"the import file Merchant Account "
"column: %s"
)
% merchant_account
)
def _get_rows(self, data_file):
"""Get rows from data_file."""