From ed2c3e5a82c2f6a386044023a0bb41aaee63b1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ant=C3=B3=20Garc=C3=ADa?= Date: Mon, 27 Nov 2023 12:40:33 +0100 Subject: [PATCH] [MIG] l10n_es_partner: Migration to 17.0 --- l10n_es_partner/README.rst | 3 +++ l10n_es_partner/__manifest__.py | 2 +- l10n_es_partner/models/res_partner.py | 22 +++++++++---------- l10n_es_partner/readme/CONTRIBUTORS.md | 2 ++ l10n_es_partner/static/description/index.html | 4 ++++ l10n_es_partner/tests/test_l10n_es_partner.py | 12 ++++++++-- l10n_es_partner/views/res_partner_view.xml | 4 ++-- .../wizard/l10n_es_partner_wizard.py | 7 +++--- .../wizard/l10n_es_partner_wizard.xml | 8 +++---- 9 files changed, 40 insertions(+), 24 deletions(-) diff --git a/l10n_es_partner/README.rst b/l10n_es_partner/README.rst index 6bd161071d8..75dfa6767fa 100644 --- a/l10n_es_partner/README.rst +++ b/l10n_es_partner/README.rst @@ -104,6 +104,9 @@ Contributors - Ismael Calvo - Carlos Dauden - Manuel Regidor +- `APSL `__: + + - Javier Antó Maintainers ----------- diff --git a/l10n_es_partner/__manifest__.py b/l10n_es_partner/__manifest__.py index c4457cf00f5..20b44352749 100644 --- a/l10n_es_partner/__manifest__.py +++ b/l10n_es_partner/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Adaptación de los clientes, proveedores y bancos para España", - "version": "16.0.2.1.0", + "version": "17.0.1.0.0", "author": "ZikZak," "Acysos," "Tecnativa," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/l10n-spain", "category": "Localisation/Europe", diff --git a/l10n_es_partner/models/res_partner.py b/l10n_es_partner/models/res_partner.py index d3f44bc5504..ceb6c10c50b 100644 --- a/l10n_es_partner/models/res_partner.py +++ b/l10n_es_partner/models/res_partner.py @@ -13,23 +13,23 @@ class ResPartner(models.Model): display_name = fields.Char(compute="_compute_display_name") @api.depends("comercial") + @api.depends_context("no_display_commercial") def _compute_display_name(self): - return super()._compute_display_name() - - def _get_name(self): name_pattern = ( self.env["ir.config_parameter"] .sudo() .get_param("l10n_es_partner.name_pattern", default="") ) - origin = super()._get_name() - if ( - self.env.context.get("no_display_commercial", False) - or not name_pattern - or not self.comercial - ): - return origin - return name_pattern % {"name": origin, "comercial_name": self.comercial} + super()._compute_display_name() + no_display_commercial = self.env.context.get("no_display_commercial") + for partner in self: + if no_display_commercial or not name_pattern or not partner.comercial: + partner.display_name = partner.complete_name + else: + partner.display_name = name_pattern % { + "name": partner.display_name, + "comercial_name": partner.comercial, + } @api.model def _commercial_fields(self): diff --git a/l10n_es_partner/readme/CONTRIBUTORS.md b/l10n_es_partner/readme/CONTRIBUTORS.md index beb8070fd64..58e05fe3ca9 100644 --- a/l10n_es_partner/readme/CONTRIBUTORS.md +++ b/l10n_es_partner/readme/CONTRIBUTORS.md @@ -5,3 +5,5 @@ - Ismael Calvo \<\> - Carlos Dauden \<\> - Manuel Regidor \<\> +- [APSL](https://apsl.tech): + - Javier Antó \<\> diff --git a/l10n_es_partner/static/description/index.html b/l10n_es_partner/static/description/index.html index a8ed238f17b..1e90029c39d 100644 --- a/l10n_es_partner/static/description/index.html +++ b/l10n_es_partner/static/description/index.html @@ -451,6 +451,10 @@

Contributors

  • Ismael Calvo <ismael.calvo@factorlibre.com>
  • Carlos Dauden <carlos.dauden@tecnativa.com>
  • Manuel Regidor <manuel.regidor@sygel.es>
    • +
  • APSL: +
    • diff --git a/l10n_es_partner/tests/test_l10n_es_partner.py b/l10n_es_partner/tests/test_l10n_es_partner.py index 49d229ee53c..e8df6708227 100644 --- a/l10n_es_partner/tests/test_l10n_es_partner.py +++ b/l10n_es_partner/tests/test_l10n_es_partner.py @@ -70,7 +70,15 @@ def test_name(self): self.assertEqual(partner2.display_name, "Nombre comercial (Empresa de prueba)") partner2.write({"comercial": "Nuevo nombre"}) self.assertEqual(partner2.display_name, "Nuevo nombre (Empresa de prueba)") - names = dict(partner2.with_context(no_display_commercial=True).name_get()) + names = dict( + [ + ( + partner2.id, + partner2.with_context(no_display_commercial=True).display_name, + ) + ] + ) self.assertEqual(names.get(partner2.id), "Empresa de prueba") - names = dict(partner2.name_get()) + names = dict([(partner2.id, partner2.display_name)]) + # names = dict(partner2.display_name) self.assertEqual(names.get(partner2.id), "Nuevo nombre (Empresa de prueba)") diff --git a/l10n_es_partner/views/res_partner_view.xml b/l10n_es_partner/views/res_partner_view.xml index 4f41f98423f..99e9ceb1270 100644 --- a/l10n_es_partner/views/res_partner_view.xml +++ b/l10n_es_partner/views/res_partner_view.xml @@ -8,7 +8,7 @@ @@ -21,7 +21,7 @@ diff --git a/l10n_es_partner/wizard/l10n_es_partner_wizard.py b/l10n_es_partner/wizard/l10n_es_partner_wizard.py index 793c302a633..2c449a49401 100644 --- a/l10n_es_partner/wizard/l10n_es_partner_wizard.py +++ b/l10n_es_partner/wizard/l10n_es_partner_wizard.py @@ -24,7 +24,7 @@ def import_local(self): path = os.path.join("l10n_es_partner", "wizard", "data_banks.xml") with tools.file_open(path) as fp: tools.convert_xml_import( - self._cr, "l10n_es_partner", fp, {}, "init", noupdate=True + self.env, "l10n_es_partner", fp, {}, "init", noupdate=True ) return res @@ -36,7 +36,7 @@ def execute(self): try: response = requests.get( "https://www.bde.es/f/webbde/SGE/regis/REGBANESP_CONESTAB_A.xls", - timeout=5, + timeout=10, ) response.raise_for_status() src_file.write(response.content) @@ -46,6 +46,7 @@ def execute(self): requests.exceptions.HTTPError, requests.exceptions.ConnectTimeout, requests.exceptions.ReadTimeout, + requests.exceptions.ConnectionError, ): # BDE is forbidding on certain conditions to get the file, so we use a # local file. Latest update: 2023-10-07 @@ -56,7 +57,7 @@ def execute(self): # Generate XML and import it gen_bank_data_xml(src_file_name, dest_file.name) tools.convert_xml_import( - self._cr, "l10n_es_partner", dest_file.name, {}, "init", noupdate=True + self.env, "l10n_es_partner", dest_file.name, {}, "init", noupdate=True ) os.remove(src_file.name) os.remove(dest_file.name) diff --git a/l10n_es_partner/wizard/l10n_es_partner_wizard.xml b/l10n_es_partner/wizard/l10n_es_partner_wizard.xml index 4766bab1255..9e556670770 100644 --- a/l10n_es_partner/wizard/l10n_es_partner_wizard.xml +++ b/l10n_es_partner/wizard/l10n_es_partner_wizard.xml @@ -15,7 +15,7 @@ Import spanish bank data - +

    This wizard will import spanish bank data. You can choose to import it from:

    @@ -29,7 +29,7 @@     @@ -42,9 +42,7 @@