Merge lp:~openerp-dev/openerp-web/trunk-bug-994589-vme into lp:openerp-web

Proposed by Vidhin Mehta (OpenERP)
Status: Merged
Merged at revision: 2591
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-994589-vme
Merge into: lp:openerp-web
Diff against target: 13 lines (+2/-1)
1 file modified
addons/web/static/src/js/formats.js (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-bug-994589-vme
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+107164@code.launchpad.net

Description of the change

Tree view was not considering decimal precision which given from xml file,
converts string object to list object.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/formats.js'
2--- addons/web/static/src/js/formats.js 2012-05-11 11:32:22 +0000
3+++ addons/web/static/src/js/formats.js 2012-05-24 07:26:17 +0000
4@@ -118,7 +118,8 @@
5 return instance.web.insert_thousand_seps(
6 _.str.sprintf('%d', value));
7 case 'float':
8- var precision = descriptor.digits ? descriptor.digits[1] : 2;
9+ var precision = descriptor.digits ?
10+ (typeof descriptor.digits === "string")? py.eval(descriptor.digits)[1]: descriptor.digits[1] : 2;
11 var formatted = _.str.sprintf('%.' + precision + 'f', value).split('.');
12 formatted[0] = instance.web.insert_thousand_seps(formatted[0]);
13 return formatted.join(l10n.decimal_point);