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

[UPD] adapt to upstream changes

Browse Source
This commit is contained in:
Holger Brunn
2015-06-25 15:09:32 +02:00
parent 1ca4c6e9d8
commit 59e27cd17e
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
account_bank_statement_import_save_file/models/account_bank_statement_import.py
View File

@@ -27,25 +27,16 @@ class AccountBankStatementImport(models.TransientModel):
_inherit = 'account.bank.statement.import' _inherit = 'account.bank.statement.import'
@api.model @api.model
def _import_statement(self, statement): def _import_file(self, data_file):
(statement_id, notifications) = \ (statement_ids, notifications) = \
super(AccountBankStatementImport, self)._import_statement( super(AccountBankStatementImport, self)._import_file(data_file)
statement) if statement_ids:
if statement_id: self.env['account.bank.statement'].browse(statement_ids).write({
# 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({
'import_file': self.env['ir.attachment'].create( 'import_file': self.env['ir.attachment'].create(
self._create_import_file_attachment_data( 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 @api.model
def _create_import_file_attachment_data(self, data_file, statement_id, def _create_import_file_attachment_data(self, data_file, statement_id,

28
account_bank_statement_import_save_file/tests/test_save_file.py
View File

@@ -31,18 +31,20 @@ class HelloWorldParser(models.TransientModel):
@api.model @api.model
def _parse_file(self, data_file): def _parse_file(self, data_file):
return [{ return (
'currency_code': 'EUR', 'EUR',
'account_number': acc_number, acc_number,
'name': '000000123', [{
'date': '2013-06-26', 'name': '000000123',
'transactions': [{
'name': 'KBC-INVESTERINGSKREDIET 787-5562831-01',
'date': '2013-06-26', 'date': '2013-06-26',
'amount': 42, 'transactions': [{
'unique_import_id': 'hello', 'name': 'KBC-INVESTERINGSKREDIET 787-5562831-01',
'date': '2013-06-26',
'amount': 42,
'unique_import_id': 'hello',
}],
}], }],
}] )
class TestSaveFile(TransactionCase): class TestSaveFile(TransactionCase):
@@ -60,7 +62,11 @@ class TestSaveFile(TransactionCase):
if not journal_id: if not journal_id:
account = import_wizard._create_bank_account(acc_number) account = import_wizard._create_bank_account(acc_number)
journal_id = self.env['account.journal']\ 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 account.journal_id = journal_id
action = import_wizard.with_context(journal_id=journal_id)\ action = import_wizard.with_context(journal_id=journal_id)\
.create({'data_file': base64.b64encode('hello world')})\ .create({'data_file': base64.b64encode('hello world')})\