mirror of
https://github.com/brain-tec/account_ebics.git
synced 2024-11-27 14:37:25 +00:00
fixing merge conflict from Noviat 16.0
This commit is contained in:
commit
083c6162c8
@ -403,7 +403,7 @@ class EbicsUserID(models.Model):
|
|||||||
else:
|
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]
|
lang = lang[:2]
|
||||||
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_host + "/tmp")
|
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_keys + "/tmp")
|
||||||
if not os.path.isdir(tmp_dir):
|
if not os.path.isdir(tmp_dir):
|
||||||
os.makedirs(tmp_dir, mode=0o700)
|
os.makedirs(tmp_dir, mode=0o700)
|
||||||
fn_date = fields.Date.today().isoformat()
|
fn_date = fields.Date.today().isoformat()
|
||||||
@ -479,7 +479,7 @@ class EbicsUserID(models.Model):
|
|||||||
raise UserError(error) from err
|
raise UserError(error) from err
|
||||||
|
|
||||||
public_bank_keys = public_bank_keys.encode()
|
public_bank_keys = public_bank_keys.encode()
|
||||||
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_host + "/tmp")
|
tmp_dir = os.path.normpath(self.ebics_config_id.ebics_keys + "/tmp")
|
||||||
if not os.path.isdir(tmp_dir):
|
if not os.path.isdir(tmp_dir):
|
||||||
os.makedirs(tmp_dir, mode=0o700)
|
os.makedirs(tmp_dir, mode=0o700)
|
||||||
fn_date = fields.Date.today().isoformat()
|
fn_date = fields.Date.today().isoformat()
|
||||||
|
Loading…
Reference in New Issue
Block a user