Merge lp:~fabien-morin/unifield-web/fm-us-2110 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/utils/tools.py'
--- addons/openerp/utils/tools.py	2016-08-31 07:37:14 +0000
+++ addons/openerp/utils/tools.py	2017-01-10 09:25:40 +0000
@@ -206,21 +206,24 @@
 
     return xp
 
-def get_size(sz):
+def get_size(data):
     """
     Return the size in a human readable format
     """
-    if not sz:
-        return False
-
-    units = ('bytes', 'Kb', 'Mb', 'Gb')
-    if isinstance(sz,basestring):
-        sz=len(sz)
-    s, i = float(sz), 0
-    while s >= 1024 and i < len(units)-1:
-        s = s / 1024
-        i = i + 1
-    return "%0.2f %s" % (s, units[i])
+    units = ('Bytes', 'KB', 'MB', 'GB', 'TB')
+    if isinstance(data, basestring):
+        size = float(len(data))
+    elif isinstance(data, (int, long)):
+        size = float(data)
+    elif isinstance(data, float):
+        size = data
+    else:
+        return '0 Bytes'
+    unit_index = 0
+    while size >= 1024 and unit_index < len(units) - 1:
+        size = size / 1024
+        unit_index += 1
+    return "%0.2f %s" % (size, units[unit_index])
 
 def context_with_concurrency_info(context, concurrency_info):
     ctx = (context or {})

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2016-09-08 12:22:46 +0000
+++ addons/openerp/widgets/listgrid.py	2017-01-10 09:25:40 +0000
@@ -709,6 +709,11 @@
             self.val = self.value
             self.kind = 'text'
 
+class HumanSize(Char):
+
+    def get_text(self):
+        return utils.get_size(self.value or 0.0)
+
 class Button(TinyInputWidget):
 
     params = ['icon', 'id', 'parent_grid', 'btype', 'confirm', 'width', 'context']
@@ -802,4 +807,5 @@
         'null_boolean' : NullBoolean,
         'progressbar' : ProgressBar,
         'separator': Separator,
+        'human_size': HumanSize,
 }