From a720eec77c4df8b08cdf38da3929030a6f2f3c05 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 Oct 2013 11:36:57 +0200
Subject: [PATCH] [FIX] monetary field rounding, QWebContext in tests

bzr revid: xmo@openerp.com-20131014093657-wl00zhbgk5b1zs0o
---
 openerp/addons/base/ir/ir_qweb.py                 |  3 ++-
 .../addons/test_converter/tests/test_html.py      |  4 ++--
 openerp/tests/test_qweb.py                        | 15 ++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index e7566f9e232..3fe5cb03c03 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -615,6 +615,7 @@ class MonetaryConverter(osv.AbstractModel):
             source_element, t_att, g_att, qweb_context)
 
     def record_to_html(self, cr, uid, field_name, record, column, options):
+        Currency = self.pool['res.currency']
         display = self.display_currency(cr, uid, options)
 
         symbol_pre = symbol_post = space_pre = space_post = u''
@@ -628,7 +629,7 @@ class MonetaryConverter(osv.AbstractModel):
         return u'{symbol_pre}{space_pre}' \
                u'<span class="oe_currency_value">{0}</span>' \
                u'{space_post}{symbol_post}'.format(
-            record[field_name],
+            Currency.round(cr, uid, display, record[field_name]),
             space_pre=space_pre,
             symbol_pre=symbol_pre,
             space_post=space_post,
diff --git a/openerp/tests/addons/test_converter/tests/test_html.py b/openerp/tests/addons/test_converter/tests/test_html.py
index f0c48df4a93..d433c814958 100644
--- a/openerp/tests/addons/test_converter/tests/test_html.py
+++ b/openerp/tests/addons/test_converter/tests/test_html.py
@@ -4,6 +4,7 @@ import os
 import xml.dom.minidom
 
 from openerp.tests import common
+from openerp.addons.base.ir import ir_qweb
 
 directory = os.path.dirname(__file__)
 
@@ -80,7 +81,6 @@ class TestCurrencyExport(TestExport):
         super(TestCurrencyExport, self).setUp()
         self.Currency = self.registry('res.currency')
         self.base = self.create(self.Currency, name="Source", symbol=u'source')
-        self.create_rate(self.base)
 
     def create(self, model, context=None, **values):
         return model.browse(
@@ -98,7 +98,7 @@ class TestCurrencyExport(TestExport):
             self.cr, self.uid, 'value', obj, options,
             doc.createElement('span'),
             {'field': 'obj.value', 'field-options': json.dumps(options)},
-            '', {'obj': obj, 'c2': dest, })
+            '', ir_qweb.QWebContext({'obj': obj, 'c2': dest, }))
         return converted
 
     def test_currency_post(self):
diff --git a/openerp/tests/test_qweb.py b/openerp/tests/test_qweb.py
index 3bdff5e63d0..662946c175e 100644
--- a/openerp/tests/test_qweb.py
+++ b/openerp/tests/test_qweb.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 import cgi
-from collections import namedtuple
 from xml.dom import minidom as dom
 
 import common
+from openerp.addons.base.ir import ir_qweb
+import openerp.addons.base.ir.ir_qweb
 
 impl = dom.getDOMImplementation()
 document = impl.createDocument(None, None, None)
@@ -23,9 +24,9 @@ class TestQWebTField(common.TransactionCase):
         })
         root_company = Companies.browse(self.cr, self.uid, company_id)
 
-        result = self.engine.render_node(field, {
+        result = self.engine.render_node(field, ir_qweb.QWebContext({
             'company': root_company,
-        })
+        }))
 
         self.assertEqual(
             result,
@@ -46,9 +47,9 @@ class TestQWebTField(common.TransactionCase):
         })
         root_company = Companies.browse(self.cr, self.uid, company_id)
 
-        result = self.engine.render_node(field, {
+        result = self.engine.render_node(field, ir_qweb.QWebContext({
             'company': root_company,
-        })
+        }))
         self.assertEqual(
             result,
             '<span data-oe-model="res.company" data-oe-id="%d" '
@@ -64,7 +65,7 @@ class TestQWebTField(common.TransactionCase):
         with self.assertRaisesRegexp(
                 AssertionError,
                 r'^RTE widgets do not work correctly'):
-            self.engine.render_node(field, {'company': None})
+            self.engine.render_node(field, ir_qweb.QWebContext({'company': None}))
 
     def test_reject_t_tag(self):
         field = document.createElement('t')
@@ -73,4 +74,4 @@ class TestQWebTField(common.TransactionCase):
         with self.assertRaisesRegexp(
                 AssertionError,
                 r'^t-field can not be used on a t element'):
-            self.engine.render_node(field, {'company': None})
+            self.engine.render_node(field, ir_qweb.QWebContext({'company': None}))