mirror of
https://gitlab.com/datalifeit/trytond-aeat_sii
synced 2023-12-13 20:30:37 +01:00
adapt to python3
This commit is contained in:
parent
cf1e6a7878
commit
3df29fc9c7
4 changed files with 15 additions and 14 deletions
4
aeat.xml
4
aeat.xml
|
@ -10,10 +10,6 @@
|
|||
<field name="user" ref="res.user_admin"/>
|
||||
<field name="group" ref="group_aeat_sii_admin"/>
|
||||
</record>
|
||||
<record model="res.user-res.group" id="user_trigger_group_aeat_sii_admin">
|
||||
<field name="user" ref="res.user_trigger"/>
|
||||
<field name="group" ref="group_aeat_sii_admin"/>
|
||||
</record>
|
||||
|
||||
<menuitem id="menu_aeat_sii_report_menu"
|
||||
sequence="999" parent="account.menu_reporting"
|
||||
|
|
18
company.py
18
company.py
|
@ -35,10 +35,16 @@ class Company(metaclass=PoolMeta):
|
|||
converter = len
|
||||
default = 0
|
||||
|
||||
pkeys = [
|
||||
company._get_private_key(name)
|
||||
for company in companies
|
||||
]
|
||||
pkeys = []
|
||||
for company in companies:
|
||||
key = company._get_private_key(name)
|
||||
if not key:
|
||||
continue
|
||||
pkeys.append(key)
|
||||
|
||||
if not pkeys:
|
||||
return {company.id:None for x in companies}
|
||||
|
||||
return {
|
||||
company.id: converter(pkey) if pkey else default
|
||||
for (company, pkey) in zip(companies, pkeys)
|
||||
|
@ -48,6 +54,8 @@ class Company(metaclass=PoolMeta):
|
|||
if not self.encrypted_private_key:
|
||||
return None
|
||||
fernet = self.get_fernet_key()
|
||||
if not fernet:
|
||||
return None
|
||||
decrypted_key = fernet.decrypt(bytes(self.encrypted_private_key))
|
||||
return decrypted_key
|
||||
|
||||
|
@ -64,7 +72,7 @@ class Company(metaclass=PoolMeta):
|
|||
fernet_key = config.get('cryptography', 'fernet_key')
|
||||
if not fernet_key:
|
||||
_logger.error('Missing Fernet key configuration')
|
||||
raise UserError(gettext('aeat_sii.msg_missing_fernet_key'))
|
||||
# raise UserError(gettext('aeat_sii.msg_missing_fernet_key'))
|
||||
else:
|
||||
return Fernet(fernet_key)
|
||||
|
||||
|
|
|
@ -94,8 +94,7 @@ class Invoice(metaclass=PoolMeta):
|
|||
('sii_pending_sending', '=', True),
|
||||
('sii_state', '=', 'Correcto'),
|
||||
('sii_header', '!=', None),
|
||||
('type', '=', 'out'),
|
||||
])
|
||||
])
|
||||
|
||||
# search issued invoices [delete]
|
||||
delete_issued_invoices = []
|
||||
|
|
4
tools.py
4
tools.py
|
@ -14,8 +14,6 @@ def normalize(text):
|
|||
|
||||
|
||||
def unaccent(text):
|
||||
if isinstance(text, bytes):
|
||||
text = str(text, 'utf-8')
|
||||
output = text
|
||||
for c in range(len(src_chars)):
|
||||
if c >= len(dst_chars):
|
||||
|
@ -23,4 +21,4 @@ def unaccent(text):
|
|||
output = output.replace(src_chars[c], dst_chars[c])
|
||||
output = unicodedata.normalize('NFKD', output).encode('ASCII',
|
||||
'ignore')
|
||||
return output.strip('_').encode('utf-8')
|
||||
return output.replace(b"_",b"")
|
||||
|
|
Loading…
Reference in a new issue