[IMP] qweb: add backward compatibility for t-field-options

2 files changed, 11 insertions, 2 deletions

diff --git a/openerp/addons/base/ir/ir_qweb/fields.py b/openerp/addons/base/ir/ir_qweb/fields.py
index e542bdc5e69..c0feaa27aa8 100644
--- a/openerp/addons/base/ir/ir_qweb/fields.py
+++ b/openerp/addons/base/ir/ir_qweb/fields.py
@@ -5,7 +5,7 @@ from odoo import api, fields, models, _
 from PIL import Image
 from cStringIO import StringIO
 import babel
-from openerp.tools import html_escape as escape, posix_to_ldml
+from openerp.tools import html_escape as escape, posix_to_ldml, safe_eval
 from .qweb import unicodifier
 
 import logging
@@ -300,6 +300,15 @@ class MonetaryConverter(models.AbstractModel):
     def record_to_html(self, record, field_name, options, values=None):
         field = record._fields[field_name]
 
+        # for backward compatibility to remove after v10
+        if isinstance(options.get('display_currency'), str):
+            _logger.warning("Use new syntax for '%s' monetary widget 'display_currency' option (instead of deprecated JSON syntax) to improve speed." % options['display_currency'])
+            options['display_currency'] = safe_eval.safe_eval(options['display_currency'], mode='eval', globals_dict=values)
+        if isinstance(options.get('from_currency'), str):
+            _logger.warning("Use new syntax for '%s' monetary widget 'from_currency' option (instead of deprecated JSON syntax) to improve speed." % options['from_currency'])
+            options['from_currency'] = safe_eval.safe_eval(options['from_currency'], mode='eval', globals_dict=values)
+        # end backward
+
         display_currency = False
         #currency should be specified by monetary field
         if field.type == 'monetary' and field.currency_field:
diff --git a/openerp/addons/base/ir/ir_qweb/ir_qweb.py b/openerp/addons/base/ir/ir_qweb/ir_qweb.py
index 4965b84e2e4..bf228a2bdbe 100644
--- a/openerp/addons/base/ir/ir_qweb/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb/ir_qweb.py
@@ -56,7 +56,7 @@ class IrQWeb(models.AbstractModel, QWeb):
         """ attributes add to the values for each computed template
         """
         default = super(IrQWeb, self).default_values()
-        default.update(request=request, cache_assets=round(time()/180))
+        default.update(request=request, cache_assets=round(time()/180), true=True, false=False) # true and false added for backward compatibility to remove after v10
         return default
 
     # assume cache will be invalidated by third party on write to ir.ui.view