[Merge] Merged with main branch.

bzr revid: noz@tinyerp.com-20110727053822-olbfv0ljww17cz9c

1 files changed, 4 insertions, 3 deletions

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index c9892ff4706..2e89dacceb8 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -240,11 +240,12 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
      * @constructs
      * @extends openerp.base.Controller
      *
-     * @param {openerp.base.Session} session current OpenERP session
      * @param {String} model the OpenERP model this dataset will manage
      */
-    init: function(parent, model, context) {
-        this._super(parent);
+    init: function(source_controller, model, context) {
+        // we don't want the dataset to be a child of anything!
+        this._super(null);
+        this.session = source_controller ? source_controller.session : undefined;
         this.model = model;
         this.context = context || {};
         this.index = null;