Merge lp:~xmo-deactivatedaccount/openobject-client-web/code-cleanups into lp:~openerp-dev/openobject-client-web/trunk-dev-web

[Xavier (Open ERP)]

A few style (python) & intellij warnings (js, mostly) fixes, removal of duplicate js link in base mako template.

=== modified file 'addons/openerp/controllers/tree.py'
--- addons/openerp/controllers/tree.py	2010-03-16 20:07:12 +0000
+++ addons/openerp/controllers/tree.py	2010-03-31 08:25:34 +0000
@@ -40,17 +40,24 @@
 
 from openobject.tools import url, expose
 
-
 DT_FORMAT = '%Y-%m-%d'
 DHM_FORMAT = '%Y-%m-%d %H:%M:%S'
 
+FORMATTERS = {
+    'integer': lambda value, _i: str(value),
+    'float': lambda value, _i: '%.02f' % (value),
+    'date': lambda value, _i: time.strftime('%x', time.strptime(value, DT_FORMAT)),
+    'datetime': lambda value, _i: time.strftime('%x', time.strptime(value, DHM_FORMAT)),
+    'one2one': lambda value, _i: value[1],
+    'many2one': lambda value, _i: value[1],
+    'selection': lambda value, info: info['selection'].get(value, ''),
+}
+
 class Tree(SecuredController):
-    
     _cp_path = "/tree"
 
     @expose(template="templates/tree.mako")
     def create(self, params):
-
         view_id = (params.view_ids or False) and params.view_ids[0]
         domain = params.domain
         context = params.context
@@ -59,7 +66,9 @@
         model = params.model
 
         if view_id:
-            view_base =  rpc.session.execute('object', 'execute', 'ir.ui.view', 'read', [view_id], ['model', 'type'], context)[0]
+            view_base =  rpc.session.execute(
+                    'object', 'execute', 'ir.ui.view', 'read', [view_id],
+                    ['model', 'type'], context)[0]
             model = view_base['model']
             view = cache.fields_view_get(model, view_id, view_base['type'], context)
         else:
@@ -67,9 +76,8 @@
 
         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'])
@@ -78,8 +86,8 @@
                 id = tool['id']
                 ids = proxy.read([id], [tree.field_parent])[0][tree.field_parent]
                 tool['ids'] = ids
-                
-        return dict(tree=tree, model=model)
+
+        return {'tree': tree, 'model': model}
 
     @expose()
     def default(self, id, model, view_id, domain, context):
@@ -87,7 +95,8 @@
 
         try:
             view_id = int(view_id)
-        except:
+        except TypeError:
+            # if view_id is None
             view_id = False
 
         params.ids = id
@@ -101,7 +110,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]
@@ -112,16 +121,15 @@
         return cmp(a, b)
 
     @expose('json')
-    def data(self, ids, model, fields, field_parent=None, icon_name=None, domain=[], context={}, sort_by=None, sort_order="asc"):
-
+    def data(self, ids, model, fields, field_parent=None, icon_name=None,
+             domain=[], context={}, sort_by=None, sort_order="asc"):
         ids = ids or []
 
-        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(ids, basestring):
+            ids = map(int, ids.split(','))
+        elif isinstance(ids, list):
+            ids = map(int, ids)
+
         if isinstance(fields, basestring):
             fields = eval(fields)
 
@@ -136,8 +144,8 @@
 
         proxy = rpc.RPCProxy(model)
 
-        ctx = context or {}
-        ctx.update(rpc.session.context.copy())
+        ctx = dict(context,
+                   **rpc.session.context)
 
         if icon_name:
             fields.append(icon_name)
@@ -148,56 +156,29 @@
         if sort_by:
             result.sort(lambda a,b: self.sort_callback(a, b, sort_by, sort_order, type=fields_info[sort_by]['type']))
 
-        # formate the data
+        # format the data
         for field in fields:
-
-            if fields_info[field]['type'] in ('integer'):
-                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]:
-                        x[field] = '%.02f'%(round(x[field], 2))
-
-            if fields_info[field]['type'] in ('date',):
-                for x in result:
-                    if x[field]:
-                        date = time.strptime(x[field], DT_FORMAT)
-                        x[field] = time.strftime('%x', date)
-
-            if fields_info[field]['type'] in ('datetime',):
-                for x in result:
-                    if x[field]:
-                        date = time.strptime(x[field], DHM_FORMAT)
-                        x[field] = time.strftime('%x %H:%M:%S', date)
-
-            if fields_info[field]['type'] in ('one2one', 'many2one'):
-                for x in result:
-                    if x[field]:
-                        x[field] = x[field][1]
-
-            if fields_info[field]['type'] in ('selection'):
-                for x in result:
-                    if x[field]:
-                        x[field] = dict(fields_info[field]['selection']).get(x[field], '')
+            field_info = fields_info[field]
+            formatter = FORMATTERS.get(field_info['type'])
+            for x in result:
+                if x[field]:
+                    x[field] = formatter(x[field], field_info)
 
         records = []
         for item in result:
-
-            # empty string instead of bool and None
+            # empty string instead of False or None
             for k, v in item.items():
-                if v==None or (v==False and type(v)==bool):
+                if v is None or v is False:
                     item[k] = ''
 
-            record = {}
-
-            record['id'] = item.pop('id')
-            record['action'] = url('/tree/open', model=model, id=record['id'])
-            record['target'] = None
-
-            record['icon'] = None
+            record = {
+                'id': item.pop('id'),
+                'action': url('/tree/open', model=model, id=record['id']),
+                'target': None,
+                'icon': None,
+                'children': [],
+                'items': item
+            }
 
             if icon_name and item.get(icon_name):
                 icon = item.pop(icon_name)
@@ -207,16 +188,12 @@
                     record['action'] = None
                     record['target'] = None
 
-            record['children'] = []
-
             if field_parent and field_parent in item:
                 record['children'] = item.pop(field_parent) or None
 
-            record['items'] = item
+            records.append(record)
 
-            records += [record]
-            
-        return dict(records=records)
+        return {'records': records}
 
     def do_action(self, name, adds={}, datas={}):
         params, data = TinyDict.split(datas)
@@ -234,7 +211,9 @@
         id = (ids or False) and ids[0]
 
         if ids:
-            return actions.execute_by_keyword(name, adds=adds, model=model, id=id, ids=ids, context=ctx, report_type='pdf')
+            return actions.execute_by_keyword(
+                    name, adds=adds, model=model, id=id, ids=ids, context=ctx,
+                    report_type='pdf')
         else:
             raise common.message(_("No record selected!"))
 
@@ -260,11 +239,10 @@
 
     @expose()
     def switch(self, **kw):
-
         params, data = TinyDict.split(kw)
 
-        ids = params.selection or []            
-        if len(ids):
+        ids = params.selection or []
+        if ids:
             import actions
             return actions.execute_window(False, res_id=ids, model=params.model, domain=params.domain)
         else:
@@ -272,11 +250,8 @@
 
     @expose()
     def open(self, **kw):
-        datas = {'_terp_model': kw.get('model'),
-                 '_terp_context': kw.get('context', {}),
-                 '_terp_domain': kw.get('domain', []),
-                 'ids': kw.get('id')}
-
-        return self.do_action('tree_but_open', datas=datas)
-
-# vim: ts=4 sts=4 sw=4 si et
+        return self.do_action('tree_but_open', datas={
+                '_terp_model': kw.get('model'),
+                '_terp_context': kw.get('context', {}),
+                '_terp_domain': kw.get('domain', []),
+                'ids': kw.get('id')})

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2010-03-31 07:22:59 +0000
+++ addons/openerp/static/javascript/form.js	2010-03-31 08:25:34 +0000
@@ -27,25 +27,25 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-function get_form_action(action, params){
-    
+function get_form_action(action, params) {
+
     var act = typeof(form_controller) == 'undefined' ? '/form' : form_controller;
     act = action && action.indexOf('/') == 0 ? action : act + '/' + action;
     return openobject.http.getURL(act, params);
 }
 
-var openRecord = function(id, src, target, readonly){
+function openRecord(id, src, target, readonly) {
 
     var kind = getNodeAttribute(src + '_set', 'kind');
-    
+
     if (!kind && openobject.dom.get('_o2m_' + src)) {
         kind = "one2many";
     }
-        
+
     if (kind == "one2many") {
         return new One2Many(src).edit(id, readonly);
     }
-    
+
     var prefix = src && src != '_terp_list' ? src + '/' : '';
 
     var model = openobject.dom.get(prefix + '_terp_model').value;
@@ -67,6 +67,7 @@
     var search_data = openobject.dom.get('_terp_search_data');
     search_data = search_data ? search_data.value : null;
 
+<<<<<<< TREE
     var args = {'model': model,
                 'id': id ? id : 'False',
                 'ids': ids,
@@ -80,12 +81,28 @@
                 'search_domain': search_domain,
                 'search_data':search_data};
                 
+=======
+    var args = {
+        'model': model,
+        'id': id ? id : 'False',
+        'ids': ids,
+        'view_ids': view_ids,
+        'view_mode': view_mode,
+        'domain': domain,
+        'context': context,
+        'offset': offset,
+        'limit': limit,
+        'count': count,
+        'search_domain': search_domain
+    };
+
+>>>>>>> MERGE-SOURCE
     var action = readonly ? 'view' : 'edit';
-        
+
     if (target == '_blank') {
         return window.open(get_form_action(action, args));
     }
-    
+
     if (kind == 'many2many') {
         args['source'] = src;
         return openobject.tools.openWindow(get_form_action('/openm2m/edit', args));
@@ -94,41 +111,52 @@
     window.location.href = get_form_action(action, args);
 }
 
-var editRecord = function(id, src, target){
+function editRecord(id, src, target) {
     return openRecord(id, src, target, false);
 }
 
-var viewRecord = function(id, src){
+function viewRecord(id, src) {
     return openRecord(id, src, null, true);
 }
 
-var editSelectedRecord = function() {
+function editSelectedRecord() {
 
     var lst = new ListView('_terp_list');
     var ids = lst.getSelectedRecords();
-    
+
     if (ids && ids.length > 5) {
         var msg = _('You selected to open %(tabs)s tabs - do you want to continue?');
         msg = msg.replace('%(tabs)s', ids.length);
-        if (!confirm(msg)) return;
+        if (!confirm(msg)) {
+            return;
+        }
     }
 
-    forEach(ids, function(id){
+    forEach(ids, function(id) {
         editRecord(id, '_terp_list', '_blank');
     });
 }
 
-var switchView = function(view_type, src){
-
+function switchView(view_type, src) {
+
+<<<<<<< TREE
+=======
+    var search_filter_data = getElement('search_filter_data')
+    if (search_filter_data) {
+        search_filter_data.style.display = "none";
+        appendChildNodes(parent.window.document.body, search_filter_data);
+    }
+
+>>>>>>> MERGE-SOURCE
     var prefix = src ? src + '/' : '';
     var form = document.forms['view_form'];
 
     var params = {
         '_terp_source': src,
         '_terp_source_view_type': view_type
-    }
+    };
 
-    if (openobject.dom.get('_terp_list')){
+    if (openobject.dom.get('_terp_list')) {
         var ids = new ListView('_terp_list').getSelectedRecords();
         if (ids.length > 0) {
             openobject.dom.get('_terp_id').value = ids[0];
@@ -138,43 +166,43 @@
     submit_form(get_form_action('switch', params));
 }
 
-var switch_O2M = function(view_type, src){
-    
-    if (openobject.http.AJAX_COUNT > 0){
+function switch_O2M(view_type, src) {
+
+    if (openobject.http.AJAX_COUNT > 0) {
         return;
     }
-    
+
     var prefix = src ? src + '/' : '';
     var form = document.forms['view_form'];
-	
+
     var params = getFormParams();
-    
+
     params['_terp_source'] = src;
     params['_terp_source_view_type'] = view_type;
-    
-    if (openobject.dom.get('_terp_list')){
+
+    if (openobject.dom.get('_terp_list')) {
         var ids = new ListView('_terp_list').getSelectedRecords();
         if (ids.length > 0) {
             openobject.dom.get('_terp_id').value = ids[0];
         }
     }
-    
+
     req = openobject.http.post('/form/switch_o2m', params);
-    req.addCallback(function(xmlHttp){
-    
+    req.addCallback(function(xmlHttp) {
+
         var text = xmlHttp.responseText;
         if (text.indexOf('ERROR: ') == 0) {
             text = text.replace('ERROR: ', '');
             return alert(text);
         }
 
-        var frm = openobject.dom.get('_o2m_'+src);
-        
+        var frm = openobject.dom.get('_o2m_' + src);
+
         var d = DIV();
         d.innerHTML = text;
-        
+
         var newo2m = d.getElementsByTagName('table')[0];
-        
+
         swapDOM(frm, newo2m);
 
         var ua = navigator.userAgent.toLowerCase();
@@ -182,43 +210,46 @@
         if ((navigator.appName != 'Netscape') || (ua.indexOf('safari') != -1)) {
             // execute JavaScript
             var scripts = openobject.dom.select('script', newo2m);
-            forEach(scripts, function(s){
+            forEach(scripts, function(s) {
                 eval(s.innerHTML);
             });
         }
     });
 }
 
-var show_process_view = function() {
+function show_process_view() {
     var model = openobject.dom.get('_terp_model').value;
     var id = openobject.dom.get('_terp_id').value;
 
     if (openobject.dom.get('_terp_list')) {
         var list = new ListView('_terp_list');
         var ids = list.getSelectedRecords();
-        if (ids.length)
+        if (ids.length) {
             id = ids[0];
+        }
     }
 
     id = parseInt(id) || null;
 	window.location.href = openobject.http.getURL('/process', {res_model: model, res_id: id})
 }
 
-var validate_required = function(form) {
+function validate_required(form) {
 
     if (typeof form == 'string') {
-       form = document.forms[form];
+        form = document.forms[form];
     }
 
-    if (!form) return true;
+    if (!form) {
+        return true;
+    }
 
     var elements = MochiKit.Base.filter(function(el) {
-       return !el.disabled && el.id && el.name && el.id.indexOf('_terp_listfields/') == -1 && hasElementClass(el, 'requiredfield');
+        return !el.disabled && el.id && el.name && el.id.indexOf('_terp_listfields/') == -1 && hasElementClass(el, 'requiredfield');
     }, form.elements);
 
     var result = true;
 
-    for (var i=0; i<elements.length; i++){
+    for (var i = 0; i < elements.length; i++) {
 
         var elem = elem2 = elements[i];
         var value = elem.value;
@@ -240,7 +271,7 @@
             removeElementClass(elem2, 'errorfield');
         }
     }
-    
+
     if (!result) {
         alert(_("Invalid form, correct red fields !"));
     }
@@ -248,8 +279,8 @@
     return result;
 }
 
-var submit_form = function(action, src, target){
-    
+function submit_form(action, src, target) {
+
     if (openobject.http.AJAX_COUNT > 0) {
         return callLater(1, submit_form, action, src, target);
     }
@@ -266,54 +297,54 @@
     var args = {
         _terp_source: source
     };
-   
-    if (target == "new" || target == "_blank"){
+
+    if (target == "new" || target == "_blank") {
         setNodeAttribute(form, 'target', '_blank');
     }
-    
-    if (action == 'save_and_edit'){
+
+    if (action == 'save_and_edit') {
         action = 'save';
         args['_terp_return_edit'] = 1;
     }
 
     action = get_form_action(action, args);
 
-    if (/\/save(\?|\/)?/.test(action) && !validate_required(form)){
+    if (/\/save(\?|\/)?/.test(action) && !validate_required(form)) {
         return false;
     }
-    
-    form.attributes['action'].value = action;    
+
+    form.attributes['action'].value = action;
     form.submit();
 }
 
-var pager_action = function(action, src) {
+function pager_action(action, src) {
     return src ? new ListView(src).go(action) : submit_form(action ? action : 'find');
 }
 
-var buttonClicked = function(name, btype, model, id, sure, target){
+function buttonClicked(name, btype, model, id, sure, target) {
 
-    if (sure && !confirm(sure)){
+    if (sure && !confirm(sure)) {
         return;
     }
 
-    var params = {};
+    var params = {
+        '_terp_button/name': name,
+        '_terp_button/btype': btype,
+        '_terp_button/model': model,
+        '_terp_button/id': id
+    };
 
-    params['_terp_button/name'] = name;
-    params['_terp_button/btype'] = btype;
-    params['_terp_button/model'] = model;
-    params['_terp_button/id'] = id;
-    
     var act = get_form_action(btype == 'cancel' ? 'cancel' : 'save', params);
     submit_form(act, null, target);
 }
 
-var onBooleanClicked = function(name) {
+function onBooleanClicked(name) {
 
     var source = openobject.dom.get(name + '_checkbox_');
     var target = openobject.dom.get(name);
 
     target.value = source.checked ? 1 : '';
-	MochiKit.Signal.signal(target, 'onchange');
+    MochiKit.Signal.signal(target, 'onchange');
 }
 
 /**
@@ -324,64 +355,65 @@
  *    2 then give form data with type info + required flag
  * else gives simple key-value pairs
  */
-var getFormData = function(extended) {
+function getFormData(extended) {
 
     var parentNode = openobject.dom.get('_terp_list') || document.forms['view_form'];
 
     var frm = {};
     var fields = [];
-    
+
     var is_editable = openobject.dom.get('_terp_editable').value == 'True';
-    
+
     if (is_editable) {
-	    fields = openobject.dom.select("input, textarea, select", parentNode);
+        fields = openobject.dom.select("input, textarea, select", parentNode);
     } else {
-        fields =  fields.concat(openobject.dom.select('kind=value')); 
-        fields = fields.concat(openobject.dom.select('[name$=/__id]'));       
+        fields = fields.concat(openobject.dom.select('kind=value'));
+        fields = fields.concat(openobject.dom.select('[name$=/__id]'));
     }
-    
-    fields = fields.concat(filter(function(e){
-        return getNodeAttribute(e,'kind')=='picture';
+
+    fields = fields.concat(filter(function(e) {
+        return getNodeAttribute(e, 'kind') == 'picture';
     }, openobject.dom.select('img', parentNode)));
-    
-    for(var i=0; i<fields.length; i++) {
-    
+
+    for (var i = 0; i < fields.length; i++) {
+
         var e = fields[i];
         var n = is_editable ? e.name : e.id;
-        
-        if (e.tagName.toLowerCase() != 'img' && !n)
+
+        if (e.tagName.toLowerCase() != 'img' && !n) {
             continue;
+        }
 
-        var n = n.replace('_terp_listfields/', '');
+        n = n.replace('_terp_listfields/', '');
 
         // don't include _terp_ fields except _terp_id
-        if (/_terp_/.test(n) && ! /_terp_id$/.test(n))
+        if (/_terp_/.test(n) && ! /_terp_id$/.test(n)) {
             continue;
+        }
 
-        // work arround to skip o2m values (list mode)
+        // work around to skip o2m values (list mode)
+        var value;
         if (n.indexOf('/__id') > 0) {
-        
+
             n = n.replace('/__id', '');
 
             if (openobject.dom.get(n + '/_terp_view_type').value == 'form') {
-                frm[n+'/__id'] = openobject.dom.get(n+'/__id').value;
+                frm[n + '/__id'] = openobject.dom.get(n + '/__id').value;
                 continue;
             }
             // skip if editable list's editors are visible
             if (openobject.dom.select("[name^=_terp_listfields/" + n + "]").length) {
                 continue;
             }
-            
-            
-            var value = openobject.dom.get(n + '/_terp_ids').value;
 
+            value = openobject.dom.get(n + '/_terp_ids').value;
             if (extended) {
-                value = {'value': value, 
-                         'type': 'one2many', 
-                         'relation': openobject.dom.get(n + '/_terp_model').value};
+                value = {'value': value,
+                    'type': 'one2many',
+                    'relation': openobject.dom.get(n + '/_terp_model').value};
                 value = serializeJSON(value);
             }
-            
+
             frm[n] = value;
             continue;
         }
@@ -389,8 +421,8 @@
         if (extended && n.indexOf('/__id') == -1) {
 
             var attrs = {};
-            
-            var value = (is_editable ? e.value : getNodeAttribute(e, 'value')) || "";
+
+            value = (is_editable ? e.value : getNodeAttribute(e, 'value')) || "";
             var kind = getNodeAttribute(e, 'kind') || "char";
 
             //take care of _terp_id
@@ -399,42 +431,44 @@
                 //  only the resource id and all O2M
                 n = n.replace(/_terp_id$/, '');
                 if (n && !openobject.dom.get(n + '__id')) {
-                    continue; 
+                    continue;
                 }
 
                 n = n + 'id';
-                
+
                 if (!openobject.dom.get(n)) {
-                    continue;    
+                    continue;
                 }
-                
+
                 kind = 'integer';
                 value = value == 'False' ? '' : value;
             }
 
             attrs['value'] = typeof(value) == "undefined" ? '' : value;
 
-            if (kind)
+            if (kind) {
                 attrs['type'] = kind;
-                
-            if (extended && (kind == 'many2one' || kind == 'many2many')){
+            }
+
+            if (extended && (kind == 'many2one' || kind == 'many2many')) {
                 attrs['relation'] = getNodeAttribute(e, 'relation');
             }
 
-            if (extended > 1 && hasElementClass(e, 'requiredfield'))
-                attrs['required'] =  1;
+            if (extended > 1 && hasElementClass(e, 'requiredfield')) {
+                attrs['required'] = 1;
+            }
 
             if (kind == "picture") {
                 n = e.id;
             }
 
             if (kind == 'text_html') {
-                attrs['value'] =  tinyMCE.get(e.name).getContent();
+                attrs['value'] = tinyMCE.get(e.name).getContent();
             }
 
             // stringify the attr object
             frm[n] = serializeJSON(attrs);
-            
+
         } else {
             frm[n] = e.value;
         }
@@ -447,17 +481,18 @@
  * get key-value pair of form params (_terp_)
  * @param name: only return values for given param
  */
-var getFormParams = function(name){
+function getFormParams(name) {
 
     var parentNode = document.forms['view_form'];
 
     var frm = {};
     var fields = openobject.dom.select('input', parentNode);
 
-    forEach(fields, function(e){
+    forEach(fields, function(e) {
 
-        if (!e.name || e.name.indexOf('_terp_listfields/') > -1 || e.name.indexOf('_terp_') == -1)
+        if (!e.name || e.name.indexOf('_terp_listfields/') > -1 || e.name.indexOf('_terp_') == -1) {
             return
+        }
 
         if (name && e.name != name) {
             return;
@@ -473,19 +508,19 @@
     return frm;
 }
 
-var onChange = function(name) {
+function onChange(name) {
 
     var caller = openobject.dom.get(name);
     var callback = getNodeAttribute(caller, 'callback');
     var change_default = getNodeAttribute(caller, 'change_default');
-    
+
     if (!(callback || change_default) || caller.__lock_onchange) {
         return;
     }
-    
+
     var is_list = caller.id.indexOf('_terp_listfields') == 0;
     var prefix = caller.name || caller.id;
-    prefix = prefix.slice(0, prefix.lastIndexOf('/')+1);
+    prefix = prefix.slice(0, prefix.lastIndexOf('/') + 1);
 
     var params = getFormData(1);
     var model = is_list ? openobject.dom.get(prefix.slice(17) + '_terp_model').value : openobject.dom.get(prefix + '_terp_model').value;
@@ -498,33 +533,35 @@
     params['_terp_context'] = context;
     params['_terp_value'] = caller.value;
     params['id'] = id;
-    
+
     var req = openobject.http.postJSON(callback ? '/form/on_change' : '/form/change_default_get', params);
 
-    req.addCallback(function(obj){
+    req.addCallback(function(obj) {
 
         if (obj.error) {
             return alert(obj.error);
         }
-        
+
         values = obj['value'];
         domains = obj['domain'];
 
         domains = domains ? domains : {};
 
-        for(var k in domains){
-            fld = openobject.dom.get(prefix + k);
-            if (fld){
-                setNodeAttribute(fld, 'domain', domains[k]);
+        for (var domain in domains) {
+            fld = openobject.dom.get(prefix + domain);
+            if (fld) {
+                setNodeAttribute(fld, 'domain', domains[domain]);
             }
         }
 
-        for(var k in values){
-            
+        for (var k in values) {
+
             flag = false;
             fld = openobject.dom.get(prefix + k);
 
-            if (!fld) continue;
+            if (!fld) {
+                continue;
+            }
 
             value = values[k];
             value = value === false || value === null ? '' : value;
@@ -532,7 +569,7 @@
             // prevent recursive onchange
             fld.__lock_onchange = true;
 
-            if (openobject.dom.get(prefix + k + '_id')){
+            if (openobject.dom.get(prefix + k + '_id')) {
                 fld = openobject.dom.get(prefix + k + '_id');
                 flag = true;
             }
@@ -541,36 +578,39 @@
                 fld.value = value;
 
                 var kind = getNodeAttribute(fld, 'kind');
-                
-                if (kind == 'picture') {
-                    fld.src = value;
-                }
-
-                if (kind == 'many2one'){
-                    fld.value = value[0] || '';
-                    try {
-                        openobject.dom.get(prefix + k + '_text').value = value[1] || '';
-                    }catch(e){}
-                }
-
-                if (kind == 'boolean') {
-                    openobject.dom.get(prefix + k + '_checkbox_').checked = value || false;
-                }
-                
-                if (kind=='text_html') {
-                    tinyMCE.execInstanceCommand(k, 'mceSetContent', false, value || '')
-                }
-                
-                if (kind=='selection') {                    
-                    var opts = [];
-                    opts.push(OPTION({'value': ''}))
-                    
-                    for (i in value) {                        
-                        var item = value[i];                        
-                        opts.push(OPTION({'value': item[0]}, item[1]));
-                    } 
-                    MochiKit.DOM.replaceChildNodes(fld, map(function(x){return x;}, opts));
-                }                
+
+                switch (kind) {
+                    case 'picture':
+                        fld.src = value;
+                        break;
+                    case 'many2one':
+                        fld.value = value[0] || '';
+                        try {
+                            openobject.dom.get(prefix + k + '_text').value = value[1] || '';
+                        } catch(e) {
+                        }
+                        break;
+                    case 'boolean':
+                        openobject.dom.get(prefix + k + '_checkbox_').checked = value || false;
+                        break;
+                    case 'text_html':
+                        tinyMCE.execInstanceCommand(k, 'mceSetContent', false, value || '');
+                        break;
+                    case 'selection':
+                        var opts = [];
+                        opts.push(OPTION({'value': ''}));
+
+                        for (i in value) {
+                            var item = value[i];
+                            opts.push(OPTION({'value': item[0]}, item[1]));
+                        }
+                        MochiKit.DOM.replaceChildNodes(fld, map(function(x) {
+                            return x;
+                        }, opts));
+                        break;
+                    default:
+                        // do nothing on default
+                }
 
                 MochiKit.Signal.signal(fld, 'onchange');
             }
@@ -592,27 +632,27 @@
  *
  * @return string
  */
-function getName(name, relation){
+function getName(name, relation) {
 
     var value_field = openobject.dom.get(name);
     var text_field = openobject.dom.get(value_field.name + '_text');
 
     relation = relation ? relation : getNodeAttribute(value_field, 'relation');
 
-    if (value_field.value == ''){
+    if (value_field.value == '') {
         text_field.value = ''
     }
 
-    if (value_field.value){
+    if (value_field.value) {
         var req = openobject.http.getJSON('/search/get_name', {model: relation, id : value_field.value});
-        req.addCallback(function(obj){
+        req.addCallback(function(obj) {
             text_field.value = obj.name;
         });
     }
 }
 
-function eval_domain_context_request(options){
-    
+function eval_domain_context_request(options) {
+
     if ((!options.domain || options.domain == '[]') && (!options.context || options.context == '{}')) {
         return new MochiKit.Async.succeed(-1);
     }
@@ -621,39 +661,40 @@
     prefix.pop();
 
     // editable listview fields
-    if (prefix[0] == '_terp_listfields'){
+    if (prefix[0] == '_terp_listfields') {
         prefix.shift();
     }
     prefix = prefix.join('/');
 
     var params = getFormData(1);
-    
+
     params['_terp_domain'] = options.domain;
     params['_terp_context'] = options.context;
-    params['_terp_prefix'] = prefix;    
+    params['_terp_prefix'] = prefix;
     params['_terp_active_id'] = prefix ? openobject.dom.get(prefix + '/_terp_id').value : openobject.dom.get('_terp_id').value;
     params['_terp_active_ids'] = prefix ? openobject.dom.get(prefix + '/_terp_ids').value : openobject.dom.get('_terp_ids').value;
-    
+
     if (options.active_id) {
         params['_terp_active_id'] = options.active_id;
         params['_terp_active_ids'] = options.active_ids;
     }
-        
+
     var parent_context = prefix ? openobject.dom.get(prefix + '/_terp_context') : openobject.dom.get('_terp_context');
-    
-    if (parent_context){
+
+    if (parent_context) {
         params['_terp_parent_context'] = parent_context.value;
     }
-    
+
     var req = openobject.http.postJSON('/search/eval_domain_and_context', params);
-    return req.addCallback(function(obj){
+    return req.addCallback(function(obj) {
 
         if (obj.error_field) {
 
             var fld = openobject.dom.get(obj.error_field) || openobject.dom.get('_terp_listfields/' + obj.error_field);
 
-            if (fld && getNodeAttribute(fld, 'kind') == 'many2one')
-            fld = openobject.dom.get(fld.id + '_text');
+            if (fld && getNodeAttribute(fld, 'kind') == 'many2one') {
+                fld = openobject.dom.get(fld.id + '_text');
+            }
 
             if (fld) {
                 fld.focus();
@@ -671,32 +712,36 @@
 
 function open_search_window(relation, domain, context, source, kind, text) {
 
-    var req = eval_domain_context_request({source: source, 
-                                           domain: domain, 
-                                           context: context});
+    var req = eval_domain_context_request({
+        'source': source,
+        'domain': domain,
+        'context': context
+    });
 
     if (kind == 2 && source.indexOf('_terp_listfields/') == 0) {
         text = "";
     }
 
-    req.addCallback(function(obj){
-        openobject.tools.openWindow(openobject.http.getURL('/search/new', {model: relation, 
-                                          domain: obj.domain, 
-                                          context: obj.context, 
-                                          source: source, 
-                                          kind: kind, 
-                                          text: text}));
+    req.addCallback(function(obj) {
+        openobject.tools.openWindow(openobject.http.getURL('/search/new', {
+            'model': relation,
+            'domain': obj.domain,
+            'context': obj.context,
+            'source': source,
+            'kind': kind,
+            'text': text
+        }));
     });
 }
 
-var showCustomizeMenu = function(src, elem) {
+function showCustomizeMenu(src, elem) {
     var elem = openobject.dom.get(elem);
-    
+
     var frame = window.frameElement ? window.frameElement : null;
     if (frame) {
-    	frame.style.height = elementDimensions(openobject.dom.get('main_form_body')).h + 70 + 'px';	
+        frame.style.height = elementDimensions(openobject.dom.get('main_form_body')).h + 70 + 'px';
     }
-        
+
     MochiKit.Visual.appear(elem, {from: 0, duration: 0.4});
 }
 
@@ -710,42 +755,46 @@
     var model = prefix ? openobject.dom.get(prefix + '_terp_model').value : openobject.dom.get('_terp_model').value;
 
     var params = {'model': model, 'field': id, 'kind': kind, 'relation': relation, 'value': val};
-    
+
     var req = openobject.http.postJSON(act, params);
 
     req.addCallback(function(obj) {
 
         var rows = [];
 
-        for(var r in obj.defaults) {
-            var o = obj.defaults[r];                        
+        for (var r in obj.defaults) {
+            var o = obj.defaults[r];
             var a = SPAN({onclick: 'hideElement("contextmenu"); return ' + o.action}, o.text);
             rows = rows.concat(a);
         }
 
-        if(obj.actions.length > 0) {
+        if (obj.actions.length > 0) {
             rows = rows.concat(HR());
 
-            for(var r in obj.actions) {
+            for (var r in obj.actions) {
                 var o = obj.actions[r];
 
-                var a = SPAN({'class': o.action ? '' : 'disabled',
-                           'onclick': o.action ? 'hideElement("contextmenu"); return ' + o.action : ''}, o.text);
+                var a = SPAN({
+                    'class': o.action ? '' : 'disabled',
+                    'onclick': o.action ? 'hideElement("contextmenu"); return ' + o.action : ''
+                }, o.text);
 
                 rows = rows.concat(a);
             }
         }
 
-        if(obj.relates.length > 0) {
-            rows = rows.concat(HR())
+        if (obj.relates.length > 0) {
+            rows = rows.concat(HR());
 
-            for(var r in obj.relates) {
+            for (var r in obj.relates) {
                 var o = obj.relates[r];
-                
-                var a = SPAN({'class': o.action ? '' : 'disabled',
-                              'onclick': o.action ? 'hideElement(\'contextmenu\'); return ' + o.action : '',
-                              'domain': o.domain,
-                              'context': o.context}, o.text);
+
+                var a = SPAN({
+                    'class': o.action ? '' : 'disabled',
+                    'onclick': o.action ? 'hideElement(\'contextmenu\'); return ' + o.action : '',
+                    'domain': o.domain,
+                    'context': o.context
+                }, o.text);
 
                 rows = rows.concat(a);
             }
@@ -753,8 +802,10 @@
 
         openobject.dom.get('contextmenu').innerHTML = '';
 
-        var tbl = TABLE({'cellpadding': 0, 'cellspacing' : 0}, 
-                    TBODY(null, map(function(r){return TR(null, TD(null, r));}, rows)));
+        var tbl = TABLE({'cellpadding': 0, 'cellspacing' : 0},
+                TBODY(null, map(function(r) {
+                    return TR(null, TD(null, r));
+                }, rows)));
 
         appendChildNodes('contextmenu', tbl);
 
@@ -770,7 +821,7 @@
             x -= x + md.w - vd.w;
             openobject.dom.get('contextmenu').style.left = x + 'px';
         }
-        
+
         if ((y + md.h) > vd.h) {
             y -= y + md.h - vd.h;
             openobject.dom.get('contextmenu').style.top = y + 'px';
@@ -780,14 +831,14 @@
     });
 }
 
-var showContextMenu = function(){
+function showContextMenu() {
 
     var menu = openobject.dom.get('contextmenu');
     var ifrm = openobject.dom.get('contextmenu_frm');
 
     showElement(menu);
 
-    if (ifrm){
+    if (ifrm) {
 
         ifrm.style.left = menu.offsetLeft + "px";
         ifrm.style.top = menu.offsetTop + "px";
@@ -799,21 +850,21 @@
     }
 }
 
-var hideContextMenu = function(){
+function hideContextMenu() {
     var menu = openobject.dom.get('contextmenu');
     var ifrm = openobject.dom.get('contextmenu_frm');
 
-    if (ifrm){
+    if (ifrm) {
         hideElement(ifrm);
     }
 
     hideElement(menu);
 }
 
-function set_to_default(field, model){
+function set_to_default(field, model) {
 
     var kind = getNodeAttribute(openobject.dom.get(field), 'kind');
-    
+
     var act = get_form_action('get_default_value');
     var params = {'model': model, 'field': field};
 
@@ -825,25 +876,27 @@
     });
 }
 
-function set_as_default(field, model){
+function set_as_default(field, model) {
 
     var kind = getNodeAttribute(openobject.dom.get(field), 'kind');
 
     var args = getFormData(1);
-    
+
     args['_terp_model'] = model;
     args['_terp_field'] = field;
 
     var req = openobject.http.postJSON('/fieldpref/get', args);
 
-    req.addCallback(function(obj){
+    req.addCallback(function(obj) {
         var text = obj.text;
-        var params = {'_terp_model': model, 
-                      '_terp_field/name': field, 
-                      '_terp_field/string': text, 
-                      '_terp_field/value': openobject.dom.get(field).value, 
-                      '_terp_deps': obj.deps};
-        
+        var params = {
+            '_terp_model': model,
+            '_terp_field/name': field,
+            '_terp_field/string': text,
+            '_terp_field/value': openobject.dom.get(field).value,
+            '_terp_deps': obj.deps
+        };
+
         openobject.tools.openWindow(openobject.http.getURL('/fieldpref', params), {width: 500, height: 350});
     });
 }
@@ -859,15 +912,15 @@
 }
 
 function do_action(action_id, field, relation, src) {
-    
+
     var params = {};
-    
+
     if (openobject.dom.get('_terp_list')) {
         var list = new ListView('_terp_list');
         var ids = list.getSelectedRecords();
 
         if (ids.length == 0) {
-           return alert(_('You must select at least one record.'));
+            return alert(_('You must select at least one record.'));
         }
 
         params['_terp_selection'] = '[' + ids.join(',') + ']';
@@ -876,107 +929,118 @@
     var id = openobject.dom.get(field).value;
     var domain = getNodeAttribute(src, 'domain');
     var context = getNodeAttribute(src, 'context');
-    
-    var req = eval_domain_context_request({source: openobject.dom.get(field).id,
-                                           active_id: id,
-                                           active_ids: params['_terp_selection'],
-                                           domain: domain, 
-                                           context: context});
-                                           
-    req.addCallback(function(obj){
-          
+
+    var req = eval_domain_context_request({
+        'source': openobject.dom.get(field).id,
+        'active_id': id,
+        'active_ids': params['_terp_selection'],
+        'domain': domain,
+        'context': context
+    });
+
+    req.addCallback(function(obj) {
+
         var act = get_form_action('action');
         MochiKit.Base.update(params, {
             '_terp_action': action_id,
-            '_terp_domain': obj.domain, 
-            '_terp_context': obj.context, 
+            '_terp_domain': obj.domain,
+            '_terp_context': obj.context,
             '_terp_id': id,
-            '_terp_model': relation});
-        
+            '_terp_model': relation
+        });
+
         window.open(openobject.http.getURL(act, params));
 
     });
 }
 
-function on_context_menu(evt) { 
-    
-    if(! evt.modifier().ctrl)
+function on_context_menu(evt) {
+
+    if (! evt.modifier().ctrl) {
         return;
-        
+    }
+
     var target = evt.target();
     var kind = getNodeAttribute(target, 'kind');
-    
-    if(! kind || target.disabled)
+
+    if (! kind || target.disabled) {
         return;
+    }
 
     var menu = openobject.dom.get('contextmenu');
 
     if (!menu) {
 
-        menu = DIV({'id': 'contextmenu', 
-                    'class' : 'contextmenu', 
-                    'onmouseout' : 'hideContextMenu()', 
-                    'onmouseover' : 'showContextMenu()',
-                    'style' : 'position: absolute; display: none;'});
+        menu = DIV({
+            'id': 'contextmenu',
+            'class': 'contextmenu',
+            'onmouseout': 'hideContextMenu()',
+            'onmouseover': 'showContextMenu()',
+            'style': 'position: absolute; display: none;'
+        });
 
         appendChildNodes(document.body, menu);
 
         if (/msie/.test(navigator.userAgent.toLowerCase())) {
-            var ifrm = createDOM('IFRAME', {'id' : 'contextmenu_frm', 
-                                            'src' : '#', 'frameborder': '0', 'scrolling' :'no', 
-                                            'style':'position: absolute; display: none;'});
+            var ifrm = createDOM('IFRAME', {
+                'id': 'contextmenu_frm',
+                'src': '#', 'frameborder': '0', 'scrolling' :'no',
+                'style':'position: absolute; display: none;'
+            });
 
             appendChildNodes(document.body, ifrm);
         }
     }
 
     var src = target.id;
-    
+
     if (kind == 'many2one') {
         src = src.slice(0, -5);
     }
-    
+
     var val = openobject.dom.get(src).value;
     var relation = getNodeAttribute(src, 'relation');
 
     hideElement(menu);
 
     var p = evt.mouse().page;
-    
+
     setElementPosition(menu, p);
 
-    makeContextMenu(src, kind, relation, val);        
-    
+    makeContextMenu(src, kind, relation, val);
+
     evt.stop();
 }
 
-function open_url(site){
+function open_url(site) {
     var web_site;
 
     isIE = /msie/.test(navigator.userAgent.toLowerCase());
-    
-    if(isIE && site.indexOf('@') > -1) {
+
+    if (isIE && site.indexOf('@') > -1) {
         site = site.split('@');
         site = site[1]
     }
-    
-    if(site.indexOf("://")== -1)
-        web_site='http://'+site;
-    else
+
+    if (site.indexOf("://") == -1) {
+        web_site = 'http://' + site;
+    } else {
         web_site = site;
+    }
 
-    if(site.length > 0) {
+    if (site.length > 0) {
         window.open(web_site);
     }
 }
 
 function submenu_action(action_id, model) {
-	window.location.href = openobject.http.getURL("/form/action_submenu", {	
-	    _terp_action_id: action_id,
-	    _terp_model: model,
-		_terp_id: $('_terp_id').value
-	});
+    window.location.href = openobject.http.getURL("/form/action_submenu", {
+        _terp_action_id: action_id,
+        _terp_model: model,
+        _terp_id: $('_terp_id').value
+    });
 }
+<<<<<<< TREE
 
 function show_wkf() {
 
@@ -995,3 +1059,5 @@
 }
 // vim: ts=4 sts=4 sw=4 si et
 
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'addons/openerp/static/javascript/menubar.js'
--- addons/openerp/static/javascript/menubar.js	2010-03-16 19:33:17 +0000
+++ addons/openerp/static/javascript/menubar.js	2010-03-31 08:25:34 +0000
@@ -1,22 +1,29 @@
-
-function adjustAppFrame(evt){
-
-    var $ = jQuery;
-   
-    var h = $("#appFrame").contents().find("body").height();
-    var w = $("#appFrame").contents().width();
-    
-    $("#menubar").width(250);
-    $("#appFrame").height(Math.max(0, h));
-        
-    var mh = $("#menubar").height();
-    var ww = $(window).width();
-    var tw = $("#menubar").width() + w;
-    var rw = ww - $("#menubar").width();
-    
-    var w = tw > ww ? w : rw - 16;
-    
-    $("#appFrame").width(Math.max(0, w));    
-    $("table#contents").height(Math.max(h, mh));
+/**
+ * Allowable width for the left-hand menu (for the current application)
+ */
+var MENU_WIDTH = 250;
+/**
+ * Tries to fit the size of the #appFrame frame to better fit its current
+ * content.extend
+ * Has to be called from the document outside of the frame itself.
+ *
+ * Probably won't get it exactly right, you might want to call it
+ * several times
+ */
+function adjustAppFrame() {
+    var frameHeight = jQuery("#appFrame").contents().find("body").height();
+    var frameWidth = jQuery("#appFrame").contents().width();
+
+    jQuery("#menubar").width(MENU_WIDTH);
+    jQuery("#appFrame").height(Math.max(0, frameHeight));
+
+    var menuWidth = jQuery("#menubar").height();
+    var windowWidth = jQuery(window).width();
+    var totalWidth = jQuery("#menubar").width() + frameWidth;
+    var rw = windowWidth - jQuery("#menubar").width();
+
+    var newWidth = totalWidth > windowWidth ? frameWidth : rw - 16;
+
+    jQuery("#appFrame").width(Math.max(0, newWidth));
+    jQuery("table#contents").height(Math.max(frameHeight, menuWidth));
 }
-

=== modified file 'openobject/controllers/templates/base.mako'
--- openobject/controllers/templates/base.mako	2010-03-16 19:43:23 +0000
+++ openobject/controllers/templates/base.mako	2010-03-31 08:25:34 +0000
@@ -10,10 +10,8 @@
     <script type="text/javascript" src="/openobject/static/javascript/MochiKit/MochiKit.js"></script>
     <script type="text/javascript" src="/openobject/static/javascript/MochiKit/DragAndDrop.js"></script>
     <script type="text/javascript" src="/openobject/static/javascript/MochiKit/Resizable.js"></script>
-
-    <script type="text/javascript" src="/openobject/static/javascript/MochiKit/Resizable.js"></script>
     <script type="text/javascript" src="/openobject/static/javascript/MochiKit/Sortable.js"></script>
-    
+
     <script type="text/javascript" src="/openobject/static/javascript/jQuery/jquery-1.4.2.js"></script>
     <script type="text/javascript">
         jQuery.noConflict();