mirror of
https://github.com/OCA/bank-statement-import.git
synced 2025-01-20 12:37:43 +02:00
[UPD] adapt to upstream changes
This commit is contained in:
@@ -27,25 +27,16 @@ class AccountBankStatementImport(models.TransientModel):
|
||||
_inherit = 'account.bank.statement.import'
|
||||
|
||||
@api.model
|
||||
def _import_statement(self, statement):
|
||||
(statement_id, notifications) = \
|
||||
super(AccountBankStatementImport, self)._import_statement(
|
||||
statement)
|
||||
if statement_id:
|
||||
# get raw file data from the stack
|
||||
def get_data_file(frame):
|
||||
if 'data_file' in frame.f_locals:
|
||||
return frame.f_locals['data_file']
|
||||
if frame.f_back:
|
||||
return get_data_file(frame.f_back)
|
||||
return None
|
||||
data_file = get_data_file(inspect.currentframe())
|
||||
self.env['account.bank.statement'].browse([statement_id]).write({
|
||||
def _import_file(self, data_file):
|
||||
(statement_ids, notifications) = \
|
||||
super(AccountBankStatementImport, self)._import_file(data_file)
|
||||
if statement_ids:
|
||||
self.env['account.bank.statement'].browse(statement_ids).write({
|
||||
'import_file': self.env['ir.attachment'].create(
|
||||
self._create_import_file_attachment_data(
|
||||
data_file, statement_id, notifications)).id,
|
||||
data_file, statement_ids[0], notifications)).id,
|
||||
})
|
||||
return (statement_id, notifications)
|
||||
return (statement_ids, notifications)
|
||||
|
||||
@api.model
|
||||
def _create_import_file_attachment_data(self, data_file, statement_id,
|
||||
|
||||
@@ -31,9 +31,10 @@ class HelloWorldParser(models.TransientModel):
|
||||
|
||||
@api.model
|
||||
def _parse_file(self, data_file):
|
||||
return [{
|
||||
'currency_code': 'EUR',
|
||||
'account_number': acc_number,
|
||||
return (
|
||||
'EUR',
|
||||
acc_number,
|
||||
[{
|
||||
'name': '000000123',
|
||||
'date': '2013-06-26',
|
||||
'transactions': [{
|
||||
@@ -42,7 +43,8 @@ class HelloWorldParser(models.TransientModel):
|
||||
'amount': 42,
|
||||
'unique_import_id': 'hello',
|
||||
}],
|
||||
}]
|
||||
}],
|
||||
)
|
||||
|
||||
|
||||
class TestSaveFile(TransactionCase):
|
||||
@@ -60,7 +62,11 @@ class TestSaveFile(TransactionCase):
|
||||
if not journal_id:
|
||||
account = import_wizard._create_bank_account(acc_number)
|
||||
journal_id = self.env['account.journal']\
|
||||
.search([('currency.name', '=', 'EUR')]).ids[0]
|
||||
.search([
|
||||
'|',
|
||||
('currency.name', '=', 'EUR'),
|
||||
('currency', '=', False)
|
||||
]).ids[0]
|
||||
account.journal_id = journal_id
|
||||
action = import_wizard.with_context(journal_id=journal_id)\
|
||||
.create({'data_file': base64.b64encode('hello world')})\
|
||||
|
||||
Reference in New Issue
Block a user