Mirror/odoo_account_ebics
2
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2024-11-23 20:52:04 +00:00
Code Issues Projects Releases Wiki Activity

cfonb multibank statement support

Browse Source
This commit is contained in:
Luc De Meyer 2020-07-16 23:32:20 +02:00
parent 27722891e5
commit 2291e9d230
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
account_ebics/models/ebics_file.py
View File

@ -162,8 +162,8 @@ class EbicsFile(models.Model):
SELECT DISTINCT statement_id SELECT DISTINCT statement_id
FROM account_bank_statement_line FROM account_bank_statement_line
WHERE id IN %s WHERE id IN %s
""" """,
% (tuple(st_line_ids),) (tuple(st_line_ids),)
) )
statement_ids = list(self.env.cr.fetchall()[0]) statement_ids = list(self.env.cr.fetchall()[0])
self.note_process += _( self.note_process += _(
@ -189,35 +189,51 @@ class EbicsFile(models.Model):
@staticmethod @staticmethod
def _process_cfonb120(self): def _process_cfonb120(self):
""" """
TODO: We do not support the standard _journal_creation_wizard since a single
adapt OCA import logic to find correct journal on the basis cfonb120 file may contain statements from different legal entities.
of both account number and currency.
Prompt for journal in case the journal is not found.
""" """
import_module = 'account_bank_statement_import_fr_cfonb' import_module = 'account_bank_statement_import_fr_cfonb'
self._check_import_module(import_module) self._check_import_module(import_module)
wiz_model = 'account.bank.statement.import' wiz_model = 'account.bank.statement.import'
data_file = base64.b64decode(self.data) data_file = base64.b64decode(self.data)
lines = data_file.split(b'\n') lines = data_file.split(b'\n')
att_vals = [] attachments_vals = []
st_lines = b'' st_lines = b''
transactions = False
for line in lines: for line in lines:
rec_type = line[0:2] rec_type = line[0:2]
acc_number = line[21:32] acc_number = line[21:32]
st_lines += line + b'\n' st_lines += line + b'\n'
if rec_type == b'04':
transactions = True
if rec_type == b'07': if rec_type == b'07':
fn = '_'.join([acc_number.decode(), self.name]) if transactions:
att_vals.append({ fn = '_'.join([acc_number.decode(), self.name])
'name': fn, attachments_vals.append({
'store_fname': fn, 'name': fn,
'datas': base64.b64encode(st_lines) 'store_fname': fn,
}) 'datas': base64.b64encode(st_lines)
})
st_lines = b'' st_lines = b''
wiz_vals = {'attachment_ids': [(0, 0, x) for x in att_vals]} transactions = False
result = {
'type': 'ir.actions.client',
'tag': 'bank_statement_reconciliation_view',
'context': {'statement_line_ids': [],
'company_ids': self.env.user.company_ids.ids,
'notifications': []},
}
wiz_ctx = dict(self.env.context, active_model='ebics.file') wiz_ctx = dict(self.env.context, active_model='ebics.file')
wiz = self.env[wiz_model].with_context(wiz_ctx).create(wiz_vals) for attachment_vals in attachments_vals:
res = wiz.import_file() wiz_vals = {'attachment_ids': [(0, 0, attachment_vals)]}
return self._process_result_action(res) wiz = self.env[wiz_model].with_context(wiz_ctx).create(wiz_vals)
res = wiz.import_file()
ctx = res.get('context')
result['context']['statement_line_ids'].extend(
ctx['statement_line_ids'])
result['context']['notifications'].extend(
ctx['notifications'])
return self._process_result_action(result)
@staticmethod @staticmethod
def _unlink_cfonb120(self): def _unlink_cfonb120(self):