openerp-dev-web team mailing list archive

["Ravi Gadhia \(OpenERP\)" <rga@xxxxxxxxxxx>]

Ravi Gadhia (OpenERP) has proposed merging lp:~openerp-dev/openobject-client/trunk-bug-786868-rga into lp:openobject-client.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)
Related bugs:
  Bug #786868 in OpenERP GTK Client: "[PS] Task : total work time"
  https://bugs.launchpad.net/openobject-client/+bug/786868

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-786868-rga/+merge/62967
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-786868-rga/+merge/62967
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/trunk-bug-786868-rga.

=== modified file 'bin/widget/view/list.py'
--- bin/widget/view/list.py	2011-05-27 11:23:55 +0000
+++ bin/widget/view/list.py	2011-05-31 11:03:30 +0000
@@ -35,6 +35,7 @@
 from interface import parser_view
 from tools import user_locale_format
 from widget.model.record import ModelRecord
+from tools.datetime_util import float_time_convert
 
 class field_record(object):
     def __init__(self, name, count):
@@ -778,7 +779,10 @@
                         value += float(model.fields_get()[self.children[c][0]].get(model, check_load=False) or 0.0)
             if self.children[c][5] == 'avg' and length:
                 value = value/length
-            label_str = user_locale_format.format('%.' + str(self.children[c][3]) + 'f', value)
+            if self.children[c][6] == 'float_time':
+                label_str = float_time_convert(value)
+            else:
+                label_str = user_locale_format.format('%.' + str(self.children[c][3]) + 'f', value)
             if self.children[c][4]:
                 self.children[c][2].set_markup('<b>%s</b>' % label_str)
             else:

=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py	2011-03-20 11:26:23 +0000
+++ bin/widget/view/tree_gtk/parser.py	2011-05-31 11:03:30 +0000
@@ -231,7 +231,7 @@
                     label_sum = gtk.Label()
                     label_sum.set_use_markup(True)
                     dict_widget[n] = (fname, label, label_sum,
-                            fields[fname].get('digits', (16,2))[1], label_bold, calculate)
+                            fields[fname].get('digits', (16,2))[1], label_bold, calculate, fields[fname]['type'])
         return treeview, dict_widget, [], on_write
 
 class UnsettableColumn(Exception):