Mirror/odoo_account_ebics
2
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2025-08-02 16:59:20 +00:00
Code Issues Projects Releases Wiki Activity

various fixes

Browse Source
This commit is contained in:
Luc De Meyer
2020-07-14 23:18:32 +02:00
parent 113caae673
commit f16e81f0a4
5 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
account_ebics/wizards/ebics_change_passphrase.py
View File

@@ -20,9 +20,9 @@ class EbicsChangePassphrase(models.TransientModel):
_name = 'ebics.change.passphrase'
_description = 'Change EBICS keys passphrase'
ebics_config_id = fields.Many2one(
comodel_name='ebics.config',
string='EBICS Configuration',
ebics_userid_id = fields.Many2one(
comodel_name='ebics.userid',
string='EBICS UserID',
readonly=True)
old_pass = fields.Char(
string='Old Passphrase',
@@ -37,23 +37,23 @@ class EbicsChangePassphrase(models.TransientModel):
def change_passphrase(self):
self.ensure_one()
if self.old_pass != self.ebics_config_id.ebics_passphrase:
if self.old_pass != self.ebics_userid_id.ebics_passphrase:
raise UserError(_(
"Incorrect old passphrase."))
if self.new_pass != self.new_pass_check:
raise UserError(_(
"New passphrase verification error."))
if self.new_pass == self.ebics_config_id.ebics_passphrase:
if self.new_pass == self.ebics_userid_id.ebics_passphrase:
raise UserError(_(
"New passphrase equal to old passphrase."))
try:
keyring = EbicsKeyRing(
keys=self.ebics_config_id.ebics_keys,
passphrase=self.ebics_config_id.ebics_passphrase)
keys=self.ebics_userid_id.ebics_keys_fn,
passphrase=self.ebics_userid_id.ebics_passphrase)
keyring.change_passphrase(self.new_pass)
except ValueError as e:
raise UserError(str(e))
self.ebics_config_id.ebics_passphrase = self.new_pass
self.ebics_userid.ebics_passphrase = self.new_pass
self.note = "The EBICS Passphrase has been changed."
module = __name__.split('addons.')[1].split('.')[0]

18
account_ebics/wizards/ebics_xfer.py
View File

@@ -277,10 +277,10 @@ class EbicsXfer(models.TransientModel):
and getattr(client, order_type)
if order_type == 'FUL':
kwargs = {}
# bank = self.ebics_config_id.bank_id.bank v8.0
bank = self.ebics_config_id.bank_id.bank_id
if bank.country:
kwargs['country'] = bank.country.code
bank = self.ebics_config_id.journal_ids[0].bank_id
cc = bank.country.code
if cc:
kwargs['country'] = cc
if self.test_mode:
kwargs['TEST'] = 'TRUE'
OrderID = method(ef_format.name, upload_data, **kwargs)
@@ -298,7 +298,7 @@ class EbicsXfer(models.TransientModel):
"EBICS File has been uploaded (OrderID %s)."
) % OrderID
ef_note = _("EBICS OrderID: %s") % OrderID
if self._context.get('origin'):
if self.env.context.get('origin'):
ef_note += '\n' + _(
"Origin: %s") % self._context['origin']
suffix = self.format_id.suffix
@@ -351,7 +351,7 @@ class EbicsXfer(models.TransientModel):
self.ebics_config_id._check_ebics_keys()
passphrase = self._get_passphrase()
keyring = EbicsKeyRing(
keys=self.ebics_config_id.ebics_keys,
keys=self.ebics_userid_id.ebics_keys_fn,
passphrase=passphrase)
bank = EbicsBank(
@@ -364,9 +364,9 @@ class EbicsXfer(models.TransientModel):
user = EbicsUser(
keyring=keyring,
partnerid=self.ebics_config_id.ebics_partner,
userid=self.ebics_config_id.ebics_user)
userid=self.ebics_userid_id.name)
signature_class = self.format_id.signature_class \
or self.ebics_config_id.signature_class
or self.ebics_userid_id.signature_class
if signature_class == 'T':
user.manual_approval = True
@@ -383,7 +383,7 @@ class EbicsXfer(models.TransientModel):
return client
def _get_passphrase(self):
passphrase = self.ebics_config_id.ebics_passphrase
passphrase = self.ebics_userid_id.ebics_passphrase
if passphrase:
return passphrase