Merge lp:~unifield-team/unifield-web/us-2156 into lp:unifield-web

[Quentin THEURET @Amaris]

Unmerged revisions

4838. By Quentin THEURET @Amaris on 2017-02-21

Merge https://code.launchpad.net/~jfb-tempo-consulting/unifield-web/utp-830

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2017-02-06 11:21:15 +0000
+++ addons/openerp/controllers/form.py	2017-02-22 08:04:53 +0000
@@ -84,8 +84,8 @@
     data = data or {}
 
     proxy = rpc.RPCProxy(model)
-    fields = proxy.fields_get([], rpc.session.context)
-
+    if data:
+        fields = proxy.fields_get(data.keys(), rpc.session.context)
     search_domain = domain[:]
     search_data = {}
 
@@ -1206,6 +1206,7 @@
         # apply validators (transform values from python)
         values = result['value']
         values2 = {}
+        float_to_check = []
         for k, v in values.items():
             key = ((prefix or '') and prefix + '/') + k
 
@@ -1218,14 +1219,17 @@
                 values2[k] = {'value': v}
 
             if kind == 'float':
-                field = proxy.fields_get([k], ctx2)
-                digit = field[k].get('digits')
-                if digit: digit = digit[1]
+                float_to_check.append(k)
+        if float_to_check:
+            fields = proxy.fields_get(float_to_check, ctx2)
+            for k in float_to_check:
+                digit = fields[k].get('digits')
+                if digit:
+                    digit = digit[1]
                 values2[k]['digit'] = digit or 2
-
                 # custom fields - decimal_precision computation
-                computation = field[k].get('computation')
-                values2[k]['computation'] = computation
+                values2[k]['computation'] = fields[k].get('computation')
+                values2[k]['truncate'] = fields[k].get('truncate', False)
 
         values = TinyForm(**values2).from_python().make_plain()
 
 
=== modified file 'addons/openerp/utils/utils.py'
--- addons/openerp/utils/utils.py	2017-01-17 11:01:12 +0000
+++ addons/openerp/utils/utils.py	2017-02-22 08:04:53 +0000
@@ -367,7 +367,7 @@
 
             v = _VALIDATORS.get(kind, openobject.validators.DefaultValidator)()
             if kind == "float" and attrs.get("digit"):
-                v = validators.Float(digit=attrs.get("digit"), computation=attrs.get("computation"))
+                v = validators.Float(digit=attrs.get("digit"), computation=attrs.get("computation"), truncate=attrs.get("truncate"))
             v.not_empty = (required or False) and True
 
             try:
 
=== modified file 'addons/openerp/validators.py'
--- addons/openerp/validators.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/validators.py	2017-02-22 08:04:53 +0000
@@ -65,9 +65,10 @@
     if_empty = False
     digit = 2
     computation = False
+    truncate = False
 
     def _from_python(self, value, state):
-        return format.format_decimal(float(value) or 0.0, self.digit, computation=self.computation)
+        return format.format_decimal(float(value) or 0.0, self.digit, computation=self.computation, truncate=self.truncate)
 
     def _to_python(self, value, state):
         try:
 
=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/widgets/form/_form.py	2017-02-22 08:04:53 +0000
@@ -455,13 +455,13 @@
             digits = eval(digits)
 
         integer, digit = digits
-        
+        truncate = attrs.get('truncate', False)
         # custom fields - decimal_precision computation
         computation = attrs.get('computation', False)
         if isinstance(computation, basestring):
             computation = eval(computation)
 
-        self.validator = validators.Float(digit=digit, computation=computation)
+        self.validator = validators.Float(digit=digit, computation=computation, truncate=truncate)
 
 #        if not self.default:
 #            self.default = 0.0
 
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2017-02-08 15:03:00 +0000
+++ addons/openerp/widgets/listgrid.py	2017-02-22 08:04:53 +0000
@@ -323,11 +323,12 @@
 
         # custom fields - decimal_precision computation
         computation = attrs.get('computation', False)
+        truncate = attrs.get('truncate', False)
         if isinstance(computation, basestring):
             computation = eval(computation)
 
         integer, digit = digits
-        return format.format_decimal(sum or 0.0, digit, computation=computation)
+        return format.format_decimal(sum or 0.0, digit, computation=computation, truncate=truncate)
 
     def do_real_sum(self, data, field):
         sum = 0.0
@@ -348,11 +349,12 @@
 
         # custom fields - decimal_precision computation
         computation = attrs.get('computation', False)
+        truncate = attrs.get('truncate', False)
         if isinstance(computation, basestring):
             computation = eval(computation)
 
         integer, digit = digits
-        return format.format_decimal(sum or 0.0, digit, computation=computation)
+        return format.format_decimal(sum or 0.0, digit, computation=computation, truncate=truncate)
 
 
     def display(self, value=None, **params):
@@ -608,11 +610,12 @@
 
         # custom fields - decimal_precision computation
         computation = self.attrs.get('computation', False)
+        truncate = self.attrs.get('truncate', False)
         if isinstance(computation, basestring):
             computation = eval(computation)
 
         integer, digit = digits
-        return format.format_decimal(self.value or 0.0, digit, computation=computation)
+        return format.format_decimal(self.value or 0.0, digit, computation=computation, truncate=truncate)
 
     def get_sortable_text(self):
         return ustr(self.value or '0.0')
 
=== modified file 'addons/openerp/widgets/listgroup.py'
--- addons/openerp/widgets/listgroup.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/widgets/listgroup.py	2017-02-22 08:04:53 +0000
@@ -81,7 +81,8 @@
     digits = (16,2)
     # custom fields - decimal_precision computation
     computation = False
-    
+    truncate = False
+
     if fields:
         for key, val in fields.items():
             if val.get('digits'):
@@ -89,6 +90,8 @@
             # custom fields - decimal_precision computation
             if val.get('computation'):
                 computation = val['computation']
+            if val.get('truncate'):
+                truncate = val['truncate']
     if isinstance(digits, basestring):
             digits = eval(digits)
     integer, digit = digits
@@ -101,14 +104,14 @@
             if grp_records[0].has_key(sum_key):
                 value = sum(map(lambda x: x[sum_key], grp_records))
                 if isinstance(value, float):
-                    total_fields[sum_key][1] = format.format_decimal(value or 0.0, digit, computation=computation)
+                    total_fields[sum_key][1] = format.format_decimal(value or 0.0, digit, computation=computation, truncate=truncate)
                 else:
                     total_fields[sum_key][1] = value
     if grp_records:
         for rec in grp_records:
             for key, val in rec.items():
                 if isinstance(val, float):
-                    rec[key] = format.format_decimal(val or 0.0, digit, computation=computation)
+                    rec[key] = format.format_decimal(val or 0.0, digit, computation=computation, truncate=truncate)
 
             for grp_by in group_by:
                 if not rec.get(grp_by):
 
=== modified file 'openobject/i18n/format.py'
--- openobject/i18n/format.py	2017-01-02 14:59:00 +0000
+++ openobject/i18n/format.py	2017-02-22 08:04:53 +0000
@@ -291,6 +291,7 @@
     return fixed_domain
 
 def format_decimal(value, digits=2, **kwargs):
+    truncate = kwargs.get('truncate', False)
     locale = get_locale()
     # fix issue where "%.2f"%a != '%s'%round(a, 2) exple a=51.345 depends on python version / win / linux
     value = round(value, digits)
@@ -315,8 +316,13 @@
         if len(decimals) < min_digits:
             decimals = decimals + '0'*(min_digits - len(decimals))
 
+    if truncate:
+        decimals = decimals.rstrip('0')
+        if not decimals:
+            return val
+
     result = val + unicode(numbers.get_decimal_symbol(locale) + decimals)
-        
+
     return result
 
 def parse_decimal(value):