odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] upstream 

bzr revid: fme@openerp.com-20140116181519-xtzhzm7u98u6xz18
This commit is contained in:
Fabien Meghazi 2014-01-16 19:15:19 +01:00
parent 4b663489a6 153df3aeac
commit c0dda700f1
465 changed files with 10590 additions and 19286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/web/controllers/main.py
View File

@ -129,13 +129,11 @@ def local_redirect(path, query=None, keep_hash=False, forward_debug=True, code=3
return werkzeug.utils.redirect(url, code) return werkzeug.utils.redirect(url, code)
def redirect_with_hash(url, code=303): def redirect_with_hash(url, code=303):
if request.httprequest.user_agent.browser in ('msie', 'safari'): # Most IE and Safari versions decided not to preserve location.hash upon
# Most IE and Safari versions decided not to preserve location.hash upon # redirect. And even if IE10 pretends to support it, it still fails
# redirect. And even if IE10 pretends to support it, it still fails # inexplicably in case of multiple redirects (and we do have some).
# inexplicably in case of multiple redirects (and we do have some). # See extensive test page at http://greenbytes.de/tech/tc/httpredirects/
# See extensive test page at http://greenbytes.de/tech/tc/httpredirects/ return "<html><head><script>window.location = '%s' + location.hash;</script></head></html>" % url
return "<html><head><script>window.location = '%s' + location.hash;</script></head></html>" % url
return werkzeug.utils.redirect(url, code)
def module_topological_sort(modules): def module_topological_sort(modules):
""" Return a list of module names sorted so that their dependencies of the """ Return a list of module names sorted so that their dependencies of the

17
addons/web/doc/qweb.rst
View File

@ -312,15 +312,6 @@ Output
Evaluates, html-escapes and outputs ``content``. Evaluates, html-escapes and outputs ``content``.
.. _qweb-directive-escf:
.. function:: t-escf=content
:param Format content:
Similar to :ref:`t-esc <qweb-directive-esc>` but evaluates a
``Format`` instead of just an expression.
.. _qweb-directive-raw: .. _qweb-directive-raw:
.. function:: t-raw=content .. function:: t-raw=content
@ -331,14 +322,6 @@ Output
html-escape the result of evaluating ``content``. Should only ever html-escape the result of evaluating ``content``. Should only ever
be used for known-secure content, or will be an XSS attack vector. be used for known-secure content, or will be an XSS attack vector.
.. _qweb-directive-rawf:
.. function:: t-rawf=content
:param Format content:
``Format``-based version of :ref:`t-raw <qweb-directive-raw>`.
.. _qweb-directive-att: .. _qweb-directive-att:
.. function:: t-att=map .. function:: t-att=map

514
addons/web/i18n/ar.po
View File

File diff suppressed because it is too large Load Diff

4
addons/web/i18n/bg.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/bn.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/bs.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/ca.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/cs.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
"X-Poedit-Language: Czech\n" "X-Poedit-Language: Czech\n"
#. module: web #. module: web

4
addons/web/i18n/da.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/de.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/en_AU.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/en_GB.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/es.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/es_CL.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/es_CR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
"Language: es\n" "Language: es\n"
#. module: web #. module: web

4
addons/web/i18n/es_DO.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/es_EC.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/es_MX.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/es_PE.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/et.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/eu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/fa.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/fi.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

8
addons/web/i18n/fr.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web
@ -244,7 +244,7 @@ msgstr "Formulaire"
#: code:addons/web/static/src/xml/base.xml:1352 #: code:addons/web/static/src/xml/base.xml:1352
#, python-format #, python-format
msgid "(no string)" msgid "(no string)"
msgstr "(no string)" msgstr "(chaîne vide)"
#. module: web #. module: web
#. openerp-web #. openerp-web
@ -893,7 +893,7 @@ msgstr "Préférences"
#: code:addons/web/static/src/js/view_form.js:435 #: code:addons/web/static/src/js/view_form.js:435
#, python-format #, python-format
msgid "Wrong on change format: %s" msgid "Wrong on change format: %s"
msgstr "Mauvais format sur le changement : %s" msgstr "Mauvais format \"on change\": %s"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/fr_CA.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/gl.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/gu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

406
addons/web/i18n/he.po
View File

File diff suppressed because it is too large Load Diff

4
addons/web/i18n/hi.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/hr.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/hu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/id.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/it.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/ja.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/ka.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/ko.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/lo.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/lt.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/lv.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/mk.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/mn.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/nb.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/nl.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/nl_BE.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/pl.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/pt.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/pt_BR.po
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/ro.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

34
addons/web/i18n/ru.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web
@ -2685,9 +2685,6 @@ msgstr "Фильтры"
#~ msgid "OK" #~ msgid "OK"
#~ msgstr "OK" #~ msgstr "OK"
#~ msgid "Filter Entry"
#~ msgstr "Входящий фильтр"
#~ msgid "Import Data" #~ msgid "Import Data"
#~ msgstr "Импорт данных" #~ msgstr "Импорт данных"
@ -2757,9 +2754,6 @@ msgstr "Фильтры"
#~ msgid "Add / Remove Shortcut..." #~ msgid "Add / Remove Shortcut..."
#~ msgstr "Добавить / Удалить ярлык..." #~ msgstr "Добавить / Удалить ярлык..."
#~ msgid "Home"
#~ msgstr "Домой"
#~ msgid "Unfold menu" #~ msgid "Unfold menu"
#~ msgstr "Развернуть меню" #~ msgstr "Развернуть меню"
@ -2793,15 +2787,6 @@ msgstr "Фильтры"
#~ msgid "and" #~ msgid "and"
#~ msgstr "и" #~ msgstr "и"
#~ msgid "Any of the following conditions must match"
#~ msgstr "Одно из следующих условий должно соответствовать"
#~ msgid "All the following conditions must match"
#~ msgstr "Все следующие условия должны соответствовать"
#~ msgid "None of the following conditions must match"
#~ msgstr "Ни одно из следующих условий не должно соответствовать"
#, python-format #, python-format
#~ msgid "Confirm Password:" #~ msgid "Confirm Password:"
#~ msgstr "Пароль ещё раз:" #~ msgstr "Пароль ещё раз:"
@ -2825,6 +2810,9 @@ msgstr "Фильтры"
#~ msgid "*Required Fields are not selected :" #~ msgid "*Required Fields are not selected :"
#~ msgstr "*Требуемые поля не выбраны :" #~ msgstr "*Требуемые поля не выбраны :"
#~ msgid "Filter Entry"
#~ msgstr "Фильтровать вхождения"
#~ msgid "Filter disabled due to invalid syntax" #~ msgid "Filter disabled due to invalid syntax"
#~ msgstr "Фильтр отключен из-за неверного синтаксиса" #~ msgstr "Фильтр отключен из-за неверного синтаксиса"
@ -2861,9 +2849,21 @@ msgstr "Фильтры"
#~ msgid "OpenERP Enterprise Contract." #~ msgid "OpenERP Enterprise Contract."
#~ msgstr "Контракт OpenERP Enterprise." #~ msgstr "Контракт OpenERP Enterprise."
#~ msgid "Home"
#~ msgstr "Главная"
#~ msgid "Send an e-mail with your default e-mail client" #~ msgid "Send an e-mail with your default e-mail client"
#~ msgstr "Отправлять e-mail вашим почтовым клиентом" #~ msgstr "Отправлять e-mail вашим почтовым клиентом"
#~ msgid "Any of the following conditions must match"
#~ msgstr "Одно из этих условий должно быть выполнено"
#~ msgid "All the following conditions must match"
#~ msgstr "Все эти условия должны быть выполнены"
#~ msgid "None of the following conditions must match"
#~ msgstr "Ни одно из этих условий не должно быть выполнено"
#~ msgid "Select Dashboard to add this filter to:" #~ msgid "Select Dashboard to add this filter to:"
#~ msgstr "Выберите панель для добавления этого фильтра:" #~ msgstr "Выберите панель для добавления этого фильтра:"

4
addons/web/i18n/sk.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/sl.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/sq.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/sr@latin.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/sv.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/th.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/tr.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/uk.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/vi.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/zh_CN.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

4
addons/web/i18n/zh_TW.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web #. module: web
#. openerp-web #. openerp-web

28
addons/web/static/lib/qweb/qweb-test-output.xml
View File

@ -10,20 +10,6 @@
<t t-esc="ok"/> <t t-esc="ok"/>
</t> </t>
<!-- escf, same as t-esc, but @t-escf is a format string -->
<t t-name="escf-noformat-literal">
<t t-escf="ok"/>
</t>
<t t-name="escf-simpleformat-variable">
<t t-escf="#{value}"/>
</t>
<t t-name="escf-format-variable">
<t t-escf="[#{value}]"/>
</t>
<t t-name="escf-format-variable-with-escapes">
<t t-escf="[#{value}]"/>
</t>
<!-- raw, evaluates and returns @t-raw directly (no escaping) --> <!-- raw, evaluates and returns @t-raw directly (no escaping) -->
<t t-name="raw-literal"> <t t-name="raw-literal">
<t t-raw="'ok'"/> <t t-raw="'ok'"/>
@ -34,18 +20,4 @@
<t t-name="raw-notescaped"> <t t-name="raw-notescaped">
<t t-raw="ok"/> <t t-raw="ok"/>
</t> </t>
<!-- rawf, same as t-raw, but @t-rawf is a format string -->
<t t-name="rawf-noformat-literal">
<t t-escf="ok"/>
</t>
<t t-name="rawf-simpleformat-variable">
<t t-escf="#{value}"/>
</t>
<t t-name="rawf-format-variable">
<t t-escf="[#{value}]"/>
</t>
<t t-name="rawf-format-variable-notescaped">
<t t-rawf="[#{value}]"/>
</t>
</templates> </templates>

18
addons/web/static/lib/qweb/qweb-test.js.html
View File

@ -32,29 +32,11 @@
equals(render('esc-variable', {ok: 'ok'}), "ok", "Render a string variable"); equals(render('esc-variable', {ok: 'ok'}), "ok", "Render a string variable");
equals(render('esc-toescape', {ok: '<ok>'}), "&lt;ok&gt;", "Render a string with data to escape"); equals(render('esc-toescape', {ok: '<ok>'}), "&lt;ok&gt;", "Render a string with data to escape");
}); });
test("Formatted escaped output", function () {
equals(render('escf-noformat-literal', {}), "ok", "Render a literal string");
equals(render('escf-simpleformat-variable', {value: 'ok'}), "ok",
"Only render an interpolated variable");
equals(render('escf-format-variable', {value: 'ok'}), "[ok]",
"Actually formatted variable");
equals(render('escf-format-variable-with-escapes', {value: '<ok>'}), '[&lt;ok&gt;]',
"Render a formatted string with data to escape");
});
test("Basic unescaped output", function () { test("Basic unescaped output", function () {
equals(render('raw-literal', {}), "ok", "Render a literal string"); equals(render('raw-literal', {}), "ok", "Render a literal string");
equals(render('raw-variable', {ok: 'ok'}), "ok", "Render a string variable"); equals(render('raw-variable', {ok: 'ok'}), "ok", "Render a string variable");
equals(render('raw-notescaped', {ok: '<ok>'}), "<ok>", "Render a string with data not escaped"); equals(render('raw-notescaped', {ok: '<ok>'}), "<ok>", "Render a string with data not escaped");
}); });
test("Formatted unescaped output", function () {
equals(render('rawf-noformat-literal', {}), "ok", "Render a literal string");
equals(render('rawf-simpleformat-variable', {value: 'ok'}), "ok",
"Only render an interpolated variable");
equals(render('rawf-format-variable', {value: 'ok'}), "[ok]",
"Actually formatted variable");
equals(render('rawf-format-variable-notescaped', {value: '<ok>'}), '[<ok>]',
"Render a formatted string with data not escaped");
});
module("Context-setting tests", { module("Context-setting tests", {
setup: function () { setup: function () {

8
addons/web/static/lib/qweb/qweb2.js
View File

@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
var QWeb2 = { var QWeb2 = {
expressions_cache: {}, expressions_cache: {},
RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,window,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','), RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,window,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,escf,raw,rawf,js,debug,log'.split(','), ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,raw,js,debug,log'.split(','),
WORD_REPLACEMENT: { WORD_REPLACEMENT: {
'and': '&&', 'and': '&&',
'or': '||', 'or': '||',
@ -735,15 +735,9 @@ QWeb2.Element = (function() {
compile_action_esc : function(value) { compile_action_esc : function(value) {
this.top("r.push(context.engine.tools.html_escape(" + (this.format_expression(value)) + "));"); this.top("r.push(context.engine.tools.html_escape(" + (this.format_expression(value)) + "));");
}, },
compile_action_escf : function(value) {
this.top("r.push(context.engine.tools.html_escape(" + (this.string_interpolation(value)) + "));");
},
compile_action_raw : function(value) { compile_action_raw : function(value) {
this.top("r.push(" + (this.format_expression(value)) + ");"); this.top("r.push(" + (this.format_expression(value)) + ");");
}, },
compile_action_rawf : function(value) {
this.top("r.push(" + (this.string_interpolation(value)) + ");");
},
compile_action_js : function(value) { compile_action_js : function(value) {
this.top("(function(" + value + ") {"); this.top("(function(" + value + ") {");
this.bottom("})(dict);"); this.bottom("})(dict);");

258
addons/web/static/src/css/base.css
View File

@ -658,6 +658,10 @@
display: block; display: block;
color: gray; color: gray;
} }
.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
border-bottom: none;
padding-bottom: 1px;
}
.openerp .oe_notebook > li.ui-tabs-active > a { .openerp .oe_notebook > li.ui-tabs-active > a {
color: #4c4c4c; color: #4c4c4c;
} }
@ -2746,6 +2750,9 @@
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master { .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
width: 100% !important; width: 100% !important;
} }
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_reference {
display: table;
}
.openerp .oe_list_group_name { .openerp .oe_list_group_name {
white-space: nowrap; white-space: nowrap;
} }
@ -3035,6 +3042,123 @@
float: right; float: right;
color: #333333; color: #333333;
} }
.openerp .navbar {
min-height: 32px;
margin-bottom: 0px;
border: none;
z-index: 1;
background-color: #414141;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.openerp .navbar-default .navbar-nav li a:hover, .openerp .navbar-default .navbar-nav li a:focus {
background: rgba(0, 0, 0, 0.3);
}
.openerp .navbar-default .navbar-nav .open > a, .openerp .navbar-default .navbar-nav a:hover, .openerp .navbar-default .navbar-nav a:focus {
background: rgba(0, 0, 0, 0.3) !important;
}
.openerp .navbar-default .navbar-nav .dropdown > a .caret {
border-top-color: #777777 !important;
border-bottom-color: #777777 !important;
}
.openerp .navbar-nav li a {
padding: 4px 32px 4px 12px;
}
.openerp .oe_navbar .dropdown-menu {
font-size: 13px;
padding: 4px 0;
background: #333333 !important;
background: rgba(37, 37, 37, 0.9) !important;
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
background-color: #414141;
text-shadow: none;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .oe_navbar .dropdown-menu li a, .openerp .oe_navbar .dropdown-menu li a:hover, .openerp .oe_navbar .dropdown-menu li a:focus {
color: #eeeeee;
}
.openerp .oe_view_manager_new .oe_form_nosheet {
margin-top: 8px;
}
.openerp .oe_view_manager_new .oe_form_nosheet .oe_form_label {
font-weight: normal;
}
.openerp .nav li > a {
padding: 3px 4px 2px 18px;
color: #4c4c4c;
}
.openerp .nav nav-pills.nav-stacked > li > ul {
padding-left: 16px;
}
.openerp .nav-pills > li.active > a, .openerp a.list-group-item.active > a {
background-color: #7c7bad;
color: white;
border-radius: 0;
}
.openerp .nav-pills > li.active a:hover, .openerp .nav-pills > li.active a:focus, .openerp a.list-group-item.active a:hover, .openerp a.list-group-item.active a:focus {
background-color: #7c7bad;
}
.openerp .nav-pills > li.active .badge, .openerp a.list-group-item.active .badge {
background-color: white;
color: #7c7bad;
text-shadow: none;
}
.openerp .badge {
font-weight: normal;
font-size: 11px;
background-color: #7c7bad;
}
.openerp button, .openerp body {
line-height: normal;
}
.openerp h1, .openerp h2 {
font-weight: bold;
}
.openerp h3 {
font-size: 1.17em;
font-weight: bold;
}
.openerp p {
display: block;
-webkit-margin-before: 1em;
-webkit-margin-after: 1em;
-webkit-margin-start: 0px;
-webkit-margin-end: 0px;
}
.openerp pre {
background-color: white;
border: none;
padding: 10px 0 3px 0;
}
.openerp .jqstooltip {
height: auto !important;
width: auto !important;
}
.openerp h5 {
font-weight: bold;
font-size: smaller;
}
.openerp .oe_form .oe_subtype label, .openerp .oe_subtype label {
font-weight: normal;
}
.openerp .oe_msg_subtype_check {
margin: 3px 3px 0 !important;
}
@-moz-document url-prefix() { @-moz-document url-prefix() {
.openerp .oe_searchview .oe_searchview_search { .openerp .oe_searchview .oe_searchview_search {
@ -3317,140 +3441,6 @@ body.oe_single_form .oe_single_form_container {
overflow: hidden !important; overflow: hidden !important;
} }
} }
.nav li > a {
padding: 3px 4px 2px 18px;
color: #4c4c4c;
}
.nav nav-pills.nav-stacked > li > ul {
padding-left: 16px;
}
.nav-pills > li.active > a, a.list-group-item.active > a {
background-color: #7c7bad;
color: white;
border-radius: 0;
}
.nav-pills > li.active a:hover, .nav-pills > li.active a:focus, a.list-group-item.active a:hover, a.list-group-item.active a:focus {
background-color: #7c7bad;
}
.nav-pills > li.active .badge, a.list-group-item.active .badge {
background-color: white;
color: #7c7bad;
text-shadow: none;
}
.badge {
font-weight: normal;
font-size: 11px;
background-color: #7c7bad;
}
button, body {
line-height: normal;
}
h1, h2 {
font-weight: bold;
}
h3 {
font-size: 1.17em;
font-weight: bold;
}
p {
display: block;
-webkit-margin-before: 1em;
-webkit-margin-after: 1em;
-webkit-margin-start: 0px;
-webkit-margin-end: 0px;
}
pre {
background-color: white;
border: none;
padding: 10px 0 3px 0;
}
.jqstooltip {
height: auto !important;
width: auto !important;
}
h5 {
font-weight: bold;
font-size: smaller;
}
.oe_form .oe_subtype label, .oe_subtype label {
font-weight: normal;
}
.oe_msg_subtype_check {
margin: 3px 3px 0 !important;
}
.oe_view_manager_new .oe_form_nosheet {
margin-top: 8px;
}
.oe_view_manager_new .oe_form_nosheet .oe_form_label {
font-weight: normal;
}
.navbar {
min-height: 32px;
margin-bottom: 0px;
border: none;
z-index: 1;
background-color: #414141;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus {
background: rgba(0, 0, 0, 0.3);
}
.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus {
background: rgba(0, 0, 0, 0.3) !important;
}
.navbar-default .navbar-nav .dropdown > a .caret {
border-top-color: #777777 !important;
border-bottom-color: #777777 !important;
}
.navbar-nav li a {
padding: 4px 32px 4px 12px;
}
.oe_navbar .dropdown-menu {
font-size: 13px;
padding: 4px 0;
background: #333333 !important;
background: rgba(37, 37, 37, 0.9) !important;
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
background-color: #414141;
text-shadow: none;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.oe_navbar .dropdown-menu li a, .oe_navbar .dropdown-menu li a:hover, .oe_navbar .dropdown-menu li a:focus {
color: #eeeeee;
}
.ui-icon { .ui-icon {
width: 18px; width: 18px;
height: 18px; height: 18px;

209
addons/web/static/src/css/base.sass
View File

@ -594,6 +594,9 @@ $sheet-padding: 16px
text-decoration: none text-decoration: none
background-color: #eee background-color: #eee
border-color: #eee #eee #ddd border-color: #eee #eee #ddd
.ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active
border-bottom: none
padding-bottom: 1px
.oe_notebook > li.ui-state-active > a, .oe_notebook > li.ui-state-active > a:hover .oe_notebook > li.ui-state-active > a, .oe_notebook > li.ui-state-active > a:hover
background-color: #ffffff background-color: #ffffff
border: 1px solid #ddd border: 1px solid #ddd
@ -2204,6 +2207,8 @@ $sheet-padding: 16px
&.oe_form_field_datetime,&.oe_form_field_date &.oe_form_field_datetime,&.oe_form_field_date
input.oe_datepicker_master input.oe_datepicker_master
width: 100% !important width: 100% !important
&.oe_form_field_reference
display: table
.oe_list_group_name .oe_list_group_name
white-space: nowrap white-space: nowrap
// }}} // }}}
@ -2430,6 +2435,106 @@ $sheet-padding: 16px
float: right float: right
color: #333 color: #333
// }}} // }}}
// Bootstrap HACKS {{{
.navbar
min-height: 32px
margin-bottom: 0px
border: none
z-index: 1
background-color: #414141
@include vertical-gradient(#646060, #262626)
.navbar-default
.navbar-nav
li
a:hover,a:focus
background: rgba(0, 0, 0, 0.3)
.open > a,a:hover,a:focus
background: rgba(0, 0, 0, 0.3) !important
.dropdown > a .caret
border-top-color: #777 !important
border-bottom-color: #777 !important
.navbar-nav
li
a
padding: 4px 32px 4px 12px
.oe_navbar .dropdown-menu
font-size: 13px
padding: 4px 0
background: #333333 !important
background: rgba(37, 37, 37, 0.9) !important
border-color: #999999
border-color: rgba(0, 0, 0, 0.2)
background-color: #414141
text-shadow: none
@include vertical-gradient(#646060, #262626)
@include radius(3px)
li
a,a:hover,a:focus
color: #eeeeee
// Minimized unused white space and label weight for wizard popup
.oe_view_manager_new .oe_form_nosheet
margin-top: 8px
.oe_form_label
font-weight: normal
// Customize bootstrap3 for leftbar
.nav
li > a
padding: 3px 4px 2px 18px
color: #4c4c4c
nav-pills.nav-stacked > li > ul
padding-left: 16px
.nav-pills > li.active,a.list-group-item.active
> a
background-color: #7c7bad
color: white
border-radius: 0
a:hover,a:focus
background-color: #7c7bad
.badge
background-color: white
color: #7c7bad
text-shadow: none
.badge
font-weight: normal
font-size: 11px
background-color: #7c7bad
// Customize for global tags
button, body
line-height: normal
h1,h2
font-weight: bold
h3
font-size: 1.17em
font-weight: bold
p
display: block
-webkit-margin-before: 1em
-webkit-margin-after: 1em
-webkit-margin-start: 0px
-webkit-margin-end: 0px
pre
background-color: #FFFFFF
border: none
padding: 10px 0 3px 0
// Customize for kanban tooltip
.jqstooltip
height: auto !important
width: auto !important
// Customize for chatter
h5
font-weight: bold
font-size: smaller
.oe_form .oe_subtype label, .oe_subtype label
font-weight: normal
.oe_msg_subtype_check
margin: 3px 3px 0 !important
// }}}
@-moz-document url-prefix() @-moz-document url-prefix()
.openerp .openerp
.oe_searchview .oe_searchview_search .oe_searchview .oe_searchview_search
@ -2672,110 +2777,6 @@ body.oe_single_form
overflow: hidden !important overflow: hidden !important
// }}} // }}}
// Customize bootstrap3 for leftbar
.nav
li > a
padding: 3px 4px 2px 18px
color: #4c4c4c
nav-pills.nav-stacked > li > ul
padding-left: 16px
.nav-pills > li.active,a.list-group-item.active
> a
background-color: #7c7bad
color: white
border-radius: 0
a:hover,a:focus
background-color: #7c7bad
.badge
background-color: white
color: #7c7bad
text-shadow: none
.badge
font-weight: normal
font-size: 11px
background-color: #7c7bad
// End of customize
// Customize for global tags
button, body
line-height: normal
h1,h2
font-weight: bold
h3
font-size: 1.17em
font-weight: bold
p
display: block
-webkit-margin-before: 1em
-webkit-margin-after: 1em
-webkit-margin-start: 0px
-webkit-margin-end: 0px
pre
background-color: #FFFFFF
border: none
padding: 10px 0 3px 0
// End of customize
// Customize for kanban tooltip
.jqstooltip
height: auto !important
width: auto !important
// End of kanban tooltip
// Customize for chatter
h5
font-weight: bold
font-size: smaller
.oe_form .oe_subtype label, .oe_subtype label
font-weight: normal
.oe_msg_subtype_check
margin: 3px 3px 0 !important
// End of customize
// Minimized unused white space and label weight for wizard popup
.oe_view_manager_new .oe_form_nosheet
margin-top: 8px
.oe_form_label
font-weight: normal
// End of customize
// navbar hack {{{
.navbar
min-height: 32px
margin-bottom: 0px
border: none
z-index: 1
background-color: #414141
@include vertical-gradient(#646060, #262626)
.navbar-default
.navbar-nav
li
a:hover,a:focus
background: rgba(0, 0, 0, 0.3)
.open > a,a:hover,a:focus
background: rgba(0, 0, 0, 0.3) !important
.dropdown > a .caret
border-top-color: #777 !important
border-bottom-color: #777 !important
.navbar-nav
li
a
padding: 4px 32px 4px 12px
.oe_navbar .dropdown-menu
font-size: 13px
padding: 4px 0
background: #333333 !important
background: rgba(37, 37, 37, 0.9) !important
border-color: #999999
border-color: rgba(0, 0, 0, 0.2)
background-color: #414141
text-shadow: none
@include vertical-gradient(#646060, #262626)
@include radius(3px)
li
a,a:hover,a:focus
color: #eeeeee
// End hack }}}
// Hack for ui icon {{{ // Hack for ui icon {{{
.ui-icon .ui-icon

2
addons/web/static/src/js/chrome.js
View File

@ -705,7 +705,7 @@ instance.web.client_actions.add("history_back", "instance.web.HistoryBack");
*/ */
instance.web.Home = function(parent, action) { instance.web.Home = function(parent, action) {
var url = '/' + (window.location.search || ''); var url = '/' + (window.location.search || '');
instance.web.redirect(url, action.params && action.params.wait); instance.web.redirect(url, action && action.params && action.params.wait);
}; };
instance.web.client_actions.add("home", "instance.web.Home"); instance.web.client_actions.add("home", "instance.web.Home");

9
addons/web/static/src/js/data.js
View File

@ -939,6 +939,15 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
* @param {Object} id record to remove from the BDS's cache * @param {Object} id record to remove from the BDS's cache
*/ */
evict_record: function (id) { evict_record: function (id) {
// Don't evict records which haven't yet been saved: there is no more
// recent data on the server (and there potentially isn't any data),
// and this breaks the assumptions of other methods (that the data
// for new and altered records is both in the cache and in the to_write
// or to_create collection)
if (_(this.to_create.concat(this.to_write)).find(function (record) {
return record.id === id; })) {
return;
}
for(var i=0, len=this.cache.length; i<len; ++i) { for(var i=0, len=this.cache.length; i<len; ++i) {
var record = this.cache[i]; var record = this.cache[i];
// if record we call the button upon is in the cache // if record we call the button upon is in the cache

1
addons/web/static/src/js/formats.js
View File

@ -147,6 +147,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
console.warn('Field', descriptor, 'had an empty string as value, treating as false...'); console.warn('Field', descriptor, 'had an empty string as value, treating as false...');
return value_if_empty === undefined ? '' : value_if_empty; return value_if_empty === undefined ? '' : value_if_empty;
case false: case false:
case undefined:
case Infinity: case Infinity:
case -Infinity: case -Infinity:
return value_if_empty === undefined ? '' : value_if_empty; return value_if_empty === undefined ? '' : value_if_empty;

9
addons/web/static/src/js/search.js
View File

@ -1870,9 +1870,14 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
new instance.web.Model(this.view.model).call('fields_get', { new instance.web.Model(this.view.model).call('fields_get', {
context: this.view.dataset.context context: this.view.dataset.context
}).done(function(data) { }).done(function(data) {
self.fields = _.extend({ self.fields = {
id: { string: 'ID', type: 'id' } id: { string: 'ID', type: 'id' }
}, data); };
_.each(data, function(field_def, field_name) {
if (field_def.selectable !== false && field_name != 'id') {
self.fields[field_name] = field_def;
}
});
})).done(function () { })).done(function () {
self.append_proposition(); self.append_proposition();
}); });

77
addons/web/static/src/js/view_form.js
View File

@ -2624,6 +2624,11 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
e.stopPropagation(); e.stopPropagation();
} }
}, },
'keypress': function (e) {
if (e.which === $.ui.keyCode.ENTER) {
e.stopPropagation();
}
},
'change textarea': 'store_dom_value', 'change textarea': 'store_dom_value',
}, },
initialize_content: function() { initialize_content: function() {
@ -3450,6 +3455,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
if (! no_recurse) { if (! no_recurse) {
var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context()); var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
this.alive(dataset.name_get([self.get("value")])).done(function(data) { this.alive(dataset.name_get([self.get("value")])).done(function(data) {
if (!data[0]) {
self.do_warn(_t("Render"), _t("No value found for the field "+self.field.string+" for value "+self.get("value")));
return;
}
self.display_value["" + self.get("value")] = data[0][1]; self.display_value["" + self.get("value")] = data[0][1];
self.render_value(true); self.render_value(true);
}).fail( function (data, event) { }).fail( function (data, event) {
@ -4045,7 +4054,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
GroupsType: instance.web.form.One2ManyGroups, GroupsType: instance.web.form.One2ManyGroups,
ListType: instance.web.form.One2ManyList ListType: instance.web.form.One2ManyList
})); }));
this.on('edit:before', this, this.proxy('_before_edit'));
this.on('edit:after', this, this.proxy('_after_edit')); this.on('edit:after', this, this.proxy('_after_edit'));
this.on('save:before cancel:before', this, this.proxy('_before_unedit')); this.on('save:before cancel:before', this, this.proxy('_before_unedit'));
@ -4058,7 +4066,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
var ret = this._super(); var ret = this._super();
this.$el this.$el
.off('mousedown.handleButtons') .off('mousedown.handleButtons')
.on('mousedown.handleButtons', 'table button', this.proxy('_button_down')); .on('mousedown.handleButtons', 'table button, div a.oe_m2o_cm_button', this.proxy('_button_down'));
return ret; return ret;
}, },
changed_records: function () { changed_records: function () {
@ -4166,11 +4174,10 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
}); });
}, },
_before_edit: function () { _after_edit: function () {
this.__ignore_blur = false; this.__ignore_blur = false;
this.editor.form.on('blurred', this, this._on_form_blur); this.editor.form.on('blurred', this, this._on_form_blur);
},
_after_edit: function () {
// The form's blur thing may be jiggered during the edition setup, // The form's blur thing may be jiggered during the edition setup,
// potentially leading to the o2m instasaving the row. Cancel any // potentially leading to the o2m instasaving the row. Cancel any
// blurring triggered the edition startup here // blurring triggered the edition startup here
@ -4203,7 +4210,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
} }
this.cancel_edition(); this.cancel_edition();
}, },
keyup_ENTER: function () { keypress_ENTER: function () {
// blurring caused by hitting the [Return] key, should skip the // blurring caused by hitting the [Return] key, should skip the
// autosave-on-blur and let the handler for [Return] do its thing (save // autosave-on-blur and let the handler for [Return] do its thing (save
// the current row *anyway*, then create a new one/edit the next one) // the current row *anyway*, then create a new one/edit the next one)
@ -4218,6 +4225,12 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
} finally { } finally {
window.confirm = confirm; window.confirm = confirm;
} }
},
reload_record: function (record) {
// Evict record.id from cache to ensure it will be reloaded correctly
this.dataset.evict_record(record.get('id'));
return this._super(record);
} }
}); });
instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({ instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({
@ -4261,6 +4274,7 @@ var lazy_build_o2m_kanban_view = function() {
instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, { instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, {
template: "FieldMany2ManyTags", template: "FieldMany2ManyTags",
tag_template: "FieldMany2ManyTag",
init: function() { init: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
instance.web.form.CompletionFieldMixin.init.call(this); instance.web.form.CompletionFieldMixin.init.call(this);
@ -4268,13 +4282,9 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
this._display_orderer = new instance.web.DropMisordered(); this._display_orderer = new instance.web.DropMisordered();
this._drop_shown = false; this._drop_shown = false;
}, },
initialize_content: function() { initialize_texttext: function(){
if (this.get("effective_readonly"))
return;
var self = this; var self = this;
var ignore_blur = false; return {
self.$text = this.$("textarea");
self.$text.textext({
plugins : 'tags arrow autocomplete', plugins : 'tags arrow autocomplete',
autocomplete: { autocomplete: {
render: function(suggestion) { render: function(suggestion) {
@ -4325,7 +4335,15 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
}, },
}, },
}, },
}).bind('getSuggestions', function(e, data) { }
},
initialize_content: function() {
if (this.get("effective_readonly"))
return;
var self = this;
var ignore_blur = false;
self.$text = this.$("textarea");
self.$text.textext(self.initialize_texttext()).bind('getSuggestions', function(e, data) {
var _this = this; var _this = this;
var str = !!data ? data.query || '' : ''; var str = !!data ? data.query || '' : '';
self.get_search_result(str).done(function(result) { self.get_search_result(str).done(function(result) {
@ -4373,6 +4391,24 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
get_search_blacklist: function() { get_search_blacklist: function() {
return this.get("value"); return this.get("value");
}, },
map_tag: function(data){
return _.map(data, function(el) {return {name: el[1], id:el[0]};})
},
get_render_data: function(ids){
var self = this;
var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
return dataset.name_get(ids);
},
render_tag: function(data) {
var self = this;
if (! self.get("effective_readonly")) {
self.tags.containerElement().children().remove();
self.$('textarea').css("padding-left", "3px");
self.tags.addTags(self.map_tag(data));
} else {
self.$el.html(QWeb.render(self.tag_template, {elements: data}));
}
},
render_value: function() { render_value: function() {
var self = this; var self = this;
var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context()); var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
@ -4385,17 +4421,12 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
indexed[el[0]] = el; indexed[el[0]] = el;
}); });
data = _.map(values, function(el) { return indexed[el]; }); data = _.map(values, function(el) { return indexed[el]; });
if (! self.get("effective_readonly")) { self.render_tag(data);
self.tags.containerElement().children().remove(); }
self.$('textarea').css("padding-left", "3px");
self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};}));
} else {
self.$el.html(QWeb.render("FieldMany2ManyTag", {elements: data}));
}
};
if (! values || values.length > 0) { if (! values || values.length > 0) {
this._display_orderer.add(dataset.name_get(values)).done(handle_names); this._display_orderer.add(self.get_render_data(values)).done(handle_names);
} else { }
else{
handle_names([]); handle_names([]);
} }
}, },

22
addons/web/static/src/js/view_list.js
View File

@ -1056,7 +1056,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
id = parseInt(ref_match[2], 10); id = parseInt(ref_match[2], 10);
new instance.web.DataSet(this.view, model).name_get([id]).done(function(names) { new instance.web.DataSet(this.view, model).name_get([id]).done(function(names) {
if (!names.length) { return; } if (!names.length) { return; }
record.set(column.id, names[0][1]); record.set(column.id + '__display', names[0][1]);
}); });
} }
} else if (column.type === 'many2one') { } else if (column.type === 'many2one') {
@ -1314,7 +1314,8 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
} }
}, },
close: function () { close: function () {
this.$row.children().last().empty(); this.$row.children().last().find('button').remove();
this.$row.children().last().find('span').remove();
this.records.reset(); this.records.reset();
}, },
/** /**
@ -1485,7 +1486,8 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
} else { } else {
if (dataset.size() == records.length) { if (dataset.size() == records.length) {
// only one page // only one page
self.$row.find('td.oe_list_group_pagination').empty(); self.$row.find('td.oe_list_group_pagination').find('button').remove();
self.$row.find('td.oe_list_group_pagination').find('span').remove();
} else { } else {
var pages = Math.ceil(dataset.size() / limit); var pages = Math.ceil(dataset.size() / limit);
self.$row self.$row
@ -2127,6 +2129,7 @@ instance.web.list.columns = new instance.web.Registry({
'field.handle': 'instance.web.list.Handle', 'field.handle': 'instance.web.list.Handle',
'button': 'instance.web.list.Button', 'button': 'instance.web.list.Button',
'field.many2onebutton': 'instance.web.list.Many2OneButton', 'field.many2onebutton': 'instance.web.list.Many2OneButton',
'field.reference': 'instance.web.list.Reference',
'field.many2many': 'instance.web.list.Many2Many' 'field.many2many': 'instance.web.list.Many2Many'
}); });
instance.web.list.columns.for_ = function (id, field, node) { instance.web.list.columns.for_ = function (id, field, node) {
@ -2353,5 +2356,18 @@ instance.web.list.Many2Many = instance.web.list.Column.extend({
return this._super(row_data, options); return this._super(row_data, options);
} }
}); });
instance.web.list.Reference = instance.web.list.Column.extend({
_format: function (row_data, options) {
if (!_.isEmpty(row_data[this.id].value)) {
// If value, use __display version for printing
if (!!row_data[this.id + '__display']) {
row_data[this.id] = row_data[this.id + '__display'];
} else {
row_data[this.id] = {'value': ''};
}
}
return this._super(row_data, options);
}
});
})(); })();
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

29
addons/web/static/src/js/view_list_editable.js
View File

@ -53,8 +53,10 @@
}); });
this.on('edit:after', this, function () { this.on('edit:after', this, function () {
self.$el.add(self.$buttons).addClass('oe_editing'); self.$el.add(self.$buttons).addClass('oe_editing');
self.$('.ui-sortable').sortable('disable');
}); });
this.on('save:after cancel:after', this, function () { this.on('save:after cancel:after', this, function () {
self.$('.ui-sortable').sortable('enable');
self.$el.add(self.$buttons).removeClass('oe_editing'); self.$el.add(self.$buttons).removeClass('oe_editing');
}); });
}, },
@ -275,7 +277,7 @@
if (!this.editor.is_editing()) { return; } if (!this.editor.is_editing()) { return; }
for(var i=0, len=this.fields_for_resize.length; i<len; ++i) { for(var i=0, len=this.fields_for_resize.length; i<len; ++i) {
var item = this.fields_for_resize[i]; var item = this.fields_for_resize[i];
if (!item.field.get('invisible')) { if (!item.field.get('effective_invisible')) {
this.resize_field(item.field, item.cell); this.resize_field(item.field, item.cell);
} }
} }
@ -441,20 +443,26 @@
setup_events: function () { setup_events: function () {
var self = this; var self = this;
_.each(this.editor.form.fields, function(field, field_name) { _.each(this.editor.form.fields, function(field, field_name) {
var setting = false;
var set_invisible = function() { var set_invisible = function() {
if (!setting && field.get("effective_readonly")) { field.set({'force_invisible': field.get('effective_readonly')});
setting = true;
field.set({invisible: true});
setting = false;
}
}; };
field.on("change:effective_readonly", self, set_invisible); field.on("change:effective_readonly", self, set_invisible);
field.on("change:invisible", self, set_invisible);
set_invisible(); set_invisible();
field.on('change:effective_invisible', self, function () {
if (field.get('effective_invisible')) { return; }
var item = _(self.fields_for_resize).find(function (item) {
return item.field === field;
});
if (item) {
setTimeout(function() {
self.resize_field(item.field, item.cell);
}, 0);
}
});
}); });
this.editor.$el.on('keyup keydown', function (e) { this.editor.$el.on('keyup keypress keydown', function (e) {
if (!self.editor.is_editing()) { return true; } if (!self.editor.is_editing()) { return true; }
var key = _($.ui.keyCode).chain() var key = _($.ui.keyCode).chain()
.map(function (v, k) { return {name: k, code: v}; }) .map(function (v, k) { return {name: k, code: v}; })
@ -480,6 +488,7 @@
next_record = next_record || 'succ'; next_record = next_record || 'succ';
var self = this; var self = this;
return this.save_edition().then(function (saveInfo) { return this.save_edition().then(function (saveInfo) {
if (!saveInfo) { return null; }
if (saveInfo.created) { if (saveInfo.created) {
return self.start_edition(); return self.start_edition();
} }
@ -488,7 +497,7 @@
return self.start_edition(record, options); return self.start_edition(record, options);
}); });
}, },
keyup_ENTER: function () { keypress_ENTER: function () {
return this._next(); return this._next();
}, },
keydown_ESCAPE: function (e) { keydown_ESCAPE: function (e) {

1
addons/web/static/src/js/views.js
View File

@ -331,6 +331,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
action_menu_id: null, action_menu_id: null,
additional_context: {}, additional_context: {},
}); });
if (action === false) { if (action === false) {
action = { type: 'ir.actions.act_window_close' }; action = { type: 'ir.actions.act_window_close' };
} else if (_.isString(action) && instance.web.client_actions.contains(action)) { } else if (_.isString(action) && instance.web.client_actions.contains(action)) {

14
addons/web_calendar/__openerp__.py
View File

@ -8,18 +8,16 @@ OpenERP Web Calendar view.
""", """,
'version': '2.0', 'version': '2.0',
'depends': ['web'], 'depends': ['web'],
'data' : [],
'js': [ 'js': [
'static/lib/dhtmlxScheduler/sources/dhtmlxscheduler.js', 'static/lib/fullcalendar/js/fullcalendar.js',
'static/lib/dhtmlxScheduler/sources/ext/dhtmlxscheduler_minical.js', 'static/src/js/*.js'
'static/src/js/calendar.js'
], ],
'css': [ 'css': [
#'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css', 'static/lib/fullcalendar/css/*.css',
#'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_dhx_terrace.css', 'static/src/css/*.css'
'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css',
'static/src/css/web_calendar.css'
], ],
'qweb' : [ 'qweb': [
'static/src/xml/*.xml', 'static/src/xml/*.xml',
], ],
'auto_install': True 'auto_install': True

4
addons/web_calendar/i18n/ar.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/bg.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/bn.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/bs.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/ca.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/cs.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
"X-Poedit-Language: Czech\n" "X-Poedit-Language: Czech\n"
#. module: web_calendar #. module: web_calendar

4
addons/web_calendar/i18n/da.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

6
addons/web_calendar/i18n/de.po
View File

@ -9,13 +9,13 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n" "POT-Creation-Date: 2012-12-21 17:06+0000\n"
"PO-Revision-Date: 2012-12-04 07:12+0000\n" "PO-Revision-Date: 2012-12-04 07:12+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n" "Last-Translator: Ferdinand <Unknown>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/en_AU.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/en_GB.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/es.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/es_CL.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/es_CR.po
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
"Language: es\n" "Language: es\n"
#. module: web_calendar #. module: web_calendar

4
addons/web_calendar/i18n/es_DO.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/es_EC.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/es_MX.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/es_PE.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/et.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/eu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/fa.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/fi.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/fr.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

20
addons/web_calendar/i18n/fr_CA.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -29,7 +29,7 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:164 #: code:addons/web_calendar/static/src/js/calendar.js:164
#, python-format #, python-format
msgid "Details" msgid "Details"
msgstr "" msgstr "Détails"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -64,7 +64,7 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:171 #: code:addons/web_calendar/static/src/js/calendar.js:171
#, python-format #, python-format
msgid "Full day" msgid "Full day"
msgstr "" msgstr "Journée entière"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -79,7 +79,7 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:168 #: code:addons/web_calendar/static/src/js/calendar.js:168
#, python-format #, python-format
msgid "Event will be deleted permanently, are you sure?" msgid "Event will be deleted permanently, are you sure?"
msgstr "" msgstr "Êtes-vous certain de vouloir supprimer définitivement cet événement?"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -115,14 +115,14 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:165 #: code:addons/web_calendar/static/src/js/calendar.js:165
#, python-format #, python-format
msgid "Edit" msgid "Edit"
msgstr "" msgstr "Modifier"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
#: code:addons/web_calendar/static/src/js/calendar.js:177 #: code:addons/web_calendar/static/src/js/calendar.js:177
#, python-format #, python-format
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr "Activé"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -143,7 +143,7 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:175 #: code:addons/web_calendar/static/src/js/calendar.js:175
#, python-format #, python-format
msgid "Repeat event" msgid "Repeat event"
msgstr "" msgstr "Répéter l'événement"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -158,7 +158,7 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:170 #: code:addons/web_calendar/static/src/js/calendar.js:170
#, python-format #, python-format
msgid "Time period" msgid "Time period"
msgstr "" msgstr "Période de temps"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web
@ -200,7 +200,7 @@ msgstr ""
#: code:addons/web_calendar/static/src/js/calendar.js:163 #: code:addons/web_calendar/static/src/js/calendar.js:163
#, python-format #, python-format
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr "Annuler"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/gl.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/gu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

4
addons/web_calendar/i18n/hr.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n" "X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
"X-Generator: Launchpad (build 16872)\n" "X-Generator: Launchpad (build 16890)\n"
#. module: web_calendar #. module: web_calendar
#. openerp-web #. openerp-web

Some files were not shown because too many files have changed in this diff Show More