[FIX] rename currency widget to monetary to match views
bzr revid: xmo@openerp.com-20131008122006-k7xjv2lkd0t7lza7
This commit is contained in:
parent
273f62bc78
commit
ef848653af
|
@ -554,20 +554,20 @@ class ImageConverter(osv.AbstractModel):
|
|||
|
||||
return '<img src="data:%s;base64,%s">' % (Image.MIME[image.format], value)
|
||||
|
||||
class CurrencyConverter(osv.AbstractModel):
|
||||
""" ``currency`` converter, has a mandatory option ``currency``.
|
||||
class MonetaryConverter(osv.AbstractModel):
|
||||
""" ``monetary`` converter, has a mandatory option ``currency_field``.
|
||||
|
||||
The currency field is a (float) value, the linked ``currency`` is an m2o
|
||||
to a ``res.currency`` indicating how to format the field.
|
||||
The currency field is a (float) value, the linked ``currency_field`` is an
|
||||
m2o to a ``res.currency`` indicating how to format the field.
|
||||
"""
|
||||
_name = 'ir.qweb.field.currency'
|
||||
_name = 'ir.qweb.field.monetary'
|
||||
_inherit = 'ir.qweb.field'
|
||||
|
||||
def record_to_html(self, cr, uid, field_name, record, column, options):
|
||||
Currency = self.pool['res.currency']
|
||||
|
||||
symbol_pre = symbol_post = space_pre = space_post = u''
|
||||
currency = record[options['currency']]
|
||||
currency = record[options['currency_field']]
|
||||
if currency.position == 'before':
|
||||
space_pre = u' '
|
||||
symbol_pre = currency.symbol
|
||||
|
|
|
@ -118,4 +118,4 @@ access_ir_qweb_field_selection,access_ir_qweb_field_selection,model_ir_qweb_fiel
|
|||
access_ir_qweb_field_many2one,access_ir_qweb_field_many2one,model_ir_qweb_field_many2one,,0,0,0,0
|
||||
access_ir_qweb_field_html,access_ir_qweb_field_html,model_ir_qweb_field_html,,0,0,0,0
|
||||
access_ir_qweb_field_image,access_ir_qweb_field_image,model_ir_qweb_field_image,,0,0,0,0
|
||||
access_ir_qweb_field_currency,access_ir_qweb_field_currency,model_ir_qweb_field_currency,,0,0,0,0
|
||||
access_ir_qweb_field_monetary,access_ir_qweb_field_monetary,model_ir_qweb_field_monetary,,0,0,0,0
|
||||
|
|
|
|
@ -1,4 +1,4 @@
|
|||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_converter_model,access_converter_model,model_test_converter_test_model,,1,1,1,1
|
||||
access_test_converter_test_model_sub,access_test_converter_test_model_sub,model_test_converter_test_model_sub,,1,1,1,1
|
||||
access_test_converter_currency,access_test_converter_currency,model_test_converter_currency,,1,1,1,1
|
||||
access_test_converter_monetary,access_test_converter_monetary,model_test_converter_monetary,,1,1,1,1
|
||||
|
|
|
|
@ -38,8 +38,8 @@ class test_model_sub(orm.Model):
|
|||
}
|
||||
|
||||
|
||||
class test_model_currency(orm.Model):
|
||||
_name = 'test_converter.currency'
|
||||
class test_model_monetary(orm.Model):
|
||||
_name = 'test_converter.monetary'
|
||||
|
||||
_columns = {
|
||||
'value': fields.float(digits=(16, 55)),
|
||||
|
|
|
@ -74,7 +74,7 @@ class TestFloatExport(TestBasicExport):
|
|||
self.assertEqual(value, '42.01')
|
||||
|
||||
class TestCurrencyExport(TestExport):
|
||||
_model = 'test_converter.currency'
|
||||
_model = 'test_converter.monetary'
|
||||
|
||||
def setUp(self):
|
||||
super(TestCurrencyExport, self).setUp()
|
||||
|
@ -87,8 +87,8 @@ class TestCurrencyExport(TestExport):
|
|||
context=context)
|
||||
|
||||
def convert(self, obj):
|
||||
converter = self.registry('ir.qweb.field.currency')
|
||||
options = {'widget': 'currency', 'currency': 'currency_id'}
|
||||
converter = self.registry('ir.qweb.field.monetary')
|
||||
options = {'widget': 'monetary', 'currency_field': 'currency_id'}
|
||||
converted = converter.to_html(
|
||||
self.cr, self.uid, 'value', obj, options,
|
||||
doc.createElement('span'),
|
||||
|
@ -105,7 +105,7 @@ class TestCurrencyExport(TestExport):
|
|||
self.assertEqual(
|
||||
converted,
|
||||
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
|
||||
'data-oe-field="value" data-oe-type="currency" '
|
||||
'data-oe-field="value" data-oe-type="monetary" '
|
||||
'data-oe-expression="obj.value">'
|
||||
'<span class="oe_currency_value">0.12</span>'
|
||||
' {symbol}</span>'.format(
|
||||
|
@ -123,7 +123,7 @@ class TestCurrencyExport(TestExport):
|
|||
self.assertEqual(
|
||||
converted,
|
||||
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
|
||||
'data-oe-field="value" data-oe-type="currency" '
|
||||
'data-oe-field="value" data-oe-type="monetary" '
|
||||
'data-oe-expression="obj.value">'
|
||||
'{symbol} '
|
||||
'<span class="oe_currency_value">0.12</span>'
|
||||
|
@ -143,7 +143,7 @@ class TestCurrencyExport(TestExport):
|
|||
self.assertEqual(
|
||||
converted,
|
||||
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
|
||||
'data-oe-field="value" data-oe-type="currency" '
|
||||
'data-oe-field="value" data-oe-type="monetary" '
|
||||
'data-oe-expression="obj.value">'
|
||||
'<span class="oe_currency_value">0.12</span>'
|
||||
' {symbol}</span>'.format(
|
||||
|
|
Loading…
Reference in New Issue