[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140116110102-6jo2ta5fjkfppu1j
This commit is contained in:
Thibault Delavallée
commit
7416766f6a
|
|
@ -109,13 +109,11 @@ def serialize_exception(f):
|
|||
return wrap
|
||||
|
||||
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
|
||||
# redirect. And even if IE10 pretends to support it, it still fails
|
||||
# inexplicably in case of multiple redirects (and we do have some).
|
||||
# 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 werkzeug.utils.redirect(url, code)
|
||||
# Most IE and Safari versions decided not to preserve location.hash upon
|
||||
# redirect. And even if IE10 pretends to support it, it still fails
|
||||
# inexplicably in case of multiple redirects (and we do have some).
|
||||
# See extensive test page at http://greenbytes.de/tech/tc/httpredirects/
|
||||
return "<html><head><script>window.location = '%s' + location.hash;</script></head></html>" % url
|
||||
|
||||
def module_topological_sort(modules):
|
||||
""" Return a list of module names sorted so that their dependencies of the
|
||||
|
|
|
|||
|
|
@ -312,15 +312,6 @@ Output
|
|||
|
||||
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:
|
||||
|
||||
.. function:: t-raw=content
|
||||
|
|
@ -331,14 +322,6 @@ Output
|
|||
html-escape the result of evaluating ``content``. Should only ever
|
||||
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:
|
||||
|
||||
.. function:: t-att=map
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
"X-Poedit-Language: Czech\n"
|
||||
|
||||
#. module: web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
"Language: es\n"
|
||||
|
||||
#. module: web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
@ -244,7 +244,7 @@ msgstr "Formulaire"
|
|||
#: code:addons/web/static/src/xml/base.xml:1352
|
||||
#, python-format
|
||||
msgid "(no string)"
|
||||
msgstr "(no string)"
|
||||
msgstr "(chaîne vide)"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
@ -893,7 +893,7 @@ msgstr "Préférences"
|
|||
#: code:addons/web/static/src/js/view_form.js:435
|
||||
#, python-format
|
||||
msgid "Wrong on change format: %s"
|
||||
msgstr "Mauvais format sur le changement : %s"
|
||||
msgstr "Mauvais format \"on change\": %s"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
@ -2685,9 +2685,6 @@ msgstr "Фильтры"
|
|||
#~ msgid "OK"
|
||||
#~ msgstr "OK"
|
||||
|
||||
#~ msgid "Filter Entry"
|
||||
#~ msgstr "Входящий фильтр"
|
||||
|
||||
#~ msgid "Import Data"
|
||||
#~ msgstr "Импорт данных"
|
||||
|
||||
|
|
@ -2757,9 +2754,6 @@ msgstr "Фильтры"
|
|||
#~ msgid "Add / Remove Shortcut..."
|
||||
#~ msgstr "Добавить / Удалить ярлык..."
|
||||
|
||||
#~ msgid "Home"
|
||||
#~ msgstr "Домой"
|
||||
|
||||
#~ msgid "Unfold menu"
|
||||
#~ msgstr "Развернуть меню"
|
||||
|
||||
|
|
@ -2793,15 +2787,6 @@ msgstr "Фильтры"
|
|||
#~ msgid "and"
|
||||
#~ 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
|
||||
#~ msgid "Confirm Password:"
|
||||
#~ msgstr "Пароль ещё раз:"
|
||||
|
|
@ -2825,6 +2810,9 @@ msgstr "Фильтры"
|
|||
#~ msgid "*Required Fields are not selected :"
|
||||
#~ msgstr "*Требуемые поля не выбраны :"
|
||||
|
||||
#~ msgid "Filter Entry"
|
||||
#~ msgstr "Фильтровать вхождения"
|
||||
|
||||
#~ msgid "Filter disabled due to invalid syntax"
|
||||
#~ msgstr "Фильтр отключен из-за неверного синтаксиса"
|
||||
|
||||
|
|
@ -2861,9 +2849,21 @@ msgstr "Фильтры"
|
|||
#~ msgid "OpenERP Enterprise Contract."
|
||||
#~ msgstr "Контракт OpenERP Enterprise."
|
||||
|
||||
#~ msgid "Home"
|
||||
#~ msgstr "Главная"
|
||||
|
||||
#~ msgid "Send an e-mail with your default e-mail client"
|
||||
#~ 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:"
|
||||
#~ msgstr "Выберите панель для добавления этого фильтра:"
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -10,20 +10,6 @@
|
|||
<t t-esc="ok"/>
|
||||
</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) -->
|
||||
<t t-name="raw-literal">
|
||||
<t t-raw="'ok'"/>
|
||||
|
|
@ -34,18 +20,4 @@
|
|||
<t t-name="raw-notescaped">
|
||||
<t t-raw="ok"/>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -32,29 +32,11 @@
|
|||
equals(render('esc-variable', {ok: 'ok'}), "ok", "Render a string variable");
|
||||
equals(render('esc-toescape', {ok: '<ok>'}), "<ok>", "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>'}), '[<ok>]',
|
||||
"Render a formatted string with data to escape");
|
||||
});
|
||||
test("Basic unescaped output", function () {
|
||||
equals(render('raw-literal', {}), "ok", "Render a literal string");
|
||||
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");
|
||||
});
|
||||
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", {
|
||||
setup: function () {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
var QWeb2 = {
|
||||
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(','),
|
||||
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: {
|
||||
'and': '&&',
|
||||
'or': '||',
|
||||
|
|
@ -735,15 +735,9 @@ QWeb2.Element = (function() {
|
|||
compile_action_esc : function(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) {
|
||||
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) {
|
||||
this.top("(function(" + value + ") {");
|
||||
this.bottom("})(dict);");
|
||||
|
|
|
|||
|
|
@ -658,6 +658,10 @@
|
|||
display: block;
|
||||
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 {
|
||||
color: #4c4c4c;
|
||||
}
|
||||
|
|
@ -2893,6 +2897,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 {
|
||||
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 {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -594,6 +594,9 @@ $sheet-padding: 16px
|
|||
text-decoration: none
|
||||
background-color: #eee
|
||||
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
|
||||
background-color: #ffffff
|
||||
border: 1px solid #ddd
|
||||
|
|
@ -2306,6 +2309,8 @@ $sheet-padding: 16px
|
|||
&.oe_form_field_datetime,&.oe_form_field_date
|
||||
input.oe_datepicker_master
|
||||
width: 100% !important
|
||||
&.oe_form_field_reference
|
||||
display: table
|
||||
.oe_list_group_name
|
||||
white-space: nowrap
|
||||
// }}}
|
||||
|
|
|
|||
|
|
@ -868,7 +868,7 @@ instance.web.client_actions.add("history_back", "instance.web.HistoryBack");
|
|||
*/
|
||||
instance.web.Home = function(parent, action) {
|
||||
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");
|
||||
|
||||
|
|
|
|||
|
|
@ -939,6 +939,15 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
|
|||
* @param {Object} id record to remove from the BDS's cache
|
||||
*/
|
||||
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) {
|
||||
var record = this.cache[i];
|
||||
// if record we call the button upon is in the cache
|
||||
|
|
|
|||
|
|
@ -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...');
|
||||
return value_if_empty === undefined ? '' : value_if_empty;
|
||||
case false:
|
||||
case undefined:
|
||||
case Infinity:
|
||||
case -Infinity:
|
||||
return value_if_empty === undefined ? '' : value_if_empty;
|
||||
|
|
|
|||
|
|
@ -1870,9 +1870,14 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
|
|||
new instance.web.Model(this.view.model).call('fields_get', {
|
||||
context: this.view.dataset.context
|
||||
}).done(function(data) {
|
||||
self.fields = _.extend({
|
||||
self.fields = {
|
||||
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 () {
|
||||
self.append_proposition();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2624,6 +2624,11 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
|
|||
e.stopPropagation();
|
||||
}
|
||||
},
|
||||
'keypress': function (e) {
|
||||
if (e.which === $.ui.keyCode.ENTER) {
|
||||
e.stopPropagation();
|
||||
}
|
||||
},
|
||||
'change textarea': 'store_dom_value',
|
||||
},
|
||||
initialize_content: function() {
|
||||
|
|
@ -3450,6 +3455,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
|
|||
if (! no_recurse) {
|
||||
var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
|
||||
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.render_value(true);
|
||||
}).fail( function (data, event) {
|
||||
|
|
@ -4045,7 +4054,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
|
|||
GroupsType: instance.web.form.One2ManyGroups,
|
||||
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('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();
|
||||
this.$el
|
||||
.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;
|
||||
},
|
||||
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.editor.form.on('blurred', this, this._on_form_blur);
|
||||
},
|
||||
_after_edit: function () {
|
||||
|
||||
// The form's blur thing may be jiggered during the edition setup,
|
||||
// potentially leading to the o2m instasaving the row. Cancel any
|
||||
// blurring triggered the edition startup here
|
||||
|
|
@ -4203,7 +4210,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
|
|||
}
|
||||
this.cancel_edition();
|
||||
},
|
||||
keyup_ENTER: function () {
|
||||
keypress_ENTER: function () {
|
||||
// blurring caused by hitting the [Return] key, should skip the
|
||||
// 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)
|
||||
|
|
@ -4218,6 +4225,12 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
|
|||
} finally {
|
||||
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({
|
||||
|
|
@ -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, {
|
||||
template: "FieldMany2ManyTags",
|
||||
tag_template: "FieldMany2ManyTag",
|
||||
init: function() {
|
||||
this._super.apply(this, arguments);
|
||||
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._drop_shown = false;
|
||||
},
|
||||
initialize_content: function() {
|
||||
if (this.get("effective_readonly"))
|
||||
return;
|
||||
initialize_texttext: function(){
|
||||
var self = this;
|
||||
var ignore_blur = false;
|
||||
self.$text = this.$("textarea");
|
||||
self.$text.textext({
|
||||
return {
|
||||
plugins : 'tags arrow autocomplete',
|
||||
autocomplete: {
|
||||
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 str = !!data ? data.query || '' : '';
|
||||
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() {
|
||||
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() {
|
||||
var self = this;
|
||||
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;
|
||||
});
|
||||
data = _.map(values, function(el) { return indexed[el]; });
|
||||
if (! self.get("effective_readonly")) {
|
||||
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}));
|
||||
}
|
||||
};
|
||||
self.render_tag(data);
|
||||
}
|
||||
if (! values || values.length > 0) {
|
||||
this._display_orderer.add(dataset.name_get(values)).done(handle_names);
|
||||
} else {
|
||||
this._display_orderer.add(self.get_render_data(values)).done(handle_names);
|
||||
}
|
||||
else{
|
||||
handle_names([]);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1056,7 +1056,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
|
|||
id = parseInt(ref_match[2], 10);
|
||||
new instance.web.DataSet(this.view, model).name_get([id]).done(function(names) {
|
||||
if (!names.length) { return; }
|
||||
record.set(column.id, names[0][1]);
|
||||
record.set(column.id + '__display', names[0][1]);
|
||||
});
|
||||
}
|
||||
} else if (column.type === 'many2one') {
|
||||
|
|
@ -1314,7 +1314,8 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
|
|||
}
|
||||
},
|
||||
close: function () {
|
||||
this.$row.children().last().empty();
|
||||
this.$row.children().last().find('button').remove();
|
||||
this.$row.children().last().find('span').remove();
|
||||
this.records.reset();
|
||||
},
|
||||
/**
|
||||
|
|
@ -1485,7 +1486,8 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
|
|||
} else {
|
||||
if (dataset.size() == records.length) {
|
||||
// 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 {
|
||||
var pages = Math.ceil(dataset.size() / limit);
|
||||
self.$row
|
||||
|
|
@ -2127,6 +2129,7 @@ instance.web.list.columns = new instance.web.Registry({
|
|||
'field.handle': 'instance.web.list.Handle',
|
||||
'button': 'instance.web.list.Button',
|
||||
'field.many2onebutton': 'instance.web.list.Many2OneButton',
|
||||
'field.reference': 'instance.web.list.Reference',
|
||||
'field.many2many': 'instance.web.list.Many2Many'
|
||||
});
|
||||
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);
|
||||
}
|
||||
});
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -53,8 +53,10 @@
|
|||
});
|
||||
this.on('edit:after', this, function () {
|
||||
self.$el.add(self.$buttons).addClass('oe_editing');
|
||||
self.$('.ui-sortable').sortable('disable');
|
||||
});
|
||||
this.on('save:after cancel:after', this, function () {
|
||||
self.$('.ui-sortable').sortable('enable');
|
||||
self.$el.add(self.$buttons).removeClass('oe_editing');
|
||||
});
|
||||
},
|
||||
|
|
@ -275,7 +277,7 @@
|
|||
if (!this.editor.is_editing()) { return; }
|
||||
for(var i=0, len=this.fields_for_resize.length; i<len; ++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);
|
||||
}
|
||||
}
|
||||
|
|
@ -441,20 +443,26 @@
|
|||
setup_events: function () {
|
||||
var self = this;
|
||||
_.each(this.editor.form.fields, function(field, field_name) {
|
||||
var setting = false;
|
||||
var set_invisible = function() {
|
||||
if (!setting && field.get("effective_readonly")) {
|
||||
setting = true;
|
||||
field.set({invisible: true});
|
||||
setting = false;
|
||||
}
|
||||
field.set({'force_invisible': field.get('effective_readonly')});
|
||||
};
|
||||
field.on("change:effective_readonly", self, set_invisible);
|
||||
field.on("change:invisible", self, 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; }
|
||||
var key = _($.ui.keyCode).chain()
|
||||
.map(function (v, k) { return {name: k, code: v}; })
|
||||
|
|
@ -480,6 +488,7 @@
|
|||
next_record = next_record || 'succ';
|
||||
var self = this;
|
||||
return this.save_edition().then(function (saveInfo) {
|
||||
if (!saveInfo) { return null; }
|
||||
if (saveInfo.created) {
|
||||
return self.start_edition();
|
||||
}
|
||||
|
|
@ -488,7 +497,7 @@
|
|||
return self.start_edition(record, options);
|
||||
});
|
||||
},
|
||||
keyup_ENTER: function () {
|
||||
keypress_ENTER: function () {
|
||||
return this._next();
|
||||
},
|
||||
keydown_ESCAPE: function (e) {
|
||||
|
|
|
|||
|
|
@ -331,6 +331,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
|
|||
action_menu_id: null,
|
||||
additional_context: {},
|
||||
});
|
||||
|
||||
if (action === false) {
|
||||
action = { type: 'ir.actions.act_window_close' };
|
||||
} else if (_.isString(action) && instance.web.client_actions.contains(action)) {
|
||||
|
|
|
|||
|
|
@ -8,18 +8,16 @@ OpenERP Web Calendar view.
|
|||
""",
|
||||
'version': '2.0',
|
||||
'depends': ['web'],
|
||||
'data' : [],
|
||||
'js': [
|
||||
'static/lib/dhtmlxScheduler/sources/dhtmlxscheduler.js',
|
||||
'static/lib/dhtmlxScheduler/sources/ext/dhtmlxscheduler_minical.js',
|
||||
'static/src/js/calendar.js'
|
||||
'static/lib/fullcalendar/js/fullcalendar.js',
|
||||
'static/src/js/*.js'
|
||||
],
|
||||
'css': [
|
||||
#'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css',
|
||||
#'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_dhx_terrace.css',
|
||||
'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css',
|
||||
'static/src/css/web_calendar.css'
|
||||
'static/lib/fullcalendar/css/*.css',
|
||||
'static/src/css/*.css'
|
||||
],
|
||||
'qweb' : [
|
||||
'qweb': [
|
||||
'static/src/xml/*.xml',
|
||||
],
|
||||
'auto_install': True
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:57+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
"X-Poedit-Language: Czech\n"
|
||||
|
||||
#. module: web_calendar
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ msgstr ""
|
|||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:06+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"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
"Language: es\n"
|
||||
|
||||
#. module: web_calendar
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
@ -29,7 +29,7 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:164
|
||||
#, python-format
|
||||
msgid "Details"
|
||||
msgstr ""
|
||||
msgstr "Détails"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
@ -64,7 +64,7 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:171
|
||||
#, python-format
|
||||
msgid "Full day"
|
||||
msgstr ""
|
||||
msgstr "Journée entière"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
@ -79,7 +79,7 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:168
|
||||
#, python-format
|
||||
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
|
||||
#. openerp-web
|
||||
|
|
@ -115,14 +115,14 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:165
|
||||
#, python-format
|
||||
msgid "Edit"
|
||||
msgstr ""
|
||||
msgstr "Modifier"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
#: code:addons/web_calendar/static/src/js/calendar.js:177
|
||||
#, python-format
|
||||
msgid "Enabled"
|
||||
msgstr ""
|
||||
msgstr "Activé"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
@ -143,7 +143,7 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:175
|
||||
#, python-format
|
||||
msgid "Repeat event"
|
||||
msgstr ""
|
||||
msgstr "Répéter l'événement"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
@ -158,7 +158,7 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:170
|
||||
#, python-format
|
||||
msgid "Time period"
|
||||
msgstr ""
|
||||
msgstr "Période de temps"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
@ -200,7 +200,7 @@ msgstr ""
|
|||
#: code:addons/web_calendar/static/src/js/calendar.js:163
|
||||
#, python-format
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Annuler"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16872)\n"
|
||||
"X-Launchpad-Export-Date: 2014-01-14 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16890)\n"
|
||||
|
||||
#. module: web_calendar
|
||||
#. openerp-web
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue