diff --git a/openerp/tests/addons/test_converter/models.py b/openerp/tests/addons/test_converter/models.py index 0cd861aa274..9074ba8178f 100644 --- a/openerp/tests/addons/test_converter/models.py +++ b/openerp/tests/addons/test_converter/models.py @@ -43,5 +43,4 @@ class test_model_monetary(orm.Model): _columns = { 'value': fields.float(digits=(16, 55)), - 'currency_id': fields.many2one('res.currency'), } diff --git a/openerp/tests/addons/test_converter/tests/test_html.py b/openerp/tests/addons/test_converter/tests/test_html.py index aca9967e89b..06e7ffce97a 100644 --- a/openerp/tests/addons/test_converter/tests/test_html.py +++ b/openerp/tests/addons/test_converter/tests/test_html.py @@ -109,7 +109,7 @@ class TestCurrencyExport(TestExport): def test_currency_post(self): currency = self.create(self.Currency, name="Test", symbol=u"test") self.create_rate(currency) - obj = self.create(self.Model, value=0.12, currency_id=currency.id) + obj = self.create(self.Model, value=0.12) converted = self.convert(obj, dest=currency) @@ -128,7 +128,7 @@ class TestCurrencyExport(TestExport): currency = self.create( self.Currency, name="Test", symbol=u"test", position='before') self.create_rate(currency) - obj = self.create(self.Model, value=0.12, currency_id=currency.id) + obj = self.create(self.Model, value=0.12) converted = self.convert(obj, dest=currency) @@ -144,12 +144,31 @@ class TestCurrencyExport(TestExport): symbol=currency.symbol.encode('utf-8') ),) + def test_currency_rate_conversion(self): + currency = self.create( + self.Currency, name="Test", symbol=u"dest") + self.create_rate(currency, rate=2.0) + obj = self.create(self.Model, value=0.12) + + converted = self.convert(obj, dest=currency) + + self.assertEqual( + converted, + '' + '0.24' + ' {symbol}'.format( + obj=obj, + symbol=currency.symbol.encode('utf-8') + ),) + def test_currency_precision(self): """ Precision should be the currency's, not the float field's """ currency = self.create(self.Currency, name="Test", symbol=u"test",) self.create_rate(currency) - obj = self.create(self.Model, value=0.1234567, currency_id=currency.id) + obj = self.create(self.Model, value=0.1234567) converted = self.convert(obj, dest=currency)