Skip to content

Commit 6c517cf

Browse files
yajosimahawk
yajo
authored and
simahawk
committed
Fix Qweb templates. (OCA#561)
* [FIX][web_m2x_options] Fix Qweb templates. They were trying to replace non-existing elements, and this was being logged to console: Can't find "a.oe_m2o_cm_button" when extending template FieldMany2One Can't find "span.badge" when extending template FieldMany2ManyTag * Raise version correctly. * [FIX] Make many2many_tags tag deletion work again * Correct replacement of event Instead of overwriting all events from upstream widget, better just overwrite the one you need and inherit the rest.
1 parent 5fed837 commit 6c517cf

15 files changed

Lines changed: 677 additions & 140 deletions

File tree

‎web_m2x_options/README.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Your XML form view definition could contain::
116116
Known issues
117117
============
118118

119-
Double check that you have no inherited view that remove ``options`` you set on a field !
119+
Double check that you have no inherited view that remove ``options`` you set on a field !
120120
If nothing works, add a debugger in the first line of ``get_search_result method`` and enable debug mode in Odoo. When you write something in a many2one field, javascript debugger should pause. If not verify your installation.
121121

122122
Roadmap
@@ -146,6 +146,7 @@ Contributors
146146
* Nicolas JEUDY <nicolas@sudokeys.com>
147147
* Yannick Vaucher <yannick.vaucher@camptocamp.com>
148148
* Zakaria Makrelouf <z.makrelouf@gmail.com>
149+
* Jairo Llopis <jairo.llopis@tecnativa.com>
149150

150151
Maintainer
151152
----------

‎web_m2x_options/__openerp__.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{
44
"name": 'web_m2x_options',
5-
"version": "9.0.1.0.0",
5+
"version": "9.0.1.1.0",
66
"depends": [
77
'base',
88
'web',
@@ -12,6 +12,7 @@
1212
],
1313
'license': 'AGPL-3',
1414
'data': ['views/view.xml'],
15-
"author": "ACSONE SA/NV, 0k.io,Odoo Community Association (OCA)",
15+
"author": "ACSONE SA/NV, 0k.io, Tecnativa, "
16+
"Odoo Community Association (OCA)",
1617
'installable': True,
1718
}

‎web_m2x_options/i18n/ar.po‎

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# * web_m2x_options
44
#
55
# Translators:
6-
# SaFi J. <safi2266@gmail.com>, 2015
6+
# OCA Transbot <transbot@odoo-community.org>, 2017
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: web (8.0)\n"
9+
"Project-Id-Version: Odoo Server 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-02-26 02:05+0000\n"
12-
"PO-Revision-Date: 2015-12-16 17:30+0000\n"
13-
"Last-Translator: SaFi J. <safi2266@gmail.com>\n"
14-
"Language-Team: Arabic (http://www.transifex.com/oca/OCA-web-8-0/language/ar/)\n"
11+
"POT-Creation-Date: 2018-01-03 03:50+0000\n"
12+
"PO-Revision-Date: 2018-01-03 03:50+0000\n"
13+
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
14+
"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: \n"
@@ -20,24 +20,66 @@ msgstr ""
2020

2121
#. module: web_m2x_options
2222
#. openerp-web
23-
#: code:addons/web_m2x_options/static/src/js/form.js:219
24-
#: code:addons/web_m2x_options/static/src/js/form.js:373
23+
#: code:addons/web_m2x_options/static/src/xml/base.xml:8
24+
#, python-format
25+
msgid "!(widget.options.no_open || widget.options.no_open_edit)"
26+
msgstr ""
27+
28+
#. module: web_m2x_options
29+
#. openerp-web
30+
#: code:addons/web_m2x_options/static/src/js/form.js:47
31+
#, python-format
32+
msgid "Cancel"
33+
msgstr "إلغاء"
34+
35+
#. module: web_m2x_options
36+
#. openerp-web
37+
#: code:addons/web_m2x_options/static/src/js/form.js:33
38+
#, python-format
39+
msgid "Create"
40+
msgstr ""
41+
42+
#. module: web_m2x_options
43+
#. openerp-web
44+
#: code:addons/web_m2x_options/static/src/js/form.js:232
45+
#: code:addons/web_m2x_options/static/src/js/form.js:382
2546
#, python-format
2647
msgid "Create \"<strong>%s</strong>\""
2748
msgstr "إنشاء \"<strong>%s</strong>\""
2849

2950
#. module: web_m2x_options
3051
#. openerp-web
31-
#: code:addons/web_m2x_options/static/src/js/form.js:237
32-
#: code:addons/web_m2x_options/static/src/js/form.js:392
52+
#: code:addons/web_m2x_options/static/src/js/form.js:30
53+
#, python-format
54+
msgid "Create a %s"
55+
msgstr ""
56+
57+
#. module: web_m2x_options
58+
#. openerp-web
59+
#: code:addons/web_m2x_options/static/src/js/form.js:250
60+
#: code:addons/web_m2x_options/static/src/js/form.js:401
3361
#, python-format
3462
msgid "Create and Edit..."
3563
msgstr "إنشاء وتحرير ..."
3664

3765
#. module: web_m2x_options
3866
#. openerp-web
39-
#: code:addons/web_m2x_options/static/src/js/form.js:188
40-
#: code:addons/web_m2x_options/static/src/js/form.js:349
67+
#: code:addons/web_m2x_options/static/src/js/form.js:43
68+
#, python-format
69+
msgid "Create and edit"
70+
msgstr ""
71+
72+
#. module: web_m2x_options
73+
#. openerp-web
74+
#: code:addons/web_m2x_options/static/src/js/form.js:201
75+
#: code:addons/web_m2x_options/static/src/js/form.js:358
4176
#, python-format
4277
msgid "Search More..."
4378
msgstr "البحث عن المزيد ..."
79+
80+
#. module: web_m2x_options
81+
#. openerp-web
82+
#: code:addons/web_m2x_options/static/src/js/form.js:52
83+
#, python-format
84+
msgid "You are creating a new %s, are you sure it does not exist yet?"
85+
msgstr ""

‎web_m2x_options/i18n/de.po‎

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
# * web_m2x_options
44
#
55
# Translators:
6-
# Rudolf Schnapka <rs@techno-flex.de>, 2016
6+
# OCA Transbot <transbot@odoo-community.org>, 2017
7+
# Rudolf Schnapka <rs@techno-flex.de>, 2018
78
msgid ""
89
msgstr ""
9-
"Project-Id-Version: web (8.0)\n"
10+
"Project-Id-Version: Odoo Server 10.0\n"
1011
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-02-26 02:05+0000\n"
12-
"PO-Revision-Date: 2016-01-18 20:15+0000\n"
13-
"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
14-
"Language-Team: German (http://www.transifex.com/oca/OCA-web-8-0/language/de/)\n"
12+
"POT-Creation-Date: 2018-01-03 03:50+0000\n"
13+
"PO-Revision-Date: 2018-01-03 03:50+0000\n"
14+
"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2018\n"
15+
"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
1516
"MIME-Version: 1.0\n"
1617
"Content-Type: text/plain; charset=UTF-8\n"
1718
"Content-Transfer-Encoding: \n"
@@ -20,24 +21,68 @@ msgstr ""
2021

2122
#. module: web_m2x_options
2223
#. openerp-web
23-
#: code:addons/web_m2x_options/static/src/js/form.js:219
24-
#: code:addons/web_m2x_options/static/src/js/form.js:373
24+
#: code:addons/web_m2x_options/static/src/xml/base.xml:8
25+
#, python-format
26+
msgid "!(widget.options.no_open || widget.options.no_open_edit)"
27+
msgstr "!(widget.options.no_open || widget.options.no_open_edit)"
28+
29+
#. module: web_m2x_options
30+
#. openerp-web
31+
#: code:addons/web_m2x_options/static/src/js/form.js:47
32+
#, python-format
33+
msgid "Cancel"
34+
msgstr "Abbrechen"
35+
36+
#. module: web_m2x_options
37+
#. openerp-web
38+
#: code:addons/web_m2x_options/static/src/js/form.js:33
39+
#, python-format
40+
msgid "Create"
41+
msgstr "Anlegen"
42+
43+
#. module: web_m2x_options
44+
#. openerp-web
45+
#: code:addons/web_m2x_options/static/src/js/form.js:232
46+
#: code:addons/web_m2x_options/static/src/js/form.js:382
2547
#, python-format
2648
msgid "Create \"<strong>%s</strong>\""
2749
msgstr "Anlegen \"<strong>%s</strong>"
2850

2951
#. module: web_m2x_options
3052
#. openerp-web
31-
#: code:addons/web_m2x_options/static/src/js/form.js:237
32-
#: code:addons/web_m2x_options/static/src/js/form.js:392
53+
#: code:addons/web_m2x_options/static/src/js/form.js:30
54+
#, python-format
55+
msgid "Create a %s"
56+
msgstr "Eine %s anlegen"
57+
58+
#. module: web_m2x_options
59+
#. openerp-web
60+
#: code:addons/web_m2x_options/static/src/js/form.js:250
61+
#: code:addons/web_m2x_options/static/src/js/form.js:401
3362
#, python-format
3463
msgid "Create and Edit..."
3564
msgstr "Anlegen und Bearbeiten"
3665

3766
#. module: web_m2x_options
3867
#. openerp-web
39-
#: code:addons/web_m2x_options/static/src/js/form.js:188
40-
#: code:addons/web_m2x_options/static/src/js/form.js:349
68+
#: code:addons/web_m2x_options/static/src/js/form.js:43
69+
#, python-format
70+
msgid "Create and edit"
71+
msgstr "Anlegen und bearbeiten"
72+
73+
#. module: web_m2x_options
74+
#. openerp-web
75+
#: code:addons/web_m2x_options/static/src/js/form.js:201
76+
#: code:addons/web_m2x_options/static/src/js/form.js:358
4177
#, python-format
4278
msgid "Search More..."
4379
msgstr "Suche weitere..."
80+
81+
#. module: web_m2x_options
82+
#. openerp-web
83+
#: code:addons/web_m2x_options/static/src/js/form.js:52
84+
#, python-format
85+
msgid "You are creating a new %s, are you sure it does not exist yet?"
86+
msgstr ""
87+
"Sie legen eine neue %s an, sind Sie sicher, dass diese nicht bereits "
88+
"vorhanden ist?"

‎web_m2x_options/i18n/es.po‎

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# * web_m2x_options
44
#
55
# Translators:
6-
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2015
6+
# OCA Transbot <transbot@odoo-community.org>, 2017
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: web (8.0)\n"
9+
"Project-Id-Version: Odoo Server 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2016-02-26 02:05+0000\n"
12-
"PO-Revision-Date: 2015-11-07 11:28+0000\n"
13-
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
14-
"Language-Team: Spanish (http://www.transifex.com/oca/OCA-web-8-0/language/es/)\n"
11+
"POT-Creation-Date: 2018-01-03 03:50+0000\n"
12+
"PO-Revision-Date: 2018-01-03 03:50+0000\n"
13+
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
14+
"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: \n"
@@ -20,24 +20,66 @@ msgstr ""
2020

2121
#. module: web_m2x_options
2222
#. openerp-web
23-
#: code:addons/web_m2x_options/static/src/js/form.js:219
24-
#: code:addons/web_m2x_options/static/src/js/form.js:373
23+
#: code:addons/web_m2x_options/static/src/xml/base.xml:8
24+
#, python-format
25+
msgid "!(widget.options.no_open || widget.options.no_open_edit)"
26+
msgstr ""
27+
28+
#. module: web_m2x_options
29+
#. openerp-web
30+
#: code:addons/web_m2x_options/static/src/js/form.js:47
31+
#, python-format
32+
msgid "Cancel"
33+
msgstr "Cancelar"
34+
35+
#. module: web_m2x_options
36+
#. openerp-web
37+
#: code:addons/web_m2x_options/static/src/js/form.js:33
38+
#, python-format
39+
msgid "Create"
40+
msgstr "Crear"
41+
42+
#. module: web_m2x_options
43+
#. openerp-web
44+
#: code:addons/web_m2x_options/static/src/js/form.js:232
45+
#: code:addons/web_m2x_options/static/src/js/form.js:382
2546
#, python-format
2647
msgid "Create \"<strong>%s</strong>\""
2748
msgstr "Crear \"<strong>%s</strong>\""
2849

2950
#. module: web_m2x_options
3051
#. openerp-web
31-
#: code:addons/web_m2x_options/static/src/js/form.js:237
32-
#: code:addons/web_m2x_options/static/src/js/form.js:392
52+
#: code:addons/web_m2x_options/static/src/js/form.js:30
53+
#, python-format
54+
msgid "Create a %s"
55+
msgstr "Crear un %s"
56+
57+
#. module: web_m2x_options
58+
#. openerp-web
59+
#: code:addons/web_m2x_options/static/src/js/form.js:250
60+
#: code:addons/web_m2x_options/static/src/js/form.js:401
3361
#, python-format
3462
msgid "Create and Edit..."
3563
msgstr "Crear y editar..."
3664

3765
#. module: web_m2x_options
3866
#. openerp-web
39-
#: code:addons/web_m2x_options/static/src/js/form.js:188
40-
#: code:addons/web_m2x_options/static/src/js/form.js:349
67+
#: code:addons/web_m2x_options/static/src/js/form.js:43
68+
#, python-format
69+
msgid "Create and edit"
70+
msgstr "Crear y editar"
71+
72+
#. module: web_m2x_options
73+
#. openerp-web
74+
#: code:addons/web_m2x_options/static/src/js/form.js:201
75+
#: code:addons/web_m2x_options/static/src/js/form.js:358
4176
#, python-format
4277
msgid "Search More..."
4378
msgstr "Buscar más..."
79+
80+
#. module: web_m2x_options
81+
#. openerp-web
82+
#: code:addons/web_m2x_options/static/src/js/form.js:52
83+
#, python-format
84+
msgid "You are creating a new %s, are you sure it does not exist yet?"
85+
msgstr "Está creando un nuevo %s, ¿está seguro de no existe ya?"

0 commit comments

Comments
 (0)