From 802131d422dc0398a2dfc3cdf883311acd56217a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 10 Jun 2011 18:19:00 +0200
Subject: [PATCH 1/5] [imp] removed useless file

bzr revid: nicolas.vanhoren@openerp.com-20110610161900-mh86ligudsczqyfv
---
 addons/base/static/src/js/m2o.js | 282 -------------------------------
 1 file changed, 282 deletions(-)
 delete mode 100644 addons/base/static/src/js/m2o.js

diff --git a/addons/base/static/src/js/m2o.js b/addons/base/static/src/js/m2o.js
deleted file mode 100644
index dea7e7c3b2e..00000000000
--- a/addons/base/static/src/js/m2o.js
+++ /dev/null
@@ -1,282 +0,0 @@
-openerp.base.m2o = function(openerp){
-    
-/*
-<input type="text"
-    t-att-name="widget.name"
-    t-att-id="widget.element_id + '_field'"
-    t-att-class="'field_' + widget.type"
-    t-att-type="widget.type"
-    style="width: 100%;"/>
-<span type='button' t-att-class="'ui_combo'" tabindex="'-1'" title="'Show All Items'"></span>
-<img t-att-id="widget.name + '_open'" t-att-alt="'Open'" t-att-title="'Create'"
-t-att-src="'/base/static/src/img/iconset-d-drop.gif'" t-att-class="'m2o_open'"/>
- */
-
-    openerp.base.m2o = openerp.base.Controller.extend({
-        init: function(element_id, model, dataset, session){
-            this._super(element_id, model, dataset, session);
-
-            this.session = session;
-            this.element = element_id.find('input');
-            this.button = element_id.find('span');
-            this.dataset = dataset;
-            this.cache = {};
-            var lastXhr;
-            this.$input;
-            this.relation = model;
-            this.result_ids = [];
-            this.create_option = jQuery('#'+this.element.attr('name')+ '_open');
-            if (this.create_option) {
-                var defaults = [
-                    {'text': 'Go to..', 'action': "call_Actions()"},
-                    {'text': 'Choose..', 'action': "call_Actions()"}
-                ]
-                jQuery(this.create_option).click(jQuery.proxy(function(evt){
-                    on_context_menu(evt, this.element, defaults);
-                }, this));
-            }
-            var self = this;
-
-            this.$input = this.element.autocomplete ({
-                source: function(request, response){
-                    self.getSearch_Result(request, response);
-                    return;
-                },
-                select: function(event, ui){
-                    ui.item.value = ui.item.orig_val? ui.item.orig_val : self.element.data( "autocomplete" ).term;
-                    if (ui.item.id == 'more') {
-                        self.dataset.ids = self.result_ids;
-                        self.dataset.count = self.dataset.ids.length;
-                        self.dataset.domain = self.result_ids.length ? [["id", "in", self.dataset.ids]] : []
-                        self.element.val('');
-                        var pop = new openerp.base.form.Many2XSelectPopup(null, self.session);
-                        pop.select_element(self.relation, self.dataset);
-                        return;
-                    }
-
-                    if (ui.item.id == 'create') {
-                        var val = self.element.val();
-                        self.dataset.create({'name': ui.item.value},
-                            function(r){}, function(r){
-                                var element_id = _.uniqueId("act_window_dialog");
-                                var dialog = jQuery('<div>',
-                                                        {'id': element_id
-                                                    }).dialog({
-                                                                modal: true,
-                                                                minWidth: 800
-                                                             });
-                                self.element.val('');
-                                var event_form = new openerp.base.FormView(null,
-                                        self.session, element_id, self.dataset, false);
-                                event_form.start();
-                        });
-                        $input.val(self.element.data( "autocomplete" ).term);
-                        return true;
-                    }
-                    self.element.attr('m2o_id', ui.item.id);
-                },
-                minLength: 0,
-                focus: function(event, ui) {
-                    self.gotFocus(event, ui);
-                }
-            });
-
-            this.button.button({
-                icons: {
-                    primary: "ui-icon-triangle-1-s"},
-                    text: false
-            })
-            .click(function() {
-                // close if already visible
-                if (self.$input.autocomplete("widget").is(":visible")) {
-                    self.$input.autocomplete( "close" );
-                    return;
-                }
-                $(this).blur();
-                self.$input.autocomplete("search", "" );
-                self.$input.focus();
-            });
-        },
-
-        getSearch_Result: function(request, response) {
-            var search_val = request.term;
-            if (search_val in this.cache) {
-                response(this.cache[search_val]);
-                return;
-            }
-            var self = this;
-            //pass request to server
-            lastXhr = this.dataset.name_search(search_val, function(obj, status, xhr){
-                var result = obj.result;
-                var values = [];
-
-                $.each(result, function(i, val){
-                    values.push({
-                        value: val[1],
-                        id: val[0],
-                        orig_val: val[1]
-                    });
-                    self.result_ids.push(result[i][0]);
-                });
-
-                if (values.length > 7) {
-                    values = values.slice(0, 7);
-                }
-                values.push({'value': 'More...', id: 'more', orig_val:''},
-                            {'value': 'Create..'+search_val, id: 'create', orig_val: ''});
-                self.cache[search_val] = values;
-                response(values);
-            });
-        },
-
-        getSelected_Result: function(event, ui) {
-            ui.item.value = ui.item.orig_val? ui.item.orig_val : this.element.data( "autocomplete" ).term;
-            if (ui.item.id == 'more') {
-                this.dataset.ids = this.result_ids;
-                this.dataset.count = this.dataset.ids.length;
-                this.dataset.domain = this.result_ids.length ? [["id", "in", this.dataset.ids]] : [];
-                this.element.val('');
-                var pop = new openerp.base.form.Many2XSelectPopup(null, this.session);
-                pop.select_element(this.relation, this.dataset);
-                return;
-            }
-
-            if (ui.item.id == 'create') {
-                this.openRecords(event, ui);
-            }
-            this.element.attr('m2o_id', ui.item.id);
-        },
-
-        gotFocus: function(event, ui) {
-            if (ui.item.id == ('create')) {
-                return true;
-            }
-            ui.item.value = this.element.data("autocomplete").term.length ?
-                this.element.val() + '[' + ui.item.orig_val.substring(this.element.data("autocomplete").term.length) + ']' : this.lastSearch;
-        },
-
-        openRecords: function(event, ui) {
-            var val = this.element.val();
-            var self = this;
-                this.dataset.create({'name': ui.item.value},
-                    function(r){}, function(r){
-                        var element_id = _.uniqueId("act_window_dialog");
-                        var dialog = jQuery('<div>',
-                                                {'id': element_id
-                                            }).dialog({
-                                                        modal: true,
-                                                        minWidth: 800
-                                                     });
-                        self.element.val('');
-                        var event_form = new openerp.base.FormView(null, self.session,
-                            element_id, self.dataset, false);
-                        event_form.start();
-                });
-                self.$input.val(self.element.data( "autocomplete" ).term);
-                return true;
-        }
-    });
-}
-
-function call_Actions() {
-
-}
-
-function on_context_menu(evt, target, defaults){
-
-    var $target = jQuery(target || evt.target);
-    var kind = $target.attr('type');
-    if (!(kind && $target.is(':input, :enabled'))) {
-        return;
-    }
-    var $menu = jQuery('#m2o_contextmenu').show();
-    if (!$menu.length) {
-        $menu = jQuery('<div id="m2o_contextmenu" class="m2o_contextmenu">')
-                .css({position: 'absolute'})
-                .hover(showContextMenu, hideContextMenu)
-                .appendTo(document.body).show();
-
-        if (jQuery(document.documentElement).hasClass('ie')) {
-            jQuery('<iframe id="m2o_contextmenu_frm" src="#" frameborder="0" scrolling="no">')
-                    .css({position: 'absolute'})
-                    .hide().appendTo(document.body);
-        }
-    }
-
-    var src = $target.attr('id');
-    if (kind == 'many2one' || kind == 'reference') {
-        src = src.slice(0, -5);
-    }
-    var $src = jQuery('[id="' + src + '"]');
-
-    var click_position = mousePositionDammit(evt);
-    $menu.offset({top: 0, left: 0});
-    $menu.offset({top: click_position.y - 5, left: click_position.x - 5});
-    $menu.hide();
-    makeContextMenu(src, kind, $src.attr('relation'), $src.val(), defaults);
-
-    if(evt.stop) {
-        evt.stop();
-    }
-    evt.stopPropagation();
-    evt.preventDefault();
-}
-
-
-function makeContextMenu(id, kind, relation, val, defaults){
-        var $tbody = jQuery('<tbody>');
-        jQuery.each(defaults, function (_, default_) {
-            jQuery('<tr>').append(jQuery('<td>').append(
-                jQuery('<span>').click(function () {
-                    hideContextMenu();
-                    return eval(default_.action);
-                }).text(default_.text))).appendTo($tbody);
-        });
-
-        var $menu = jQuery('#m2o_contextmenu');
-        $menu.empty().append(
-            jQuery('<table cellpadding="0" cellspacing="0">').append($tbody));
-
-        var menu_width = $menu.width();
-        var body_width = jQuery(document.body).width();
-        if (parseInt($menu.css("left")) + menu_width > body_width) {
-            $menu.offset({ left: body_width - menu_width - 10 });
-        }
-        showContextMenu();
-}
-
-function showContextMenu(){
-    var $menu = jQuery('#m2o_contextmenu');
-    var $ifrm = jQuery('#m2o_contextmenu_frm');
-    console.log($menu, 8888888, $ifrm)
-    $menu.show();
-    if ($ifrm.length) {
-        $ifrm.offset($menu.offset())
-             .css({
-                  width: $menu.offsetWidth(),
-                  height: $menu.offsetHeight(),
-                  zIndex: 6
-              }).show();
-    }
-}
-
-function hideContextMenu(){
-    jQuery('#m2o_contextmenu, #m2o_contextmenu_frm').hide();
-}
-
-/**
- * Adapts mouse position on page for functions which may be bound using both
- * jQuery and MochiKit event handlers
- *
- * @param evt the library's events
- */
-function mousePositionDammit(evt) {
-    if(evt.mouse) {
-        // mochikit
-        return evt.mouse().page;
-    }
-    return {
-        x: evt.pageX,
-        y: evt.pageY
-    }
-}

From 4c1bfafa12b1d6fcb8277b57bdf2dad143321ed4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Jun 2011 10:10:46 +0200
Subject: [PATCH 2/5] [fix] fixed some problem with quick create showing

bzr revid: nicolas.vanhoren@openerp.com-20110614081046-6nai60903x2qcyde
---
 addons/base/static/src/js/form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index d2f23bdc262..66d77ed1bf6 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1140,7 +1140,10 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                     });
                 }});
             }
-            if (self.value === undefined) {
+            var raw_result = _(data.result).map(function(x) {return x[1];})
+            if (search_val.length > 0 &&
+                !_.include(raw_result, search_val) &&
+                (!self.value || search_val !== self.value[1])) {
                 values.push({label: '<em>   Create "<strong>' +
                         $('<span />').text(search_val).html() + '</strong>"</em>', action: function() {
                     self._quick_create(search_val);

From 29d45187ddc9762c8e7cbe81cd1f0a8fc54c11d4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 15 Jun 2011 11:54:07 +0200
Subject: [PATCH 3/5] [imp] added context & domain in m2o

bzr revid: nicolas.vanhoren@openerp.com-20110615095407-a3sgzvpyrafzgg4t
---
 addons/base/static/src/js/form.js | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 209635fa89c..86ad8158faf 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1013,6 +1013,17 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
     });
 })(null);
 
+/**
+ * Builds a new context usable for operations related to fields by merging
+ * the fields'context with the action's context.
+ */
+var build_relation_context = function(relation_field) {
+    var action = relation_field.view.view_manager.action || {};
+    var a_context = action.context || {};
+    var f_context = relation_field.field.context || {};
+    return $.extend({}, a_context, f_context);
+}
+
 openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
@@ -1048,7 +1059,8 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                 "type":"ir.actions.act_window",
                 "view_type":"form",
                 "view_mode":"form",
-                "target":"new"
+                "target":"new",
+                "context": build_relation_context(self)
             });
         };
         var cmenu = this.$menu_btn.contextMenu(this.cm_id, {'leftClickToo': true,
@@ -1125,23 +1137,26 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         
         var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, []);
         
-        dataset.name_search([search_val, false, 'ilike', {}, this.limit + 1], function(data) {
+        dataset.name_search([search_val, self.field.domain || false, 'ilike',
+                build_relation_context(self), this.limit + 1], function(data) {
             self.last_search = data.result;
             // possible selections for the m2o
             var values = _.map(data.result, function(x) {
                 return {label: $('<span />').text(x[1]).html(), name:x[1], id:x[0]};
             });
             
-            // additional selections, actions that open popup
+            // search more... if more results that max
             if (values.length > self.limit) {
                 values = values.slice(0, self.limit);
                 values.push({label: "<em>   Search More...</em>", action: function() {
-                    dataset.name_search([search_val, false, 'ilike', {}, false], function(data) {
+                    dataset.name_search([search_val, self.field.domain || false, 'ilike',
+                            build_relation_context(self), false], function(data) {
                         self._change_int_value(null);
                         self._search_create_popup("search", data.result);
                     });
                 }});
             }
+            // quick create
             var raw_result = _(data.result).map(function(x) {return x[1];})
             if (search_val.length > 0 &&
                 !_.include(raw_result, search_val) &&
@@ -1151,6 +1166,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                     self._quick_create(search_val);
                 }});
             }
+            // create...
             values.push({label: "<em>   Create and Edit...</em>", action: function() {
                 self._change_int_value(null);
                 self._search_create_popup("form");
@@ -1162,7 +1178,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     _quick_create: function(name) {
         var self = this;
         var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, []);
-        dataset.call("name_create", [name, {}], function(data) {
+        dataset.call("name_create", [name, build_relation_context(self)], function(data) {
             self._change_int_ext_value(data.result);
         }, function(a, b) {
             self._change_int_value(null);
@@ -1353,10 +1369,12 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
 openerp.base.form.Many2XSelectPopup = openerp.base.BaseWidget.extend({
     identifier_prefix: "many2xselectpopup",
     template: "Many2XSelectPopup",
-    select_element: function(model, initial_ids, initial_view) {
+    select_element: function(model, initial_ids, initial_view, domain, context) {
         this.model = model;
         this.initial_ids = initial_ids;
         this.initial_view = initial_view || "search";
+        this.domain = domain;
+        this.context = context;
         jQuery(this.render()).dialog({title: '',
                     modal: true,
                     minWidth: 800});

From 858f61c6bed22a117a219b2b46f3d543fded51d3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Jun 2011 11:58:35 +0200
Subject: [PATCH 4/5] [imp] added compound domains and contexts

bzr revid: nicolas.vanhoren@openerp.com-20110617095835-oymrh9u459hhwqa1
---
 addons/base/static/src/js/data.js | 28 ++++++++++++
 openerpweb/nonliterals.py         | 73 +++++++++++++++++++++++++++++++
 openerpweb/openerpweb.py          |  4 +-
 3 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 76a803fa0ff..2021f13f092 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -431,6 +431,34 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
     }
 });
 
+openerp.base.CompoundContext = function(source_context) {
+    this.__ref = "compound_context";
+    this.__contexts = [];
+    if (source_context === undefined)
+        return;
+    else if (source_context.__ref === "compound_context")
+        this.__contexts.concat(source_context.__contexts);
+    else
+        this.add(source_context);
+};
+openerp.base.CompoundContext.prototype.add = function(context) {
+    this.__contexts.push(context);
+};
+
+openerp.base.CompoundDomain = function(source_domain) {
+    this.__ref = "compound_domain";
+    this.__domains = [];
+    if (source_domain === undefined)
+        return;
+    else if (source_domain.__ref === "compound_domain")
+        this.__domains.concat(source_domain.__domains);
+    else
+        this.add(source_domain);
+};
+openerp.base.CompoundDomain.prototype.add = function(domain) {
+    this.__domains.push(domain);
+};
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/openerpweb/nonliterals.py b/openerpweb/nonliterals.py
index 1584628f777..fe7a5e3cdd9 100644
--- a/openerpweb/nonliterals.py
+++ b/openerpweb/nonliterals.py
@@ -27,6 +27,16 @@ class NonLiteralEncoder(simplejson.encoder.JSONEncoder):
                 '__ref': 'context',
                 '__id': object.key
             }
+        elif isinstance(object, CompoundDomain):
+            return {
+                '__ref': 'compound_domain',
+                '__domains': [self.default(el) for el in object.domains]
+            }
+        elif isinstance(object, CompoundContext):
+            return {
+                '__ref': 'compound_context',
+                '__contexts': [self.default(el) for el in object.contexts]
+            }
         return super(NonLiteralEncoder, self).default(object)
 
 def non_literal_decoder(dct):
@@ -47,6 +57,16 @@ def non_literal_decoder(dct):
             if 'own_values' in dct:
                 context.own = dct['own_values']
             return context
+        elif dct["__ref"] == "compound_domain":
+            cdomain = CompoundDomain()
+            for el in dct["__domains"]:
+                cdomain.domains.append(non_literal_decoder(el))
+            return cdomain
+        elif dct["__ref"] == "compound_context":
+            ccontext = CompoundContext()
+            for el in dct["__contexts"]:
+                ccontext.contexts.append(non_literal_decoder(el))
+            return ccontext
     return dct
 
 class Domain(object):
@@ -138,3 +158,56 @@ class Context(object):
             ctx.update(self.own)
         return eval(self.get_context_string(),
                     ctx)
+
+class CompoundDomain:
+    def __init__(self):
+        self.domains = []
+        self.session = None
+        
+    def evaluate(self, context=None):
+        final_domain = []
+        for domain in self.domains:
+            if not isinstance(domain, (list, nonliterals.Domain, nonliterals.CompoundDomain)):
+                raise TypeError("Domain %r is not a list or a nonliteral Domain",
+                                 domain)
+                
+            if isinstance(domain, list):
+                final_domain.extend(domain)
+                break
+            
+            ctx = dict(context or {})
+            ctx['context'] = ctx
+            
+            domain.session = self.session
+            domain.extend(domain.evaluate(ctx))
+    
+    def add(self, domain):
+        self.domains.append(domain)
+        return self
+
+class CompoundContext:
+    def __init__(self):
+        self.contexts = []
+        self.session = None
+    
+    def evaluate(self, context=None):
+        final_context = dict(context or {})
+        for context_to_eval in self.contexts:
+            if not isinstance(context_to_eval, (dict, nonliterals.Context, nonliterals.CompoundContext)):
+                raise TypeError("Context %r is not a dict or a nonliteral Context",
+                                 context_to_eval)
+    
+            if isinstance(context_to_eval, dict):
+                final_context.update(context_to_eval)
+                break
+            
+            ctx = dict(final_context)
+            ctx["context"] = ctx
+            
+            context_to_eval.session = self.session
+            final_context.update(context_to_eval.evaluate(ctx))
+            
+    def add(self, context):
+        self.contexts.append(context)
+        return self
+        
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 5ef4369dbb5..2ee59779cb3 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -194,7 +194,7 @@ class OpenERPSession(object):
         :raises: ``TypeError`` if ``context_to_eval`` is neither a dict nor
                  a Context
         """
-        if not isinstance(context_to_eval, (dict, nonliterals.Domain)):
+        if not isinstance(context_to_eval, (dict, nonliterals.Context, nonliterals.CompoundContext)):
             raise TypeError("Context %r is not a dict or a nonliteral Context",
                              context_to_eval)
 
@@ -250,7 +250,7 @@ class OpenERPSession(object):
 
         :raises: ``TypeError`` if ``domain`` is neither a list nor a Domain
         """
-        if not isinstance(domain, (list, nonliterals.Domain)):
+        if not isinstance(domain, (list, nonliterals.Domain, nonliterals.CompoundDomain)):
             raise TypeError("Domain %r is not a list or a nonliteral Domain",
                              domain)
 

From e975b4ac1e68c903f5adef9347f606e764578044 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Jun 2011 14:08:34 +0200
Subject: [PATCH 5/5] [imp] added compound context and compound domain and
 implemented correctly context & domain handling in m2o

bzr revid: nicolas.vanhoren@openerp.com-20110617120834-c616130ueklb3rxs
---
 addons/base/controllers/main.py   | 50 ++++++++++++++++++-------------
 addons/base/static/src/js/data.js | 15 ++++++++--
 addons/base/static/src/js/form.js |  8 ++---
 openerpweb/nonliterals.py         | 11 ++++---
 4 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 0684964256f..3b8ed588169 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -170,25 +170,7 @@ class Session(openerpweb.Controller):
                 a list of fields to group by, potentially empty (in which case
                 no group by should be performed)
         """
-        context = req.session.eval_contexts(contexts)
-        domain = req.session.eval_domains(domains, context)
-
-        group_by_sequence = []
-        for candidate in (group_by_seq or []):
-            ctx = req.session.eval_context(candidate, context)
-            group_by = ctx.get('group_by')
-            if not group_by:
-                continue
-            elif isinstance(group_by, basestring):
-                group_by_sequence.append(group_by)
-            else:
-                group_by_sequence.extend(group_by)
-
-        return {
-            'context': context,
-            'domain': domain,
-            'group_by': group_by_sequence
-        }
+        return _eval_domain_and_context(req, contexts, domains, group_by_seq)
 
     @openerpweb.jsonrequest
     def save_session_action(self, req, the_action):
@@ -230,6 +212,26 @@ class Session(openerpweb.Controller):
             return None
         return saved_actions["actions"].get(key)
         
+def _eval_domain_and_context(req, contexts, domains, group_by_seq=None):
+    context = req.session.eval_contexts(contexts)
+    domain = req.session.eval_domains(domains, context)
+
+    group_by_sequence = []
+    for candidate in (group_by_seq or []):
+        ctx = req.session.eval_context(candidate, context)
+        group_by = ctx.get('group_by')
+        if not group_by:
+            continue
+        elif isinstance(group_by, basestring):
+            group_by_sequence.append(group_by)
+        else:
+            group_by_sequence.extend(group_by)
+
+    return {
+        'context': context,
+        'domain': domain,
+        'group_by': group_by_sequence
+    }
         
 def load_actions_from_ir_values(req, key, key2, models, meta, context):
     Values = req.session.model('ir.values')
@@ -434,7 +436,15 @@ class DataSet(openerpweb.Controller):
         return Model.unlink(ids)
 
     @openerpweb.jsonrequest
-    def call(self, req, model, method, args):
+    def call(self, req, model, method, args, domain_id=None, context_id=None):
+        domain = args[domain_id] if domain_id and len(args) - 1 >= domain_id  else []
+        context = args[context_id] if context_id and len(args) - 1 >= context_id  else {}
+        res = _eval_domain_and_context(req, [context], [domain]);
+        if(domain_id and len(args) - 1 >= domain_id):
+            args[context_id] = res["context"]
+        if(context_id and len(args) - 1 >= context_id):
+            args[domain_id] = res["domain"]
+        
         m = req.session.model(model)
         r = getattr(m, method)(*args)
         return {'result': r}
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 2021f13f092..581bd217ba9 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -320,13 +320,22 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             args: args || []
         }, callback, error_callback);
     },
+    call_and_eval: function (method, args, domain_id, context_id, callback, error_callback) {
+        return this.rpc('/base/dataset/call', {
+            model: this.model,
+            method: method,
+            domain_id: domain_id || null,
+            context_id: context_id || null,
+            args: args || []
+        }, callback, error_callback);
+    },
     /**
      * Arguments:
      * name='', args=[], operator='ilike', context=None, limit=100
      */
     name_search: function (args, callback, error_callback) {
-        return this.call('name_search',
-            args,
+        return this.call_and_eval('name_search',
+            args, 1, 3,
             callback, error_callback);
     },
     exec_workflow: function (id, signal, callback) {
@@ -443,6 +452,7 @@ openerp.base.CompoundContext = function(source_context) {
 };
 openerp.base.CompoundContext.prototype.add = function(context) {
     this.__contexts.push(context);
+    return this;
 };
 
 openerp.base.CompoundDomain = function(source_domain) {
@@ -457,6 +467,7 @@ openerp.base.CompoundDomain = function(source_domain) {
 };
 openerp.base.CompoundDomain.prototype.add = function(domain) {
     this.__domains.push(domain);
+    return this;
 };
 
 };
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index f7c4d87f725..2aa29fac377 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1021,7 +1021,8 @@ var build_relation_context = function(relation_field) {
     var action = relation_field.view.view_manager.action || {};
     var a_context = action.context || {};
     var f_context = relation_field.field.context || {};
-    return $.extend({}, a_context, f_context);
+    var ctx = new openerp.base.CompoundContext(a_context).add(f_context);
+    return ctx;
 }
 
 openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
@@ -1419,8 +1420,8 @@ openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({
      */
     select_element: function(model, options, domain, context) {
         this.model = model;
-        this.domain = domain;
-        this.context = context;
+        this.domain = domain || [];
+        this.context = context || {};
         this.options = options || {};
         this.initial_ids = this.options.initial_ids;
         jQuery(this.render()).dialog({title: '',
@@ -1503,7 +1504,6 @@ openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({
         this.view_form = new openerp.base.FormView(null, this.session,
                 this.element_id + "_view_form", this.dataset, false);
         if (this.options.alternative_form_view) {
-            debugger;
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
         this.view_form.start();
diff --git a/openerpweb/nonliterals.py b/openerpweb/nonliterals.py
index fe7a5e3cdd9..38c94e6d230 100644
--- a/openerpweb/nonliterals.py
+++ b/openerpweb/nonliterals.py
@@ -167,7 +167,7 @@ class CompoundDomain:
     def evaluate(self, context=None):
         final_domain = []
         for domain in self.domains:
-            if not isinstance(domain, (list, nonliterals.Domain, nonliterals.CompoundDomain)):
+            if not isinstance(domain, (list, Domain, CompoundDomain)):
                 raise TypeError("Domain %r is not a list or a nonliteral Domain",
                                  domain)
                 
@@ -180,6 +180,7 @@ class CompoundDomain:
             
             domain.session = self.session
             domain.extend(domain.evaluate(ctx))
+        return final_domain
     
     def add(self, domain):
         self.domains.append(domain)
@@ -191,9 +192,10 @@ class CompoundContext:
         self.session = None
     
     def evaluate(self, context=None):
-        final_context = dict(context or {})
+        ctx = dict(context or {})
+        final_context = {}
         for context_to_eval in self.contexts:
-            if not isinstance(context_to_eval, (dict, nonliterals.Context, nonliterals.CompoundContext)):
+            if not isinstance(context_to_eval, (dict, Context, CompoundContext)):
                 raise TypeError("Context %r is not a dict or a nonliteral Context",
                                  context_to_eval)
     
@@ -201,11 +203,12 @@ class CompoundContext:
                 final_context.update(context_to_eval)
                 break
             
-            ctx = dict(final_context)
+            ctx.update(final_context)
             ctx["context"] = ctx
             
             context_to_eval.session = self.session
             final_context.update(context_to_eval.evaluate(ctx))
+        return final_context
             
     def add(self, context):
         self.contexts.append(context)