odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Problem with float formatting, not analyzing correctly the digits parameter 

bzr revid: nicolas.vanhoren@openerp.com-20120621124123-novg5wadwvvcbrkt
This commit is contained in:
niv-openerp 2012-06-21 14:41:23 +02:00
parent 7a48f76737 24f870f066
commit cae22c8ff4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/formats.js
View File

@ -118,7 +118,9 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
return instance.web.insert_thousand_seps(
_.str.sprintf('%d', value));
case 'float':
var precision = descriptor.digits ? descriptor.digits[1] : 2;
var digits = descriptor.digits ? descriptor.digits : [69,2];
digits = typeof digits === "string" ? py.eval(digits) : digits;
var precision = digits[1];
var formatted = _.str.sprintf('%.' + precision + 'f', value).split('.');
formatted[0] = instance.web.insert_thousand_seps(formatted[0]);
return formatted.join(l10n.decimal_point);

2
addons/web/static/src/js/view_form.js
View File

@ -1995,7 +1995,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
this._super(field_manager, node);
this.set({'value': 0});
if (this.node.attrs.digits) {
this.digits = py.eval(node.attrs.digits);
this.digits = this.node.attrs.digits;
} else {
this.digits = this.field.digits;
}