Merge lp:~xmo-deactivatedaccount/openobject-client-web/trunk-various-stuff into lp:openobject-client-web/trunk

[Xavier (Open ERP)]

Small improvements (mostly style) done while reading the code

[Christophe Simonis (OpenERP) (kangol)]

rev2943 seems to break <group> tag (as it generate a Frame object instead of a Group object)

review: Needs Fixing

[lp:~xmo-deactivatedaccount/openobject-client-web/trunk-various-stuff]

2945. By Xavier (Open ERP) on 2010-03-09

[fix] <group/> broken in <email address hidden>

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Fixed, thanks

=== modified file 'addons/openerp/__init__.py'
--- addons/openerp/__init__.py	2009-11-10 09:21:45 +0000
+++ addons/openerp/__init__.py	2010-03-09 13:30:53 +0000
@@ -3,4 +3,3 @@
 import controllers
 
 import utils
-

=== modified file 'addons/openerp/controllers/__init__.py'
--- addons/openerp/controllers/__init__.py	2010-02-04 12:16:22 +0000
+++ addons/openerp/controllers/__init__.py	2010-03-09 13:30:53 +0000
@@ -31,6 +31,3 @@
 import workflow
 import process
 import modules
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2010-01-13 13:41:55 +0000
+++ addons/openerp/controllers/actions.py	2010-03-09 13:30:53 +0000
@@ -29,24 +29,18 @@
 
 """This module implementes action methods.
 """
-
-import time
 import base64
 import datetime
+import time
 
 import cherrypy
+from openerp.utils import rpc, common, expr_eval, TinyDict
 
+from form import Form
 from openobject import tools
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import expr_eval
-from openerp.utils import TinyDict
-
-from form import Form
+from selection import Selection
 from tree import Tree
 from wizard import Wizard
-from selection import Selection
 
 
 def execute_window(view_ids, model, res_id=False, domain=None, view_type='form', context={},
@@ -72,10 +66,10 @@
     params.domain = domain or []
     params.context = context or {}
     params.limit = limit
-    
+
     cherrypy.request._terp_view_name = name or None
     cherrypy.request._terp_view_target = target or None
-    
+
     if params.ids and not isinstance(params.ids, list):
         params.ids = [params.ids]
 
@@ -202,10 +196,10 @@
     elif action['type'] in ['ir.actions.act_window', 'ir.actions.submenu']:
         for key in ('res_id', 'res_model', 'view_type','view_mode', 'limit'):
             data[key] = action.get(key, data.get(key, None))
-            
+
         if not data.get('limit'):
             data['limit'] = 80
-        
+
         view_ids=False
         if action.get('views', []):
             if isinstance(action['views'], list):
@@ -223,14 +217,14 @@
         ctx = data.get('context', {}).copy()
         ctx.update({'active_id': data.get('id', False), 'active_ids': data.get('ids', [])})
         ctx.update(expr_eval(action.get('context', '{}'), ctx.copy()))
-        
+
         search_view = action.get('search_view_id')
         if search_view:
             if isinstance(search_view, (list, tuple)):
                 ctx['search_view'] = search_view[0]
             else:
                 ctx['search_view'] = search_view
-            
+
         # save active_id in session
         rpc.session.active_id = data.get('id')
 
@@ -251,7 +245,7 @@
                              name=action.get('name'),
                              target=action.get('target'),
                              limit=data.get('limit'))
-        
+
         return res
 
     elif action['type']=='ir.actions.server':
@@ -266,7 +260,7 @@
     elif action['type']=='ir.actions.wizard':
         if 'window' in data:
             del data['window']
-        
+
 
         ctx1 = data.get('context', {}).copy()
         ctx2 = action.get('context', {}).copy()
@@ -324,7 +318,7 @@
 
     if type==None:
         type = get_action_type(act_id)
-	
+
     res = rpc.session.execute('object', 'execute', type, 'read', act_id, False, rpc.session.context)
     return execute(res, **data)
 
@@ -366,6 +360,3 @@
 @tools.expose(template="templates/closepopup.mako")
 def close_popup(*args, **kw):
     return dict()
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/attachment.py	2010-03-09 13:30:53 +0000
@@ -26,21 +26,16 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
 import base64
 
+from openerp.controllers import SecuredController
+from openerp.utils import rpc, common
+
 from openobject.tools import expose
 
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-
-from openerp.controllers import SecuredController
-
 
 class Attachment(SecuredController):
-    
+
     _cp_path = "/attachment"
 
     @expose()

=== modified file 'addons/openerp/controllers/controllers.py'
--- addons/openerp/controllers/controllers.py	2010-01-09 14:09:46 +0000
+++ addons/openerp/controllers/controllers.py	2010-03-09 13:30:53 +0000
@@ -30,18 +30,13 @@
 """
 This modules implements custom authorization logic for the OpenERP Web Client.
 """
-
 import types
-import cherrypy
 
 from openobject.controllers import BaseController
-
 from utils import secured
 
-
 __all__ = ["SecuredController"]
 
-    
 class SecuredController(BaseController):
 
     def __getattribute__( self, name ):

=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2010-03-03 12:24:36 +0000
+++ addons/openerp/controllers/database.py	2010-03-09 13:30:53 +0000
@@ -26,26 +26,16 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
+import base64
 import re
 import time
-import base64
 
 import cherrypy
-
-from openobject.tools import url
-from openobject.tools import expose
-from openobject.tools import redirect
-from openobject.tools import validate
-from openobject.tools import error_handler
+from openerp import widgets, validators
+from openerp.utils import rpc, common
 
 from openobject.controllers import BaseController
-
-from openerp.utils import rpc
-from openerp.utils import common
-
-from openerp import widgets
-from openerp import validators
+from openobject.tools import url, expose, redirect, validate, error_handler
 
 
 def get_lang_list():
@@ -70,7 +60,7 @@
             self.validator = validators.Schema()
         for f in self.fields:
             self.validator.add_field(f.name, f.validator)
-            
+
     def update_params(self, d):
         super(DBForm, self).update_params(d)
         d.attrs['action'] = url(self.action)
@@ -138,7 +128,7 @@
 }
 
 class Database(BaseController):
-    
+
     _cp_path = "/database"
 
     @expose()

=== modified file 'addons/openerp/controllers/error_page.py'
--- addons/openerp/controllers/error_page.py	2010-01-11 10:07:02 +0000
+++ addons/openerp/controllers/error_page.py	2010-03-09 13:30:53 +0000
@@ -26,26 +26,18 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
+import cgitb
 import sys
-import cgitb
 
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
+from openerp import widgets
+from openerp.utils import rpc, common
 
 from openobject.controllers import BaseController
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-
-from openerp import widgets
-
+from openobject.tools import expose, redirect
 
 class ErrorPage(BaseController):
-    
+
     _cp_path = "/errorpage"
 
     nb = widgets.form.Notebook()
@@ -56,36 +48,36 @@
 
     def render(self):
         etype, value, tb = sys.exc_info()
-        
+
         if isinstance(value, common.Concurrency):
             return self.__render(value)
-        
+
         if not isinstance(value, common.TinyException):
             return cgitb.html((etype, value, tb))
-        
+
         return self.__render(value)
 
     @expose(template="templates/error_page.mako")
     def __render(self, value):
-        
+
         maintenance = None
         concurrency = False
-        
+
         all_params = cherrypy.request.params
-        
+
         title=value.title
         error=value.message
-        
+
         target = cherrypy.request.path_info or '/form/save'
-                
+
         if isinstance(value, common.Concurrency):
             concurrency = True
-                
+
         if isinstance(value, common.TinyError):
             proxy = rpc.RPCProxy('maintenance.contract')
             maintenance = proxy.status()
-        
-        return dict(title=title, error=error, maintenance=maintenance, nb=self.nb, 
+
+        return dict(title=title, error=error, maintenance=maintenance, nb=self.nb,
                     concurrency=concurrency, all_params=all_params, target=target)
 
     @expose('json')

=== modified file 'addons/openerp/controllers/fieldpref.py'
--- addons/openerp/controllers/fieldpref.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/fieldpref.py	2010-03-09 13:30:53 +0000
@@ -26,24 +26,13 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
-import time
-
-import cherrypy
+from openerp.controllers import SecuredController
+from openerp.utils import rpc, TinyDict, TinyForm
 
 from openobject.tools import expose
 
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-from openerp.utils import TinyForm
-
-from openerp.controllers import SecuredController
-
-
 class FieldPref(SecuredController):
-    
+
     _cp_path = "/fieldpref"
 
     @expose(template="templates/fieldpref.mako")

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2010-02-04 12:16:22 +0000
+++ addons/openerp/controllers/form.py	2010-03-09 13:30:53 +0000
@@ -26,39 +26,22 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
+import base64
 import re
-import base64
 
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-from openobject.tools import validate
-from openobject.tools import error_handler
-from openobject.tools import exception_handler
-
-from openerp import utils
-
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import common
-from openerp.utils import TinyDict
-from openerp.utils import TinyForm
-
+from openerp import utils, widgets as tw, validators
 from openerp.controllers import SecuredController
-
-from openerp import widgets as tw
-from openerp import validators
-
+from openerp.utils import rpc, cache, common, TinyDict, TinyForm
 from openerp.widgets.form import generate_url_for_picture
 
+from openobject.tools import expose, redirect, validate, error_handler, exception_handler
 
 def make_domain(name, value, kind='char'):
     """A helper function to generate domain for the given name, value pair.
     Will be used for search window...
     """
-        
+
     if isinstance(value, int) and not isinstance(value, bool):
         return [(name, '=', value)]
 
@@ -77,10 +60,10 @@
             return [(name, '<=', end)]
 
         return None
-    
+
     if kind == "selection" and value:
         return [(name, '=', value)]
-    
+
     if isinstance(value, basestring) and value:
         return [(name, 'ilike', value)]
 
@@ -105,10 +88,10 @@
     domain = domain or []
     context = context or {}
     data = data or {}
-    
+
     proxy = rpc.RPCProxy(model)
     fields = proxy.fields_get([], {})
-    
+
     search_domain = domain[:]
     search_data = {}
 
@@ -153,9 +136,9 @@
 
     cherrypy.request.terp_validators = {}
     cherrypy.request.terp_data = data
-    
+
     params.nodefault = True
-    
+
     form = self.create_form(params)
     cherrypy.request.terp_form = form
 
@@ -187,9 +170,9 @@
     raise tg_exceptions
 
 class Form(SecuredController):
-    
+
     _cp_path = "/form"
-    
+
     def create_form(self, params, tg_errors=None):
         if tg_errors:
             return cherrypy.request.terp_form
@@ -234,24 +217,24 @@
         buttons.can_attach = id and mode == 'form'
         buttons.has_attach = buttons.can_attach and len(form.sidebar.attachments)
         buttons.i18n = not editable and mode == 'form'
-                
+
         from openerp.widgets import get_registered_views
         buttons.views = []
-        
+
         views = get_registered_views()
         for k, v in views:
             active = k in params.view_mode and mode != k
             buttons.views.append(dict(kind=k, name=v.name, desc=v.desc, active=active))
-            
+
         target = getattr(cherrypy.request, '_terp_view_target', None)
         buttons.toolbar = target != 'new' and not form.is_dashboard
 
         if cache.can_write('ir.ui.view'):
             links.view_manager = True
-            
+
         if cache.can_write('workflow'):
             links.workflow_manager = True
-            
+
         buttons.process = cache.can_read('process.process')
 
         pager = None
@@ -280,7 +263,7 @@
 
         params.editable = True
         params.view_type = 'form'
-        
+
         cherrypy.request._terp_view_target = kw.get('target')
 
         if params.view_mode and 'form' not in params.view_mode:
@@ -319,7 +302,7 @@
 
         params.editable = False
         params.view_type = 'form'
-        
+
         cherrypy.request._terp_view_target = kw.get('target')
 
         if params.view_mode and 'form' not in params.view_mode:
@@ -412,7 +395,7 @@
 
         if terp_save_only:
             return dict(params=params, data=data)
-        
+
         def get_params(p, f):
 
             pp = p.chain_get(f)
@@ -448,7 +431,7 @@
                 'limit': params.limit,
                 'count': params.count,
                 'search_domain': ustr(params.search_domain)}
-                
+
         if params.editable or params.source or params.return_edit:
             raise redirect(self.path + '/edit', source=params.source, **args)
 
@@ -617,7 +600,7 @@
             proxy.write([params.id], {params.field: False, params.fname: False}, ctx)
         else:
             proxy.write([params.id], {params.field: False}, ctx)
-            
+
         args = {'model': params.model,
                 'id': params.id,
                 'ids': ustr(params.ids),
@@ -629,7 +612,7 @@
                 'limit': params.limit,
                 'count': params.count,
                 'search_domain': ustr(params.search_domain)}
-                
+
         raise redirect(self.path + '/edit', **args)
 
     @expose()
@@ -856,33 +839,33 @@
     @expose()
     def action(self, **kw):
         params, data = TinyDict.split(kw)
-        
+
         id = params.id or False
         ids = params.selection or []
-        
+
         if not ids and id:
             ids = [id]
-            
+
         if not id and ids:
             id = ids[0]
-        
+
         domain = params.domain or []
         context = params.context or {}
-        
+
         act_id = params.action
-        
+
         if not params.selection and not params.id:
             raise common.message(_('You must save this record to use the sidebar button!'))
-        
+
         if not act_id:
             return self.do_action('client_action_multi', datas=kw)
-        
+
         action_type = rpc.RPCProxy('ir.actions.actions').read(act_id, ['type'], rpc.session.context)['type']
         action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, rpc.session.context)
-        
+
         action['domain'] = domain or []
         action['context'] = context or {}
-        
+
         import actions
         return actions.execute(action, model=params.model, id=id, ids=ids, report_type='pdf')
 
@@ -955,13 +938,13 @@
             response = getattr(proxy, func_name)(ids, *args)
         except Exception, e:
             return dict(error=ustr(e))
-        
+
         if response is False: # response is False when creating new record for inherited view.
             response = {}
-            
+
         if 'value' not in response:
             response['value'] = {}
-            
+
         result.update(response)
 
         # apply validators (transform values from python)
@@ -1066,16 +1049,16 @@
     @expose()
     def action_submenu(self, **kw):
         params, data = TinyDict.split(kw)
-        
+
         import actions
-        
+
         act_id = rpc.session.execute('object', 'execute', 'ir.model.data', 'search', [('name','=', params.action_id)])
         res_model = rpc.session.execute('object', 'execute', 'ir.model.data', 'read', act_id, ['res_id'])
-        
+
         res = rpc.session.execute('object', 'execute', 'ir.actions.act_window', 'read', res_model[0]['res_id'], False)
-        
+
         if res:
             return actions.execute(res, model=params.model, id=params.id, context=rpc.session.context.copy())
 
-        
+
 # vim: ts=4 sts=4 sw=4 si et

=== modified file 'addons/openerp/controllers/image.py'
--- addons/openerp/controllers/image.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/image.py	2010-03-09 13:30:53 +0000
@@ -26,22 +26,18 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
 import base64
 
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-
+from openerp.controllers import SecuredController
 from openerp.utils import rpc
-from openerp.controllers import SecuredController
 from openerp.widgets.form import get_temp_file
 
+from openobject.tools import expose, redirect
+
 
 class Image(SecuredController):
-    
+
     _cp_path = "/image"
 
     @expose(template="templates/image.mako")
@@ -68,7 +64,7 @@
             return base64.decodestring(res)
         else:
             return ''
-        
+
     @expose(content_type='application/octet')
     def get_picture(self, **kw):
         fname = get_temp_file(**kw)

=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/impex.py	2010-03-09 13:30:53 +0000
@@ -26,36 +26,21 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
+import StringIO
+import csv
 import re
-import os
-import csv
-import time
-import types
-import base64
-import StringIO
 import xml.dom.minidom
 
-import cherrypy
+from openerp.controllers import SecuredController
+from openerp.utils import rpc, common, TinyDict, node_attributes
+from openerp.widgets import treegrid, listgrid
 
 from openobject import tools
-
-from openobject.tools import expose
-from openobject.tools import redirect
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-from openerp.utils import node_attributes
-
-from openerp.controllers import SecuredController
-
-from openerp.widgets import treegrid
-from openerp.widgets import listgrid
+from openobject.tools import expose, redirect
 
 
 def datas_read(ids, model, fields, context=None):
-    ctx = context.copy()    
+    ctx = context.copy()
     ctx.update(rpc.session.context)
     return rpc.RPCProxy(model).export_data(ids, fields, ctx)
 
@@ -125,7 +110,7 @@
     return fields
 
 class ImpEx(SecuredController):
-    
+
     _cp_path = "/impex"
 
     @expose(template="templates/exp.mako")
@@ -355,32 +340,32 @@
 
         ids = params.ids or proxy.search(domain, 0, 0, 0, ctx)
         result = datas_read(ids, params.model, fields, context=ctx)
-        
+
         if result.get('warning', False):
             common.warning(unicode(result.get('warning', False)), _('Export Error!'))
             return False
         result = result.get('datas',[])
-        
+
         if import_compat:
             params.fields2 = fields
 
         if export_as == 'xls':
-            try:            
+            try:
                 import xlwt
             except Exception, e:
-                  raise common.warning(_('Please Install xlwt Library.\nTo create spreadsheet files compatible with MS Excel.'), _('Import Error.')) 
-                   
+                  raise common.warning(_('Please Install xlwt Library.\nTo create spreadsheet files compatible with MS Excel.'), _('Import Error.'))
+
             ezxf = xlwt.easyxf
-          
+
             fp = StringIO.StringIO()
-          
+
             wb = xlwt.Workbook()
             worksheet = wb.add_sheet('Sheet 1')
-          
+
             for col in range(len(fields)):
                 worksheet.write(0, col, str(fields[col]))
                 col+1
-                
+
             heading_xf = ezxf('align: wrap yes')
 
             for data in range(len(result)):
@@ -391,13 +376,13 @@
                         pass
                     result[data][d] = re.sub("\r", " ", result[data][d])
                     worksheet.write(data+1, d, result[data][d], heading_xf)
-                    worksheet.col(d).width = 8000  
-                    d+1   
-            
-            wb.save(fp)            
+                    worksheet.col(d).width = 8000
+                    d+1
+
+            wb.save(fp)
 
             fp.seek(0)
-            data = fp.read()          
+            data = fp.read()
             return data
         else:
             return export_csv(params.fields2, result, add_names)
@@ -487,7 +472,7 @@
         #if csv_data['combo']:
         ctx = {}
         ctx.update(rpc.session.context.copy())
-        
+
         if not isinstance(fields, list):
             fields = [fields]
 
@@ -504,7 +489,7 @@
             for key,val in res[1].items():
                 d+= ('\t%s: %s\n' % (ustr(key),ustr(val)))
             error = _('Error trying to import this record:\n%s\nError Message:\n%s\n\n%s') % (d,res[2],res[3])
-            raise common.warning(unicode(error), _('Importation Error !'))   
+            raise common.warning(unicode(error), _('Importation Error !'))
 
         return self.imp(**kw)
 

=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py	2010-02-26 06:44:18 +0000
+++ addons/openerp/controllers/listgrid.py	2010-03-09 13:30:53 +0000
@@ -26,27 +26,18 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
-from openobject.tools import expose
-
-from openerp.utils import rpc
-from openerp.utils import TinyDict
-from openerp.utils import TinyForm
-from openerp.utils import TinyFormError
-from openerp.utils import context_with_concurrency_info
-
 from openerp.controllers import SecuredController
-
+from openerp.utils import rpc, TinyDict, TinyForm, TinyFormError, context_with_concurrency_info
 from openerp.widgets import listgrid
 
 import form
-import search
 import wizard
+from openobject.tools import expose
+
 
 class List(SecuredController):
-    
+
     _cp_path = "/listgrid"
 
     @expose('json')
@@ -234,14 +225,14 @@
             error = ustr(e)
 
         return dict(error=error, result=result, reload=reload)
-    
+
     @expose('json')
     def sort_by_order(self, **kw):
         params, data = TinyDict.split(kw)
         proxy = rpc.RPCProxy(params.model)
         ctx = rpc.session.context.copy()
         try:
-            
+
             if params.sort_domain:
                 ids = proxy.search(params.sort_domain, 0,0, params.sort_order, ctx)
             else:
@@ -249,7 +240,7 @@
             return dict(ids = ids)
         except Exception , e:
             return dict(error = e.message)
-    
+
     @expose('json')
     def sort_by_drag(self, **kw):
         params, data = TinyDict.split(kw)
@@ -258,7 +249,7 @@
         proxy = rpc.RPCProxy(params.model)
         ctx = rpc.session.context.copy()
         swap_id = params.swap_id
-        
+
         res_id = proxy.read([id], ['sequence'], ctx)[0]
         id_seq = res_id['sequence']
         res_swap_id = proxy.read([swap_id], ['sequence'], ctx)[0]
@@ -279,14 +270,14 @@
                         proxy.write([r['id']], {'sequence': len(new_ids)}, ctx)
                     else:
                         proxy.write([r['id']], {'sequence': ids.index(r['id'])}, ctx)
-                        
+
             else:
                 for r in res:
                     if r['id'] == id:
                         proxy.write([r['id']], {'sequence': swap_id_seq}, ctx)
                     else:
                         proxy.write([r['id']], {'sequence': r['sequence'] -1}, ctx)
-        
+
         else:
             new_ids = []
             new_ids.append(id)
@@ -297,9 +288,9 @@
                     proxy.write([r['id']], {'sequence': swap_id_seq}, ctx)
                 else:
                     proxy.write([r['id']], {'sequence': ids.index(r['id'])+2}, ctx)
-        
+
         return dict()
-    
+
     @expose('json')
     def moveUp(self, **kw):
 
@@ -314,7 +305,7 @@
         ctx = rpc.session.context.copy()
 
         prev_id = ids[ids.index(id)-1]
-        
+
         try:
             res = proxy.read([id, prev_id], ['sequence'], ctx)
             records = dict([(r['id'], r['sequence']) for r in res])

=== modified file 'addons/openerp/controllers/modules.py'
--- addons/openerp/controllers/modules.py	2010-01-12 21:09:06 +0000
+++ addons/openerp/controllers/modules.py	2010-03-09 13:30:53 +0000
@@ -1,14 +1,13 @@
+from openerp.controllers import form
+from openerp.utils import rpc, TinyDict
+
 from openobject.tools import expose
 
-from openerp.controllers import form
-
-from openerp.utils import rpc
-from openerp.utils import TinyDict
 
 class ModuleForm(form.Form):
-    
+
     _cp_path = "/modules"
-    
+
     @expose(template="templates/modules.mako")
     def create(self, params, tg_errors=None):
         params.model = "ir.module.web"
@@ -16,43 +15,42 @@
         params.view_mode = "['tree']"
         params.ids = None
         params.editable = False
-        
+
         params.context = ctx = rpc.session.context.copy()
         ctx['reload'] = True
-        
+
         form = self.create_form(params, tg_errors)
         return dict(form=form, params=params)
-    
+
     @expose()
     def index(self):
-        
+
         from openobject import addons
-        
+
         modules = addons.get_module_list()
         data = []
-        
+
         for name in modules:
             mod = addons.get_info(name)
-            
+
             mod['module'] = name
-            
+
             mod.pop("depends", None)
             mod.pop("version", None)
             if mod.pop("active", False):
                 mod["state"] = "uninstallable"
-            
+
             data.append(mod)
-        
+
         proxy = rpc.RPCProxy("ir.module.web")
         proxy.update_module_list(data)
-        
+
         params = TinyDict()
         return self.create(params)
-    
+
     def get_installed_modules(self):
-                
+
         proxy = rpc.RPCProxy("ir.module.web")
         ids = proxy.search([('state', '=', 'installed')])
-        
+
         return [m['module'] for m in proxy.read(ids)]
-        

=== modified file 'addons/openerp/controllers/openm2m.py'
--- addons/openerp/controllers/openm2m.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/openm2m.py	2010-03-09 13:30:53 +0000
@@ -26,30 +26,16 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
-from openobject import tools
-
-from openobject.tools import expose
-from openobject.tools import validate
-from openobject.tools import error_handler
-from openobject.tools import exception_handler
-
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import TinyDict
-from openerp.utils import context_with_concurrency_info
-
+from openerp.utils import rpc, TinyDict, context_with_concurrency_info
 from openerp.widgets.form import Hidden
 
-from form import Form
-from form import get_validation_schema
-from form import default_error_handler
-from form import default_exception_handler
+from form import Form, get_validation_schema, default_error_handler, default_exception_handler
+from openobject.tools import expose, validate, error_handler, exception_handler
+
 
 class OpenM2M(Form):
-    
+
     _cp_path = "/openm2m"
 
     @expose(template="templates/openm2m.mako")
@@ -88,7 +74,7 @@
 
         current = params.chain_get(params.source or '')
         button = (params.button or False) and True
-        
+
         params.load_counter = 1
         if current and current.id and not button:
             params.load_counter = 2
@@ -99,7 +85,7 @@
             if res:
                 return res
 
-        
+
         if current:
             current.id = None
             if not params.id:
@@ -125,4 +111,3 @@
         params.editable = params.get('_terp_editable', True)
 
         return self.create(params)
-

=== modified file 'addons/openerp/controllers/openm2o.py'
--- addons/openerp/controllers/openm2o.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/openm2o.py	2010-03-09 13:30:53 +0000
@@ -26,28 +26,16 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import validate
-from openobject.tools import error_handler
-from openobject.tools import exception_handler
-
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import TinyDict
-from openerp.utils import context_with_concurrency_info
-
+from openerp.utils import rpc, TinyDict, context_with_concurrency_info
 from openerp.widgets.form import Hidden
 
-from form import Form
-from form import get_validation_schema
-from form import default_error_handler
-from form import default_exception_handler
+from form import Form, get_validation_schema, default_error_handler, default_exception_handler
+from openobject.tools import expose, validate, error_handler, exception_handler
+
 
 class OpenM2O(Form):
-    
+
     _cp_path = "/openm2o"
 
     @expose(template="templates/openm2o.mako")
@@ -119,4 +107,3 @@
         return self.create(params)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py	2010-02-04 06:19:33 +0000
+++ addons/openerp/controllers/openo2m.py	2010-03-09 13:30:53 +0000
@@ -26,30 +26,18 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import urllib
 
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import validate
-from openobject.tools import error_handler
-from openobject.tools import exception_handler
-
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import TinyDict
-from openerp.utils import context_with_concurrency_info
-
 from openerp import widgets as tw
-
-from form import Form
-from form import get_validation_schema
-from form import default_error_handler
-from form import default_exception_handler
+from openerp.utils import rpc, TinyDict, context_with_concurrency_info
+
+from form import Form, get_validation_schema, default_error_handler, default_exception_handler
+from openobject.tools import expose, validate, error_handler, exception_handler
+
 
 class OpenO2M(Form):
-    
+
     _cp_path = "/openo2m"
 
     def create_form(self, params, tg_errors=None):
@@ -58,18 +46,18 @@
         params.model = params.o2m_model
         params.view_mode = ['form', 'tree']
         params.view_type = 'form'
-        
+
         #XXX: dirty hack to fix bug #401700
         if not params.get('_terp_view_ids'):
             params['_terp_view_ids'] = []
 
         # to get proper view, first generate form using the view_params
         vp = params.view_params
-        
-        # this prevents calling default_get, causes unnecessary 
+
+        # this prevents calling default_get, causes unnecessary
         # auto increment of sequence
-        vp.id = params.parent_id or False 
-        
+        vp.id = params.parent_id or False
+
         form = tw.form_view.ViewForm(vp, name="view_form", action="/openo2m/save")
         cherrypy.request.terp_validators = {}
         wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
@@ -80,7 +68,7 @@
 
         params.prefix = params.o2m
         params.views = wid.view
-        
+
         # IE hack, get context from cookies (see o2m.js)
         o2m_context = {}
         try:
@@ -89,9 +77,9 @@
             cherrypy.response.cookie['_terp_o2m_context']['expires'] = 0
         except:
             pass
-        
+
         params.o2m_context = params.o2m_context or o2m_context
-        
+
         ctx = params.context or {}
         ctx.update(params.parent_context or {})
         ctx.update(params.o2m_context or {})
@@ -109,7 +97,7 @@
 
         form = tw.form_view.ViewForm(params, name="view_form", action="/openo2m/save")
         form.screen.string = wid.screen.string
-        
+
         return form
 
     @expose(template="templates/openo2m.mako")
@@ -142,14 +130,14 @@
         ctx.update(params.o2m_context or {})
 
         id = proxy.write([params.parent_id], data, ctx)
-        
+
         prefix = params.o2m
         current = params.chain_get(prefix)
-        
+
         params.load_counter = 1
         if current and current.id and not params.button:
             params.load_counter = 2
-        
+
         ids = current.ids
         fld = params.o2m.split('/')[-1]
         all_ids = proxy.read([params.parent_id], [fld])[0][fld]
@@ -159,7 +147,7 @@
         if new_ids:
             current.id = new_ids[0]
             params.o2m_id = current.id
-            
+
         # perform button action
         if params.button:
             current.button = params.button
@@ -177,4 +165,3 @@
         return self.create(params)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/preferences.py'
--- addons/openerp/controllers/preferences.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/preferences.py	2010-03-09 13:30:53 +0000
@@ -26,25 +26,14 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import re
-import time
-
-import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-
-from openerp.utils import rpc
-from openerp.utils import TinyDict
-
-from openerp.controllers import SecuredController
+from openerp.utils import rpc, TinyDict
 
 from form import Form
+from openobject.tools import expose, redirect
 
 
 class Preferences(Form):
-    
+
     _cp_path = "/pref"
 
     @expose(template="templates/preferences.mako")
@@ -86,4 +75,3 @@
         raise redirect('/pref/create')
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/process.py'
--- addons/openerp/controllers/process.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/process.py	2010-03-09 13:30:53 +0000
@@ -26,27 +26,20 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-
-from openobject.i18n import format
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-
 from openerp.controllers import SecuredController
+from openerp.utils import rpc, TinyDict
 
+import actions
 import form
-import actions
+from openobject.i18n import format
+from openobject.tools import expose
+
 
 class ResourcePopup(form.Form):
 
     _cp_path = "/process/resource"
-    
+
     @expose(template="templates/process_open.mako")
     def create(self, params, tg_errors=None):
         params.editable = True
@@ -58,7 +51,7 @@
         return dict(form=form, params=params)
 
 class Process(SecuredController):
-    
+
     _cp_path = "/process"
 
     resource = ResourcePopup()
@@ -158,4 +151,3 @@
         return actions.execute_report("workflow.instance.graph", ids=[], id=int(id), model=model, nested=False)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/record.py'
--- addons/openerp/controllers/record.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/record.py	2010-03-09 13:30:53 +0000
@@ -26,14 +26,10 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import time
 
-from openerp.utils import expr_eval
-from openerp.utils import TinyDict
-
-from openerp.widgets import TinyWidget
-from openerp.widgets import TinyInputWidget
+from openerp.utils import expr_eval, TinyDict
+from openerp.widgets import TinyWidget, TinyInputWidget
 
 from form import Form
 
@@ -57,7 +53,7 @@
         parent = parent or self
 
         for wid in parent.iter_member_widgets():
-            
+
             if isinstance(wid, TinyInputWidget) and wid.name and not wid.name.endswith('/'):
                 self[wid.name] = wid.get_value()
 

=== modified file 'addons/openerp/controllers/requests.py'
--- addons/openerp/controllers/requests.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/requests.py	2010-03-09 13:30:53 +0000
@@ -26,20 +26,15 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
+from openerp.controllers import SecuredController
 from openerp.utils import rpc
-from openerp.utils import common
 
 from openobject.tools import expose
-from openobject.tools import redirect
-
-from openerp.controllers import SecuredController
 
 
 class Requests(SecuredController):
-    
+
     _cp_path = "/requests"
 
     def my(self):
@@ -64,9 +59,8 @@
     @expose()
     def default(self):
         import actions
-        return actions.execute_window(False, 'res.request', res_id=None, 
+        return actions.execute_window(False, 'res.request', res_id=None,
             domain=[('act_to','=',rpc.session.uid)], view_type='form', mode='tree,form')
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2010-03-05 10:39:40 +0000
+++ addons/openerp/controllers/root.py	2010-03-09 13:30:53 +0000
@@ -26,35 +26,21 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
-import re
-
 import cherrypy
-
-from openobject import tools
-
-from openobject.tools import url
-from openobject.tools import expose
-from openobject.tools import redirect
-from openobject.tools import find_resource
-
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import common
-
-from openerp.controllers import SecuredController, unsecured
-from openerp.controllers import login as tiny_login
+from openerp.controllers import SecuredController, unsecured, login as tiny_login
+from openerp.utils import rpc, cache
+
+from openobject.tools import url, expose, redirect
 
 
 def _cp_on_error():
-    
+
     errorpage = cherrypy.request.pool.get_controller("/errorpage")
     message = errorpage.render()
     cherrypy.response.status = 500
     #cherrypy.response.headers['Content-Type'] = 'text/html'
     cherrypy.response.body = [message]
-    
+
 cherrypy.config.update({'request.error_response': _cp_on_error})
 
 class Root(SecuredController):
@@ -66,7 +52,7 @@
         """Index page, loads the view defined by `action_id`.
         """
         raise redirect("/menu")
-    
+
     @expose()
     def info(self):
         return """
@@ -79,18 +65,18 @@
     </body>
     </html>
     """ % (url("/openerp/static/images/loading.gif"))
-    
+
     @expose(template="templates/menu.mako")
     def menu(self, active=None, **kw):
-        
+
         from openerp.utils import icons
         from openerp.widgets import tree_view
-        
+
         try:
             id = int(active)
         except:
             id = False
-        
+
         ctx = rpc.session.context.copy()
         proxy = rpc.RPCProxy("ir.ui.menu")
 
@@ -99,17 +85,17 @@
 
         if not id and ids:
             id = ids[0]
-            
+
         ids = proxy.search([('parent_id', '=', id)], 0, 0, 0, ctx)
         tools = proxy.read(ids, ['name', 'icon'], ctx)
-        
+
         view = cache.fields_view_get('ir.ui.menu', 1, 'tree', {})
 
         for tool in tools:
             tid = tool['id']
             tool['icon'] = icons.get_icon(tool['icon'])
-            tool['tree'] = tree = tree_view.ViewTree(view, 'ir.ui.menu', tid, 
-                                    domain=[('parent_id', '=', tid)], 
+            tool['tree'] = tree = tree_view.ViewTree(view, 'ir.ui.menu', tid,
+                                    domain=[('parent_id', '=', tid)],
                                     context=ctx, action="/tree/action")
             tree._name = "tree_%s" %(tid)
             tree.tree.onselection = None
@@ -135,7 +121,7 @@
             return dict(result=0)
 
         if style in ('ajax', 'ajax_small'):
-            return dict(db=db, user=user, password=password, location=location, 
+            return dict(db=db, user=user, password=password, location=location,
                     style=style, cp_template="templates/login_ajax.mako")
 
         return tiny_login(target=location, db=db, user=user, password=password, action="login")
@@ -157,4 +143,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2010-02-24 07:01:25 +0000
+++ addons/openerp/controllers/search.py	2010-03-09 13:30:53 +0000
@@ -26,28 +26,17 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
+from openerp.utils import rpc, expr_eval, TinyDict, TinyForm, TinyFormError
 
 import actions
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import expr_eval
-from openerp.utils import TinyDict
-from openerp.utils import TinyForm
-from openerp.utils import TinyFormError
-
-from openerp.controllers import SecuredController
 from form import Form
+from openobject.tools import expose
+
 
 class Search(Form):
 
     _cp_path = "/search"
-    
+
     @expose(template="templates/search.mako")
     def create(self, params, tg_errors=None):
 
@@ -105,10 +94,10 @@
 
         domain = kw.get('_terp_domain', [])
         context = kw.get('_terp_context', {})
-        
+
         parent_context = params.parent_context or {}
         parent_context.update(rpc.session.context.copy())
-        
+
         try:
             ctx = TinyForm(**kw).to_python()
             pctx = ctx
@@ -129,18 +118,18 @@
         ctx['context'] = parent_context
         ctx['active_id'] = params.active_id or False
         ctx['active_ids'] = params.active_ids or []
-        
+
         if params.active_id and not params.active_ids:
             ctx['active_ids'] = [params.active_id]
-        
+
         if domain and isinstance(domain, basestring):
             domain = expr_eval(domain, ctx)
-            
+
         if domain and len(domain) >= 2 and domain[-2] in ['&', '|']: # For custom domain ('AND', OR') from search view.
             dom1 = domain[-1:]
             dom2 = domain[:-2]
             domain = dom2 + dom1
-        
+
         if context and isinstance(context, basestring):
             if not context.startswith('{'):
                 context = "dict(%s)"%context
@@ -152,40 +141,40 @@
             for key, val in context.items():
                 if val==None:
                     context[key] = False
-                    
+
         ctx2 = parent_context
         parent_context.update(context)
-        
+
         return dict(domain=ustr(domain), context=ustr(parent_context))
 
     @expose('json')
     def get(self, **kw):
-        
+
         params, data = TinyDict.split(kw)
-        
+
         model = params.model
         context = rpc.session.context
-        
+
         record = kw.get('record')
         record = eval(record)
-        
+
         proxy = rpc.RPCProxy(model)
         data = {}
-        
+
         frm = {}
         error = ''
         values = {}
-        
+
         for key, val in record.items():
             id = key
-            for field in val:            
+            for field in val:
                 fld = {}
                 datas = {}
                 res = proxy.fields_get(field)
-                
+
                 fld['value'] = val[field]
                 fld['type'] = res[field].get('type')
-                
+
                 data[field] = fld
                 try:
                     frm = TinyForm(**data).to_python()
@@ -193,9 +182,9 @@
                     error = ustr(e)
                     error_field = ustr(e.field)
                     return dict(error=error, error_field=error_field)
-                
+
                 datas['rec'] = field
-                
+
                 if fld['type'] == 'many2one':
                     datas['rec_val'] = fld['value']
                     frm[field] = 'many2one'
@@ -206,46 +195,46 @@
                         datas['rec_val'] = 0
                 else:
                     datas['rec_val'] = frm[field]
-                    
+
             datas['type'] = fld['type']
             values[key] = datas
-            
+
         return dict(frm=values, error=error)
 
     @expose('json')
     def eval_domain_filter(self, **kw):
-        
+
         all_domains = kw.get('all_domains')
         custom_domains = kw.get('custom_domain')
         model = kw.get('model')
-        
+
         all_domains = eval(all_domains)
-        
+
         domains = all_domains.get('domains')
         selection_domain = all_domains.get('selection_domain')
         search_context = all_domains.get('search_context')
-        
-        if domains: 
+
+        if domains:
             domains = eval(domains)
-        
+
         c = search_context.get('context', {})
         v = search_context.get('value')
         ctx = expr_eval(c, {'self':v})
-        
+
         context = rpc.session.context
         if ctx:
             ctx.update(context)
-        
+
         domain = []
         check_domain = []
         check_domain = all_domains.get('check_domain')
-        
+
         if check_domain and isinstance(check_domain, basestring):
             domain = expr_eval(check_domain, context)
-            
+
         if domain == None:
             domain = []
-        
+
         if domains:
             for key in domains:
                 if domains[key] in ['0', '1']:
@@ -254,11 +243,11 @@
                     domain += [(key, '=', domains[key])]
                 else:
                     domain += [(key, 'ilike', domains[key])]
-        
+
         if custom_domains:
             inner_domain = []
             tmp_domain = ''
-            
+
             custom_domains = eval(custom_domains)
             for inner in custom_domains:
                 if len(inner) == 4:
@@ -271,60 +260,60 @@
                         tmp_domain += '[(\'' + inner[0] + '\', \'' + inner[1] + '\', ' + ustr(inner[2]) + ')]'
                     else:
                         tmp_domain += '[(\'' + inner[0] + '\', \'' + inner[1] + '\', \'' + inner[2] + '\')]'
-            
+
             if tmp_domain :
                 cust_domain = tmp_domain.replace('][', ', ')
                 domain += eval(cust_domain)
-        
+
         if selection_domain:
             if selection_domain in ['blk', 'sh', 'sf', 'mf']:
                 if selection_domain == 'blk':
                     selection_domain = []
-                
+
                 if selection_domain in ['sh', 'sf']:
                     return dict(flag=selection_domain, sf_dom=ustr(domain))
-                
+
                 if selection_domain == 'mf':
-                    act = {'name':'Manage Filters', 
-                         'res_model':'ir.actions.act_window', 
-                         'type':'ir.actions.act_window', 
-                         'view_type':'form', 
-                         'view_mode':'tree,form', 
+                    act = {'name':'Manage Filters',
+                         'res_model':'ir.actions.act_window',
+                         'type':'ir.actions.act_window',
+                         'view_type':'form',
+                         'view_mode':'tree,form',
                          'domain':'[(\'filter\',\'=\',True), (\'res_model\',\'=\',\'' + model + '\'), (\'default_user_ids\',\'in\', (\'' + str(rpc.session.uid) + '\',))]'}
                     return dict(action=act)
             else:
                 selection_domain = expr_eval(selection_domain)
                 if selection_domain:
                     domain += selection_domain
-        
+
         if not domain:
             domain = None
-            
+
         return dict(domain=ustr(domain), context=ustr(ctx))
 
     @expose()
     def manage_filter(self, **kw):
         action = kw.get('action')
         action = eval(action)
-        
+
         return actions.execute(action, context=rpc.session.context)
 
     @expose(template="templates/save_filter.mako")
     def save_filter(self, **kw):
-        
+
         model = kw.get('model')
         domain = kw.get('domain')
         flag = kw.get('flag')
-        
+
         new_view_ids = rpc.session.execute('object', 'execute', 'ir.ui.view', 'search', [('model', '=', model), ('inherit_id', '=', False)])
         view_datas = rpc.session.execute('object', 'execute', 'ir.ui.view', 'read', new_view_ids, ['id', 'name', 'type'])
-        
+
         form_views = []
         tree_views = []
         graph_views = []
         calendar_views = []
         gantt_views = []
-        
+
         for data in view_datas:
             if data['type'] == 'form':
                 form_views.append([data['id'],data['name']])
@@ -336,26 +325,26 @@
                 calendar_views.append([data['id'],data['name']])
             elif data['type'] == 'gantt':
                 gantt_views.append([data['id'],data['name']])
-        
-        return dict(model=model, domain=domain, flag=flag, form_views=form_views, 
+
+        return dict(model=model, domain=domain, flag=flag, form_views=form_views,
                     tree_views=tree_views, graph_views=graph_views, calendar_views=calendar_views, gantt_views=gantt_views)
-    
+
     @expose()
     def do_filter_sc(self, **kw):
-        
+
         name = kw.get('sc_name')
         model = kw.get('model')
         domain = kw.get('domain')
         flag = kw.get('flag')
-        
+
         form_id = kw.get('form_views')
         tree_id = kw.get('tree_views')
         graph_id = kw.get('graph_views')
         calendar_id = kw.get('calendar_views')
         gantt_id = kw.get('gantt_views')
-        
+
         if name:
-            v_ids=[]                
+            v_ids=[]
             if kw.get('form_views'):
                 rec = {'view_mode':'form', 'view_id': form_id, 'sequence':2}
                 v_ids.append(rpc.session.execute('object', 'execute', 'ir.actions.act_window.view', 'create', rec))
@@ -369,29 +358,29 @@
                 rec = {'view_mode':'calendar', 'view_id':calendar_id, 'sequence':3}
                 v_ids.append(rpc.session.execute('object', 'execute', 'ir.actions.act_window.view', 'create', rec))
             if kw.get('gantt_views'):
-                rec = {'view_mode':'gantt', 'view_id':gantt_id, 'sequence':5}                                        
+                rec = {'view_mode':'gantt', 'view_id':gantt_id, 'sequence':5}
                 v_ids.append(rpc.session.execute('object', 'execute', 'ir.actions.act_window.view', 'create', rec))
-        
-            datas = {'name': name, 
-                   'res_model': model, 
-                   'domain': domain, 
+
+            datas = {'name': name,
+                   'res_model': model,
+                   'domain': domain,
                    'context': str({}),
                    'view_ids':[(6, 0, v_ids)],
                    'filter': True,
-                   'default_user_ids': [[6, 0, [rpc.session.uid]]], 
+                   'default_user_ids': [[6, 0, [rpc.session.uid]]],
                    }
             action_id = rpc.session.execute('object', 'execute', 'ir.actions.act_window', 'create', datas)
 
             if flag == 'sh':
                 parent_menu_id = rpc.session.execute('object', 'execute', 'ir.ui.menu', 'search', [('name','=','Custom Shortcuts')])
-                
+
                 if parent_menu_id:
                     menu_data = {'name': name,
                                'sequence': 20,
                                'action': 'ir.actions.act_window,' + str(action_id),
                                'parent_id': parent_menu_id[0],
                                }
-                    
+
                     menu_id = rpc.session.execute('object', 'execute', 'ir.ui.menu', 'create', menu_data)
                     sc_data = {'name': name,
                              'sequence': 1,
@@ -399,14 +388,14 @@
                              }
                     shortcut_id = rpc.session.execute('object', 'execute', 'ir.ui.view_sc', 'create', sc_data)
             return True
-        
+
     @expose('json')
     def ok(self, **kw):
         params, data = TinyDict.split(kw)
 
         ids = [int(id) for id in data.get('search_list', [])]
         return dict(ids=ids)
-    
+
     @expose('json')
     def get_name(self, model, id):
         return dict(name=rpc.name_get(model, id))
@@ -415,7 +404,7 @@
     def get_matched(self, model, text, **kw):
         params, data = TinyDict.split(kw)
         limit = kw.get('limit', 10)
-        
+
         domain = params.domain or []
         context = params.context or {}
 
@@ -429,4 +418,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/selection.py'
--- addons/openerp/controllers/selection.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/selection.py	2010-03-09 13:30:53 +0000
@@ -26,20 +26,14 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import cherrypy
+from openerp.controllers import SecuredController
+from openerp.utils import TinyDict
 
 from openobject.tools import expose
 
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-
-from openerp.controllers import SecuredController
-
 
 class Selection(SecuredController):
-    
+
     _cp_path = "/selection"
 
     @expose(template="templates/selection.mako")
@@ -52,6 +46,3 @@
 
         import actions
         return actions.execute(params.action, **params.data)
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/shortcuts.py'
--- addons/openerp/controllers/shortcuts.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/shortcuts.py	2010-03-09 13:30:53 +0000
@@ -26,22 +26,17 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-
+from openerp.controllers import SecuredController
 from openerp.utils import rpc
-from openerp.utils import common
 
-from openerp.controllers import SecuredController
+from openobject.tools import expose, redirect
 
 
 class Shortcuts(SecuredController):
-    
+
     _cp_path = "/shortcuts"
-    
+
     def my(self):
 
         if not rpc.session.is_logged():
@@ -94,4 +89,3 @@
         raise redirect('/tree/open', id=id, model='ir.ui.menu')
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/templates/view_log.mako'
--- addons/openerp/controllers/templates/view_log.mako	2010-01-12 04:35:09 +0000
+++ addons/openerp/controllers/templates/view_log.mako	2010-03-09 13:30:53 +0000
@@ -18,19 +18,18 @@
         </tr>
         <tr>
             <td>
-                % if tmp and not message:
+                % if not message:
                 <div class="box2">
                     <table border="0" width="100%" align="center">
-                        % for key, val in todo:
+                        % for field, description in fields:
                         <tr>
-                            <td class="label" width="50%">${val}:</td>
-                            <td width="50%">${tmp[key]}</td>
+                            <td class="label" width="50%">${description}:</td>
+                            <td width="50%">${values[field]}</td>
                         </tr>
                         % endfor
                     </table>
                 </div>
-                % endif
-                % if message and not tmp:
+                % else:
                 <div class="toolbar">
                     <table border="0" cellpadding="0" cellspacing="0" width="100%">
                         <tr>

=== modified file 'addons/openerp/controllers/translator.py'
--- addons/openerp/controllers/translator.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/translator.py	2010-03-09 13:30:53 +0000
@@ -26,21 +26,13 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
 import copy
 
-import cherrypy
+from openerp.controllers import SecuredController
+from openerp.utils import rpc, cache, common, TinyDict
 
 from openobject.tools import expose
 
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import common
-from openerp.utils import TinyDict
-
-from openerp.controllers import SecuredController
-
 
 #change 'en' to false for context
 def adapt_context(val):
@@ -50,7 +42,7 @@
         return val
 
 class Translator(SecuredController):
-    
+
     _cp_path = "/translator"
 
     @expose(template="templates/translator.mako")
@@ -171,4 +163,3 @@
         return self.index(translate=translate, _terp_model=params.model, _terp_id=params.id)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2010-01-27 11:50:51 +0000
+++ addons/openerp/controllers/tree.py	2010-03-09 13:30:53 +0000
@@ -31,28 +31,20 @@
 This module implementes heirarchical tree view for a tiny model having
     view_type = 'tree'
 """
-
 import time
-import xml.dom.minidom
-
-from openobject.tools import url
-from openobject.tools import expose
-
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import icons
-from openerp.utils import common
-from openerp.utils import TinyDict
 
 from openerp.controllers import SecuredController
+from openerp.utils import rpc, cache, icons, common, TinyDict
 from openerp.widgets import tree_view
 
+from openobject.tools import url, expose
+
 
 DT_FORMAT = '%Y-%m-%d'
 DHM_FORMAT = '%Y-%m-%d %H:%M:%S'
 
 class Tree(SecuredController):
-    
+
     _cp_path = "/tree"
 
     @expose(template="templates/tree.mako")
@@ -74,9 +66,9 @@
 
         tree = tree_view.ViewTree(view, model, res_id, domain=domain, context=context, action="/tree/action")
         if tree.toolbar:
-            
+
             proxy = rpc.RPCProxy(model)
-            
+
             for tool in tree.toolbar:
                 if tool.get('icon'):
                     tool['icon'] = icons.get_icon(tool['icon'])
@@ -85,7 +77,7 @@
                 id = tool['id']
                 ids = proxy.read([id], [tree.field_parent])[0][tree.field_parent]
                 tool['ids'] = ids
-                
+
         return dict(tree=tree, model=model)
 
     @expose()
@@ -108,7 +100,7 @@
     def sort_callback(self, item1, item2, field, sort_order="asc", type=None):
         a = item1[field]
         b = item2[field]
-        
+
         if type == 'many2one' and isinstance(a, (tuple, list)):
             a = a[1]
             b = b[1]
@@ -123,12 +115,12 @@
 
         ids = ids or []
 
-        if isinstance(ids, basestring):           
+        if isinstance(ids, basestring):
             ids = [int(id) for id in ids.split(',')]
-            
+
         if isinstance(ids, list):
             ids = [int(id) for id in ids]
-        
+
         if isinstance(fields, basestring):
             fields = eval(fields)
 
@@ -162,7 +154,7 @@
                 for x in result:
                     if x[field]:
                         x[field] = '%s'%(x[field])
-            
+
             if fields_info[field]['type'] in ('float'):
                 for x in result:
                     if x[field]:
@@ -222,7 +214,7 @@
             record['items'] = item
 
             records += [record]
-            
+
         return dict(records=records)
 
     def do_action(self, name, adds={}, datas={}):
@@ -271,7 +263,7 @@
 
         params, data = TinyDict.split(kw)
 
-        ids = params.selection or []            
+        ids = params.selection or []
         if len(ids):
             import actions
             return actions.execute_window(False, res_id=ids, model=params.model, domain=params.domain)
@@ -291,4 +283,3 @@
         return self.do_action('tree_but_open', datas=datas)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/utils.py'
--- addons/openerp/controllers/utils.py	2010-03-03 12:24:36 +0000
+++ addons/openerp/controllers/utils.py	2010-03-09 13:30:53 +0000
@@ -26,19 +26,14 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import re
 import time
-import types
 
 import cherrypy
+from openerp.utils import rpc
 
 from openobject import tools
-
 from openobject.tools import expose
-from openobject.tools import redirect
-
-from openerp.utils import rpc
 
 
 __all__ = ["secured", "unsecured", "login"]
@@ -184,4 +179,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/view_log.py'
--- addons/openerp/controllers/view_log.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/view_log.py	2010-03-09 13:30:53 +0000
@@ -26,60 +26,45 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
-import copy
-
-import cherrypy
+from openerp.controllers import SecuredController
+from openerp.utils import rpc, TinyDict
 
 from openobject.tools import expose
 
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import common
-from openerp.utils import TinyDict
-
-from openerp.controllers import SecuredController
-
 
 class View_Log(SecuredController):
-    
+
     _cp_path = "/viewlog"
 
+    fields = [
+        ('id', _('ID')),
+        ('create_uid', _('Creation User')),
+        ('create_date', _('Creation Date')),
+        ('write_uid', _('Latest Modification by')),
+        ('write_date', _('Latest Modification Date')),
+        ('uid', _('Owner')),
+        ('gid', _('Group Owner')),
+        ('level', _('Access Level'))
+    ]
+
     @expose(template="templates/view_log.mako")
-    def index(self, **kw):
-        params, data = TinyDict.split(kw)
-
-        id = params.id
-        model = params.model
-        message = None
-        tmp = {}
-        todo = []
-
-        if id:
-            res = rpc.session.execute('object', 'execute', model, 'perm_read', [id], rpc.session.context)
+    def index(self, _terp_id=None, _terp_model=None):
+
+        values = {}
+        if _terp_id:
+            message = None
+            res = rpc.session.execute('object', 'execute', _terp_model,
+                                      'perm_read', [_terp_id], rpc.session.context)
 
             for line in res:
-                todo = [
-                    ('id', _('ID')),
-                    ('create_uid', _('Creation User')),
-                    ('create_date', _('Creation Date')),
-                    ('write_uid', _('Latest Modification by')),
-                    ('write_date', _('Latest Modification Date')),
-                    ('uid', _('Owner')),
-                    ('gid', _('Group Owner')),
-                    ('level', _('Access Level'))
-                ]
-                for (key,val) in todo:
-                    if line.get(key) and key in ('create_uid','write_uid','uid'):
-                        line[key] = line[key][1]
-
-                    tmp[key] = ustr(line.get(key) or '/')
-
-        if not id:
+                for field, label in self.fields:
+                    if line.get(field) and field in ('create_uid','write_uid','uid'):
+                        line[field] = line[field][1]
+
+                    values[field] = ustr(line.get(field) or '/')
+        else:
             message = _("No resource is selected...")
 
-        return dict(tmp=tmp, todo=todo, message=message)
+        return {'values':values, 'fields':self.fields, 'message':message}
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/viewed.py'
--- addons/openerp/controllers/viewed.py	2010-01-11 14:39:12 +0000
+++ addons/openerp/controllers/viewed.py	2010-03-09 13:30:53 +0000
@@ -26,36 +26,24 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
+import random
 import xml
-import random
 
 import cherrypy
-
-from openobject.tools import url
-from openobject.tools import expose
-
-from openerp import utils
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import icons
-from openerp.utils import cache
-from openerp.utils import TinyDict
-
+from openerp import utils, widgets, validators
 from openerp.controllers import SecuredController
-
-from openerp import widgets
-from openerp import validators
+from openerp.utils import rpc, common, icons, cache, TinyDict
 
 from form import Form
+from openobject.tools import url, expose
+
 
 class NewField(Form):
 
     _cp_path = "/viewed/new_field"
-    
+
     def create_form(self, params, tg_errors=None):
-        
+
         # generate model_id field
         params.hidden_fields = [widgets.form.Hidden(name='model_id', default=params.model_id)]
         form = super(NewField, self).create_form(params, tg_errors)
@@ -93,7 +81,7 @@
 class NewModel(Form):
 
     _cp_path = "/viewed/new_model"
-    
+
     @expose(template="templates/viewed_new_model.mako")
     def create(self, params, tg_errors=None):
 
@@ -124,7 +112,7 @@
 class Preview(Form):
 
     _cp_path = "/viewed/preview"
-    
+
     @expose(template="templates/viewed_preview.mako")
     def create(self, params, tg_errors=None):
         form = self.create_form(params, tg_errors)
@@ -233,7 +221,7 @@
     return field
 
 class ViewEd(SecuredController):
-    
+
     _cp_path = "/viewed"
 
     @expose(template="templates/viewed.mako")
@@ -587,7 +575,7 @@
 
             if new_node.localName == "field":
                 new_node.setAttribute('name', kw.get('name', new_node.localName))
-            
+
             elif new_node.localName == "notebook":
                 page = doc.createElement('page')
                 page.setAttribute('string', 'Page 1')
@@ -907,12 +895,12 @@
     def __init__(self, name, default=None):
         options = [('', ''), ('save', _('Save Button')), ('cancel', _('Cancel Button')), ('open', _('Open Button'))]
         super(ButtonSpecialProperty, self).__init__(name=name, options=options, default=default)
-        
+
 class AlignProperty(widgets.SelectField):
 
     def __init__(self, name, default=None):
         options = [('', ''), ('0.0', _('Left')), ('0.5', _('Center')), ('1.0', _('Right'))]
-        super(AlignProperty, self).__init__(name=name, options=options, default=default)   
+        super(AlignProperty, self).__init__(name=name, options=options, default=default)
 
 _PROPERTY_WIDGETS = {
     'select' : SelectProperty,
@@ -939,4 +927,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/viewlist.py'
--- addons/openerp/controllers/viewlist.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/viewlist.py	2010-03-09 13:30:53 +0000
@@ -26,22 +26,15 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
-import base64
-
-from openobject.tools import expose
-from openobject.tools import redirect
-
-from openerp.utils import rpc
-from openerp.utils import TinyDict
-
 from openerp.controllers import SecuredController
+from openerp.utils import rpc, TinyDict
 from openerp.widgets.screen import Screen
 
+from openobject.tools import expose, redirect
+
 
 class ViewList(SecuredController):
-    
+
     _cp_path = "/viewlist"
 
     @expose(template="templates/viewlist.mako")
@@ -108,4 +101,3 @@
         raise redirect('/viewlist', model=model)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/wizard.py'
--- addons/openerp/controllers/wizard.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/wizard.py	2010-03-09 13:30:53 +0000
@@ -26,30 +26,19 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import re
 
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-from openobject.tools import validate
-from openobject.tools import error_handler
-
-from openerp.utils import rpc
-from openerp.utils import icons
-from openerp.utils import common
-from openerp.utils import TinyDict
-
+from openerp import widgets as tw, validators
 from openerp.controllers import SecuredController
-
-from openerp import widgets as tw
-from openerp import validators
+from openerp.utils import rpc, icons, TinyDict
 
 import form
+from openobject.tools import expose, redirect, validate, error_handler
+
 
 class Wizard(SecuredController):
-    
+
     _cp_path = "/wizard"
 
     def execute(self, params):
@@ -89,7 +78,7 @@
                 res['datas'] = {}
 
             if res['type']=='form':
-                
+
                 fields = res['fields']
                 form_values = {}
 
@@ -102,27 +91,27 @@
                 datas['form'] = form_values
 
                 res['datas'].update(datas['form'])
-                
+
                 params.is_wizard = True
                 params.view_mode = ['form']
                 params.view_type = 'form'
                 params.views = {'form': res}
-                
+
                 # keep track of datas and some other required information
                 params.hidden_fields = [tw.form.Hidden(name='_terp_datas', default=ustr(datas)),
                                         tw.form.Hidden(name='_terp_state2', default=state),
                                         tw.form.Hidden(name='_terp_wiz_id', default=wiz_id)]
-                
+
                 form = tw.form_view.ViewForm(params, name="view_form", action="/wizard/action")
 
                 buttons = []
                 for x in res.get('state', []):
                     x = list(x)
                     x[1] = re.sub('_(?!_)', '', x[1]) # remove mnemonic
-                    
+
                     if len(x) >= 3:
                         x[2] = icons.get_icon(x[2])
-                        
+
                     buttons.append(tuple(x))
 
                 params.state = state
@@ -231,4 +220,3 @@
         return self.create(params, tg_errors=tg_errors)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/controllers/workflow.py'
--- addons/openerp/controllers/workflow.py	2010-01-09 12:38:38 +0000
+++ addons/openerp/controllers/workflow.py	2010-03-09 13:30:53 +0000
@@ -26,29 +26,19 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
 import cherrypy
-
-from openobject.tools import expose
-from openobject.tools import redirect
-from openobject.tools import validate
-
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import TinyDict
-
+from openerp import widgets as tw, validators
 from openerp.controllers import SecuredController
-
-from openerp import widgets as tw
-from openerp import validators
+from openerp.utils import rpc, common, TinyDict
 
 from form import Form
+from openobject.tools import expose, redirect
 
 
 class State(Form):
 
     _cp_path = "/workflow/state"
-    
+
     @expose(template="templates/wkf_popup.mako")
     def create(self, params, tg_errors=None):
 
@@ -117,7 +107,7 @@
 class Connector(Form):
 
     _cp_path = "/workflow/connector"
-    
+
     @expose(template="templates/wkf_popup.mako")
     def create(self, params, tg_errors=None):
 
@@ -204,7 +194,7 @@
 class Workflow(Form):
 
     _cp_path = "/workflow"
-    
+
     @expose(template="templates/workflow.mako")
     def index(self, model, id=None):
 
@@ -271,7 +261,7 @@
 
 
 class WorkflowList(SecuredController):
-    
+
     _cp_path = "/workflowlist"
 
     @expose(template="templates/wkf_list.mako")
@@ -329,5 +319,3 @@
         raise redirect('/workflowlist', model=model)
 
 # vim: ts=4 sts=4 sw=4 si et
-
-

=== modified file 'addons/openerp/tests/test_root_controller.py'
--- addons/openerp/tests/test_root_controller.py	2010-01-09 13:02:21 +0000
+++ addons/openerp/tests/test_root_controller.py	2010-03-09 13:30:53 +0000
@@ -1,4 +1,3 @@
-
 from openerp.utils import rpc
 from openobject.test import TestCase
 
@@ -17,5 +16,3 @@
         self.getPage("/menu")
         self.assertStatus(200)
         self.assertInBody("new TreeGrid")
-        
-

=== modified file 'addons/openerp/utils/__init__.py'
--- addons/openerp/utils/__init__.py	2010-01-09 14:09:46 +0000
+++ addons/openerp/utils/__init__.py	2010-03-09 13:30:53 +0000
@@ -1,11 +1,9 @@
-
 import rpc
 import rpc_utils
-
+from openobject.tools import register_template_vars
 from tools import *
 from utils import *
 
-from openobject.tools import register_template_vars
 
 def _root_vars():
     return {
@@ -15,4 +13,3 @@
 register_template_vars(_root_vars, None)
 
 del register_template_vars
-

=== modified file 'addons/openerp/utils/cache.py'
--- addons/openerp/utils/cache.py	2010-01-09 11:49:22 +0000
+++ addons/openerp/utils/cache.py	2010-03-09 13:30:53 +0000
@@ -54,9 +54,9 @@
             return func
 
         def func_wrapper(*args, **kwargs):
-            
+
             queue, store = __cache.setdefault(rpc.session.db, ([], {}))
-            
+
             key = cPickle.dumps((args, kwargs))
             try:
                 queue.append(queue.pop(queue.index(key)))
@@ -112,4 +112,3 @@
     return __can_read(model, uid=rpc.session.uid)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/utils/common.py'
--- addons/openerp/utils/common.py	2010-01-07 07:47:47 +0000
+++ addons/openerp/utils/common.py	2010-03-09 13:30:53 +0000
@@ -56,12 +56,12 @@
         TinyException.__init__(self, message=message, title=title)
 
 class Concurrency(Exception):
-    
+
     def __init__(self, message, title=None, datas=None):
         self.title = title
         self.datas = datas
         self.message = message
-        
+
     def __unicode__(self):
         return ustr(self.title)
 
@@ -84,4 +84,3 @@
     return Concurrency(message, title, datas)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/utils/icons.py'
--- addons/openerp/utils/icons.py	2010-01-11 09:47:54 +0000
+++ addons/openerp/utils/icons.py	2010-03-09 13:30:53 +0000
@@ -154,7 +154,7 @@
 }
 
 def get_icon(name):
-    
+
     if name.startswith('STOCK_'):
         res = "images/stock/%s.png"%(stock_items.get(name, "stock"))
 
@@ -163,13 +163,12 @@
 
     elif name.startswith('terp-'):
         res = "images/icons/%s.png"%(name.replace('terp-', '', 1))
-    
+
     else:
         name, ext = os.path.splitext(name)
         res = "images/%s%s" % (name, ext or '.png')
-    
+
     return "/openerp/static/%s" % res
-    
+
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/utils/rpc.py'
--- addons/openerp/utils/rpc.py	2010-03-03 12:24:36 +0000
+++ addons/openerp/utils/rpc.py	2010-03-09 13:30:53 +0000
@@ -7,17 +7,17 @@
 # Developed by Tiny (http://openerp.com) and Axelor (http://axelor.com).
 #
 # The OpenERP web client is distributed under the "OpenERP Public License".
-# It's based on Mozilla Public License Version (MPL) 1.1 with following 
+# It's based on Mozilla Public License Version (MPL) 1.1 with following
 # restrictions:
 #
-# -   All names, links and logos of Tiny, Open ERP and Axelor must be 
-#     kept as in original distribution without any changes in all software 
-#     screens, especially in start-up page and the software header, even if 
-#     the application source code has been changed or updated or code has been 
+# -   All names, links and logos of Tiny, Open ERP and Axelor must be
+#     kept as in original distribution without any changes in all software
+#     screens, especially in start-up page and the software header, even if
+#     the application source code has been changed or updated or code has been
 #     added.
 #
 # -   All distributions of the software must keep source code with OEPL.
-# 
+#
 # -   All integrations to any other software must keep source code with OEPL.
 #
 # If you need commercial licence to remove this kind of restriction please
@@ -203,7 +203,7 @@
 
         except xmlrpclib.Fault, err:
             raise RPCException(err.faultCode, err.faultString)
-        
+
         except TinySocketError, err:
             raise RPCException(err.faultCode, err.faultString)
 
@@ -215,7 +215,7 @@
 
 
 class RPCSession(object):
-    """Maintains client session and provides way to authenticate 
+    """Maintains client session and provides way to authenticate
     client & invoce RPC requested by clients.
     """
 
@@ -289,7 +289,7 @@
             raise
 
     def login(self, db, user, password):
-        
+
         if not (db and user and password):
             return -1
 
@@ -328,21 +328,21 @@
         """
 
         self._context = {'client': 'web'}
-        
+
         # self.uid
         context = self.execute('object', 'execute', 'res.users', 'context_get')
         self._context.update(context or {})
-        
+
         self.remote_timezone = 'utc'
         self.client_timezone = self.context.get("tz", False)
-        
+
         if self.client_timezone:
             self.remote_timezone = self.execute('common', 'timezone_get')
             try:
                 import pytz
             except:
                 raise common.warning(_('You select a timezone but OpenERP could not find pytz library!\nThe timezone functionality will be disable.'))
-                
+
         # set locale in session
         self.locale = self.context.get('lang')
 
@@ -354,7 +354,7 @@
 
     def execute_noauth(self, obj, method, *args):
         return self.gateway.execute_noauth(obj, method, *args)
-    
+
     def execute_db(self, method, *args):
         return self.execute_noauth('db', method, *args)
 
@@ -387,7 +387,7 @@
         self._resource = resource
         self._session = session
         self._attrs = {}
-        
+
     def _func_getter(self, name):
         return lambda *args: self._session.execute("object", "execute", self._resource, name, *args)
 
@@ -398,17 +398,17 @@
 
 
 def name_get(model, id, context=None):
-    
+
     id = (id or False) and int(id)
     name = (id or str('')) and str(id)
 
     if model and id:
-        
+
         ctx = session.context.copy()
         ctx.update(context or {})
-        
+
         proxy = RPCProxy(model)
-        
+
         try:
             name = proxy.name_get([id], ctx)
             name = name[0][1] or ''
@@ -441,4 +441,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/utils/rpc_utils.py'
--- addons/openerp/utils/rpc_utils.py	2010-01-11 11:50:03 +0000
+++ addons/openerp/utils/rpc_utils.py	2010-03-09 13:30:53 +0000
@@ -20,18 +20,17 @@
 
     def clear(self):
         cherrypy.session.clear()
-        
+
 def init_rpc_session():
-    
+
     config = cherrypy.config
-    
+
     # initialize the rpc session
     host = config.get('openerp.server.host')
     port = config.get('openerp.server.port')
     protocol = config.get('openerp.server.protocol')
-    
+
     import rpc
     rpc.initialize(host, port, protocol, storage=CPSessionWrapper())
 
 init_rpc_session()
-

=== modified file 'addons/openerp/utils/tiny_socket.py'
--- addons/openerp/utils/tiny_socket.py	2010-01-07 07:47:47 +0000
+++ addons/openerp/utils/tiny_socket.py	2010-03-09 13:30:53 +0000
@@ -94,4 +94,3 @@
             return res[0]
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/utils/tools.py'
--- addons/openerp/utils/tools.py	2010-01-09 11:49:22 +0000
+++ addons/openerp/utils/tools.py	2010-03-09 13:30:53 +0000
@@ -36,24 +36,24 @@
 
 
 def expr_eval(string, context={}):
-    context['uid'] = rpc.session.uid
-    context['current_date'] = time.strftime('%Y-%m-%d')
-    context['time'] = time
-    context['datetime'] = DT
+    context.update(uid=rpc.session.uid,
+                   current_date=time.strftime('%Y-%m-%d'),
+                   time=time,
+                   datetime=DT)
     if isinstance(string, basestring):
-        string = string.replace("'active_id'", "active_id")
-        return eval(string, context)
+        return eval(string.replace("'active_id'", "active_id"),
+                    context)
     else:
         return string
 
 def node_attributes(node):
-    result = {}
+    if not node.hasAttributes(): return {}
     attrs = node.attributes
-    if attrs is None:
-        return {}
-    for i in range(attrs.length):
-        result[str(attrs.item(i).localName)] = attrs.item(i).nodeValue
-    return result
+    # localName can be a unicode string, we're using attribute names as
+    # **kwargs keys and python-level kwargs don't take unicode keys kindly
+    # (they blow up) so we need to ensure all keys are ``str``
+    return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue)
+                 for i in range(attrs.length)])
 
 def xml_locate(expr, ref):
     """Simple xpath locator.
@@ -66,7 +66,7 @@
 
     @return: list of nodes
     """
-    
+
     if '/' not in expr:
         name, index = expr.split('[')
         index = int(index.replace(']', ''))
@@ -76,7 +76,7 @@
             return nodes[index-1]
         except Exception, e:
             return []
-    
+
     parts = expr.split('/')
     for part in parts:
         if part in ('', '.'):
@@ -96,7 +96,7 @@
 
     if pn and pn.localName and pn.localName != 'view':
         xp = get_node_xpath(pn) + xp
-        
+
     nodes = xml_locate(root, node.parentNode)
     xp += '[%s]' % (nodes.index(node) + 1)
 
@@ -108,7 +108,7 @@
     """
     if not sz:
         return False
-    
+
     units = ('bytes', 'Kb', 'Mb', 'Gb')
     if isinstance(sz,basestring):
         sz=len(sz)
@@ -142,10 +142,9 @@
 
     def __copy__(self):
         return self
-    
+
     def __deepcopy__(self, visit):
         return self
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/utils/utils.py'
--- addons/openerp/utils/utils.py	2010-01-09 11:49:22 +0000
+++ addons/openerp/utils/utils.py	2010-03-09 13:30:53 +0000
@@ -192,7 +192,7 @@
     'many2one': lambda *a: validators.many2one(),
     'email' : lambda *a: validators.Email(),
     'url' : lambda *a: validators.URL(),
-	'picture': lambda *a: validators.Binary(),
+    'picture': lambda *a: validators.Binary(),
 }
 
 class TinyFormError(validators.Invalid):
@@ -233,7 +233,7 @@
             value = attrs.get('value')
 
             required = attrs.get('required', False)
-            
+
             if kind == "one2many":
                 try:
                     value = eval(value)
@@ -313,4 +313,3 @@
     print params.chain_get('view_ids.child').view_ids
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/validators/validators.py'
--- addons/openerp/validators/validators.py	2010-01-07 07:47:47 +0000
+++ addons/openerp/validators/validators.py	2010-03-09 13:30:53 +0000
@@ -250,4 +250,3 @@
 }
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/__init__.py'
--- addons/openerp/widgets/__init__.py	2010-02-04 12:34:58 +0000
+++ addons/openerp/widgets/__init__.py	2010-03-09 13:30:53 +0000
@@ -9,6 +9,3 @@
 
 import screen
 import form_view
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/_interface.py'
--- addons/openerp/widgets/_interface.py	2010-01-11 13:20:35 +0000
+++ addons/openerp/widgets/_interface.py	2010-03-09 13:30:53 +0000
@@ -72,7 +72,7 @@
     nolabel = False
     visible = True
     model = None
-    
+
     valign = "middle"
 
     def __init__(self, **attrs):
@@ -267,33 +267,33 @@
 
 def register_widget(klass, types, view="form"):
     """Register a widget class for the given view and types
-    
+
     @param view: the view type (e.g. form, tree)
-    @param types: register for the give types    
+    @param types: register for the give types
     @param klass: widget class
     """
-    
+
     if not isinstance(types, (list, tuple)):
         types = [types]
-        
+
     for t in types:
         pooler.register_object(klass, key=t, group=view)
-        
+
 
 def get_widget(type, view="form"):
     """Get the widget of the given type for the given view.
-    
+
     @param view: the view
     @param type: the widget type
     """
-    
+
     pool = pooler.get_pool()
     return pool.get(type, group=view)
 
 
 def get_registered_widgets(view="form"):
     """Get all the registered widgets for the given view type.
-    
+
     @param view: the view
     @returns: dict of all the registered widgets
     """
@@ -302,4 +302,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/_views.py'
--- addons/openerp/widgets/_views.py	2010-03-05 10:39:40 +0000
+++ addons/openerp/widgets/_views.py	2010-03-09 13:30:53 +0000
@@ -11,48 +11,48 @@
 
 
 class ViewType(type):
-    
+
     def __new__(cls, name, bases, attrs):
-        
-        obj = super(ViewType, cls).__new__(cls, name, bases, attrs)    
-        
+
+        obj = super(ViewType, cls).__new__(cls, name, bases, attrs)
+
         name = attrs.get("_name")
         kind = attrs.get("_type")
         desc = attrs.get("_desc")
-        
+
         if kind:
             pooler.register_object(obj, key=kind, group="view_types", auto_create=True)
-            
+
         return obj
 
 
 class TinyView(object):
-    
+
     __metaclass__ = ViewType
-    
+
     _name = None
     _type = None
     _desc = None
     _priority = 0
-    
+
     name = property(lambda self: self._name)
     kind = property(lambda self: self._type)
     desc = property(lambda self: self._desc)
     priority = property(lambda self: self._priority)
-    
+
     def __call__(self, screen):
         pass
 
 
 class FormView(TinyView):
-    
+
     _type = "form"
     _name = _("Form")
     _desc = _("Form view...")
     _priority = 1
 
     def __call__(self, screen):
-        
+
         widget = form.Form(prefix=screen.prefix,
                            model=screen.model,
                            view=screen.view,
@@ -65,21 +65,21 @@
 
         if not screen.is_wizard and screen.ids is None:
             proxy = rpc.RPCProxy(screen.model)
-            screen.ids = proxy.search(screen.domain, screen.offset or False, 
+            screen.ids = proxy.search(screen.domain, screen.offset or False,
                                       screen.limit or False, 0, screen.context)
             screen.count = proxy.search_count(screen.domain, screen.context)
 
         return widget
 
 class ListView(TinyView):
-    
+
     _type = "tree"
     _name = _("Search")
     _desc = _("Search view...")
     _priority = 0
 
     def __call__(self, screen):
-        
+
         if screen.group_by_ctx:
             widget = listgroup.ListGroup(screen.name or '_terp_list',
                                         model=screen.model,
@@ -90,7 +90,7 @@
                                         view_mode=screen.view_mode,
                                         editable=screen.editable,
                                         selectable=screen.selectable,
-                                        offset=screen.offset, limit=screen.limit, 
+                                        offset=screen.offset, limit=screen.limit,
                                         count=screen.count, nolinks=screen.link,
                                         group_by_ctx=screen.group_by_ctx)
         else:
@@ -103,38 +103,35 @@
                                     view_mode=screen.view_mode,
                                     editable=screen.editable,
                                     selectable=screen.selectable,
-                                    offset=screen.offset, limit=screen.limit, 
+                                    offset=screen.offset, limit=screen.limit,
                                     count=screen.count, nolinks=screen.link)
 
         screen.ids = widget.ids
         screen.limit = widget.limit
         screen.count = widget.count
-            
+
         return widget
-    
+
 
 def get_view_widget(kind, screen):
-    
+
     pool = pooler.get_pool()
     views = pool.get_group("view_types")
-    
+
     try:
         view = views[kind]
     except KeyError, e:
         raise Exception("view '%s' not supported." % kind)
-    
+
     return view(screen)
 
 
 def get_registered_views():
-    
+
     pool = pooler.get_pool()
     views = pool.get_group("view_types")
-    
+
     views = views.items()
     views.sort(lambda a, b: cmp(a[1].priority, b[1].priority))
-    
+
     return views
-
-    
-

=== modified file 'addons/openerp/widgets/form/_action.py'
--- addons/openerp/widgets/form/_action.py	2010-01-09 13:02:21 +0000
+++ addons/openerp/widgets/form/_action.py	2010-03-09 13:30:53 +0000
@@ -73,10 +73,10 @@
 
             if not self.action.get('domain', False):
                 self.action['domain']='[]'
-            
+
             ctx = rpc.session.context.copy()
             ctx.update({'active_id': False, 'active_ids': []})
-            
+
             self.context = expr_eval(self.action.get('context', '{}'), ctx)
             self.domain = expr_eval(self.action['domain'], ctx)
 
@@ -110,8 +110,7 @@
 
             elif self.action['view_type']=='tree':
                 pass #TODO
-            
-register_widget(Action, ["action"])            
+
+register_widget(Action, ["action"])
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form/_binary.py'
--- addons/openerp/widgets/form/_binary.py	2010-01-09 13:02:21 +0000
+++ addons/openerp/widgets/form/_binary.py	2010-03-09 13:30:53 +0000
@@ -68,7 +68,7 @@
             self.text = value or ''
 
 register_widget(Binary, ["binary"])
-            
+
 
 class Image(TinyInputWidget):
 
@@ -100,7 +100,7 @@
             self.src =  icons.get_icon(icon)
 
 register_widget(Image, ["image"])
-            
+
 
 @cache.memoize(1000, force=True)
 def get_temp_file(**kw):
@@ -114,7 +114,7 @@
         type, data = value
     else:
         type, data = None, value
-        
+
     if data:
         if type == 'stock':
             stock, size = data
@@ -128,7 +128,7 @@
                 tmp.write(base64.decodestring(data))
             finally:
                 tmp.close()
-             
+
             url = tools.url("/image/get_picture", hash=hashkey)
     else:
         url = tools.url("/static/images/blank.gif")
@@ -146,29 +146,29 @@
 
     def __init__(self, **attrs):
         super(Picture, self).__init__(**attrs)
-        
+
         height = attrs.get('img_height', attrs.get('height', None))
         self.height = height and 'height="%s"' % height or ''
         width = attrs.get('img_width', attrs.get('width', None))
         self.width = width and 'width="%s"' % width or ''
         self.validator = validators.Binary()
-        
+
         ctx = rpc.session.context.copy()
         ctx.update(self.context or {})
         ctx['bin_size'] = False
-        
+
         proxy = rpc.RPCProxy(self.model)
-        
+
         if '/' in self.name:
             name = self.name.rsplit('/', 1)[-1]
         else:
             name = self.name
-        
+
         if not self.id:
             value = proxy.default_get([name], ctx)
         else:
             value = proxy.read([self.id], [name], ctx)[0]
-            
+
         value = value.get(name) or (None, None)
         self.url = generate_url_for_picture(self.model, name, self.id, value)
 
@@ -176,4 +176,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2010-03-05 09:32:15 +0000
+++ addons/openerp/widgets/form/_form.py	2010-03-09 13:30:53 +0000
@@ -83,7 +83,7 @@
 
         self.columns = int(attrs.get('col', 4))
         self.nolabel = True
-        
+
         self.x = 0
         self.y = 0
 
@@ -133,12 +133,12 @@
             cn -= len([w for a, w in row if not isinstance(w, (basestring, Label, Image)) and not w.visible])
 
             if cn < 1: cn = 1
-            
+
             for i, (a, wid) in enumerate(row):
 
                 if isinstance(wid, (basestring, Label, Image)):
                     w = sw
-                    
+
                 else:
                     c = a.get('colspan', 1)
                     if c > max_length:
@@ -148,19 +148,19 @@
                         w = ww * c / cn
                     else:
                         w = 0
-                        
+
                 a['width'] = '%d%%' % (w)
 
     def add_row(self):
-        
+
         if len(self.table) and len(self.table[-1]) == 0:
             return self.table[-1]
-        
+
         self.table.append([])
 
         self.x = 0
         self.y += 1
-        
+
         return self.table[-1]
 
     def _add_validator(self, widget):
@@ -220,7 +220,7 @@
             if not widget.visible:
                 attrs['style'] = 'display: none'
             widget.visible = True
-            
+
         valign = getattr(widget, "valign", None)
         if valign:
             attrs['valign'] = valign
@@ -252,14 +252,14 @@
 
     params = ['fake_widget']
     member_widgets = ['children']
-    
+
     valign = "top"
-    
+
     def __init__(self, **attrs):
         super(Notebook, self).__init__(**attrs)
         self.nolabel = True
         self.colspan = attrs.get('colspan', 3)
-        
+
         self.fake_widget = '_fake'
         if attrs.get('prefix'):
             self.fake_widge = attrs['prefix'] + '/_fake'
@@ -268,12 +268,12 @@
 
 
 class Page(Frame):
-    
+
     def __init__(self, **attrs):
         super(Page, self).__init__(**attrs)
         if self.invisible:
             self.attributes = "{'invisible': [1]}"
-            
+
 register_widget(Page, ["page"])
 
 
@@ -283,7 +283,7 @@
 
     template = "templates/separator.mako"
     params = ["orientation"]
-    
+
     def __init__(self, **attrs):
         super(Separator, self).__init__(**attrs)
 
@@ -336,7 +336,7 @@
 
     def set_value(self, value):
         self.field_value = unicode(value or '', 'utf-8')
-        
+
 register_widget(Label, ["label"])
 
 
@@ -346,10 +346,10 @@
     params = ['password', 'size']
 
     def __init__(self, **attrs):
-        
+
         if attrs.get('password'):
             attrs.pop('invisible', None)
-        
+
         super(Char, self).__init__(**attrs)
         self.validator = validators.String()
 
@@ -504,10 +504,10 @@
 
     def update_params(self, d):
         super(Selection, self).update_params(d)
-        
+
         if self.search_context:
             d.setdefault('css_classes', []).append('selection_search')
-            
+
     def set_value(self, value):
 
         if isinstance(value, (tuple, list)):
@@ -517,18 +517,18 @@
             value = None
 
         super(Selection, self).set_value(value)
-        
+
 register_widget(Selection, ["selection"])
-        
+
 
 class DTLink(JSLink):
-    
+
     def update_params(self, d):
         super(DTLink, self).update_params(d)
-        
+
         lang = get_locale()
         link = "calendar/lang/calendar-%s.js" % lang
-        
+
         if os.path.exists(tools.find_resource("openobject", "static", link)):
             d.link = tools.url(["/openobject/static", link])
         else:
@@ -540,11 +540,11 @@
 class DateTime(TinyInputWidget):
 
     template = "templates/datetime.mako"
-    
+
     javascript = [JSLink("openerp", "calendar/calendar.js"),
                   JSLink("openerp", "calendar/calendar-setup.js"),
                   DTLink("openerp", "calendar/lang/calendar-en.js")]
-                            
+
     css = [CSSLink("openerp", "calendar/skins/aqua/theme.css")]
 
     params = ["format", "picker_shows_time"]
@@ -593,14 +593,14 @@
         self.widget = get_widget(kind)(**attrs)
         self.validator = self.widget.validator
         self.relation = attrs.get('relation') or None
-        
+
         if 'field_id' not in attrs:
             self.field_id = self.name
-            
+
     def set_value(self, value):
         self.widget.set_value(value)
         self.default = self.widget.default
-        
+
 
 class Button(TinyInputWidget):
 
@@ -620,7 +620,7 @@
         self.btype = attrs.get('special', attrs.get('type', 'workflow'))
 
         self.nolabel = True
-        
+
         if self.icon:
             self.icon = icons.get_icon(self.icon)
 
@@ -630,20 +630,20 @@
 
 register_widget(Button, ["button"])
 
-        
+
 class Group(TinyInputWidget):
 
     template = "templates/group.mako"
 
     member_widgets = ["frame"]
     valign = "top"
-    
+
     def __init__(self, **attrs):
         super(Group, self).__init__(**attrs)
 
         self.frame = Frame(**attrs)
         self.nolabel = True
-        
+
 register_widget(Group, ["group"])
 
 
@@ -655,7 +655,7 @@
     css = [CSSLink("openerp", 'css/dashboard.css')]
 
     member_widgets = ['children']
-    
+
 register_widget(Dashbar, ["dashbar"])
 
 
@@ -672,7 +672,7 @@
         </tr>
     </table>
     """
-    
+
     member_widgets = ['children']
 
     def __init__(self, **attrs):
@@ -695,7 +695,7 @@
         % endfor
     </table>
     """
-    
+
     member_widgets = ['children']
 
     def __init__(self, **attrs):
@@ -705,21 +705,21 @@
 register_widget(VPaned, ["vpaned"])
 
 class HtmlView(TinyWidget):
-    
+
     template = "templates/htmlview.mako"
-   
+
     params = ['tag_name', 'args']
     member_widgets = ['children', 'frame']
-    
+
     def __init__(self, **attrs):
         super(HtmlView, self).__init__(**attrs)
         self.tag_name = attrs.get('tag_name')
-        
+
         self.args = attrs.get('args', {})
-        
+
         if attrs.get('value'):
             self.default = attrs.get('value')
-                
+
 register_widget(HtmlView, ["html"])
 
 class Form(TinyInputWidget):
@@ -842,17 +842,17 @@
 
             elif node.localName=='label':
                 text = attrs.get('string', '')
-                
+
                 if not text:
                     for node in node.childNodes:
                         if node.nodeType == node.TEXT_NODE:
                             text += node.data
                         else:
                             text += node.toxml()
-                            
+
                 attrs['string'] = text
                 views += [Label(**attrs)]
-                
+
             elif node.localName=='newline':
                 views += [NewLine(**attrs)]
 
@@ -863,11 +863,11 @@
                 n = self.parse(prefix=prefix, root=node, fields=fields, values=values)
                 views += [Frame(children=n, **attrs)]
 
-            elif node.localName == 'notebook':                
+            elif node.localName == 'notebook':
                 n = self.parse(prefix=prefix, root=node, fields=fields, values=values)
                 nb = Notebook(children=n, **attrs)
                 self.nb_couter += 1
-                nb._name = prefix.replace('/', '_') + '_notebook_%s'  % (self.nb_couter)                
+                nb._name = prefix.replace('/', '_') + '_notebook_%s'  % (self.nb_couter)
                 views += [nb]
 
             elif node.localName == 'page':
@@ -925,23 +925,23 @@
                 wid = get_widget('action')(**attrs)
                 views += [wid]
                 cherrypy.request._terp_dashboard = True
-                
+
             else:
                 n = self.parse(prefix=prefix, root=node, fields=fields, values=values)
                 args = node_attributes(node)
                 attrs['args'] = args
-                attrs['tag_name'] = node.localName                
-                
+                attrs['tag_name'] = node.localName
+
                 if node.nodeType == node.TEXT_NODE:
                     if not node.nodeValue.strip():
                         continue
                     attrs['value'] = node.nodeValue
-                        
+
                 views += [HtmlView(children=n, **attrs)]
-                
+
 
         return views
-    
+
     def _make_field_widget(self, attrs, value=False):
 
         attrs['editable'] = self.editable
@@ -982,4 +982,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form/_m2m.py'
--- addons/openerp/widgets/form/_m2m.py	2010-01-09 13:02:21 +0000
+++ addons/openerp/widgets/form/_m2m.py	2010-03-09 13:30:53 +0000
@@ -53,7 +53,7 @@
     template = "templates/many2many.mako"
     params = ['relation', 'domain', 'context']
     member_widgets = ['screen']
-    
+
     valign = "top"
 
     relation = None
@@ -95,7 +95,7 @@
 
         self.switch_to = view_mode[-1]
         if view_type == view_mode[-1]: self.switch_to = view_mode[0]
-        
+
         if ids is None:
             ids = attrs.get('value', [])
 
@@ -133,7 +133,7 @@
         current.view_type = view_type
         current.domain = current.domain or []
         current.context = current.context or {}
-        
+
         if isinstance(self.context, basestring):
             ctx = cherrypy.request.terp_record
             ctx['current_date'] = time.strftime('%Y-%m-%d')
@@ -193,4 +193,3 @@
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form/_m2o.py'
--- addons/openerp/widgets/form/_m2o.py	2010-01-09 13:02:21 +0000
+++ addons/openerp/widgets/form/_m2o.py	2010-03-09 13:30:53 +0000
@@ -76,4 +76,3 @@
 register_widget(M2O, ["many2one"])
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form/_o2m.py'
--- addons/openerp/widgets/form/_o2m.py	2010-03-09 09:56:21 +0000
+++ addons/openerp/widgets/form/_o2m.py	2010-03-09 13:30:53 +0000
@@ -62,7 +62,23 @@
 
         self.new_attrs = { 'text': _("New"), 'help': _('Create new record.')}
         self.default_get_ctx = attrs.get('default_get', {}) or attrs.get('context', {})
+<<<<<<< TREE
         
+=======
+
+        group_by_ctx = ''
+
+        grp_ctx = attrs.get('context', {})
+        try:
+            grp_ctx = expr_eval(grp_ctx)
+        except:
+            pass
+
+        if grp_ctx:
+            if grp_ctx.get('group_by'):
+                group_by_ctx = grp_ctx.get('group_by')
+
+>>>>>>> MERGE-SOURCE
 #        self.colspan = 4
 #        self.nolabel = True
 
@@ -104,16 +120,16 @@
 
         self.switch_to = view_mode[-1]
         if view_type == view_mode[-1]: self.switch_to = view_mode[0]
-        
+
         ids = attrs.get('value') or []
         if not isinstance(ids, list):
             ids = [ids]
-            
+
         if ids and isinstance(ids[0], dict):
             ids = []
-            
+
         id = (ids or None) and ids[0]
-        
+
         if current and params.source and self.name in params.source.split('/'):
             id = current.id
 
@@ -152,12 +168,12 @@
         current.offset = current.offset or 0
         current.limit = current.limit or 20
         current.count = len(ids or [])
-        
+
         # Group By for one2many list.
         if group_by_ctx:
             current.group_by_ctx = group_by_ctx
             current.domain = [('id', 'in', ids)]
-            
+
         if current.view_type == 'tree' and self.readonly:
             self.editable = False
 
@@ -185,12 +201,11 @@
 
         if not self.ids:
             return []
-        
+
         values = getattr(self.screen.widget, 'values', [])
-        
+
         return [(1, val.get('id', False), val) for val in values]
 
 register_widget(O2M, ["one2many", "one2many_form", "one2many_list"])
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form/_ref.py'
--- addons/openerp/widgets/form/_ref.py	2010-01-09 13:02:21 +0000
+++ addons/openerp/widgets/form/_ref.py	2010-03-09 13:30:53 +0000
@@ -47,7 +47,7 @@
     def __init__(self, **attrs):
         super(Reference, self).__init__(**attrs)
         self.options = attrs.get('selection', [])
-        
+
         self.domain = attrs.get('domain', [])
         self.context = attrs.get('context', {})
 
@@ -62,9 +62,8 @@
             self.relation = ''
             self.default = ''
             self.text = ''
-            
+
 register_widget(Reference, ["reference"])
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/form_view.py'
--- addons/openerp/widgets/form_view.py	2010-02-04 10:58:07 +0000
+++ addons/openerp/widgets/form_view.py	2010-03-09 13:30:53 +0000
@@ -41,7 +41,7 @@
 
     params = ['limit', 'offset', 'count', 'search_domain', 'search_data']
     member_widgets = ['screen', 'search', 'sidebar']
-    
+
     css = [CSSLink("openerp", "css/autocomplete.css")]
     javascript = [JSLink("openerp", "javascript/form.js", location=locations.bodytop),
                   JSLink("openerp", "javascript/form_state.js", location=locations.bodytop),
@@ -52,7 +52,7 @@
                   JSLink("openerp", "javascript/binary.js", location=locations.bodytop)]
 
     def __init__(self, params, **kw):
-        
+
         super(ViewForm, self).__init__(**kw)
 
         # save reference of params dictionary in requeste
@@ -70,14 +70,14 @@
 
         self.screen = Screen(prefix='', hastoolbar=True, hassubmenu=True, editable=editable, readonly=readonly,
                              selectable=params.selectable or 2)
-        
+
         self.sidebar = Sidebar(self.screen.model, self.screen.submenu, self.screen.toolbar, self.screen.id,
                                self.screen.view_type, context=self.screen.context)
 
         self.is_dashboard = getattr(cherrypy.request, '_terp_dashboard', False)
 
         self.search = None
-        
+
         if params.view_type in ('tree', 'graph'):
             self.search = Search(model=params.model, domain=params.domain, context=params.context, values=params.search_data or {})
 
@@ -86,7 +86,7 @@
 
         # get the correct view title
         self.screen.string = getattr(cherrypy.request, '_terp_view_name', self.screen.string) or self.screen.string
-            
+
         # get the actual pager data
         self.limit = self.screen.limit
         self.offset = self.screen.offset
@@ -94,12 +94,11 @@
 
         self.search_domain = params.search_domain
         self.search_data = params.search_data
-        
+
         if params.hidden_fields:
             self.hidden_fields = params.hidden_fields
-            
+
         #self.fields = cherrypy.request.terp_fields
 
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2010-02-26 06:44:18 +0000
+++ addons/openerp/widgets/listgrid.py	2010-03-09 13:30:53 +0000
@@ -26,37 +26,22 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
+import copy
+import math
 import time
-import math
-import copy
-import locale
 import xml.dom.minidom
+from itertools import chain
 
 import cherrypy
+from openerp.utils import rpc, icons, common, expr_eval, node_attributes
+from openerp.widgets import TinyWidget, TinyInputWidget, ConcurrencyInfo, get_widget
 
+import form
 from openobject import tools
-
 from openobject.i18n import format
 from openobject.widgets import CSSLink, JSLink
-
-from openerp.utils import rpc
-from openerp.utils import icons
-from openerp.utils import common
-from openerp.utils import expr_eval
-from openerp.utils import node_attributes
-
-import form
-
 from pager import Pager
 
-from openerp.widgets import TinyWidget
-from openerp.widgets import TinyInputWidget
-from openerp.widgets import ConcurrencyInfo
-
-from openerp.widgets import get_widget
-from openerp.widgets import register_widget
-
 
 class List(TinyWidget):
 
@@ -106,7 +91,7 @@
         self.selectable = kw.get('selectable', 0)
         self.editable = kw.get('editable', False)
         self.pageable = kw.get('pageable', True)
-        
+
         self.offset = kw.get('offset', 0)
         self.limit = kw.get('limit', 0)
         self.count = kw.get('count', 0)
@@ -127,10 +112,10 @@
 
         attrs = node_attributes(root)
         self.string = attrs.get('string','')
-        
+
         # is relational field (M2M/O2M)
         if self.source:
-            self.limit = cherrypy.request.app.config['openobject-web'].get('child.listgrid.limit', self.limit) 
+            self.limit = cherrypy.request.app.config['openobject-web'].get('child.listgrid.limit', self.limit)
             self.min_rows = cherrypy.request.app.config['openobject-web'].get('child.listgrid.min_rows', 5)
         else:
             self.min_rows = 5
@@ -163,10 +148,10 @@
 
         self.data_dict = {}
         data = []
-        
+
         if ids and not isinstance(ids, list):
             ids = [ids]
-        
+
         if ids and len(ids) > 0:
 
             ctx = rpc.session.context.copy()
@@ -180,7 +165,7 @@
                 self.data_dict[item['id']] = item.copy()
 
             self.ids = ids
-            
+
         self.values = copy.deepcopy(data)
         self.headers, self.hiddens, self.data, self.field_total, self.buttons = self.parse(root, fields, data)
 
@@ -245,38 +230,32 @@
     def display(self, value=None, **params):
 
         # set editor values
-        if self.editors and self.edit_inline:
-
-            ctx = rpc.session.context.copy()
-            ctx.update(self.context)
-
-            fields = [f for f, fa in self.headers]
-            fields += [f for f, fa in self.hiddens]
-
-            proxy = rpc.RPCProxy(self.model)
-
-            values = {}
-            defaults = {}
+        if not (self.editors and self.edit_inline):
+            return super(List, self).display(value, **params)
+
+        ctx = dict(rpc.session.context,
+                   **self.context)
+
+        fields = [name for name, _ in chain(self.headers, self.hiddens)]
+
+        proxy = rpc.RPCProxy(self.model)
+
+        if self.edit_inline > 0:
+            values = self.data_dict[self.edit_inline]
+        else:
+            values = dict(proxy.default_get(fields, ctx))
 
             # update values according to domain
-            for d in self.domain:
-                if d[0] in fields:
-                    if d[1] == '=':
-                        values[d[0]] = d[2]
-                    if d[1] == 'in' and len(d[2]) == 1:
-                        values[d[0]] = d[2][0]
-
-            if self.edit_inline > 0:
-                values = self.data_dict[self.edit_inline]
-            else:
-                defaults = proxy.default_get(fields, ctx)
-
-            for k, v in defaults.items():
-                values.setdefault(k, v)
-
-            for f in fields:
-                if f in values:
-                    self.editors[f].set_value(values[f])
+            for (field, operator, value) in self.domain:
+                if field in fields:
+                    if operator == '=':
+                        values[field] = value
+                    elif operator == 'in' and len(value) == 1:
+                        values[field] = value[0]
+
+        for f in fields:
+            if f in values:
+                self.editors[f].set_value(values[f])
 
         return super(List, self).display(value, **params)
 
@@ -372,7 +351,7 @@
                                 pass
 
                         row[name] = cell
-                    
+
                     if invisible:
                         continue
 
@@ -396,7 +375,7 @@
 
         self.text = self.get_text()
         self.link = self.get_link()
-        
+
         self.color = None
         self.onclick = None
 
@@ -431,10 +410,10 @@
     """
 
     def get_text(self):
-        
+
         if isinstance(self.value, int):
             self.value = self.value, rpc.name_get(self.attrs['relation'], self.value)
-            
+
         if self.value and len(self.value) > 0:
             return self.value[-1]
 
@@ -442,7 +421,7 @@
 
     def get_link(self):
         m2o_link = int(self.attrs.get('link', 1))
-        
+
         if m2o_link == 1:
             return tools.url('/form/view', model=self.attrs['relation'], id=(self.value or False) and self.value[0])
         else:
@@ -512,9 +491,9 @@
 
     def get_text(self):
         if isinstance(self.value, float):
-            self.value = '%.2f' % (self.value)            
+            self.value = '%.2f' % (self.value)
             self.value = float(self.value)
-            
+
             if self.value > 100.0:
                 self.range = 100.0
             else:
@@ -534,9 +513,9 @@
         return ustr(self.value or '')
 
 class Boolean(Char):
-    
+
     params = ['value', 'kind']
-    
+
     template = """ <input type="checkbox" kind="${kind}" class="checkbox" readonly="readonly" disabled="disabled" value="${py.checker(value)}"> """
 
     def get_text(self):
@@ -544,9 +523,9 @@
             return _('Yes')
         else:
             return _('No')
-        
+
 class Button(TinyInputWidget):
-    
+
     params = ['icon', 'id', 'parent_grid', 'btype', 'confirm', 'width', 'context']
 
     template="""
@@ -615,4 +594,3 @@
 }
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/listgroup.py'
--- addons/openerp/widgets/listgroup.py	2010-02-26 06:44:18 +0000
+++ addons/openerp/widgets/listgroup.py	2010-03-09 13:30:53 +0000
@@ -26,102 +26,73 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import time
-import math
-import copy
-import locale
 import random
-import xml.dom.minidom
-
-import cherrypy
-
-from openobject import tools
-
-from openobject.i18n import format
-from openobject.widgets import CSSLink, JSLink
 
 from openerp.utils import rpc
-from openerp.utils import icons
-from openerp.utils import common
-from openerp.utils import expr_eval
-from openerp.utils import node_attributes
-
-import form
-from listgrid import List    
-
-from pager import Pager
-
-from openerp.widgets import TinyWidget
-from openerp.widgets import TinyInputWidget
-from openerp.widgets import ConcurrencyInfo
-
-from openerp.widgets import get_widget
-from openerp.widgets import register_widget
+
+from listgrid import List
+
 
 class ListGroup(List):
 
     template = "templates/listgroup.mako"
     params = ['grp_records', 'group_by_ctx']
-    
+
     def __init__(self, name, model, view, ids=[], domain=[], context={}, **kw):
 
-        params = {}
-
         self.context = context or {}
         self.domain = domain or []
-        
+
         self.selectable = kw.get('selectable', 0)
         self.editable = kw.get('editable', False)
         self.pageable = kw.get('pageable', True)
-        
+
         self.offset = kw.get('offset', 0)
         self.limit = kw.get('limit', 0)
         self.count = kw.get('count', 0)
         self.link = kw.get('nolinks')
-        
+
         proxy = rpc.RPCProxy(model)
-        
+
         if ids == None:
             if self.limit > 0:
                 ids = proxy.search(self.domain, self.offset, self.limit, 0, self.context)
             else:
                 ids = proxy.search(self.domain, 0, 0, 0, self.context)
-            
+
             self.count = proxy.search_count(domain, context)
-        
-        params['limit'] = self.limit
-        params['count'] = self.count
-        params['offset'] = self.offset
-        params['editable'] = self.editable
-        params['selectable'] = self.selectable
-        
+
+
         if ids and not isinstance(ids, list):
             ids = [ids]
-        
+
         self.ids = ids
-       
+
         self.m2m = False
         self.concurrency_info = None
-        
+
         self.group_by_ctx = kw.get('group_by_ctx', [])
-        
+
         if not isinstance(self.group_by_ctx, list):
             self.group_by_ctx = [self.group_by_ctx]
-        
+
         fields = view['fields']
-        
+
         self.grp_records = []
         group_field = None
-        
+
         self.context.update(rpc.session.context.copy())
-        
-        super(ListGroup, self).__init__(name=name, model=model, view=view, ids=self.ids, domain=self.domain, context=self.context, **params)
-        
+
+        super(ListGroup, self).__init__(
+            name=name, model=model, view=view, ids=self.ids, domain=self.domain,
+            context=self.context, limit=self.limit, count=self.count,
+            offset=self.offset, editable=self.editable,
+            selectable=self.selectable)
+
         if self.group_by_ctx:
             gb = self.group_by_ctx[0]
             self.group_by_ctx = gb
-            
+
             new_hidden = ()
             for hidden in self.hiddens:
                 if gb == hidden[0]:
@@ -137,21 +108,21 @@
                     if header[0] == gb:
                         self.headers.pop(cnt)
                         self.headers.insert(0, head)
-                                       
-            self.grp_records = proxy.read_group(self.context.get('__domain', []) + (self.domain or []), 
+
+            self.grp_records = proxy.read_group(self.context.get('__domain', []) + (self.domain or []),
                                                 fields.keys(), gb, 0, False, self.context)
-            
+
         grp_ids = []
-        
+
         if self.grp_records:
             for rec in self.grp_records:
-                
+
                 if not rec.get(self.group_by_ctx):
                     rec[self.group_by_ctx] = ''
-                    
+
                 rec_dom =  rec.get('__domain')
                 dom = [('id', 'in', self.ids), rec_dom[0]]
-                
+
                 ch_ids = []
                 grp_ids = proxy.search(dom, self.offset, self.limit, 0, self.context)
                 for id in grp_ids:
@@ -160,4 +131,3 @@
                             ch_ids.append(d)
                 rec['child_rec'] = ch_ids
                 rec['group_id'] = 'group_' + str(random.randrange(1, 10000))
-        
\ No newline at end of file

=== modified file 'addons/openerp/widgets/pager.py'
--- addons/openerp/widgets/pager.py	2010-01-11 06:30:30 +0000
+++ addons/openerp/widgets/pager.py	2010-03-09 13:30:53 +0000
@@ -79,4 +79,3 @@
             self.next = self.offset+len(self.ids) < self.count
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/screen.py'
--- addons/openerp/widgets/screen.py	2010-03-05 10:39:40 +0000
+++ addons/openerp/widgets/screen.py	2010-03-09 13:30:53 +0000
@@ -55,15 +55,15 @@
         <input type="hidden" id="${name}_terp_offset" name="${name}_terp_offset" value="${offset}"/>
         <input type="hidden" id="${name}_terp_count" name="${name}_terp_count" value="${count}"/>
         <input type="hidden" id="${name}_terp_group_by_ctx" name="${name}_terp_group_by_ctx" value="${group_by_ctx}"/>
-        
+
         % if widget:
             ${display_member(widget)}
         % endif
     """
 
-    params = ['model', 'state', 'id', 'ids', 'view_id', 'view_ids', 'view_mode', 'view_type', 'domain', 
+    params = ['model', 'state', 'id', 'ids', 'view_id', 'view_ids', 'view_mode', 'view_type', 'domain',
               'context', 'limit', 'offset', 'count', 'group_by_ctx']
-    
+
     member_widgets = ['widget']
 
     def __init__(self, params=None, prefix='', name='', views_preloaded={}, hastoolbar=False, hassubmenu=False, editable=False, readonly=False, selectable=0, nolinks=1):
@@ -112,7 +112,7 @@
 
         self.hastoolbar         = hastoolbar
         self.toolbar            = None
-        
+
         self.hassubmenu         = hassubmenu
         self.submenu            = None
 
@@ -143,7 +143,7 @@
 
         self.view_id = view.get('view_id', self.view_id)
         self.view = view
-        
+
         from _views import get_view_widget
         self.widget = get_view_widget(view_type, self)
 
@@ -154,12 +154,11 @@
             if value: toolbar[item] = value
 
         submenu = view.get('submenu', {})
-        
+
         self.toolbar = toolbar or None
         self.submenu = eval(ustr(submenu)) or None
-        
+
         self.hastoolbar = (toolbar or False) and True
         self.hassubmenu = (submenu or False) and True
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/search.py'
--- addons/openerp/widgets/search.py	2010-02-26 06:44:18 +0000
+++ addons/openerp/widgets/search.py	2010-03-09 13:30:53 +0000
@@ -31,40 +31,20 @@
 This module implementes widget parser for form view, and
 several widget components.
 """
-
-import copy
 import random
 import xml.dom.minidom
 
 import cherrypy
+from openerp.utils import rpc, cache, icons, node_attributes
+from openerp.widgets import TinyInputWidget
+from openerp.widgets.form import Char, Frame, Float, DateTime, Integer, Selection, Notebook, Separator, Group, NewLine
 
 from openobject.widgets import JSLink, locations
 
-from openerp.utils import rpc
-from openerp.utils import cache
-from openerp.utils import icons
-from openerp.utils import node_attributes
-
-from openerp.widgets import TinyInputWidget
-
-from openerp.widgets.form import Char
-from openerp.widgets.form import Form
-from openerp.widgets.form import Frame
-from openerp.widgets.form import Button
-from openerp.widgets.form import Float
-from openerp.widgets.form import Frame
-from openerp.widgets.form import DateTime
-from openerp.widgets.form import Integer
-from openerp.widgets.form import Selection
-from openerp.widgets.form import Notebook
-from openerp.widgets.form import Separator
-from openerp.widgets.form import Group
-from openerp.widgets.form import NewLine
-
 
 class RangeWidget(TinyInputWidget):
     template = "templates/rangewid.mako"
-                  
+
     params = ["field_value"]
     member_widgets = ["from_field", "to_field"]
 
@@ -75,11 +55,8 @@
 
         fname = attrs['name']
 
-        from_attrs = attrs.copy()
-        to_attrs = attrs.copy()
-
-        from_attrs['name'] = fname + '/from'
-        to_attrs['name'] = fname + '/to'
+        from_attrs = dict(attrs, name=fname+'/from')
+        to_attrs = dict(attrs, name=fname+'/to')
 
         self.from_field = RANGE_WIDGETS[kind](**from_attrs)
         self.to_field = RANGE_WIDGETS[kind](**to_attrs)
@@ -90,7 +67,7 @@
         # in search view fields should be writable
         self.from_field.readonly = False
         self.to_field.readonly = False
-        
+
         # register the validators
         if hasattr(cherrypy.request, 'terp_validators'):
             for widget in [self.from_field, self.to_field]:
@@ -106,178 +83,163 @@
 
 class Filter(TinyInputWidget):
     template = "templates/filter.mako"
-    
+
     params = ['icon', 'filter_domain', 'help', 'filter_id', 'text_val', 'group_context', 'def_checked']
-    
+
     def __init__(self, **attrs):
         super(Filter, self).__init__(**attrs)
-        
+
         self.icon = attrs.get('icon')
         self.filter_domain = attrs.get('domain', [])
         self.help = attrs.get('help')
         self.filter_id = 'filter_%s' % (random.randint(0,10000))
         filter_context = attrs.get('context', None)
-        
+
         self.def_checked = False
         default_val = attrs.get('default', 0)
         if default_val:
             self.def_checked = True
-        
+
         self.group_context = None
-        
+
         # context implemented only for group_by.
         if filter_context:
             self.filter_context = eval(filter_context)
             self.group_context = self.filter_context.get('group_by', None)
-        
+
         if self.group_context:
-            self.group_context = 'group_' + self.group_context 
-        
+            self.group_context = 'group_' + self.group_context
+
         self.nolabel = True
         self.readonly = False
-        
+
         self.text_val = self.string or self.help
-        
+
         if self.icon:
             self.icon = icons.get_icon(self.icon)
 
 class Search(TinyInputWidget):
     template = "templates/search.mako"
     javascript = [JSLink("openerp", "javascript/search.js", location=locations.bodytop)]
-    
-    params = ['fields_type', 'filters_list', 'middle_string', 'fields_list']
+
+    params = ['fields_type', 'filters_list', 'operators_map', 'fields_list']
     member_widgets = ['frame']
 
     _notebook = Notebook(name="search_notebook")
 
-    def __init__(self, model, domain=[], context={}, values={}):
-        
+    def __init__(self, model, domain=None, context=None, values={}):
+
         super(Search, self).__init__(model=model)
 
         self.domain = domain or []
         self.context = context or {}
         self.model = model
 
-        ctx = rpc.session.context.copy()
-        ctx.update(self.context)
-        
+        ctx = dict(rpc.session.context,
+                   **self.context)
+
         view_id = ctx.get('search_view') or False
-        
+
         view = cache.fields_view_get(self.model, view_id, 'search', ctx, True)
         fields = cache.fields_get(self.model, [], ctx)
-        
+
         self.fields_list = []
-        
+
         for k,v in fields.items():
-            if v['type'] in ('many2one', 'char', 'float', 'integer', 'date', 'datetime', 'selection', 'many2many', 'boolean', 'one2many') and v.get('selectable',  False):
-                self.fields_list.append([k, v['string'], v['type']])
+            if v['type'] in ('many2one', 'char', 'float', 'integer', 'date',
+                             'datetime', 'selection', 'many2many', 'boolean',
+                             'one2many') and v.get('selectable',  False):
+                self.fields_list.append((k, v['string'], v['type']))
         if self.fields_list:
             self.fields_list.sort(lambda x, y: cmp(x[1], y[1]))
-            
+
         dom = xml.dom.minidom.parseString(view['arch'].encode('utf-8'))
-        root = dom.childNodes[0]
-        attrs = node_attributes(root)
-        self.string = attrs.get('string', '')
+
+        self.string = dom.documentElement.getAttribute('string')
 
         self.fields_type = {}
-        
+
         self.frame = self.parse(model, dom, view['fields'], values)[0]
-        
+
         my_acts = rpc.session.execute('object', 'execute', 'ir.actions.act_window', 'get_filters', model)
-                
-        sorted_filters = [[act.get('domain', act['id']), act['name']] for act in my_acts]
+
+        sorted_filters = [(act.get('domain', act['id']), act['name'])
+                          for act in my_acts]
         sorted_filters.sort(lambda x, y: cmp(x[1], y[1]))
-        
-        self.filters_list = [["blk", "-- Filters --"]]
-        self.filters_list += sorted_filters
-        self.filters_list += [["blk", '--Actions--'],["sh", 'Save as a Shortcut'],["sf", 'Save as a Filter'],["mf", 'Manage Filters']]
-        
-        self.middle_string = []
-        for item in (['ilike', _('contains')], ['not ilike', _('doesn\'t contain')], ['=', _('is equal to')], 
-                     ['<>', _('is not equal to')], ['>', _('greater than')], ['<', _('less than')], 
-                     ['in', _('in')], ['not in', _('not in')]):
-            self.middle_string += [item]
-            
+
+        self.filters_list = [("blk", "-- Filters --")] \
+                          + sorted_filters \
+                          + [("blk", '--Actions--'),("sh", 'Save as a Shortcut'),
+                             ("sf", 'Save as a Filter'),("mf", 'Manage Filters')]
+
+        self.operators_map = [
+            ('ilike', _('contains')), ('not ilike', _('doesn\'t contain')),
+            ('=', _('is equal to')), ('<>', _('is not equal to')),
+            ('>', _('greater than')), ('<', _('less than')),
+            ('in', _('in')), ('not in', _('not in'))]
+
     def parse(self, model=None, root=None, fields=None, values={}):
-        
+
         views = []
         search_model = model
         for node in root.childNodes:
-            
+
             if not node.nodeType==node.ELEMENT_NODE:
                 continue
-            
-            filter_attrs = {}
+
             attrs = node_attributes(node)
-            attrs['label_position'] = 'True'
-            attrs['model'] = search_model
-            
-            if attrs.has_key('colspan'):
+            attrs.update(label_position='True',
+                         model=search_model)
+
+            if 'colspan' in attrs:
                 attrs['colspan'] = 1
 
-            if attrs.has_key('nolabel'):
+            if 'nolabel' in attrs:
                 attrs['nolabel'] = False
-                
-            if node.localName in ('form', 'tree'):
-                n = self.parse(model=search_model, root=node, fields=fields, values=values)
-                views += [Frame(children=n, **attrs)]
-
-            elif node.localName in ('notebook', 'page'):
-                n = self.parse(model=search_model, root=node, fields=fields, values=values)
-                views += [Frame(children=n, **attrs)]
-
-            elif node.localName == 'search':
-                n = self.parse(model=search_model, root=node, fields=fields, values=values)
-                views += [Frame(children=n, **attrs)]
-
-            elif node.localName=='group':
-                n = self.parse(model=search_model, root=node, fields=fields, values=values)
-                views += [Group(children=n, **attrs)]
-                
+
+            if node.localName in ('form', 'tree', 'notebook', 'page', 'search',
+                                  'group'):
+                if node.localName == 'group':
+                    Element = Group
+                else:
+                    Element = Frame
+                views.append(Element(children=
+                                     self.parse(model=search_model, root=node,
+                                                fields=fields, values=values),
+                                     **attrs))
+
             elif node.localName=='newline':
-                views += [NewLine(**attrs)]
-                    
+                views.append(NewLine(**attrs))
+
             elif node.localName=='filter':
-                kind = 'filter'
                 attrs['model'] = search_model
-                field = FILTER[kind](**attrs)
-                
-                views += [field]
-            
-#            elif node.localName=='separator':
-#                kind = 'separator'
-#                field = WIDGETS[kind](**attrs)
-#                
-#                views += [field]
-           
+                views.append(Filter(**attrs))
+
             elif node.localName == 'field':
                 name = attrs['name']
-                filter_field = {}
-                
+
                 if name in self.fields_type:
                     continue
-                
+
                 # If search view available then select=1 wont consider. All fields will display from search view.
                 if not ('select' in attrs or 'select' in fields[name]):
                     continue
-              
-                if attrs.get('widget', False):
-                    if attrs['widget']=='one2many_list':
-                        attrs['widget']='one2many'
-                    if attrs['widget']=='selection':
-                        attrs['widget']='selection'
+
+                if attrs.get('widget'):
+                    if attrs['widget'] == 'one2many_list':
+                        attrs['widget'] = 'one2many'
                     attrs['type'] = attrs['widget']
-                    
+
 
                 # in search view fields should be writable
-                attrs['readonly'] = False
-                attrs['required'] = False
-                attrs['translate'] = False
-                attrs['disabled'] = False
-                attrs['visible'] = True
-                attrs['invisible'] = False
-                attrs['editable'] = True
-                attrs['attrs'] = None
+                attrs.update(readonly=False,
+                             required=False,
+                             translate=False,
+                             disabled=False,
+                             visible=True,
+                             invisible=False,
+                             editable=True,
+                             attrs=None)
 
                 try:
                     fields[name].update(attrs)
@@ -298,26 +260,22 @@
                 field.callback = None
 
                 if kind == 'boolean':
-                    field.options = [[1, 'Yes'],[0, 'No']]
+                    field.options = [(1, 'Yes'),(0, 'No')]
                     field.validator.if_empty = ''
 
-                if values.has_key(name) and isinstance(field, (TinyInputWidget, RangeWidget)):
+                if name in values and isinstance(field, (TinyInputWidget, RangeWidget)):
                     field.set_value(values[name])
-                
-                if field:
-                    views += [field]
-                
+
+                views.append(field)
+
                 for n in node.childNodes:
                     if n.localName=='filter':
-                        attrs = node_attributes(n)
-                        kind = 'filter'
-                        
-                        filter_field = FILTER[kind](**attrs)
+                        filter_field = Filter(**node_attributes(n))
                         filter_field.onchange = None
                         filter_field.callback = None
-                        
-                        views += [filter_field]
-                
+
+                        views.append(filter_field)
+
         return views
 
 RANGE_WIDGETS = {
@@ -328,10 +286,6 @@
     'integer': Integer,
 }
 
-FILTER = {
-    'filter': Filter
-}
-
 WIDGETS = {
     'date': RangeWidget,
     'datetime': RangeWidget,

=== modified file 'addons/openerp/widgets/sidebar.py'
--- addons/openerp/widgets/sidebar.py	2010-01-11 07:27:50 +0000
+++ addons/openerp/widgets/sidebar.py	2010-03-09 13:30:53 +0000
@@ -43,7 +43,7 @@
 
     javascript = [JSSource("""
         function toggle_sidebar(forced) {
-        
+
             function a() {
 
                 var sb = openobject.dom.get('sidebar');
@@ -59,7 +59,7 @@
                     img.src = "/openerp/static/images/sidebar_hide.gif";
                 }
             }
-            
+
             if (typeof(Notebook) == "undefined") {
                 a();
             } else {
@@ -80,11 +80,11 @@
         self.multi = multi
         self.context = context or {}
         self.view_type = view_type
-        
+
         act = 'client_action_multi'
         toolbar = toolbar or {}
         submenu = submenu
-        
+
         self.reports = toolbar.get('print', [])
         self.actions = toolbar.get('action', [])
         self.relates = toolbar.get('relate', [])
@@ -93,7 +93,7 @@
         self.sub_menu = None
 
         proxy = rpc.RPCProxy('ir.values')
-        
+
         if self.view_type == 'form':
             act = 'tree_but_action'
 
@@ -103,7 +103,7 @@
         ids = [a['id'] for a in self.actions]
         for act in actions:
             if act['id'] not in ids:
-                act['context'] = self.context 
+                act['context'] = self.context
                 self.actions.append(act)
 
         reports = proxy.get('action', 'client_print_multi', [(self.model, False)], False, self.context)
@@ -116,18 +116,17 @@
                 self.reports.append(rep)
 
         if self.view_type == 'form':
-            
+
             proxy = rpc.RPCProxy('ir.attachment')
             ids = proxy.search([('res_model', '=', model), ('res_id', '=', id)], 0, 0, 0, self.context)
-            
+
             if ids:
                 attach = []
                 datas = proxy.read(ids, ['datas_fname'])
                 self.attachments = [(d['id'], d['datas_fname']) for d in datas if d['datas_fname']]
-                
+
             self.sub_menu = submenu
         else:
             self.relates = []
-        
+
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/templates/search.mako'
--- addons/openerp/widgets/templates/search.mako	2010-01-11 09:32:25 +0000
+++ addons/openerp/widgets/templates/search.mako	2010-03-09 13:30:53 +0000
@@ -9,8 +9,8 @@
 	                % endfor
 	            </select>
 	    		<select id="expr" class="expr">
-	    			% for val in middle_string:
-	                	<option value="${val[0]}">${val[1]}</option>
+	    			% for operator, description in operators_map:
+	                	<option value="${operator}">${description}</option>
 	                % endfor
 	            </select>
 	            <input type="text" class='qstring' id="qstring"></input>

=== modified file 'addons/openerp/widgets/tree_view.py'
--- addons/openerp/widgets/tree_view.py	2010-02-11 06:51:04 +0000
+++ addons/openerp/widgets/tree_view.py	2010-03-09 13:30:53 +0000
@@ -47,7 +47,7 @@
     template = "templates/viewtree.mako"
     params = ['model', 'id', 'ids', 'domain', 'context', 'view_id', 'toolbar']
     member_widgets = ['tree', 'sidebar']
-    
+
     javascript = [JSLink("openerp", "javascript/form.js", location=locations.bodytop)]
 
     def __init__(self, view, model, res_id=False, domain=[], context={}, action=None):
@@ -110,14 +110,14 @@
                                       onheaderclick="onHeaderClick")
         self.id = id
         self.ids = ids
-        
+
         submenu = {}
         toolbar = {}
         for item, value in view.get('toolbar', {}).items():
             if value: toolbar[item] = value
 
         self.sidebar = Sidebar(self.model, submenu, toolbar, context=self.context)
-        
+
         # get the correct view title
         self.string = getattr(cherrypy.request, '_terp_view_name', self.string)
 
@@ -136,4 +136,3 @@
             self.headers += [field]
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/openerp/widgets/treegrid.py'
--- addons/openerp/widgets/treegrid.py	2010-01-11 06:30:30 +0000
+++ addons/openerp/widgets/treegrid.py	2010-03-09 13:30:53 +0000
@@ -84,4 +84,3 @@
         self.url_params = _jsonify(params)
 
 # vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/view_calendar/controllers/_calendar.py'
--- addons/view_calendar/controllers/_calendar.py	2010-02-04 12:16:22 +0000
+++ addons/view_calendar/controllers/_calendar.py	2010-03-09 13:30:53 +0000
@@ -46,7 +46,7 @@
 from view_calendar import widgets as tc
 
 class TinyCalendar(Form):
-    
+
     _cp_path = "/calendar"
 
     @expose()
@@ -102,11 +102,11 @@
         params, data = TinyDict.split(kw)
 
         error = None
-        
+
         ctx = rpc.session.context.copy()
         ctx.update(params.context or {})
         ctx = context_with_concurrency_info(ctx, params.concurrency_info)
-        
+
         proxy = rpc.RPCProxy(params.model)
 
         try:
@@ -263,7 +263,7 @@
         return dict()
 
 class CalendarPopup(Form):
-    
+
     _cp_path = "/calpopup"
 
     @expose(template="templates/calpopup.mako")
@@ -312,6 +312,3 @@
         ctx.update(params.context or {})
 
         return data
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/view_calendar/widgets/_base.py'
--- addons/view_calendar/widgets/_base.py	2010-02-04 12:16:22 +0000
+++ addons/view_calendar/widgets/_base.py	2010-03-09 13:30:53 +0000
@@ -389,6 +389,3 @@
                 info_fields += [attrs['name']]
 
         return info_fields
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/view_calendar/widgets/_views.py'
--- addons/view_calendar/widgets/_views.py	2010-02-04 12:16:22 +0000
+++ addons/view_calendar/widgets/_views.py	2010-03-09 13:30:53 +0000
@@ -5,14 +5,14 @@
 from widgets import GanttCalendar
 
 class CalendarView(TinyView):
-    
+
     _type = "calendar"
     _name = _("Calendar")
     _desc = _("Calendar view...")
     _priority = 4
-    
+
     def __call__(self, screen):
-        
+
         widget = get_calendar(view=screen.view,
                               model=screen.model,
                               ids=screen.ids,
@@ -23,12 +23,12 @@
 
 
 class GanttView(TinyView):
-    
+
     _type = "gantt"
     _name = _("Gantt")
     _desc = _("Gantt view...")
     _priority = 5
-    
+
     def __call__(self, screen):
         widget = GanttCalendar(model=screen.model,
                                view=screen.view,
@@ -37,4 +37,3 @@
                                context=screen.context,
                                options=screen.kalendar)
         return widget
-

=== modified file 'addons/view_calendar/widgets/utils.py'
--- addons/view_calendar/widgets/utils.py	2009-04-15 07:40:52 +0000
+++ addons/view_calendar/widgets/utils.py	2010-03-09 13:30:53 +0000
@@ -349,6 +349,3 @@
 
     def __repr__(self):
         return "Year %s" % self.year
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/view_calendar/widgets/widgets.py'
--- addons/view_calendar/widgets/widgets.py	2010-02-04 12:16:22 +0000
+++ addons/view_calendar/widgets/widgets.py	2010-03-09 13:30:53 +0000
@@ -410,6 +410,3 @@
                 keys.append(group_id)
 
         return [groups[i] for i in keys]
-
-# vim: ts=4 sts=4 sw=4 si et
-

=== modified file 'addons/view_graph/__init__.py'
--- addons/view_graph/__init__.py	2010-02-04 12:34:58 +0000
+++ addons/view_graph/__init__.py	2010-03-09 13:30:53 +0000
@@ -1,2 +1,1 @@
 import widgets
-

=== modified file 'addons/view_graph/__terp__.py'
--- addons/view_graph/__terp__.py	2010-02-04 12:34:58 +0000
+++ addons/view_graph/__terp__.py	2010-03-09 13:30:53 +0000
@@ -8,4 +8,3 @@
     "website": 'http://www.openerp.com/',
     "active": True,
 }
-

=== modified file 'addons/view_graph/widgets/_graph.py'
--- addons/view_graph/widgets/_graph.py	2010-02-04 12:34:58 +0000
+++ addons/view_graph/widgets/_graph.py	2010-03-09 13:30:53 +0000
@@ -27,29 +27,19 @@
 # You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
 #
 ###############################################################################
-
-import os
-import time
+import locale
 import random
-import locale
-import base64
-import xml.dom.minidom
-
 import re
+import time
 import urllib
+import xml.dom.minidom
 
 import simplejson
-
+from openerp.utils import rpc, cache, node_attributes
+from openerp.widgets import TinyWidget
 from openobject.tools import url_plus
 from openobject.widgets import JSSource, JSLink
 
-from openerp.utils import rpc
-from openerp.utils import common
-from openerp.utils import cache