mirror of
https://github.com/brain-tec/account_ebics.git
synced 2025-08-14 14:45:36 +00:00
[14.0]black, isort, prettier
This commit is contained in:
Luc De Meyer
@@ -5,7 +5,6 @@ from odoo import fields, models
|
||||
|
||||
|
||||
class AccountBankStatement(models.Model):
|
||||
_inherit = 'account.bank.statement'
|
||||
_inherit = "account.bank.statement"
|
||||
|
||||
ebics_file_id = fields.Many2one(
|
||||
comodel_name='ebics.file', string='EBICS Data File')
|
||||
ebics_file_id = fields.Many2one(comodel_name="ebics.file", string="EBICS Data File")
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# Copyright 2009-2020 Noviat.
|
||||
# Copyright 2009-2022 Noviat.
|
||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
|
||||
|
||||
import logging
|
||||
import re
|
||||
import os
|
||||
import re
|
||||
|
||||
from odoo import _, api, fields, models
|
||||
from odoo.exceptions import UserError
|
||||
@@ -16,118 +16,151 @@ class EbicsConfig(models.Model):
|
||||
EBICS configuration is stored in a separate object in order to
|
||||
allow extra security policies on this object.
|
||||
"""
|
||||
_name = 'ebics.config'
|
||||
_description = 'EBICS Configuration'
|
||||
_order = 'name'
|
||||
|
||||
_name = "ebics.config"
|
||||
_description = "EBICS Configuration"
|
||||
_order = "name"
|
||||
|
||||
name = fields.Char(
|
||||
string='Name',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
required=True)
|
||||
string="Name",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
required=True,
|
||||
)
|
||||
journal_ids = fields.Many2many(
|
||||
comodel_name='account.journal',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string='Bank Accounts',
|
||||
comodel_name="account.journal",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
string="Bank Accounts",
|
||||
domain="[('type', '=', 'bank')]",
|
||||
required=True)
|
||||
required=True,
|
||||
)
|
||||
ebics_host = fields.Char(
|
||||
string='EBICS HostID', required=True,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="EBICS HostID",
|
||||
required=True,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Contact your bank to get the EBICS HostID."
|
||||
"\nIn France the BIC is usually allocated to the HostID "
|
||||
"whereas in Germany it tends to be an institute specific string "
|
||||
"of 8 characters.")
|
||||
"\nIn France the BIC is usually allocated to the HostID "
|
||||
"whereas in Germany it tends to be an institute specific string "
|
||||
"of 8 characters.",
|
||||
)
|
||||
ebics_url = fields.Char(
|
||||
string='EBICS URL', required=True,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
help="Contact your bank to get the EBICS URL.")
|
||||
string="EBICS URL",
|
||||
required=True,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Contact your bank to get the EBICS URL.",
|
||||
)
|
||||
ebics_version = fields.Selection(
|
||||
selection=[('H003', 'H003 (2.4)'),
|
||||
('H004', 'H004 (2.5)')],
|
||||
string='EBICS protocol version',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
required=True, default='H004')
|
||||
selection=[("H003", "H003 (2.4)"), ("H004", "H004 (2.5)")],
|
||||
string="EBICS protocol version",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
required=True,
|
||||
default="H004",
|
||||
)
|
||||
ebics_partner = fields.Char(
|
||||
string='EBICS PartnerID', required=True,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="EBICS PartnerID",
|
||||
required=True,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Organizational unit (company or individual) "
|
||||
"that concludes a contract with the bank. "
|
||||
"\nIn this contract it will be agreed which order types "
|
||||
"(file formats) are used, which accounts are concerned, "
|
||||
"which of the customer's users (subscribers) "
|
||||
"communicate with the EBICS bank server and the authorisations "
|
||||
"that these users will possess. "
|
||||
"\nIt is identified by the PartnerID.")
|
||||
"that concludes a contract with the bank. "
|
||||
"\nIn this contract it will be agreed which order types "
|
||||
"(file formats) are used, which accounts are concerned, "
|
||||
"which of the customer's users (subscribers) "
|
||||
"communicate with the EBICS bank server and the authorisations "
|
||||
"that these users will possess. "
|
||||
"\nIt is identified by the PartnerID.",
|
||||
)
|
||||
ebics_userid_ids = fields.One2many(
|
||||
comodel_name='ebics.userid',
|
||||
inverse_name='ebics_config_id',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
comodel_name="ebics.userid",
|
||||
inverse_name="ebics_config_id",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Human users or a technical system that is/are "
|
||||
"assigned to a customer. "
|
||||
"\nOn the EBICS bank server it is identified "
|
||||
"by the combination of UserID and PartnerID. "
|
||||
"The technical subscriber serves only for the data exchange "
|
||||
"between customer and financial institution. "
|
||||
"The human user also can authorise orders.")
|
||||
"assigned to a customer. "
|
||||
"\nOn the EBICS bank server it is identified "
|
||||
"by the combination of UserID and PartnerID. "
|
||||
"The technical subscriber serves only for the data exchange "
|
||||
"between customer and financial institution. "
|
||||
"The human user also can authorise orders.",
|
||||
)
|
||||
ebics_files = fields.Char(
|
||||
string='EBICS Files Root', required=True,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="EBICS Files Root",
|
||||
required=True,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
default=lambda self: self._default_ebics_files(),
|
||||
help="Root Directory for EBICS File Transfer Folders.")
|
||||
help="Root Directory for EBICS File Transfer Folders.",
|
||||
)
|
||||
# We store the EBICS keys in a separate directory in the file system.
|
||||
# This directory requires special protection to reduce fraude.
|
||||
ebics_keys = fields.Char(
|
||||
string='EBICS Keys Root', required=True,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="EBICS Keys Root",
|
||||
required=True,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
default=lambda self: self._default_ebics_keys(),
|
||||
help="Root Directory for storing the EBICS Keys.")
|
||||
help="Root Directory for storing the EBICS Keys.",
|
||||
)
|
||||
ebics_key_version = fields.Selection(
|
||||
selection=[('A005', 'A005 (RSASSA-PKCS1-v1_5)'),
|
||||
('A006', 'A006 (RSASSA-PSS)')],
|
||||
string='EBICS key version',
|
||||
default='A006',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
help="The key version of the electronic signature.")
|
||||
selection=[("A005", "A005 (RSASSA-PKCS1-v1_5)"), ("A006", "A006 (RSASSA-PSS)")],
|
||||
string="EBICS key version",
|
||||
default="A006",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="The key version of the electronic signature.",
|
||||
)
|
||||
ebics_key_bitlength = fields.Integer(
|
||||
string='EBICS key bitlength',
|
||||
string="EBICS key bitlength",
|
||||
default=2048,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="The bit length of the generated keys. "
|
||||
"\nThe value must be between 1536 and 4096.")
|
||||
"\nThe value must be between 1536 and 4096.",
|
||||
)
|
||||
ebics_file_format_ids = fields.Many2many(
|
||||
comodel_name='ebics.file.format',
|
||||
column1='config_id', column2='format_id',
|
||||
string='EBICS File Formats',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
comodel_name="ebics.file.format",
|
||||
column1="config_id",
|
||||
column2="format_id",
|
||||
string="EBICS File Formats",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
state = fields.Selection(
|
||||
[('draft', 'Draft'),
|
||||
('confirm', 'Confirmed')],
|
||||
string='State',
|
||||
default='draft',
|
||||
required=True, readonly=True)
|
||||
order_number = fields.Char(
|
||||
size=4, readonly=True, states={'draft': [('readonly', False)]},
|
||||
help="Specify the number for the next order."
|
||||
"\nThis number should match the following pattern : "
|
||||
"[A-Z]{1}[A-Z0-9]{3}")
|
||||
active = fields.Boolean(
|
||||
string='Active', default=True)
|
||||
company_ids = fields.Many2many(
|
||||
comodel_name='res.company',
|
||||
string='Companies',
|
||||
[("draft", "Draft"), ("confirm", "Confirmed")],
|
||||
string="State",
|
||||
default="draft",
|
||||
required=True,
|
||||
help="Companies sharing this EBICS contract.")
|
||||
readonly=True,
|
||||
)
|
||||
order_number = fields.Char(
|
||||
size=4,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Specify the number for the next order."
|
||||
"\nThis number should match the following pattern : "
|
||||
"[A-Z]{1}[A-Z0-9]{3}",
|
||||
)
|
||||
active = fields.Boolean(string="Active", default=True)
|
||||
company_ids = fields.Many2many(
|
||||
comodel_name="res.company",
|
||||
string="Companies",
|
||||
required=True,
|
||||
help="Companies sharing this EBICS contract.",
|
||||
)
|
||||
|
||||
@api.model
|
||||
def _default_ebics_files(self):
|
||||
return '/'.join(['/home/odoo/ebics_files', self._cr.dbname])
|
||||
return "/".join(["/home/odoo/ebics_files", self._cr.dbname])
|
||||
|
||||
@api.model
|
||||
def _default_ebics_keys(self):
|
||||
return '/'.join(['/etc/odoo/ebics_keys', self._cr.dbname])
|
||||
return "/".join(["/etc/odoo/ebics_keys", self._cr.dbname])
|
||||
|
||||
@api.constrains('order_number')
|
||||
@api.constrains("order_number")
|
||||
def _check_order_number(self):
|
||||
for cfg in self:
|
||||
nbr = cfg.order_number
|
||||
@@ -140,26 +173,28 @@ class EbicsConfig(models.Model):
|
||||
if not pattern.match(nbr):
|
||||
ok = False
|
||||
if not ok:
|
||||
raise UserError(_(
|
||||
"Order Number should comply with the following pattern:"
|
||||
"\n[A-Z]{1}[A-Z0-9]{3}"))
|
||||
raise UserError(
|
||||
_(
|
||||
"Order Number should comply with the following pattern:"
|
||||
"\n[A-Z]{1}[A-Z0-9]{3}"
|
||||
)
|
||||
)
|
||||
|
||||
@api.onchange('journal_ids')
|
||||
@api.onchange("journal_ids")
|
||||
def _onchange_journal_ids(self):
|
||||
self.company_ids = self.journal_ids.mapped('company_id')
|
||||
self.company_ids = self.journal_ids.mapped("company_id")
|
||||
|
||||
def unlink(self):
|
||||
for ebics_config in self:
|
||||
if ebics_config.state == 'active':
|
||||
raise UserError(_(
|
||||
"You cannot remove active EBICS configurations."))
|
||||
if ebics_config.state == "active":
|
||||
raise UserError(_("You cannot remove active EBICS configurations."))
|
||||
return super(EbicsConfig, self).unlink()
|
||||
|
||||
def set_to_draft(self):
|
||||
return self.write({'state': 'draft'})
|
||||
return self.write({"state": "draft"})
|
||||
|
||||
def set_to_confirm(self):
|
||||
return self.write({'state': 'confirm'})
|
||||
return self.write({"state": "confirm"})
|
||||
|
||||
def _get_order_number(self):
|
||||
return self.order_number
|
||||
@@ -167,31 +202,37 @@ class EbicsConfig(models.Model):
|
||||
def _update_order_number(self, OrderID):
|
||||
o_list = list(OrderID)
|
||||
for i, c in enumerate(reversed(o_list), start=1):
|
||||
if c == '9':
|
||||
o_list[-i] = 'A'
|
||||
if c == "9":
|
||||
o_list[-i] = "A"
|
||||
break
|
||||
if c == 'Z':
|
||||
if c == "Z":
|
||||
continue
|
||||
else:
|
||||
o_list[-i] = chr(ord(c) + 1)
|
||||
break
|
||||
next = ''.join(o_list)
|
||||
if next == 'ZZZZ':
|
||||
next = 'A000'
|
||||
self.order_number = next
|
||||
next_order_number = "".join(o_list)
|
||||
if next_order_number == "ZZZZ":
|
||||
next_order_number = "A000"
|
||||
self.order_number = next_order_number
|
||||
|
||||
def _check_ebics_keys(self):
|
||||
dirname = self.ebics_keys or ''
|
||||
dirname = self.ebics_keys or ""
|
||||
if not os.path.exists(dirname):
|
||||
raise UserError(_(
|
||||
"EBICS Keys Root Directory %s is not available."
|
||||
"\nPlease contact your system administrator.")
|
||||
% dirname)
|
||||
raise UserError(
|
||||
_(
|
||||
"EBICS Keys Root Directory %s is not available."
|
||||
"\nPlease contact your system administrator."
|
||||
)
|
||||
% dirname
|
||||
)
|
||||
|
||||
def _check_ebics_files(self):
|
||||
dirname = self.ebics_files or ''
|
||||
dirname = self.ebics_files or ""
|
||||
if not os.path.exists(dirname):
|
||||
raise UserError(_(
|
||||
"EBICS Files Root Directory %s is not available."
|
||||
"\nPlease contact your system administrator.")
|
||||
% dirname)
|
||||
raise UserError(
|
||||
_(
|
||||
"EBICS Files Root Directory %s is not available."
|
||||
"\nPlease contact your system administrator."
|
||||
)
|
||||
% dirname
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2009-2021 Noviat.
|
||||
# Copyright 2009-2022 Noviat.
|
||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
|
||||
|
||||
import base64
|
||||
@@ -6,113 +6,119 @@ import logging
|
||||
|
||||
from odoo import _, fields, models
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools.safe_eval import safe_eval
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class EbicsFile(models.Model):
|
||||
_name = 'ebics.file'
|
||||
_description = 'Object to store EBICS Data Files'
|
||||
_order = 'date desc'
|
||||
_name = "ebics.file"
|
||||
_description = "Object to store EBICS Data Files"
|
||||
_order = "date desc"
|
||||
_sql_constraints = [
|
||||
('name_uniq', 'unique (name, format_id)',
|
||||
'This File has already been down- or uploaded !')
|
||||
(
|
||||
"name_uniq",
|
||||
"unique (name, format_id)",
|
||||
"This File has already been down- or uploaded !",
|
||||
)
|
||||
]
|
||||
|
||||
name = fields.Char(string='Filename')
|
||||
data = fields.Binary(string='File', readonly=True)
|
||||
name = fields.Char(string="Filename")
|
||||
data = fields.Binary(string="File", readonly=True)
|
||||
format_id = fields.Many2one(
|
||||
comodel_name='ebics.file.format',
|
||||
string='EBICS File Formats',
|
||||
readonly=True)
|
||||
type = fields.Selection(
|
||||
related='format_id.type',
|
||||
readonly=True)
|
||||
comodel_name="ebics.file.format", string="EBICS File Formats", readonly=True
|
||||
)
|
||||
type = fields.Selection(related="format_id.type", readonly=True)
|
||||
date_from = fields.Date(
|
||||
readonly=True,
|
||||
help="'Date From' as entered in the download wizard.")
|
||||
readonly=True, help="'Date From' as entered in the download wizard."
|
||||
)
|
||||
date_to = fields.Date(
|
||||
readonly=True,
|
||||
help="'Date To' as entered in the download wizard.")
|
||||
readonly=True, help="'Date To' as entered in the download wizard."
|
||||
)
|
||||
date = fields.Datetime(
|
||||
required=True, readonly=True,
|
||||
help='File Upload/Download date')
|
||||
required=True, readonly=True, help="File Upload/Download date"
|
||||
)
|
||||
bank_statement_ids = fields.One2many(
|
||||
comodel_name='account.bank.statement',
|
||||
inverse_name='ebics_file_id',
|
||||
string='Generated Bank Statements', readonly=True)
|
||||
comodel_name="account.bank.statement",
|
||||
inverse_name="ebics_file_id",
|
||||
string="Generated Bank Statements",
|
||||
readonly=True,
|
||||
)
|
||||
state = fields.Selection(
|
||||
[('draft', 'Draft'),
|
||||
('done', 'Done')],
|
||||
string='State',
|
||||
default='draft',
|
||||
required=True, readonly=True)
|
||||
[("draft", "Draft"), ("done", "Done")],
|
||||
string="State",
|
||||
default="draft",
|
||||
required=True,
|
||||
readonly=True,
|
||||
)
|
||||
user_id = fields.Many2one(
|
||||
comodel_name='res.users', string='User',
|
||||
comodel_name="res.users",
|
||||
string="User",
|
||||
default=lambda self: self.env.user,
|
||||
readonly=True)
|
||||
readonly=True,
|
||||
)
|
||||
ebics_userid_id = fields.Many2one(
|
||||
comodel_name='ebics.userid',
|
||||
string='EBICS UserID',
|
||||
ondelete='restrict',
|
||||
readonly=True)
|
||||
note = fields.Text(string='Notes')
|
||||
note_process = fields.Text(string='Notes')
|
||||
comodel_name="ebics.userid",
|
||||
string="EBICS UserID",
|
||||
ondelete="restrict",
|
||||
readonly=True,
|
||||
)
|
||||
note = fields.Text(string="Notes")
|
||||
note_process = fields.Text(string="Notes")
|
||||
company_ids = fields.Many2many(
|
||||
comodel_name='res.company',
|
||||
string='Companies',
|
||||
help="Companies sharing this EBICS file.")
|
||||
comodel_name="res.company",
|
||||
string="Companies",
|
||||
help="Companies sharing this EBICS file.",
|
||||
)
|
||||
|
||||
def unlink(self):
|
||||
ff_methods = self._file_format_methods()
|
||||
for ebics_file in self:
|
||||
if ebics_file.state == 'done':
|
||||
raise UserError(_(
|
||||
"You can only remove EBICS files in state 'Draft'."))
|
||||
if ebics_file.state == "done":
|
||||
raise UserError(_("You can only remove EBICS files in state 'Draft'."))
|
||||
# execute format specific actions
|
||||
ff = ebics_file.format_id.download_process_method
|
||||
if ff in ff_methods:
|
||||
if ff_methods[ff].get('unlink'):
|
||||
ff_methods[ff]['unlink'](ebics_file)
|
||||
if ff_methods[ff].get("unlink"):
|
||||
ff_methods[ff]["unlink"](ebics_file)
|
||||
# remove bank statements
|
||||
ebics_file.bank_statement_ids.unlink()
|
||||
return super(EbicsFile, self).unlink()
|
||||
|
||||
def set_to_draft(self):
|
||||
return self.write({'state': 'draft'})
|
||||
return self.write({"state": "draft"})
|
||||
|
||||
def set_to_done(self):
|
||||
return self.write({'state': 'done'})
|
||||
return self.write({"state": "done"})
|
||||
|
||||
def process(self):
|
||||
self.ensure_one()
|
||||
ctx = dict(
|
||||
self.env.context,
|
||||
allowed_company_ids=self.env.user.company_ids.ids)
|
||||
ctx = dict(self.env.context, allowed_company_ids=self.env.user.company_ids.ids)
|
||||
self = self.with_context(ctx)
|
||||
self.note_process = ''
|
||||
self.note_process = ""
|
||||
ff_methods = self._file_format_methods()
|
||||
ff = self.format_id.download_process_method
|
||||
if ff in ff_methods:
|
||||
if ff_methods[ff].get('process'):
|
||||
res = ff_methods[ff]['process'](self)
|
||||
self.state = 'done'
|
||||
if ff_methods[ff].get("process"):
|
||||
res = ff_methods[ff]["process"](self)
|
||||
self.state = "done"
|
||||
return res
|
||||
else:
|
||||
return self._process_undefined_format()
|
||||
|
||||
def action_open_bank_statements(self):
|
||||
self.ensure_one()
|
||||
action = self.env['ir.actions.act_window']._for_xml_id(
|
||||
'account.action_bank_statement_tree')
|
||||
domain = eval(action.get('domain') or '[]')
|
||||
domain += [('id', 'in', self._context.get('statement_ids'))]
|
||||
action.update({'domain': domain})
|
||||
action = self.env["ir.actions.act_window"]._for_xml_id(
|
||||
"account.action_bank_statement_tree"
|
||||
)
|
||||
domain = safe_eval(action.get("domain") or "[]")
|
||||
domain += [("id", "in", self._context.get("statement_ids"))]
|
||||
action.update({"domain": domain})
|
||||
return action
|
||||
|
||||
def button_close(self):
|
||||
self.ensure_one()
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
return {"type": "ir.actions.act_window_close"}
|
||||
|
||||
def _file_format_methods(self):
|
||||
"""
|
||||
@@ -120,35 +126,45 @@ class EbicsFile(models.Model):
|
||||
for extra file formats.
|
||||
"""
|
||||
res = {
|
||||
'cfonb120':
|
||||
{'process': self._process_cfonb120,
|
||||
'unlink': self._unlink_cfonb120},
|
||||
'camt.052':
|
||||
{'process': self._process_camt052,
|
||||
'unlink': self._unlink_camt052},
|
||||
'camt.053':
|
||||
{'process': self._process_camt053,
|
||||
'unlink': self._unlink_camt053},
|
||||
'camt.054':
|
||||
{'process': self._process_camt054,
|
||||
'unlink': self._unlink_camt054},
|
||||
'pain.002':
|
||||
{'process': self._process_pain002,
|
||||
'unlink': self._unlink_pain002},
|
||||
"cfonb120": {
|
||||
"process": self._process_cfonb120,
|
||||
"unlink": self._unlink_cfonb120,
|
||||
},
|
||||
"camt.052": {
|
||||
"process": self._process_camt052,
|
||||
"unlink": self._unlink_camt052,
|
||||
},
|
||||
"camt.053": {
|
||||
"process": self._process_camt053,
|
||||
"unlink": self._unlink_camt053,
|
||||
},
|
||||
"camt.054": {
|
||||
"process": self._process_camt054,
|
||||
"unlink": self._unlink_camt054,
|
||||
},
|
||||
"pain.002": {
|
||||
"process": self._process_pain002,
|
||||
"unlink": self._unlink_pain002,
|
||||
},
|
||||
}
|
||||
return res
|
||||
|
||||
def _check_import_module(self, module, raise_if_not_found=True):
|
||||
mod = self.env['ir.module.module'].sudo().search(
|
||||
[('name', '=like', module),
|
||||
('state', '=', 'installed')])
|
||||
mod = (
|
||||
self.env["ir.module.module"]
|
||||
.sudo()
|
||||
.search([("name", "=like", module), ("state", "=", "installed")])
|
||||
)
|
||||
if not mod:
|
||||
if raise_if_not_found:
|
||||
raise UserError(_(
|
||||
"The module to process the '%s' format is not installed "
|
||||
"on your system. "
|
||||
"\nPlease install module '%s'")
|
||||
% (self.format_id.name, module))
|
||||
raise UserError(
|
||||
_(
|
||||
"The module to process the '%s' format is not installed "
|
||||
"on your system. "
|
||||
"\nPlease install module '%s'"
|
||||
)
|
||||
% (self.format_id.name, module)
|
||||
)
|
||||
return False
|
||||
return True
|
||||
|
||||
@@ -156,19 +172,19 @@ class EbicsFile(models.Model):
|
||||
notifications = []
|
||||
st_line_ids = []
|
||||
statement_ids = []
|
||||
if res.get('context'):
|
||||
notifications = res['context'].get('notifications', [])
|
||||
st_line_ids = res['context'].get('statement_line_ids', [])
|
||||
if res.get("context"):
|
||||
notifications = res["context"].get("notifications", [])
|
||||
st_line_ids = res["context"].get("statement_line_ids", [])
|
||||
if notifications:
|
||||
for notif in notifications:
|
||||
parts = []
|
||||
for k in ['type', 'message', 'details']:
|
||||
for k in ["type", "message", "details"]:
|
||||
if notif.get(k):
|
||||
msg = '%s: %s' % (k, notif[k])
|
||||
msg = "{}: {}".format(k, notif[k])
|
||||
parts.append(msg)
|
||||
self.note_process += '\n'.join(parts)
|
||||
self.note_process += '\n'
|
||||
self.note_process += '\n'
|
||||
self.note_process += "\n".join(parts)
|
||||
self.note_process += "\n"
|
||||
self.note_process += "\n"
|
||||
if st_line_ids:
|
||||
self.flush()
|
||||
self.env.cr.execute(
|
||||
@@ -185,36 +201,37 @@ class EbicsFile(models.Model):
|
||||
WHERE absl.id IN %s
|
||||
ORDER BY date, company_id
|
||||
""",
|
||||
(tuple(st_line_ids),)
|
||||
(tuple(st_line_ids),),
|
||||
)
|
||||
sts_data = self.env.cr.dictfetchall()
|
||||
else:
|
||||
sts_data = []
|
||||
st_cnt = len(sts_data)
|
||||
if st_cnt:
|
||||
self.note_process += _(
|
||||
"%s bank statements have been imported: "
|
||||
) % st_cnt
|
||||
self.note_process += '\n'
|
||||
self.note_process += _("%s bank statements have been imported: ") % st_cnt
|
||||
self.note_process += "\n"
|
||||
for st_data in sts_data:
|
||||
self.note_process += ("\n%s, %s (%s)") % (
|
||||
st_data['date'], st_data['name'], st_data['company_name'])
|
||||
statement_ids = [x['statement_id'] for x in sts_data]
|
||||
st_data["date"],
|
||||
st_data["name"],
|
||||
st_data["company_name"],
|
||||
)
|
||||
statement_ids = [x["statement_id"] for x in sts_data]
|
||||
if statement_ids:
|
||||
self.sudo().bank_statement_ids = [(6, 0, statement_ids)]
|
||||
ctx = dict(self.env.context, statement_ids=statement_ids)
|
||||
module = __name__.split('addons.')[1].split('.')[0]
|
||||
result_view = self.env.ref('%s.ebics_file_view_form_result' % module)
|
||||
module = __name__.split("addons.")[1].split(".")[0]
|
||||
result_view = self.env.ref("%s.ebics_file_view_form_result" % module)
|
||||
return {
|
||||
'name': _('Import EBICS File'),
|
||||
'res_id': self.id,
|
||||
'view_type': 'form',
|
||||
'view_mode': 'form',
|
||||
'res_model': self._name,
|
||||
'view_id': result_view.id,
|
||||
'target': 'new',
|
||||
'context': ctx,
|
||||
'type': 'ir.actions.act_window',
|
||||
"name": _("Import EBICS File"),
|
||||
"res_id": self.id,
|
||||
"view_type": "form",
|
||||
"view_mode": "form",
|
||||
"res_model": self._name,
|
||||
"view_id": result_view.id,
|
||||
"target": "new",
|
||||
"context": ctx,
|
||||
"type": "ir.actions.act_window",
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
@@ -223,60 +240,63 @@ class EbicsFile(models.Model):
|
||||
We do not support the standard _journal_creation_wizard since a single
|
||||
cfonb120 file may contain statements from different legal entities.
|
||||
"""
|
||||
import_module = 'account_statement_import_fr_cfonb'
|
||||
import_module = "account_statement_import_fr_cfonb"
|
||||
self._check_import_module(import_module)
|
||||
wiz_model = 'account.statement.import'
|
||||
wiz_model = "account.statement.import"
|
||||
data_file = base64.b64decode(self.data)
|
||||
lines = data_file.split(b'\n')
|
||||
lines = data_file.split(b"\n")
|
||||
wiz_vals_list = []
|
||||
st_lines = b''
|
||||
st_lines = b""
|
||||
transactions = False
|
||||
for line in lines:
|
||||
rec_type = line[0:2]
|
||||
acc_number = line[21:32]
|
||||
st_lines += line + b'\n'
|
||||
if rec_type == b'04':
|
||||
st_lines += line + b"\n"
|
||||
if rec_type == b"04":
|
||||
transactions = True
|
||||
if rec_type == b'07':
|
||||
if rec_type == b"07":
|
||||
if transactions:
|
||||
fn = '_'.join([acc_number.decode(), self.name])
|
||||
wiz_vals_list.append({
|
||||
'statement_filename': fn,
|
||||
'statement_file': base64.b64encode(st_lines)
|
||||
})
|
||||
st_lines = b''
|
||||
fn = "_".join([acc_number.decode(), self.name])
|
||||
wiz_vals_list.append(
|
||||
{
|
||||
"statement_filename": fn,
|
||||
"statement_file": base64.b64encode(st_lines),
|
||||
}
|
||||
)
|
||||
st_lines = b""
|
||||
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': []},
|
||||
"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")
|
||||
for i, wiz_vals in enumerate(wiz_vals_list, start=1):
|
||||
wiz = self.env[wiz_model].with_context(wiz_ctx).create(wiz_vals)
|
||||
res = wiz.import_file_button()
|
||||
ctx = res.get('context')
|
||||
if (res.get('res_model')
|
||||
== 'account.bank.statement.import.journal.creation'):
|
||||
message = _(
|
||||
"Error detected while importing statement number %s.\n"
|
||||
) % i
|
||||
ctx = res.get("context")
|
||||
if res.get("res_model") == "account.bank.statement.import.journal.creation":
|
||||
message = _("Error detected while importing statement number %s.\n") % i
|
||||
message += _("No financial journal found.")
|
||||
details = _(
|
||||
'Bank account number: %s'
|
||||
) % ctx.get('default_bank_acc_number')
|
||||
result['context']['notifications'].extend([{
|
||||
'type': 'warning',
|
||||
'message': message,
|
||||
'details': details,
|
||||
}])
|
||||
details = _("Bank account number: %s") % ctx.get(
|
||||
"default_bank_acc_number"
|
||||
)
|
||||
result["context"]["notifications"].extend(
|
||||
[
|
||||
{
|
||||
"type": "warning",
|
||||
"message": message,
|
||||
"details": details,
|
||||
}
|
||||
]
|
||||
)
|
||||
continue
|
||||
result['context']['statement_line_ids'].extend(
|
||||
ctx['statement_line_ids'])
|
||||
result['context']['notifications'].extend(
|
||||
ctx['notifications'])
|
||||
result["context"]["statement_line_ids"].extend(ctx["statement_line_ids"])
|
||||
result["context"]["notifications"].extend(ctx["notifications"])
|
||||
return self._process_result_action(result)
|
||||
|
||||
@staticmethod
|
||||
@@ -285,11 +305,10 @@ class EbicsFile(models.Model):
|
||||
Placeholder for cfonb120 specific actions before removing the
|
||||
EBICS data file and its related bank statements.
|
||||
"""
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _process_camt052(self):
|
||||
import_module = 'account_statement_import_camt'
|
||||
import_module = "account_statement_import_camt"
|
||||
self._check_import_module(import_module)
|
||||
return self._process_camt053(self)
|
||||
|
||||
@@ -299,11 +318,10 @@ class EbicsFile(models.Model):
|
||||
Placeholder for camt052 specific actions before removing the
|
||||
EBICS data file and its related bank statements.
|
||||
"""
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _process_camt054(self):
|
||||
import_module = 'account_statement_import_camt'
|
||||
import_module = "account_statement_import_camt"
|
||||
self._check_import_module(import_module)
|
||||
return self._process_camt053(self)
|
||||
|
||||
@@ -313,84 +331,89 @@ class EbicsFile(models.Model):
|
||||
Placeholder for camt054 specific actions before removing the
|
||||
EBICS data file and its related bank statements.
|
||||
"""
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _process_camt053(self):
|
||||
modules = [
|
||||
('oca', 'account_statement_import_camt'),
|
||||
('oe', 'account_bank_statement_import_camt'),
|
||||
("oca", "account_statement_import_camt"),
|
||||
("oe", "account_bank_statement_import_camt"),
|
||||
]
|
||||
found = False
|
||||
for src, mod in modules:
|
||||
for _src, mod in modules:
|
||||
if self._check_import_module(mod, raise_if_not_found=False):
|
||||
found = True
|
||||
break
|
||||
if not found:
|
||||
raise UserError(_(
|
||||
"The module to process the '%s' format is not installed "
|
||||
"on your system. "
|
||||
"\nPlease install one of the following modules: \n%s."
|
||||
) % (self.format_id.name, ', '.join([x[1] for x in modules]))
|
||||
raise UserError(
|
||||
_(
|
||||
"The module to process the '%s' format is not installed "
|
||||
"on your system. "
|
||||
"\nPlease install one of the following modules: \n%s."
|
||||
)
|
||||
% (self.format_id.name, ", ".join([x[1] for x in modules]))
|
||||
)
|
||||
if src == 'oca':
|
||||
if _src == "oca":
|
||||
self._process_camt053_oca()
|
||||
else:
|
||||
self._process_camt053_oe()
|
||||
|
||||
def _process_camt053_oca(self):
|
||||
wiz_model = 'account.statement.import'
|
||||
wiz_model = "account.statement.import"
|
||||
wiz_vals = {
|
||||
'statement_filename': self.name,
|
||||
'statement_file': self.data,
|
||||
"statement_filename": self.name,
|
||||
"statement_file": self.data,
|
||||
}
|
||||
result = {
|
||||
'type': 'ir.actions.client',
|
||||
'tag': 'bank_statement_reconciliation_view',
|
||||
'context': {'statement_line_ids': [],
|
||||
'company_ids': self.env.user.company_ids.ids,
|
||||
'notifications': []},
|
||||
"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)
|
||||
res = wiz.import_file_button()
|
||||
ctx = res.get('context')
|
||||
if (res.get('res_model')
|
||||
== 'account.bank.statement.import.journal.creation'):
|
||||
message = _(
|
||||
"Error detected while importing statement %s.\n"
|
||||
) % self.name
|
||||
ctx = res.get("context")
|
||||
if res.get("res_model") == "account.bank.statement.import.journal.creation":
|
||||
message = _("Error detected while importing statement %s.\n") % self.name
|
||||
message += _("No financial journal found.")
|
||||
details = _(
|
||||
'Bank account number: %s'
|
||||
) % ctx.get('default_bank_acc_number')
|
||||
result['context']['notifications'].extend([{
|
||||
'type': 'warning',
|
||||
'message': message,
|
||||
'details': details,
|
||||
}])
|
||||
result['context']['statement_line_ids'].extend(
|
||||
ctx['statement_line_ids'])
|
||||
result['context']['notifications'].extend(
|
||||
ctx['notifications'])
|
||||
details = _("Bank account number: %s") % ctx.get("default_bank_acc_number")
|
||||
result["context"]["notifications"].extend(
|
||||
[
|
||||
{
|
||||
"type": "warning",
|
||||
"message": message,
|
||||
"details": details,
|
||||
}
|
||||
]
|
||||
)
|
||||
result["context"]["statement_line_ids"].extend(ctx["statement_line_ids"])
|
||||
result["context"]["notifications"].extend(ctx["notifications"])
|
||||
return self._process_result_action(result)
|
||||
|
||||
def _process_camt053_oe(self):
|
||||
wiz_model = 'account.bank.statement.import'
|
||||
wiz_model = "account.bank.statement.import"
|
||||
wiz_vals = {
|
||||
'attachment_ids': [(0, 0, {'name': self.name,
|
||||
'datas': self.data,
|
||||
'store_fname': self.name})]}
|
||||
ctx = dict(self.env.context, active_model='ebics.file')
|
||||
"attachment_ids": [
|
||||
(
|
||||
0,
|
||||
0,
|
||||
{"name": self.name, "datas": self.data, "store_fname": self.name},
|
||||
)
|
||||
]
|
||||
}
|
||||
ctx = dict(self.env.context, active_model="ebics.file")
|
||||
wiz = self.env[wiz_model].with_context(ctx).create(wiz_vals)
|
||||
res = wiz.import_file()
|
||||
if res.get('res_model') \
|
||||
== 'account.bank.statement.import.journal.creation':
|
||||
if res.get('context'):
|
||||
bank_account = res['context'].get('default_bank_acc_number')
|
||||
raise UserError(_(
|
||||
"No financial journal found for Company Bank Account %s"
|
||||
) % bank_account)
|
||||
if res.get("res_model") == "account.bank.statement.import.journal.creation":
|
||||
if res.get("context"):
|
||||
bank_account = res["context"].get("default_bank_acc_number")
|
||||
raise UserError(
|
||||
_("No financial journal found for Company Bank Account %s")
|
||||
% bank_account
|
||||
)
|
||||
return self._process_result_action(res)
|
||||
|
||||
@staticmethod
|
||||
@@ -399,7 +422,6 @@ class EbicsFile(models.Model):
|
||||
Placeholder for camt053 specific actions before removing the
|
||||
EBICS data file and its related bank statements.
|
||||
"""
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _process_pain002(self):
|
||||
@@ -408,7 +430,6 @@ class EbicsFile(models.Model):
|
||||
TODO:
|
||||
add import logic based upon OCA 'account_payment_return_import'
|
||||
"""
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _unlink_pain002(self):
|
||||
@@ -419,8 +440,11 @@ class EbicsFile(models.Model):
|
||||
raise NotImplementedError
|
||||
|
||||
def _process_undefined_format(self):
|
||||
raise UserError(_(
|
||||
"The current version of the 'account_ebics' module "
|
||||
"has no support to automatically process EBICS files "
|
||||
"with format %s."
|
||||
) % self.format_id.name)
|
||||
raise UserError(
|
||||
_(
|
||||
"The current version of the 'account_ebics' module "
|
||||
"has no support to automatically process EBICS files "
|
||||
"with format %s."
|
||||
)
|
||||
% self.format_id.name
|
||||
)
|
||||
|
||||
@@ -5,58 +5,60 @@ from odoo import api, fields, models
|
||||
|
||||
|
||||
class EbicsFileFormat(models.Model):
|
||||
_name = 'ebics.file.format'
|
||||
_description = 'EBICS File Formats'
|
||||
_order = 'type,name,order_type'
|
||||
_name = "ebics.file.format"
|
||||
_description = "EBICS File Formats"
|
||||
_order = "type,name,order_type"
|
||||
|
||||
name = fields.Char(
|
||||
string='Request Type',
|
||||
string="Request Type",
|
||||
required=True,
|
||||
help="E.g. camt.xxx.cfonb120.stm, pain.001.001.03.sct.\n"
|
||||
"Specify camt.052, camt.053, camt.054 for camt "
|
||||
"Order Types such as C53, Z53, C54, Z54.\n"
|
||||
"This name has to match the 'Request Type' in your "
|
||||
"EBICS contract for Order Type 'FDL' or 'FUL'.\n")
|
||||
"Specify camt.052, camt.053, camt.054 for camt "
|
||||
"Order Types such as C53, Z53, C54, Z54.\n"
|
||||
"This name has to match the 'Request Type' in your "
|
||||
"EBICS contract for Order Type 'FDL' or 'FUL'.\n",
|
||||
)
|
||||
type = fields.Selection(
|
||||
selection=[('down', 'Download'),
|
||||
('up', 'Upload')],
|
||||
required=True)
|
||||
selection=[("down", "Download"), ("up", "Upload")], required=True
|
||||
)
|
||||
order_type = fields.Char(
|
||||
string='Order Type',
|
||||
string="Order Type",
|
||||
required=True,
|
||||
help="E.g. C53 (check your EBICS contract).\n"
|
||||
"For most banks in France you should use the "
|
||||
"format neutral Order Types 'FUL' for upload "
|
||||
"and 'FDL' for download.")
|
||||
"For most banks in France you should use the "
|
||||
"format neutral Order Types 'FUL' for upload "
|
||||
"and 'FDL' for download.",
|
||||
)
|
||||
download_process_method = fields.Selection(
|
||||
selection='_selection_download_process_method',
|
||||
selection="_selection_download_process_method",
|
||||
help="Enable processing within Odoo of the downloaded file "
|
||||
"via the 'Process' button."
|
||||
"E.g. specify camt.053 to import a camt.053 file and create "
|
||||
"a bank statement.")
|
||||
"via the 'Process' button."
|
||||
"E.g. specify camt.053 to import a camt.053 file and create "
|
||||
"a bank statement.",
|
||||
)
|
||||
# TODO:
|
||||
# move signature_class parameter so that it can be set per EBICS config
|
||||
signature_class = fields.Selection(
|
||||
selection=[('E', 'Single signature'),
|
||||
('T', 'Transport signature')],
|
||||
string='Signature Class',
|
||||
selection=[("E", "Single signature"), ("T", "Transport signature")],
|
||||
string="Signature Class",
|
||||
help="Please doublecheck the security of your Odoo "
|
||||
"ERP system when using class 'E' to prevent unauthorised "
|
||||
"users to make supplier payments."
|
||||
"\nLeave this field empty to use the default "
|
||||
"defined for your EBICS UserID.")
|
||||
"ERP system when using class 'E' to prevent unauthorised "
|
||||
"users to make supplier payments."
|
||||
"\nLeave this field empty to use the default "
|
||||
"defined for your EBICS UserID.",
|
||||
)
|
||||
description = fields.Char()
|
||||
suffix = fields.Char(
|
||||
required=True,
|
||||
help="Specify the filename suffix for this File Format."
|
||||
"\nE.g. c53.xml")
|
||||
help="Specify the filename suffix for this File Format." "\nE.g. c53.xml",
|
||||
)
|
||||
|
||||
@api.model
|
||||
def _selection_download_process_method(self):
|
||||
methods = self.env['ebics.file']._file_format_methods().keys()
|
||||
methods = self.env["ebics.file"]._file_format_methods().keys()
|
||||
return [(x, x) for x in methods]
|
||||
|
||||
@api.onchange('type')
|
||||
@api.onchange("type")
|
||||
def _onchange_type(self):
|
||||
if self.type == 'up':
|
||||
if self.type == "up":
|
||||
self.download_process_method = False
|
||||
|
||||
@@ -13,224 +13,240 @@ from odoo.exceptions import UserError
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
"""
|
||||
logging.basicConfig(
|
||||
level=logging.DEBUG,
|
||||
format='[%(asctime)s] %(levelname)s - %(name)s: %(message)s')
|
||||
"""
|
||||
|
||||
# logging.basicConfig(
|
||||
# level=logging.DEBUG,
|
||||
# format='[%(asctime)s] %(levelname)s - %(name)s: %(message)s')
|
||||
|
||||
try:
|
||||
import fintech
|
||||
from fintech.ebics import EbicsKeyRing, EbicsBank, EbicsUser,\
|
||||
EbicsClient, EbicsFunctionalError, EbicsTechnicalError
|
||||
fintech.cryptolib = 'cryptography'
|
||||
from fintech.ebics import (
|
||||
EbicsBank,
|
||||
EbicsClient,
|
||||
EbicsFunctionalError,
|
||||
EbicsKeyRing,
|
||||
EbicsTechnicalError,
|
||||
EbicsUser,
|
||||
)
|
||||
|
||||
fintech.cryptolib = "cryptography"
|
||||
except ImportError:
|
||||
_logger.warning('Failed to import fintech')
|
||||
_logger.warning("Failed to import fintech")
|
||||
|
||||
|
||||
class EbicsBank(EbicsBank):
|
||||
|
||||
def _next_order_id(self, partnerid):
|
||||
"""
|
||||
EBICS protocol version H003 requires generation of the OrderID.
|
||||
The OrderID must be a string between 'A000' and 'ZZZZ' and
|
||||
unique for each partner id.
|
||||
"""
|
||||
return hasattr(self, '_order_number') and self._order_number or 'A000'
|
||||
return hasattr(self, "_order_number") and self._order_number or "A000"
|
||||
|
||||
|
||||
class EbicsUserID(models.Model):
|
||||
_name = 'ebics.userid'
|
||||
_description = 'EBICS UserID'
|
||||
_order = 'name'
|
||||
_name = "ebics.userid"
|
||||
_description = "EBICS UserID"
|
||||
_order = "name"
|
||||
|
||||
name = fields.Char(
|
||||
string='EBICS UserID', required=True,
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="EBICS UserID",
|
||||
required=True,
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Human users or a technical system that is/are "
|
||||
"assigned to a customer. "
|
||||
"\nOn the EBICS bank server it is identified "
|
||||
"by the combination of UserID and PartnerID. "
|
||||
"The technical subscriber serves only for the data exchange "
|
||||
"between customer and financial institution. "
|
||||
"The human user also can authorise orders.")
|
||||
"assigned to a customer. "
|
||||
"\nOn the EBICS bank server it is identified "
|
||||
"by the combination of UserID and PartnerID. "
|
||||
"The technical subscriber serves only for the data exchange "
|
||||
"between customer and financial institution. "
|
||||
"The human user also can authorise orders.",
|
||||
)
|
||||
ebics_config_id = fields.Many2one(
|
||||
comodel_name='ebics.config',
|
||||
string='EBICS Configuration',
|
||||
ondelete='cascade')
|
||||
comodel_name="ebics.config", string="EBICS Configuration", ondelete="cascade"
|
||||
)
|
||||
user_ids = fields.Many2many(
|
||||
comodel_name='res.users',
|
||||
string='Users',
|
||||
comodel_name="res.users",
|
||||
string="Users",
|
||||
required=True,
|
||||
help="Users who are allowed to use this EBICS UserID for "
|
||||
" bank transactions.")
|
||||
" bank transactions.",
|
||||
)
|
||||
# Currently only a singe signature class per user is supported
|
||||
# Classes A and B are not yet supported.
|
||||
signature_class = fields.Selection(
|
||||
selection=[('E', 'Single signature'),
|
||||
('T', 'Transport signature')],
|
||||
string='Signature Class',
|
||||
required=True, default='T',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
selection=[("E", "Single signature"), ("T", "Transport signature")],
|
||||
string="Signature Class",
|
||||
required=True,
|
||||
default="T",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
help="Default signature class."
|
||||
"This default can be overriden for specific "
|
||||
"EBICS transactions (cf. File Formats).")
|
||||
ebics_keys_fn = fields.Char(
|
||||
compute='_compute_ebics_keys_fn')
|
||||
ebics_keys_found = fields.Boolean(
|
||||
compute='_compute_ebics_keys_found')
|
||||
ebics_passphrase = fields.Char(
|
||||
string='EBICS Passphrase')
|
||||
"This default can be overriden for specific "
|
||||
"EBICS transactions (cf. File Formats).",
|
||||
)
|
||||
ebics_keys_fn = fields.Char(compute="_compute_ebics_keys_fn")
|
||||
ebics_keys_found = fields.Boolean(compute="_compute_ebics_keys_found")
|
||||
ebics_passphrase = fields.Char(string="EBICS Passphrase")
|
||||
ebics_ini_letter = fields.Binary(
|
||||
string='EBICS INI Letter', readonly=True,
|
||||
help="INI-letter PDF document to be sent to your bank.")
|
||||
ebics_ini_letter_fn = fields.Char(
|
||||
string='INI-letter Filename', readonly=True)
|
||||
string="EBICS INI Letter",
|
||||
readonly=True,
|
||||
help="INI-letter PDF document to be sent to your bank.",
|
||||
)
|
||||
ebics_ini_letter_fn = fields.Char(string="INI-letter Filename", readonly=True)
|
||||
ebics_public_bank_keys = fields.Binary(
|
||||
string='EBICS Public Bank Keys', readonly=True,
|
||||
help="EBICS Public Bank Keys to be checked for consistency.")
|
||||
string="EBICS Public Bank Keys",
|
||||
readonly=True,
|
||||
help="EBICS Public Bank Keys to be checked for consistency.",
|
||||
)
|
||||
ebics_public_bank_keys_fn = fields.Char(
|
||||
string='EBICS Public Bank Keys Filename', readonly=True)
|
||||
string="EBICS Public Bank Keys Filename", readonly=True
|
||||
)
|
||||
swift_3skey = fields.Boolean(
|
||||
string='Enable 3SKey support',
|
||||
string="Enable 3SKey support",
|
||||
help="Transactions for this user will be signed "
|
||||
"by means of the SWIFT 3SKey token.")
|
||||
swift_3skey_certificate = fields.Binary(
|
||||
string='3SKey Certficate')
|
||||
swift_3skey_certificate_fn = fields.Char(
|
||||
string='EBICS Public Bank Keys Filename')
|
||||
"by means of the SWIFT 3SKey token.",
|
||||
)
|
||||
swift_3skey_certificate = fields.Binary(string="3SKey Certficate")
|
||||
swift_3skey_certificate_fn = fields.Char(string="EBICS Public Bank Keys Filename")
|
||||
# X.509 Distinguished Name attributes used to
|
||||
# create self-signed X.509 certificates
|
||||
ebics_key_x509 = fields.Boolean(
|
||||
string='X509 support',
|
||||
help="Set this flag in order to work with "
|
||||
"self-signed X.509 certificates")
|
||||
string="X509 support",
|
||||
help="Set this flag in order to work with " "self-signed X.509 certificates",
|
||||
)
|
||||
ebics_key_x509_dn_cn = fields.Char(
|
||||
string='Common Name [CN]',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="Common Name [CN]",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
ebics_key_x509_dn_o = fields.Char(
|
||||
string='Organization Name [O]',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="Organization Name [O]",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
ebics_key_x509_dn_ou = fields.Char(
|
||||
string='Organizational Unit Name [OU]',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="Organizational Unit Name [OU]",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
ebics_key_x509_dn_c = fields.Char(
|
||||
string='Country Name [C]',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="Country Name [C]",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
ebics_key_x509_dn_st = fields.Char(
|
||||
string='State Or Province Name [ST]',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="State Or Province Name [ST]",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
ebics_key_x509_dn_l = fields.Char(
|
||||
string='Locality Name [L]',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="Locality Name [L]",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
ebics_key_x509_dn_e = fields.Char(
|
||||
string='Email Address',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
string="Email Address",
|
||||
readonly=True,
|
||||
states={"draft": [("readonly", False)]},
|
||||
)
|
||||
state = fields.Selection(
|
||||
[('draft', 'Draft'),
|
||||
('init', 'Initialisation'),
|
||||
('get_bank_keys', 'Get Keys from Bank'),
|
||||
('to_verify', 'Verification'),
|
||||
('active_keys', 'Active Keys')],
|
||||
string='State',
|
||||
default='draft',
|
||||
required=True, readonly=True)
|
||||
active = fields.Boolean(
|
||||
string='Active', default=True)
|
||||
company_ids = fields.Many2many(
|
||||
comodel_name='res.company',
|
||||
string='Companies',
|
||||
[
|
||||
("draft", "Draft"),
|
||||
("init", "Initialisation"),
|
||||
("get_bank_keys", "Get Keys from Bank"),
|
||||
("to_verify", "Verification"),
|
||||
("active_keys", "Active Keys"),
|
||||
],
|
||||
string="State",
|
||||
default="draft",
|
||||
required=True,
|
||||
help="Companies sharing this EBICS contract.")
|
||||
readonly=True,
|
||||
)
|
||||
active = fields.Boolean(string="Active", default=True)
|
||||
company_ids = fields.Many2many(
|
||||
comodel_name="res.company",
|
||||
string="Companies",
|
||||
required=True,
|
||||
help="Companies sharing this EBICS contract.",
|
||||
)
|
||||
|
||||
@api.depends('name')
|
||||
@api.depends("name")
|
||||
def _compute_ebics_keys_fn(self):
|
||||
for rec in self:
|
||||
keys_dir = rec.ebics_config_id.ebics_keys
|
||||
rec.ebics_keys_fn = (
|
||||
rec.name
|
||||
and keys_dir
|
||||
and (keys_dir + '/' + rec.name + '_keys'))
|
||||
|
||||
@api.depends('ebics_keys_fn')
|
||||
def _compute_ebics_keys_found(self):
|
||||
for rec in self:
|
||||
rec.ebics_keys_found = (
|
||||
rec.ebics_keys_fn
|
||||
and os.path.isfile(rec.ebics_keys_fn)
|
||||
rec.name and keys_dir and (keys_dir + "/" + rec.name + "_keys")
|
||||
)
|
||||
|
||||
@api.constrains('ebics_passphrase')
|
||||
@api.depends("ebics_keys_fn")
|
||||
def _compute_ebics_keys_found(self):
|
||||
for rec in self:
|
||||
rec.ebics_keys_found = rec.ebics_keys_fn and os.path.isfile(
|
||||
rec.ebics_keys_fn
|
||||
)
|
||||
|
||||
@api.constrains("ebics_passphrase")
|
||||
def _check_ebics_passphrase(self):
|
||||
for rec in self:
|
||||
if not rec.ebics_passphrase or len(rec.ebics_passphrase) < 8:
|
||||
raise UserError(_(
|
||||
"The passphrase must be at least 8 characters long"))
|
||||
raise UserError(_("The passphrase must be at least 8 characters long"))
|
||||
|
||||
@api.onchange('signature_class')
|
||||
@api.onchange("signature_class")
|
||||
def _onchange_signature_class(self):
|
||||
if self.signature_class == 'T':
|
||||
if self.signature_class == "T":
|
||||
self.swift_3skey = False
|
||||
|
||||
@api.onchange('swift_3skey')
|
||||
@api.onchange("swift_3skey")
|
||||
def _onchange_swift_3skey(self):
|
||||
if self.swift_3skey:
|
||||
self.ebics_key_x509 = True
|
||||
|
||||
def set_to_draft(self):
|
||||
return self.write({'state': 'draft'})
|
||||
return self.write({"state": "draft"})
|
||||
|
||||
def set_to_active_keys(self):
|
||||
return self.write({'state': 'active_keys'})
|
||||
return self.write({"state": "active_keys"})
|
||||
|
||||
def set_to_get_bank_keys(self):
|
||||
return self.write({'state': 'get_bank_keys'})
|
||||
return self.write({"state": "get_bank_keys"})
|
||||
|
||||
def ebics_init_1(self):
|
||||
def ebics_init_1(self): # noqa: C901
|
||||
"""
|
||||
Initialization of bank keys - Step 1:
|
||||
Create new keys and certificates for this user
|
||||
"""
|
||||
self.ensure_one()
|
||||
self.ebics_config_id._check_ebics_files()
|
||||
if self.state != 'draft':
|
||||
if self.state != "draft":
|
||||
raise UserError(
|
||||
_("Set state to 'draft' before Bank Key (re)initialisation."))
|
||||
_("Set state to 'draft' before Bank Key (re)initialisation.")
|
||||
)
|
||||
|
||||
if not self.ebics_passphrase:
|
||||
raise UserError(
|
||||
_("Set a passphrase."))
|
||||
raise UserError(_("Set a passphrase."))
|
||||
|
||||
if self.swift_3skey and not self.swift_3skey_certificate:
|
||||
raise UserError(
|
||||
_("3SKey certificate missing."))
|
||||
raise UserError(_("3SKey certificate missing."))
|
||||
|
||||
ebics_version = self.ebics_config_id.ebics_version
|
||||
try:
|
||||
keyring = EbicsKeyRing(
|
||||
keys=self.ebics_keys_fn,
|
||||
passphrase=self.ebics_passphrase)
|
||||
keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase
|
||||
)
|
||||
bank = EbicsBank(
|
||||
keyring=keyring,
|
||||
hostid=self.ebics_config_id.ebics_host,
|
||||
url=self.ebics_config_id.ebics_url)
|
||||
url=self.ebics_config_id.ebics_url,
|
||||
)
|
||||
user = EbicsUser(
|
||||
keyring=keyring,
|
||||
partnerid=self.ebics_config_id.ebics_partner,
|
||||
userid=self.name)
|
||||
userid=self.name,
|
||||
)
|
||||
except Exception:
|
||||
exctype, value = exc_info()[:2]
|
||||
error = _("EBICS Initialisation Error:")
|
||||
error += '\n' + str(exctype) + '\n' + str(value)
|
||||
error += "\n" + str(exctype) + "\n" + str(value)
|
||||
raise UserError(error)
|
||||
|
||||
self.ebics_config_id._check_ebics_keys()
|
||||
@@ -240,60 +256,63 @@ class EbicsUserID(models.Model):
|
||||
# enable import of all type of certicates: A00x, X002, E002
|
||||
if self.swift_3skey:
|
||||
kwargs = {
|
||||
self.ebics_config_id.ebics_key_version:
|
||||
base64.decodestring(self.swift_3skey_certificate),
|
||||
self.ebics_config_id.ebics_key_version: base64.decodestring(
|
||||
self.swift_3skey_certificate
|
||||
),
|
||||
}
|
||||
user.import_certificates(**kwargs)
|
||||
user.create_keys(
|
||||
keyversion=self.ebics_config_id.ebics_key_version,
|
||||
bitlength=self.ebics_config_id.ebics_key_bitlength)
|
||||
bitlength=self.ebics_config_id.ebics_key_bitlength,
|
||||
)
|
||||
except Exception:
|
||||
exctype, value = exc_info()[:2]
|
||||
error = _("EBICS Initialisation Error:")
|
||||
error += '\n' + str(exctype) + '\n' + str(value)
|
||||
error += "\n" + str(exctype) + "\n" + str(value)
|
||||
raise UserError(error)
|
||||
|
||||
if self.swift_3skey and not self.ebics_key_x509:
|
||||
raise UserError(_(
|
||||
"The current version of this module "
|
||||
"requires to X509 support when enabling 3SKey"))
|
||||
raise UserError(
|
||||
_(
|
||||
"The current version of this module "
|
||||
"requires to X509 support when enabling 3SKey"
|
||||
)
|
||||
)
|
||||
|
||||
if self.ebics_key_x509:
|
||||
dn_attrs = {
|
||||
'commonName': self.ebics_key_x509_dn_cn,
|
||||
'organizationName': self.ebics_key_x509_dn_o,
|
||||
'organizationalUnitName': self.ebics_key_x509_dn_ou,
|
||||
'countryName': self.ebics_key_x509_dn_c,
|
||||
'stateOrProvinceName': self.ebics_key_x509_dn_st,
|
||||
'localityName': self.ebics_key_x509_dn_l,
|
||||
'emailAddress': self.ebics_key_x509_dn_e,
|
||||
"commonName": self.ebics_key_x509_dn_cn,
|
||||
"organizationName": self.ebics_key_x509_dn_o,
|
||||
"organizationalUnitName": self.ebics_key_x509_dn_ou,
|
||||
"countryName": self.ebics_key_x509_dn_c,
|
||||
"stateOrProvinceName": self.ebics_key_x509_dn_st,
|
||||
"localityName": self.ebics_key_x509_dn_l,
|
||||
"emailAddress": self.ebics_key_x509_dn_e,
|
||||
}
|
||||
kwargs = {k: v for k, v in dn_attrs.items() if v}
|
||||
user.create_certificates(**kwargs)
|
||||
|
||||
client = EbicsClient(
|
||||
bank, user, version=ebics_version)
|
||||
client = EbicsClient(bank, user, version=ebics_version)
|
||||
|
||||
# Send the public electronic signature key to the bank.
|
||||
ebics_config_bank = self.ebics_config_id.journal_ids[0].bank_id
|
||||
if not ebics_config_bank:
|
||||
raise UserError(_(
|
||||
"No bank defined for the financial journal "
|
||||
"of the EBICS Config"))
|
||||
raise UserError(
|
||||
_("No bank defined for the financial journal " "of the EBICS Config")
|
||||
)
|
||||
try:
|
||||
supported_versions = client.HEV()
|
||||
if ebics_version not in supported_versions:
|
||||
err_msg = _("EBICS version mismatch.") + "\n"
|
||||
err_msg += _("Versions supported by your bank:")
|
||||
for k in supported_versions:
|
||||
err_msg += "\n%s: %s " % (k, supported_versions[k])
|
||||
err_msg += "\n{}: {} ".format(k, supported_versions[k])
|
||||
raise UserError(err_msg)
|
||||
if ebics_version == 'H003':
|
||||
if ebics_version == "H003":
|
||||
bank._order_number = self.ebics_config_id._get_order_number()
|
||||
OrderID = client.INI()
|
||||
_logger.info(
|
||||
'%s, EBICS INI command, OrderID=%s', self._name, OrderID)
|
||||
if ebics_version == 'H003':
|
||||
_logger.info("%s, EBICS INI command, OrderID=%s", self._name, OrderID)
|
||||
if ebics_version == "H003":
|
||||
self.ebics_config_id._update_order_number(OrderID)
|
||||
except URLError:
|
||||
exctype, value = exc_info()[:2]
|
||||
@@ -303,69 +322,68 @@ class EbicsUserID(models.Model):
|
||||
self.name,
|
||||
tb,
|
||||
)
|
||||
raise UserError(_(
|
||||
"urlopen error:\n url '%s' - %s")
|
||||
% (self.ebics_config_id.ebics_url, str(value)))
|
||||
raise UserError(
|
||||
_("urlopen error:\n url '%s' - %s")
|
||||
% (self.ebics_config_id.ebics_url, str(value))
|
||||
)
|
||||
except EbicsFunctionalError:
|
||||
e = exc_info()
|
||||
error = _("EBICS Functional Error:")
|
||||
error += '\n'
|
||||
error += '%s (code: %s)' % (e[1].message, e[1].code)
|
||||
error += "\n"
|
||||
error += "{} (code: {})".format(e[1].message, e[1].code)
|
||||
raise UserError(error)
|
||||
except EbicsTechnicalError:
|
||||
e = exc_info()
|
||||
error = _("EBICS Technical Error:")
|
||||
error += '\n'
|
||||
error += '%s (code: %s)' % (e[1].message, e[1].code)
|
||||
error += "\n"
|
||||
error += "{} (code: {})".format(e[1].message, e[1].code)
|
||||
raise UserError(error)
|
||||
|
||||
# Send the public authentication and encryption keys to the bank.
|
||||
if ebics_version == 'H003':
|
||||
if ebics_version == "H003":
|
||||
bank._order_number = self.ebics_config_id._get_order_number()
|
||||
OrderID = client.HIA()
|
||||
_logger.info('%s, EBICS HIA command, OrderID=%s', self._name, OrderID)
|
||||
if ebics_version == 'H003':
|
||||
_logger.info("%s, EBICS HIA command, OrderID=%s", self._name, OrderID)
|
||||
if ebics_version == "H003":
|
||||
self.ebics_config_id._update_order_number(OrderID)
|
||||
|
||||
# Create an INI-letter which must be printed and sent to the bank.
|
||||
ebics_config_bank = self.ebics_config_id.journal_ids[0].bank_id
|
||||
cc = ebics_config_bank.country.code
|
||||
if cc in ['FR', 'DE']:
|
||||
if cc in ["FR", "DE"]:
|
||||
lang = cc
|
||||
else:
|
||||
lang = self.env.user.lang or \
|
||||
self.env['res.lang'].search([])[0].code
|
||||
lang = self.env.user.lang or self.env["res.lang"].search([])[0].code
|
||||
lang = lang[:2]
|
||||
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_files + '/tmp')
|
||||
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_files + "/tmp")
|
||||
if not os.path.isdir(tmp_dir):
|
||||
os.makedirs(tmp_dir, mode=0o700)
|
||||
fn_date = fields.Date.today().isoformat()
|
||||
fn = '_'.join(
|
||||
[self.ebics_config_id.ebics_host, 'ini_letter', fn_date]) + '.pdf'
|
||||
full_tmp_fn = os.path.normpath(tmp_dir + '/' + fn)
|
||||
fn = "_".join([self.ebics_config_id.ebics_host, "ini_letter", fn_date]) + ".pdf"
|
||||
full_tmp_fn = os.path.normpath(tmp_dir + "/" + fn)
|
||||
user.create_ini_letter(
|
||||
bankname=ebics_config_bank.name,
|
||||
path=full_tmp_fn,
|
||||
lang=lang)
|
||||
with open(full_tmp_fn, 'rb') as f:
|
||||
bankname=ebics_config_bank.name, path=full_tmp_fn, lang=lang
|
||||
)
|
||||
with open(full_tmp_fn, "rb") as f:
|
||||
letter = f.read()
|
||||
self.write({
|
||||
'ebics_ini_letter': base64.encodebytes(letter),
|
||||
'ebics_ini_letter_fn': fn,
|
||||
})
|
||||
self.write(
|
||||
{
|
||||
"ebics_ini_letter": base64.encodebytes(letter),
|
||||
"ebics_ini_letter_fn": fn,
|
||||
}
|
||||
)
|
||||
|
||||
return self.write({'state': 'init'})
|
||||
return self.write({"state": "init"})
|
||||
|
||||
def ebics_init_2(self):
|
||||
"""
|
||||
Initialization of bank keys - Step 2:
|
||||
Activation of the account by the bank.
|
||||
"""
|
||||
if self.state != 'init':
|
||||
raise UserError(
|
||||
_("Set state to 'Initialisation'."))
|
||||
if self.state != "init":
|
||||
raise UserError(_("Set state to 'Initialisation'."))
|
||||
self.ensure_one()
|
||||
return self.write({'state': 'get_bank_keys'})
|
||||
return self.write({"state": "get_bank_keys"})
|
||||
|
||||
def ebics_init_3(self):
|
||||
"""
|
||||
@@ -376,26 +394,27 @@ class EbicsUserID(models.Model):
|
||||
"""
|
||||
self.ensure_one()
|
||||
self.ebics_config_id._check_ebics_files()
|
||||
if self.state != 'get_bank_keys':
|
||||
raise UserError(
|
||||
_("Set state to 'Get Keys from Bank'."))
|
||||
if self.state != "get_bank_keys":
|
||||
raise UserError(_("Set state to 'Get Keys from Bank'."))
|
||||
try:
|
||||
keyring = EbicsKeyRing(
|
||||
keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase)
|
||||
keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase
|
||||
)
|
||||
bank = EbicsBank(
|
||||
keyring=keyring,
|
||||
hostid=self.ebics_config_id.ebics_host,
|
||||
url=self.ebics_config_id.ebics_url)
|
||||
url=self.ebics_config_id.ebics_url,
|
||||
)
|
||||
user = EbicsUser(
|
||||
keyring=keyring,
|
||||
partnerid=self.ebics_config_id.ebics_partner,
|
||||
userid=self.name)
|
||||
client = EbicsClient(
|
||||
bank, user, version=self.ebics_config_id.ebics_version)
|
||||
userid=self.name,
|
||||
)
|
||||
client = EbicsClient(bank, user, version=self.ebics_config_id.ebics_version)
|
||||
except Exception:
|
||||
exctype, value = exc_info()[:2]
|
||||
error = _("EBICS Initialisation Error:")
|
||||
error += '\n' + str(exctype) + '\n' + str(value)
|
||||
error += "\n" + str(exctype) + "\n" + str(value)
|
||||
raise UserError(error)
|
||||
|
||||
try:
|
||||
@@ -403,28 +422,31 @@ class EbicsUserID(models.Model):
|
||||
except EbicsFunctionalError:
|
||||
e = exc_info()
|
||||
error = _("EBICS Functional Error:")
|
||||
error += '\n'
|
||||
error += '%s (code: %s)' % (e[1].message, e[1].code)
|
||||
error += "\n"
|
||||
error += "{} (code: {})".format(e[1].message, e[1].code)
|
||||
raise UserError(error)
|
||||
except Exception:
|
||||
exctype, value = exc_info()[:2]
|
||||
error = _("EBICS Initialisation Error:")
|
||||
error += '\n' + str(exctype) + '\n' + str(value)
|
||||
error += "\n" + str(exctype) + "\n" + str(value)
|
||||
raise UserError(error)
|
||||
|
||||
public_bank_keys = public_bank_keys.encode()
|
||||
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_files + '/tmp')
|
||||
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_files + "/tmp")
|
||||
if not os.path.isdir(tmp_dir):
|
||||
os.makedirs(tmp_dir, mode=0o700)
|
||||
fn_date = fields.Date.today().isoformat()
|
||||
fn = '_'.join(
|
||||
[self.ebics_config_id.ebics_host, 'public_bank_keys', fn_date]
|
||||
) + '.txt'
|
||||
self.write({
|
||||
'ebics_public_bank_keys': base64.encodestring(public_bank_keys),
|
||||
'ebics_public_bank_keys_fn': fn,
|
||||
'state': 'to_verify',
|
||||
})
|
||||
fn = (
|
||||
"_".join([self.ebics_config_id.ebics_host, "public_bank_keys", fn_date])
|
||||
+ ".txt"
|
||||
)
|
||||
self.write(
|
||||
{
|
||||
"ebics_public_bank_keys": base64.encodestring(public_bank_keys),
|
||||
"ebics_public_bank_keys_fn": fn,
|
||||
"state": "to_verify",
|
||||
}
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
@@ -435,32 +457,32 @@ class EbicsUserID(models.Model):
|
||||
and activate the bank keyu.
|
||||
"""
|
||||
self.ensure_one()
|
||||
if self.state != 'to_verify':
|
||||
raise UserError(
|
||||
_("Set state to 'Verification'."))
|
||||
if self.state != "to_verify":
|
||||
raise UserError(_("Set state to 'Verification'."))
|
||||
|
||||
keyring = EbicsKeyRing(
|
||||
keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase)
|
||||
keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase
|
||||
)
|
||||
bank = EbicsBank(
|
||||
keyring=keyring,
|
||||
hostid=self.ebics_config_id.ebics_host,
|
||||
url=self.ebics_config_id.ebics_url)
|
||||
url=self.ebics_config_id.ebics_url,
|
||||
)
|
||||
bank.activate_keys()
|
||||
return self.write({'state': 'active_keys'})
|
||||
return self.write({"state": "active_keys"})
|
||||
|
||||
def change_passphrase(self):
|
||||
self.ensure_one()
|
||||
ctx = dict(self._context, default_ebics_userid_id=self.id)
|
||||
module = __name__.split('addons.')[1].split('.')[0]
|
||||
view = self.env.ref(
|
||||
'%s.ebics_change_passphrase_view_form' % module)
|
||||
module = __name__.split("addons.")[1].split(".")[0]
|
||||
view = self.env.ref("%s.ebics_change_passphrase_view_form" % module)
|
||||
return {
|
||||
'name': _('EBICS keys change passphrase'),
|
||||
'view_type': 'form',
|
||||
'view_mode': 'form',
|
||||
'res_model': 'ebics.change.passphrase',
|
||||
'view_id': view.id,
|
||||
'target': 'new',
|
||||
'context': ctx,
|
||||
'type': 'ir.actions.act_window',
|
||||
"name": _("EBICS keys change passphrase"),
|
||||
"view_type": "form",
|
||||
"view_mode": "form",
|
||||
"res_model": "ebics.change.passphrase",
|
||||
"view_id": view.id,
|
||||
"target": "new",
|
||||
"context": ctx,
|
||||
"type": "ir.actions.act_window",
|
||||
}
|
||||
|
||||
@@ -13,24 +13,25 @@ try:
|
||||
import fintech
|
||||
except ImportError:
|
||||
fintech = None
|
||||
_logger.warning('Failed to import fintech')
|
||||
_logger.warning("Failed to import fintech")
|
||||
|
||||
fintech_register_name = config.get('fintech_register_name')
|
||||
fintech_register_keycode = config.get('fintech_register_keycode')
|
||||
fintech_register_users = config.get('fintech_register_users')
|
||||
fintech_register_name = config.get("fintech_register_name")
|
||||
fintech_register_keycode = config.get("fintech_register_keycode")
|
||||
fintech_register_users = config.get("fintech_register_users")
|
||||
|
||||
try:
|
||||
if fintech:
|
||||
fintech_register_users = (
|
||||
fintech_register_users
|
||||
and [x.strip() for x in fintech_register_users.split(',')]
|
||||
and [x.strip() for x in fintech_register_users.split(",")]
|
||||
or None
|
||||
)
|
||||
fintech.cryptolib = 'cryptography'
|
||||
fintech.cryptolib = "cryptography"
|
||||
fintech.register(
|
||||
name=fintech_register_name,
|
||||
keycode=fintech_register_keycode,
|
||||
users=fintech_register_users)
|
||||
users=fintech_register_users,
|
||||
)
|
||||
except RuntimeError as e:
|
||||
if str(e) == "'register' can be called only once":
|
||||
pass
|
||||
@@ -39,7 +40,7 @@ except RuntimeError as e:
|
||||
fintech.register()
|
||||
except Exception:
|
||||
msg = "fintech.register error"
|
||||
tb = ''.join(format_exception(*exc_info()))
|
||||
msg += '\n%s' % tb
|
||||
tb = "".join(format_exception(*exc_info()))
|
||||
msg += "\n%s" % tb
|
||||
_logger.error(msg)
|
||||
fintech.register()
|
||||
|
||||
Reference in New Issue
Block a user