Merge lp:~unifield-team/unifield-web/UF_536 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2011-05-10 07:16:46 +0000
+++ addons/openerp/controllers/tree.py	2012-01-11 14:32:41 +0000
@@ -33,11 +33,13 @@
 from openobject.tools import url, expose
 
 from openerp.controllers import SecuredController
-from openerp.utils import rpc, cache, icons, common, TinyDict
+from openerp.utils import rpc, cache, icons, common, TinyDict, expr_eval
 from openerp.widgets import tree_view
+from babel import numbers
 
 FORMATTERS = {
-    'integer': lambda value, _i: str(value),
+    'integer': lambda value, _i: '%s' % int(value),
+    'integer_finance': lambda value, _i: numbers.format_number(int(value), locale='en_US'),
     'float': lambda value, _i: '%.02f' % (value),
     'date': lambda value, _i: time.strftime('%x', time.strptime(value, DT_SERVER_FORMATS['date'])),
     'datetime': lambda value, _i: time.strftime('%x', time.strptime(value, DT_SERVER_FORMATS['datetime'])),
@@ -131,7 +133,7 @@
 
     @expose('json')
     def data(self, ids, model, fields, field_parent=None, icon_name=None,
-             domain=[], context={}, sort_by=None, sort_order="asc", fields_info=None):
+             domain=[], context={}, sort_by=None, sort_order="asc", fields_info=None, colors={}):
         
         if ids == 'None' or ids == '':
             ids = []
@@ -150,6 +152,9 @@
         if isinstance(context, basestring):
             context = eval(context)
         
+        if isinstance(colors, basestring):
+            colors = eval(colors)
+            
         if isinstance(fields_info, basestring):
             fields_info = simplejson.loads(fields_info)
 
@@ -173,9 +178,21 @@
             fields_info_type = simplejson.loads(fields_info[sort_by])
             result.sort(lambda a,b: self.sort_callback(a, b, sort_by, sort_order, type=fields_info_type['type']))
 
+        for item in result:
+            if colors:
+                for color, expr in colors.items():
+                    try:
+                        if expr_eval(expr,item or False):
+                            item['color'] = color
+                            break
+                    except:
+                            pass
+
         # format the data
         for field in fields:
             field_info = simplejson.loads(fields_info[field])
+            if field_info.get('widget',''):
+                field_info['type'] = field_info['widget']
             formatter = FORMATTERS.get(field_info['type'])
             for x in result:
                 if x[field] and formatter:
 
=== modified file 'addons/openerp/static/javascript/treegrid.js'
--- addons/openerp/static/javascript/treegrid.js	2011-03-14 10:25:57 +0000
+++ addons/openerp/static/javascript/treegrid.js	2012-01-11 14:32:41 +0000
@@ -326,7 +326,7 @@
             var key = header.name;
             var value = this.record.items[key];
 
-            var td = MochiKit.DOM.TD({'class': header.type || null, 'width' : header.width || null});
+            var td = MochiKit.DOM.TD({'class': header.type || null, 'width' : header.width || null, 'style':{'color':this.record.items['color']}});
             if (i == 0) { // first column
 
                 var row = [];
@@ -344,7 +344,7 @@
 
                 row.push(arrow);
 
-                value = MochiKit.DOM.createDOM('A', {'href': '#'}, value);
+                value = MochiKit.DOM.createDOM('A', {'href': '#','style':{'color':this.record.items['color']}}, value);
                 this.element_a = value;
 
                 this.eventOnKeyDown = MochiKit.Signal.connect(value, 'onkeydown', this, this.onKeyDown);
 
=== modified file 'addons/openerp/validators.py'
--- addons/openerp/validators.py	2011-12-29 10:44:43 +0000
+++ addons/openerp/validators.py	2012-01-11 14:32:41 +0000
@@ -30,6 +30,7 @@
 
 from openobject.validators import BaseValidator
 from openobject.i18n import format
+from babel import numbers
 
 class String(BaseValidator):
     if_empty = False
@@ -60,6 +61,19 @@
 
 class Int(formencode.validators.Int):
     if_empty = False
+ 
+class IntFinance(formencode.validators.Int):
+    if_empty = False
+
+    def _from_python(self, value, state):
+        return numbers.format_number(int(value) or 0, locale='en_US')
+
+    def _to_python(self, value, state):
+        try:
+            value = numbers.parse_number(value, locale='en_US')
+        except ValueError:
+            raise formencode.api.Invalid(_('Invalid literal for int'), value, state)
+        return value
 
 class Float(formencode.validators.Number):
     if_empty = False
 
=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2011-12-29 10:44:43 +0000
+++ addons/openerp/widgets/form/_form.py	2012-01-11 14:32:41 +0000
@@ -407,6 +407,19 @@
 
 register_widget(Integer, ["integer"])
 
+class IntegerFinance(Integer):
+    template = "/openerp/widgets/form/templates/integer.mako"
+
+    def __init__(self, **attrs):
+        super(IntegerFinance, self).__init__(**attrs)
+        self.validator = validators.IntFinance()
+
+    def set_value(self, value):
+        self.default = value or 0
+
+register_widget(IntegerFinance, ["integer_finance"])
+
+
 class BooleanLabel(InputWidgetLabel):
     template = "/openerp/widgets/form/templates/boolean_label.mako"
 class Boolean(TinyInputWidget):
 
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-01-06 10:47:56 +0000
+++ addons/openerp/widgets/listgrid.py	2012-01-11 14:32:41 +0000
@@ -24,6 +24,7 @@
 import re
 from openerp import utils
 from itertools import chain, count
+from babel import numbers
 
 import cherrypy
 from openerp.utils import rpc, icons, common, expr_eval, node_attributes
@@ -619,6 +620,17 @@
             return int(self.value)
 
         return 0
+ 
+class IntFinance(Char):
+
+    def get_text(self):
+        value = 0
+        if self.value:
+            if isinstance(self.value, (unicode, str)):
+                value = eval(value)
+            else:
+                value = self.value
+        return numbers.format_number(value or 0, locale='en_US')
 
 class ProgressBar(Char):
     template = "/openerp/widgets/templates/listgrid/progressbar.mako"
@@ -754,6 +766,7 @@
         'float':Float,
         'float_time':FloatTime,
         'integer':Int,
+        'integer_finance':IntFinance,
         'boolean' : Boolean,
         'progressbar' : ProgressBar
 }
 
=== modified file 'addons/openerp/widgets/tree_view.py'
--- addons/openerp/widgets/tree_view.py	2011-04-14 09:43:11 +0000
+++ addons/openerp/widgets/tree_view.py	2012-01-11 14:32:41 +0000
@@ -72,7 +72,13 @@
 
         ids = []
         id = res_id
-
+        
+        colors = {}
+        for color_spec in attrs.get('colors', '').split(';'):
+            if color_spec:
+                colour, test = color_spec.split(':')
+                colors[colour] = test
+                
         if self.toolbar:
             ids = proxy.search(self.domain2, 0, 0, 0, ctx)
             self.toolbar = proxy.read(ids, ['name', 'icon'], ctx)
@@ -97,7 +103,8 @@
                                       context=self.context,
                                       field_parent=self.field_parent,
                                       onselection="onSelection",
-                                      fields_info=fields_info)
+                                      fields_info=fields_info,
+                                      colors=colors)
         self.id = id
         self.ids = ids