Merge lp:~openerp-dev/openobject-client/6.1-opw-576759-rgo into lp:openobject-client/6.1

[Ravi Gohil (OpenERP)]

Hello,

There is an issue with float_time widget of GTK-Client, it uses locale format instead of OpenERP locale format.

Steps to reproduce:
1) Set the 'Decimal Separator' of Language to other than dot(.),
2) after installing hr_timesheet module, go to 'Human Resources/Time Tracking/Timesheet Lines' and give value for 'Quantity' with user's locale 'Decimal Separator',

For example, with 'Decimal Separator' set to *, enter value for 'Quantity' 1*5, which should be parsed to 01:30 instead it is parsed to 15:00.

This fix fixes this issue, kindly review it.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

This merge proposal is a duplicate of your own MP
https://code.launchpad.net/~openerp-dev/openobject-client/6.1-opw-576759-rgo/+merge/114566

rejecting this one for the sake of clarity on LP.

Thanks,
Naresh

Unmerged revisions

=== modified file 'bin/widget/view/form_gtk/float_time.py'
--- bin/widget/view/form_gtk/float_time.py	2011-04-20 09:31:42 +0000
+++ bin/widget/view/form_gtk/float_time.py	2012-07-12 06:15:26 +0000
@@ -28,7 +28,7 @@
 
 import common
 import interface
-from tools import datetime_util
+from tools import user_locale_format, datetime_util
 
 class float_time(interface.widget_interface):
     def __init__(self, window, parent, model, attrs={}, label=None):
@@ -50,7 +50,7 @@
             if text and ':' in text:
                 return round(int(text.split(':')[0]) + int(text.split(':')[1]) / 60.0,4)
             else:
-                return locale.atof(text)
+                return user_locale_format.str2float(text)
         except:
             pass
         return 0.0
 
=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py	2011-10-20 07:08:15 +0000
+++ bin/widget/view/tree_gtk/parser.py	2012-07-12 06:15:26 +0000
@@ -505,7 +505,7 @@
             if text and ':' in text:
                 return round(int(text.split(':')[0]) + int(text.split(':')[1]) / 60.0,4)
             else:
-                return locale.atof(text)
+                return user_locale_format.str2float(text)
         except:
             pass
         return 0.0