Skip to content

Commit cf56d20

Browse files
committed
Merge PR #3879 into 17.0
Signed-off-by HaraldPanten
2 parents 1eb6686 + f00ed26 commit cf56d20

File tree

5 files changed

+70
-25
lines changed

5 files changed

+70
-25
lines changed

l10n_es_partner/README.rst

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ Incluye la siguiente funcionalidad:
3636
el nombre comercial de la empresa.
3737
- Añade los campos nombre largo, NIF y web a los bancos.
3838
- Añade los datos de los bancos españoles extraídos del registro
39-
oficial del Banco de España (http://goo.gl/mtx6ic). El asistente
39+
oficial del Banco de España
40+
(`http://goo.gl/mtx6ic <http://goo.gl/mtx6ic>`__). El asistente
4041
realiza la descarga automática de Internet, pero si por cualquier
4142
razón hay algún problema, existe una copia local cuya última
4243
actualización fue el 26/10/2017.
@@ -50,7 +51,8 @@ Installation
5051
============
5152

5253
Este módulo depende de *base_bank_from_iban* que se encuentra en el
53-
repositorio https://github.com/OCA/community-data-files
54+
repositorio
55+
`https://github.com/OCA/community-data-files <https://github.com/OCA/community-data-files>`__
5456

5557
Configuration
5658
=============
@@ -72,7 +74,8 @@ para nombre comercial.
7274
Known issues / Roadmap
7375
======================
7476

75-
- Take BICs from https://github.com/PeterNotenboom/SwiftCodes.
77+
- Take BICs from
78+
`https://github.com/PeterNotenboom/SwiftCodes <https://github.com/PeterNotenboom/SwiftCodes>`__.
7679

7780
Bug Tracker
7881
===========
@@ -108,6 +111,10 @@ Contributors
108111

109112
- Javier Antó <[email protected]>
110113

114+
- `Dixmit <https://www.dixmit.com>`__:
115+
116+
- Enric Tobella
117+
111118
Maintainers
112119
-----------
113120

l10n_es_partner/models/res_partner.py

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,33 @@ class ResPartner(models.Model):
1515
@api.depends("comercial")
1616
@api.depends_context("no_display_commercial")
1717
def _compute_display_name(self):
18-
name_pattern = (
19-
self.env["ir.config_parameter"]
20-
.sudo()
21-
.get_param("l10n_es_partner.name_pattern", default="")
22-
)
23-
no_display_commercial = self.env.context.get("no_display_commercial")
24-
for partner in self:
25-
if no_display_commercial or not name_pattern or not partner.comercial:
26-
super(ResPartner, partner)._compute_display_name()
27-
else:
28-
partner.display_name = name_pattern % {
29-
"name": partner.complete_name,
30-
"comercial_name": partner.comercial,
18+
"""
19+
We are enforcing the new context,
20+
because complete name field will remove the context
21+
"""
22+
return super(
23+
ResPartner,
24+
self.with_context(
25+
display_commercial=not self.env.context.get(
26+
"no_display_commercial", False
27+
)
28+
),
29+
)._compute_display_name()
30+
31+
def _get_complete_name(self):
32+
name = super()._get_complete_name()
33+
if self.env.context.get("display_commercial") and self.comercial:
34+
name_pattern = (
35+
self.env["ir.config_parameter"]
36+
.sudo()
37+
.get_param("l10n_es_partner.name_pattern", default="")
38+
)
39+
if name_pattern:
40+
name = name_pattern % {
41+
"name": name,
42+
"comercial_name": self.comercial,
3143
}
32-
return True
44+
return name
3345

3446
@api.model
3547
def _commercial_fields(self):

l10n_es_partner/readme/CONTRIBUTORS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
- Manuel Regidor \<<[email protected]>\>
88
- [APSL](https://apsl.tech):
99
- Javier Antó \<<[email protected]>\>
10+
- [Dixmit](https://www.dixmit.com):
11+
- Enric Tobella

l10n_es_partner/static/description/index.html

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger ([email protected])
11-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1516
1617
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1718
customize this style sheet.
@@ -274,7 +275,7 @@
274275
margin-left: 2em ;
275276
margin-right: 2em }
276277

277-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
278279
pre.code, code { background-color: #eeeeee }
279280
pre.code .comment, code .comment { color: #5C6576 }
280281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
300301
span.pre {
301302
white-space: pre }
302303

303-
span.problematic {
304+
span.problematic, pre.problematic {
304305
color: red }
305306

306307
span.section-subtitle {
@@ -377,7 +378,8 @@ <h1 class="title">Adaptación de los clientes, proveedores y bancos para España
377378
el nombre comercial de la empresa.</li>
378379
<li>Añade los campos nombre largo, NIF y web a los bancos.</li>
379380
<li>Añade los datos de los bancos españoles extraídos del registro
380-
oficial del Banco de España (<a class="reference external" href="http://goo.gl/mtx6ic">http://goo.gl/mtx6ic</a>). El asistente
381+
oficial del Banco de España
382+
(<a class="reference external" href="http://goo.gl/mtx6ic">http://goo.gl/mtx6ic</a>). El asistente
381383
realiza la descarga automática de Internet, pero si por cualquier
382384
razón hay algún problema, existe una copia local cuya última
383385
actualización fue el 26/10/2017.</li>
@@ -400,7 +402,8 @@ <h1 class="title">Adaptación de los clientes, proveedores y bancos para España
400402
<div class="section" id="installation">
401403
<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
402404
<p>Este módulo depende de <em>base_bank_from_iban</em> que se encuentra en el
403-
repositorio <a class="reference external" href="https://github.com/OCA/community-data-files">https://github.com/OCA/community-data-files</a></p>
405+
repositorio
406+
<a class="reference external" href="https://github.com/OCA/community-data-files">https://github.com/OCA/community-data-files</a></p>
404407
</div>
405408
<div class="section" id="configuration">
406409
<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
@@ -419,7 +422,8 @@ <h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
419422
<div class="section" id="known-issues-roadmap">
420423
<h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
421424
<ul class="simple">
422-
<li>Take BICs from <a class="reference external" href="https://github.com/PeterNotenboom/SwiftCodes">https://github.com/PeterNotenboom/SwiftCodes</a>.</li>
425+
<li>Take BICs from
426+
<a class="reference external" href="https://github.com/PeterNotenboom/SwiftCodes">https://github.com/PeterNotenboom/SwiftCodes</a>.</li>
423427
</ul>
424428
</div>
425429
<div class="section" id="bug-tracker">
@@ -454,12 +458,18 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
454458
<li>Javier Antó &lt;<a class="reference external" href="mailto:janto&#64;apsl.net">janto&#64;apsl.net</a>&gt;</li>
455459
</ul>
456460
</li>
461+
<li><a class="reference external" href="https://www.dixmit.com">Dixmit</a>:<ul>
462+
<li>Enric Tobella</li>
463+
</ul>
464+
</li>
457465
</ul>
458466
</div>
459467
<div class="section" id="maintainers">
460468
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
461469
<p>This module is maintained by the OCA.</p>
462-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
470+
<a class="reference external image-reference" href="https://odoo-community.org">
471+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
472+
</a>
463473
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
464474
mission is to support the collaborative development of Odoo features and
465475
promote its widespread use.</p>

l10n_es_partner/tests/test_l10n_es_partner.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,23 @@ def test_name(self):
6565
"l10n_es_partner.name_pattern", "%(comercial_name)s (%(name)s)"
6666
)
6767
partner2 = self.env["res.partner"].create(
68-
{"name": "Empresa de prueba", "comercial": "Nombre comercial"}
68+
{
69+
"name": "Empresa de prueba",
70+
"comercial": "Nombre comercial",
71+
"street": "My street",
72+
}
6973
)
7074
self.assertEqual(partner2.display_name, "Nombre comercial (Empresa de prueba)")
75+
self.assertEqual(partner2.complete_name, "Empresa de prueba")
76+
self.assertEqual(
77+
partner2.with_context(show_address=True).display_name,
78+
"Nombre comercial (Empresa de prueba)\nMy street",
79+
)
80+
# We will enforce the computation, but nothing should change
81+
partner2.with_context(
82+
show_address=True, display_commercial=True
83+
)._compute_complete_name()
84+
self.assertEqual(partner2.complete_name, "Empresa de prueba")
7185
partner2.write({"comercial": "Nuevo nombre"})
7286
self.assertEqual(partner2.display_name, "Nuevo nombre (Empresa de prueba)")
7387
names = dict(

0 commit comments

Comments
 (0)