Merge lp:~openerp-dev/openobject-client-web/6.0-opw-596611-msh into lp:openobject-client-web

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of decimal not formatted according to language specification in tree view for float field.

Demo:-

1.Locale Code : en_US
2.Separator Format : [3,3,3,3,3,3,3,3]
3.Decimal Separator : . (dot)
4.Thousand Separator : , (point)

Goto Accounting -> Chart of accounts -> open chart of accounts from wizard -> tree view do not have grouping in float field value.

Thanks.

Unmerged revisions

4916. By Mohammed Shekha<email address hidden> on 2013-08-16

[FIX]Fixed the issue of decimal not formatted according to language specification in tree view for float field.

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2012-05-02 20:11:32 +0000
+++ addons/openerp/controllers/tree.py	2013-08-16 13:57:14 +0000
@@ -29,7 +29,7 @@
 
 import actions
 
-from openobject.i18n.format import format_datetime
+from openobject.i18n.format import format_datetime, format_decimal
 from openobject.tools import url, expose
 
 from openerp.controllers import SecuredController
@@ -38,7 +38,7 @@
 
 FORMATTERS = {
     'integer': lambda value, _i: '%s' % int(value),
-    'float': lambda value, _i: '%.02f' % (value),
+    'float': lambda value, _i: format_decimal(float(value) or 0.0, _i and _i.get('digit')),
     'date': lambda value, _i: format_datetime(value, 'date'),
     'datetime': lambda value, _i: format_datetime(value, 'datetime'),
     'one2one': lambda value, _i: value[1],
@@ -193,6 +193,12 @@
             field_info = simplejson.loads(fields_info[field])
             if field_info.get('widget',''):
                 field_info['type'] = field_info['widget']
+            if field_info.get('type') == 'float':
+                digits = field_info.get('digits', (16,2))
+                if isinstance(digits, basestring):
+                    digits = eval(digits)
+                integer, digit = digits
+                field_info['digit'] = digit
             formatter = FORMATTERS.get(field_info['type'])
             for x in result:
                 if x[field] and formatter: