From 3df29fc9c750af2f787ebcdc310bd76bb0f96441 Mon Sep 17 00:00:00 2001
From: ?ngel ?lvarez <angel@nan-tic.com>
Date: Thu, 18 Apr 2019 10:27:44 +0200
Subject: [PATCH] adapt to python3

---
 aeat.xml   |  4 ----
 company.py | 18 +++++++++++++-----
 invoice.py |  3 +--
 tools.py   |  4 +---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/aeat.xml b/aeat.xml
index ac6b0c1..fcc6b06 100644
--- a/aeat.xml
+++ b/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"
diff --git a/company.py b/company.py
index a3813e7..cecab60 100644
--- a/company.py
+++ b/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)
 
diff --git a/invoice.py b/invoice.py
index 6aea43d..db5fd54 100644
--- a/invoice.py
+++ b/invoice.py
@@ -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 = []
diff --git a/tools.py b/tools.py
index 08c2a50..8571eb6 100644
--- a/tools.py
+++ b/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"")