[IMP] l10n_es{,edi_sii,edi_tbai}: move some code to l10n_es

The moved code will also be needed for Veri*Factu

- patched http adapter
- a function to retrieve partner info

part of
task-3745982

Part-of: odoo#197635
Signed-off-by: Sven Führ (svfu) <[email protected]>

Author: svfu-odoo

addons/l10n_es/__init__.py

@@ -1,2 +1,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from . import models
+from . import tools

addons/l10n_es/models/__init__.py

@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from . import account_move
 from . import account_tax
+from . import res_partner
 from . import template_es_assec
 from . import template_es_common
 from . import template_es_coop_full

addons/l10n_es/models/res_partner.py

@@ -0,0 +1,31 @@
+from odoo import models
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    def _l10n_es_edi_get_partner_info(self):
+        self.ensure_one()
+        eu_country_codes = set(self.env.ref('base.europe').country_ids.mapped('code'))
+
+        partner_info = {}
+        IDOtro_ID = self.vat or 'NO_DISPONIBLE'
+
+        if (not self.country_id or self.country_id.code == 'ES') and self.vat:
+            # ES partner with VAT.
+            partner_info['NIF'] = self.vat.removeprefix('ES')
+            if self.env.context.get('error_1117'):
+                partner_info['IDOtro'] = {'IDType': '07', 'ID': IDOtro_ID}
+
+        elif self.country_id.code in eu_country_codes and self.vat:
+            # European partner.
+            partner_info['IDOtro'] = {'IDType': '02', 'ID': IDOtro_ID}
+        else:
+            partner_info['IDOtro'] = {'ID': IDOtro_ID}
+            if self.vat:
+                partner_info['IDOtro']['IDType'] = '04'
+            else:
+                partner_info['IDOtro']['IDType'] = '06'
+            if self.country_id:
+                partner_info['IDOtro']['CodigoPais'] = self.country_id.code
+        return partner_info

addons/l10n_es/tools/__init__.py

@@ -0,0 +1 @@
+from . import http_adapter

addons/l10n_es/tools/http_adapter.py

@@ -0,0 +1,47 @@
+import requests
+
+from urllib3.util.ssl_ import create_urllib3_context
+from urllib3.contrib.pyopenssl import inject_into_urllib3
+from OpenSSL.crypto import load_certificate, load_privatekey, FILETYPE_PEM
+
+# Custom patches to perform the WSDL requests.
+# Avoid failure on servers where the DH key is too small
+EUSKADI_CIPHERS = "DEFAULT:!DH"
+
+
+class PatchedHTTPAdapter(requests.adapters.HTTPAdapter):
+    """ An adapter to block DH ciphers which may not work for the tax agencies called"""
+
+    def init_poolmanager(self, *args, **kwargs):
+        # OVERRIDE
+        inject_into_urllib3()
+        kwargs['ssl_context'] = create_urllib3_context(ciphers=EUSKADI_CIPHERS)
+        return super().init_poolmanager(*args, **kwargs)
+
+    def cert_verify(self, conn, url, verify, cert):
+        # OVERRIDE
+        # The last parameter is only used by the super method to check if the file exists.
+        # In our case, cert is an odoo record 'l10n_es_edi.certificate' so not a path to a file.
+        # By putting 'None' as last parameter, we ensure the check about TLS configuration is
+        # still made without checking temporary files exist.
+        super().cert_verify(conn, url, verify, None)
+        conn.cert_file = cert
+        conn.key_file = None
+
+    def get_connection(self, url, proxies=None):
+        # OVERRIDE
+        # Patch the OpenSSLContext to decode the certificate in-memory.
+        conn = super().get_connection(url, proxies=proxies)
+        context = conn.conn_kw['ssl_context']
+
+        def patched_load_cert_chain(l10n_es_odoo_certificate, keyfile=None, password=None):
+            cert_file, key_file, _certificate = l10n_es_odoo_certificate.sudo()._decode_certificate()
+            cert_obj = load_certificate(FILETYPE_PEM, cert_file)
+            pkey_obj = load_privatekey(FILETYPE_PEM, key_file)
+
+            context._ctx.use_certificate(cert_obj)
+            context._ctx.use_privatekey(pkey_obj)
+
+        context.load_cert_chain = patched_load_cert_chain
+
+        return conn

addons/l10n_es_edi_sii/models/account_edi_format.py

@@ -1,61 +1,16 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from collections import defaultdict
-from urllib3.util.ssl_ import create_urllib3_context
-from urllib3.contrib.pyopenssl import inject_into_urllib3
-from OpenSSL.crypto import load_certificate, load_privatekey, FILETYPE_PEM
 
 from odoo import fields, models, _
+from odoo.addons.l10n_es.tools.http_adapter import PatchedHTTPAdapter
 from odoo.tools import html_escape, zeep
 
 import math
 import json
 import requests
 
 
-# Custom patches to perform the WSDL requests.
-# Avoid failure on servers where the DH key is too small
-EUSKADI_CIPHERS = "DEFAULT:!DH"
-
-
-class PatchedHTTPAdapter(requests.adapters.HTTPAdapter):
-    """ An adapter to block DH ciphers which may not work for the tax agencies called"""
-
-    def init_poolmanager(self, *args, **kwargs):
-        # OVERRIDE
-        inject_into_urllib3()
-        kwargs['ssl_context'] = create_urllib3_context(ciphers=EUSKADI_CIPHERS)
-        return super().init_poolmanager(*args, **kwargs)
-
-    def cert_verify(self, conn, url, verify, cert):
-        # OVERRIDE
-        # The last parameter is only used by the super method to check if the file exists.
-        # In our case, cert is an odoo record 'l10n_es_edi.certificate' so not a path to a file.
-        # By putting 'None' as last parameter, we ensure the check about TLS configuration is
-        # still made without checking temporary files exist.
-        super().cert_verify(conn, url, verify, None)
-        conn.cert_file = cert
-        conn.key_file = None
-
-    def get_connection(self, url, proxies=None):
-        # OVERRIDE
-        # Patch the OpenSSLContext to decode the certificate in-memory.
-        conn = super().get_connection(url, proxies=proxies)
-        context = conn.conn_kw['ssl_context']
-
-        def patched_load_cert_chain(l10n_es_odoo_certificate, keyfile=None, password=None):
-            cert_file, key_file, _certificate = l10n_es_odoo_certificate.sudo()._decode_certificate()
-            cert_obj = load_certificate(FILETYPE_PEM, cert_file)
-            pkey_obj = load_privatekey(FILETYPE_PEM, key_file)
-
-            context._ctx.use_certificate(cert_obj)
-            context._ctx.use_privatekey(pkey_obj)
-
-        context.load_cert_chain = patched_load_cert_chain
-
-        return conn
-
-
 class AccountEdiFormat(models.Model):
     _inherit = 'account.edi.format'
 
@@ -237,29 +192,7 @@ def full_filter_invl_to_apply(invoice_line):
         }
 
     def _l10n_es_edi_get_partner_info(self, partner):
-        eu_country_codes = set(self.env.ref('base.europe').country_ids.mapped('code'))
-
-        partner_info = {}
-        IDOtro_ID = partner.vat or 'NO_DISPONIBLE'
-
-        if (not partner.country_id or partner.country_id.code == 'ES') and partner.vat:
-            # ES partner with VAT.
-            partner_info['NIF'] = partner.vat[2:] if partner.vat.startswith('ES') else partner.vat
-            if self.env.context.get('error_1117'):
-                partner_info['IDOtro'] = {'IDType': '07', 'ID': IDOtro_ID}
-
-        elif partner.country_id.code in eu_country_codes and partner.vat:
-            # European partner.
-            partner_info['IDOtro'] = {'IDType': '02', 'ID': IDOtro_ID}
-        else:
-            partner_info['IDOtro'] = {'ID': IDOtro_ID}
-            if partner.vat:
-                partner_info['IDOtro']['IDType'] = '04'
-            else:
-                partner_info['IDOtro']['IDType'] = '06'
-            if partner.country_id:
-                partner_info['IDOtro']['CodigoPais'] = partner.country_id.code
-        return partner_info
+        return partner._l10n_es_edi_get_partner_info()
 
     def _l10n_es_edi_get_invoices_info(self, invoices):
         eu_country_codes = set(self.env.ref('base.europe').country_ids.mapped('code'))

addons/l10n_es_edi_tbai/models/account_edi_format.py

@@ -17,7 +17,7 @@
 from requests.exceptions import RequestException
 
 from odoo import _, models, release
-from odoo.addons.l10n_es_edi_sii.models.account_edi_format import PatchedHTTPAdapter
+from odoo.addons.l10n_es.tools.http_adapter import PatchedHTTPAdapter
 from odoo.addons.l10n_es_edi_tbai.models.l10n_es_edi_tbai_agencies import get_key
 from odoo.addons.l10n_es_edi_tbai.models.xml_utils import (
     NS_MAP, bytes_as_block, calculate_references_digests,

addons/l10n_es_pos/__manifest__.py

@@ -6,7 +6,6 @@
     'category': 'Accounting/Localizations/Point of Sale',
     'summary': """Spanish localization for Point of Sale""",
     'depends': ['point_of_sale', 'l10n_es'],
-    'auto_install': True,
     'license': 'LGPL-3',
     'data': [
         'views/res_config_settings_views.xml',