[merge]

bzr revid: nicolas.vanhoren@openerp.com-20110629081431-t6b8n2xtvsix1gw3

addons/base/static/src/js/data.js

@@ -574,7 +574,7 @@ openerp.base.BufferedDataSet = openerp.base.DataSetStatic.extend({
             return_records();
         }
         return completion.promise();
-    },
+    }
 });
 
 openerp.base.ReadOnlyDataSetSearch = openerp.base.DataSetSearch.extend({

addons/base/static/src/js/views.js

@@ -459,7 +459,7 @@ openerp.base.View = openerp.base.Controller.extend({
                 result : { type: 'ir.actions.act_window_close', special: action_data.special }
             });
         } else {
-            var context = new openerp.base.CompoundContext(dataset.context).add(action_data.context || {});
+            var context = new openerp.base.CompoundContext(dataset.context, action_data.context || {});
             switch(action_data.type) {
                 case 'object':
                     return dataset.call_button(action_data.name, [[record_id], context], handler);