From d1a5c72972b056212053a0a8ee580afcffc0e30f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 12:38:36 +0200
Subject: [PATCH 01/32] [FIX] Fixed remaining references to
 session.action_manager

bzr revid: fme@openerp.com-20110810103836-li6e7kx8tdk52iil
---
 addons/base/static/src/js/form.js                | 3 +--
 addons/base/static/src/js/list.js                | 9 ++++-----
 addons/base/static/src/js/view_tree.js           | 2 +-
 addons/base/static/src/js/views.js               | 3 +--
 addons/base_dashboard/static/src/js/dashboard.js | 1 -
 addons/base_graph/static/src/js/graph.js         | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index e488bb3dfa1..b6ce4b10bfb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -767,8 +767,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
         var self = this;
 
         this.view.execute_action(
-            this.node.attrs, this.view.dataset, this.session.action_manager,
-            this.view.datarecord.id, function () {
+            this.node.attrs, this.view.dataset, this.view.datarecord.id, function () {
                 self.view.reload();
             });
     }
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 11440a003b5..54612b360d4 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -460,11 +460,10 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             return field.name === name;
         });
         if (!action) { return; }
-        this.execute_action(
-            action, this.dataset, this.session.action_manager, id, function () {
-                $.when(callback.apply(this, arguments).then(function () {
-                    self.compute_aggregates();
-                }));
+        this.execute_action(action, this.dataset, id, function () {
+            $.when(callback.apply(this, arguments).then(function () {
+                self.compute_aggregates();
+            }));
         });
     },
     /**
diff --git a/addons/base/static/src/js/view_tree.js b/addons/base/static/src/js/view_tree.js
index 05f58c077ff..9951d9429f8 100644
--- a/addons/base/static/src/js/view_tree.js
+++ b/addons/base/static/src/js/view_tree.js
@@ -177,7 +177,7 @@ openerp.base.TreeView = openerp.base.View.extend({
             if (!actions.length) { return; }
             var action = actions[0][2];
             action.flags.new_window = true;
-            self.session.action_manager.do_action(action);
+            self.do_action(action);
         });
     },
 
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f3e0bf2fc64..dd81d87cd40 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -476,11 +476,10 @@ openerp.base.View = openerp.base.Widget.extend({
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
      * @param {openerp.base.DataSet} dataset a dataset object used to communicate with the server
-     * @param {openerp.base.ActionManager} action_manager object able to actually execute the action, if any is fetched
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
-    execute_action: function (action_data, dataset, action_manager, record_id, on_closed) {
+    execute_action: function (action_data, dataset, record_id, on_closed) {
         var self = this;
         var handler = function (r) {
             var action = r.result;
diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index d03923b19e4..b4e04dbd22a 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -333,7 +333,6 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
                         type: 'object',
                         name: 'action_launch'
                     }, self.dataset,
-                    self.session.action_manager,
                     $(this).data('id'), function () {
                         // after action popup closed, refresh configuration
                         // thingie
diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js
index 25ce024638b..5ad85e4a8b0 100644
--- a/addons/base_graph/static/src/js/graph.js
+++ b/addons/base_graph/static/src/js/graph.js
@@ -442,7 +442,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
             }
             views.push(view);
         });
-        this.session.action_manager.do_action({
+        this.do_action({
             "res_model" : this.dataset.model,
             "domain" : this.dataset.domain,
             "views" : views,

From 85b1852aa6c7ca79b48ae294c53a96b9e0871966 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Aug 2011 13:49:14 +0200
Subject: [PATCH 02/32] [FIX] double action manager

bzr revid: al@openerp.com-20110810114914-rnokf7v1mp8kmtu1
---
 addons/base/static/src/js/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 822dc52b5c2..25949d375b3 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -374,6 +374,7 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
             this.open();
         }
         this._super();
+        return this;
     },
     open: function(dialog_options) {
         // TODO fme: bind window on resize
@@ -988,6 +989,8 @@ openerp.base.WebClient = openerp.base.Widget.extend({
         this.notification.notify("OpenERP Client", "The openerp client has been initialized.");
     },
     on_logged: function() {
+        if(this.action_manager)
+            this.action_manager.stop();
         this.action_manager = new openerp.base.ActionManager(this);
         this.action_manager.appendTo($("#oe_app"));
 

From 52ba9d992d70e0fe5d45b63eee841183b6ce4325 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 14:05:48 +0200
Subject: [PATCH 03/32] [REM] Removed auto open argument from Dialog#start()

bzr revid: fme@openerp.com-20110810120548-697agu5xajf11tvx
---
 addons/base/static/src/js/chrome.js            | 7 ++-----
 addons/base/static/src/js/views.js             | 4 ++--
 addons/base_calendar/static/src/js/calendar.js | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 25949d375b3..41f60be72c9 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -368,11 +368,8 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
             return parseInt(val, 10);
         }
     },
-    start: function (auto_open) {
+    start: function () {
         this.$dialog = $('<div id="' + this.element_id + '"></div>').dialog(this.dialog_options);
-        if (auto_open !== false) {
-            this.open();
-        }
         this._super();
         return this;
     },
@@ -964,7 +961,7 @@ openerp.base.WebClient = openerp.base.Widget.extend({
         this.session = new openerp.base.Session(this,"oe_errors");
         this.loading = new openerp.base.Loading(this,"oe_loading");
         this.crashmanager =  new openerp.base.CrashManager(this);
-        this.crashmanager.start(false);
+        this.crashmanager.start();
 
         // Do you autorize this ? will be replaced by notify() in controller
         openerp.base.Widget.prototype.notification = new openerp.base.Notification(this, "oe_notification");
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index dd81d87cd40..3b7374b7822 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -79,7 +79,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
             if (this.dialog == null) {
                 this.dialog = new openerp.base.ActionDialog(this, { title: action.name, width: '80%' });
                 this.dialog.close_callback = on_closed;
-                this.dialog.start(false);
+                this.dialog.start();
                 this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
                 this.dialog_viewmanager.appendTo(this.dialog.$element);
                 this.dialog.open();
@@ -572,7 +572,7 @@ openerp.base.View = openerp.base.Widget.extend({
     },
     on_sidebar_export: function() {
         var export_view = new openerp.base.DataExport(this, this.dataset);
-        export_view.start(false);
+        export_view.start();
     },
     on_sidebar_translate: function() {
     },
diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index f488c083b84..8b92300a5f7 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -411,7 +411,7 @@ openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({
         this.view = view;
     },
     start: function() {
-        this._super(false);
+        this._super();
         this.form = new openerp.base.FormView(this, this.element_id, this.dataset, this.view_id, {
             sidebar: false,
             pager: false

From 42b4e254db2eba34fb6788af0e6507e44f43bb5c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 14:16:25 +0200
Subject: [PATCH 04/32] [IMP] Reactivated date & datetime widgets

bzr revid: fme@openerp.com-20110810121625-mxbmxmr8qdy10zu6
---
 addons/base/static/src/js/form.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index b6ce4b10bfb..2931bad659a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -2319,10 +2319,8 @@ openerp.base.form.widgets = new openerp.base.Registry({
     'url' : 'openerp.base.form.FieldUrl',
     'text' : 'openerp.base.form.FieldText',
     'text_wiki' : 'openerp.base.form.FieldText',
-//    'date' : 'openerp.base.form.FieldDate',
-//    'datetime' : 'openerp.base.form.FieldDatetime',
-    'date' : 'openerp.base.form.FieldChar',
-    'datetime' : 'openerp.base.form.FieldChar',
+    'date' : 'openerp.base.form.FieldDate',
+    'datetime' : 'openerp.base.form.FieldDatetime',
     'selection' : 'openerp.base.form.FieldSelection',
     'many2one' : 'openerp.base.form.FieldMany2One',
     'many2many' : 'openerp.base.form.FieldMany2Many',

From bdacad5c2d1e9472932c60169ff7ebdd3422b4ab Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 12:49:10 +0200
Subject: [PATCH 05/32] [IMP] make search boolean field inherit from selection

bzr revid: xmo@openerp.com-20110810104910-sz4236szqt5pmjst
---
 addons/base/static/src/js/search.js | 76 ++++++++++++++++-------------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 0a1f2396123..4eb8c83eeb4 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -624,39 +624,6 @@ openerp.base.search.CharField = openerp.base.search.Field.extend( /** @lends ope
         return this.$element.val();
     }
 });
-openerp.base.search.BooleanField = openerp.base.search.Field.extend({
-    template: 'SearchView.field.selection',
-    init: function () {
-        this._super.apply(this, arguments);
-        this.attrs.selection = [
-            ['true', 'Yes'],
-            ['false', 'No']
-        ];
-    },
-    /**
-     * Search defaults likely to be boolean values (for a boolean field).
-     *
-     * In the HTML, we only get strings, and our strings here are
-     * <code>'true'</code> and <code>'false'</code>, so ensure we get only
-     * those by truth-testing the default value.
-     *
-     * @param {Object} defaults default values for this search view
-     */
-    render: function (defaults) {
-        var name = this.attrs.name;
-        if (name in defaults) {
-            defaults[name] = defaults[name] ? "true" : "false";
-        }
-        return this._super(defaults);
-    },
-    get_value: function () {
-        switch (this.$element.val()) {
-            case 'false': return false;
-            case 'true': return true;
-            default: return null;
-        }
-    }
-});
 openerp.base.search.NumberField = openerp.base.search.Field.extend(/** @lends openerp.base.search.NumberField# */{
     get_value: function () {
         if (!this.$element.val()) {
@@ -693,12 +660,53 @@ openerp.base.search.FloatField = openerp.base.search.NumberField.extend(/** @len
         return parseFloat(value);
     }
 });
-openerp.base.search.SelectionField = openerp.base.search.Field.extend({
+/**
+ * @class
+ * @extends openerp.base.search.Field
+ */
+openerp.base.search.SelectionField = openerp.base.search.Field.extend(/** @lends openerp.base.search.SelectionField# */{
     template: 'SearchView.field.selection',
     get_value: function () {
         return this.$element.val();
     }
 });
+openerp.base.search.BooleanField = openerp.base.search.SelectionField.extend(/** @lends openerp.base.search.BooleanField# */{
+    /**
+     * @constructs
+     * @extends openerp.base.search.BooleanField
+     */
+    init: function () {
+        this._super.apply(this, arguments);
+        this.attrs.selection = [
+            ['true', 'Yes'],
+            ['false', 'No']
+        ];
+    },
+    /**
+     * Search defaults likely to be boolean values (for a boolean field).
+     *
+     * In the HTML, we only want/get strings, and our strings here are ``true``
+     * and ``false``, so ensure we use precisely those by truth-testing the
+     * default value (iif there is one in the view's defaults).
+     *
+     * @param {Object} defaults default values for this search view
+     * @returns {String} rendered boolean field
+     */
+    render: function (defaults) {
+        var name = this.attrs.name;
+        if (name in defaults) {
+            defaults[name] = defaults[name] ? "true" : "false";
+        }
+        return this._super(defaults);
+    },
+    get_value: function () {
+        switch (this.$element.val()) {
+            case 'false': return false;
+            case 'true': return true;
+            default: return null;
+        }
+    }
+});
 openerp.base.search.DateField = openerp.base.search.Field.extend( /** @lends openerp.base.search.DateField# */{
     template: 'SearchView.fields.date',
     /**

From f7369a8de722855d95d83b004ce749dd44200be7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 13:00:55 +0200
Subject: [PATCH 06/32] [IMP] make date field a single-component field,
 domained by equality

bzr revid: xmo@openerp.com-20110810110055-y2zmsn33lfbeksct
---
 addons/base/static/src/js/search.js | 63 ++---------------------------
 addons/base/static/src/xml/base.xml | 16 --------
 2 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 4eb8c83eeb4..084f9effdb7 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -708,75 +708,20 @@ openerp.base.search.BooleanField = openerp.base.search.SelectionField.extend(/**
     }
 });
 openerp.base.search.DateField = openerp.base.search.Field.extend( /** @lends openerp.base.search.DateField# */{
-    template: 'SearchView.fields.date',
     /**
      * enables date picker on the HTML widgets
      */
     start: function () {
         this._super();
-        this.$element.find('input').datepicker({
+        this.$element.addClass('field_date').datepicker({
             dateFormat: 'yy-mm-dd'
         });
     },
     stop: function () {
-        this.$element.find('input').datepicker('destroy');
+        this.$element.datepicker('destroy');
     },
-    /**
-     * Returns an object with two optional keys ``from`` and ``to`` providing
-     * the values for resp. the from and to sections of the date widget.
-     *
-     * If a key is absent, then the corresponding field was not filled.
-     *
-     * @returns {Object}
-     */
-    get_values: function () {
-        var values_array = this.$element.find('input').serializeArray();
-
-        if (!values_array || !values_array[0]) {
-            throw new openerp.base.search.Invalid(
-                this.attrs.name, null, "widget not ready");
-        }
-        var from = values_array[0].value,
-              to = values_array[1].value;
-
-        var field_values = {};
-        if (from) {
-            field_values.from = from;
-        }
-        if (to) {
-            field_values.to = to;
-        }
-        return field_values;
-    },
-    get_context: function () {
-        var values = this.get_values();
-        if (!this.attrs.context || _.isEmpty(values)) {
-            return null;
-        }
-        return _.extend(
-            {}, this.attrs.context,
-            {own_values: {self: values}});
-    },
-    get_domain: function () {
-        var values = this.get_values();
-        if (_.isEmpty(values)) {
-            return null;
-        }
-        var domain = this.attrs['filter_domain'];
-        if (!domain) {
-            domain = [];
-            if (values.from) {
-                domain.push([this.attrs.name, '>=', values.from]);
-            }
-            if (values.to) {
-                domain.push([this.attrs.name, '<=', values.to]);
-            }
-            return domain;
-        }
-
-        return _.extend(
-                {}, domain,
-                {own_values: {self: values}});
+    get_value: function () {
+        return this.$element.val();
     }
 });
 openerp.base.search.DateTimeField = openerp.base.search.DateField.extend({
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 79fe7336ec8..92f95bacc90 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -968,22 +968,6 @@
         <t t-if="filters.length" t-raw="filters.render(defaults)"/>
     </div>
 </t>
-<t t-name="SearchView.fields.date">
-    <label style="display: block" t-att-title="attrs.help"
-           t-att-for="element_id">
-        <t t-esc="attrs.string || attrs.name"/>
-        <span t-if="attrs.help">(?)</span>
-    </label>
-    <div style="white-space: nowrap;" t-att-id="element_id">
-        <input t-att-name="attrs.name" type="text" class="field_date"
-               t-att-value="defaults[attrs.name] || ''"
-               t-att-autofocus="attrs.default_focus === '1' ? 'autofocus' : undefined"/>
-        to
-        <input t-att-name="attrs.name" type="text" class="field_date"
-               t-att-value="defaults[attrs.name] || ''"/>
-        <t t-if="filters.length" t-raw="filters.render(defaults)"/>
-    </div>
-</t>
 <t t-name="SearchView.field.selection">
     <label style="display: block" t-att-title="attrs.help"
            t-att-for="element_id">

From 14ec9faf37ee2e69a646b923aede35236a53b646 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 13:19:03 +0200
Subject: [PATCH 07/32] [REM] O2M and M2M search field: not sure they're ever
 used, and in case they are I'd rather have an actual error than some crappy
 placeholder field

bzr revid: xmo@openerp.com-20110810111903-doxuzpec9rb432zc
---
 addons/base/static/src/js/search.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 084f9effdb7..f895c9a26a9 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -727,9 +727,6 @@ openerp.base.search.DateField = openerp.base.search.Field.extend( /** @lends ope
 openerp.base.search.DateTimeField = openerp.base.search.DateField.extend({
     // TODO: time?
 });
-openerp.base.search.OneToManyField = openerp.base.search.CharField.extend({
-    // TODO: .relation, .context, .domain
-});
 openerp.base.search.ManyToOneField = openerp.base.search.CharField.extend({
     // TODO: @widget
     // TODO: .selection, .context, .domain
@@ -800,9 +797,6 @@ openerp.base.search.ManyToOneField = openerp.base.search.CharField.extend({
         return this._super();
     }
 });
-openerp.base.search.ManyToManyField = openerp.base.search.CharField.extend({
-    // TODO: .related_columns (Array), .context, .domain
-});
 
 openerp.base.search.ExtendedSearch = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search',

From bccbd50d6c6b311ed21ad82b29c49b79e0ed2d73 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 15:19:35 +0200
Subject: [PATCH 08/32] [FIX] Use deferred in CalendarView#do_search

bzr revid: fme@openerp.com-20110810131935-4u7w1i9pzwortf9s
---
 .../base_calendar/static/src/js/calendar.js   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index 8b92300a5f7..5aa594bcf0e 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -327,15 +327,17 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
     },
     do_search: function(domains, contexts, groupbys) {
         var self = this;
-        this.rpc('/base/session/eval_domain_and_context', {
-            domains: domains,
-            contexts: contexts,
-            group_by_seq: groupbys
-        }, function (results) {
-            // TODO: handle non-empty results.group_by with read_group
-            self.dataset.context = self.context = results.context;
-            self.dataset.domain = self.domain = results.domain;
-            self.dataset.read_slice(_.keys(self.fields), 0, self.limit, self.on_events_loaded);
+        $.when(this.has_been_loaded).then(function() {
+            self.rpc('/base/session/eval_domain_and_context', {
+                domains: domains,
+                contexts: contexts,
+                group_by_seq: groupbys
+            }, function (results) {
+                // TODO: handle non-empty results.group_by with read_group
+                self.dataset.context = self.context = results.context;
+                self.dataset.domain = self.domain = results.domain;
+                self.dataset.read_slice(_.keys(self.fields), 0, self.limit, self.on_events_loaded);
+            });
         });
     },
     do_show: function () {

From a7163f9d6a5a0aae520328cb3ab834b5f1db773c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Aug 2011 14:41:24 +0200
Subject: [PATCH 09/32] [IMP] remove nullviewmanagerfrom search

bzr revid: al@openerp.com-20110810124124-zw1ab65iz6fi79wu
---
 addons/base/static/src/js/search.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index f895c9a26a9..661e0d650b8 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -3,7 +3,6 @@ openerp.base.search = function(openerp) {
 openerp.base.SearchView = openerp.base.Widget.extend({
     init: function(parent, element_id, dataset, view_id, defaults) {
         this._super(parent, element_id);
-        this.view_manager = parent || new openerp.base.NullViewManager();
         this.dataset = dataset;
         this.model = dataset.model;
         this.view_id = view_id;

From 8faecbd609f2a533138d209695587c5f1d45c0e1 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Aug 2011 15:29:45 +0200
Subject: [PATCH 10/32] [FIX] get rid of null viewmanager

bzr revid: al@openerp.com-20110810132945-lti3ihn58he88ivq
---
 addons/base/static/src/js/form.js  | 2 +-
 addons/base/static/src/js/views.js | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 2931bad659a..3aea5828038 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1884,7 +1884,7 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
             self.on_ui_change();
         });
 
-        this.list_view = new openerp.base.form.Many2ManyListView(new openerp.base.NullViewManager(this), this.list_id, this.dataset, false, {
+        this.list_view = new openerp.base.form.Many2ManyListView(this, this.list_id, this.dataset, false, {
                     'addable': 'Add',
                     'selectable': self.multi_selection
             });
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 3b7374b7822..f72f168a1f3 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -290,15 +290,6 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
     }
 });
 
-openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.base.ViewManager, {
-    init: function(parent) {
-        this._super(parent);
-        if(parent)
-            this.session = parent.session;
-        this.action = {flags: {}};
-    }
-});
-
 // Move parts or everything to ActionManager
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(parent, action) {

From 2b460ae48b61b0f3a6de87ae1f0a32f8c81f433b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 15:38:45 +0200
Subject: [PATCH 11/32] [REM] tests of date search widget, since the complexity
 of the widget was removed

bzr revid: xmo@openerp.com-20110810133845-yuzzt1p6nvrh7lcw
---
 addons/base/static/src/js/data.js      | 13 +++--
 addons/base/static/test/search-date.js | 74 --------------------------
 addons/base/static/test/test.html      |  1 -
 3 files changed, 9 insertions(+), 79 deletions(-)
 delete mode 100644 addons/base/static/test/search-date.js

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index fb926a2a592..9e9f2b42323 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -359,12 +359,17 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
     name_get: function(ids, callback) {
         return this.call_and_eval('name_get', [ids, this.get_context()], null, 1, callback);
     },
-    /*
-     * args = domain
+    /**
+     * 
+     * @param {String} name name to perform a search for/on
+     * @param {Array} [domain=[]] filters for the objects returned, OpenERP domain
+     * @param {String} [operator='ilike'] matching operator to use with the provided name value
+     * @param {Number} [limit=100] maximum number of matches to return
+     * @param {Function} callback function to call with name_search result
      */
-    name_search: function (name, args, operator, limit, callback) {
+    name_search: function (name, domain, operator, limit, callback) {
         return this.call_and_eval('name_search',
-            [name || '', args || false, operator || 'ilike', this.get_context(), limit || 100],
+            [name || '', domain || false, operator || 'ilike', this.get_context(), limit || 100],
             1, 3, callback);
     },
     name_create: function(name, callback) {
diff --git a/addons/base/static/test/search-date.js b/addons/base/static/test/search-date.js
deleted file mode 100644
index e5ada00379e..00000000000
--- a/addons/base/static/test/search-date.js
+++ /dev/null
@@ -1,74 +0,0 @@
-$(document).ready(function () {
-    var openerp;
-    function get_widget(attrs) {
-        var widget = new openerp.base.search.DateField(
-                {attrs: attrs}, {name: 'foo'}, {inputs: []});
-        $('#qunit-fixture').html(widget.render({}));
-        widget.start();
-        return widget;
-    }
-
-    module('search-date', {
-        setup: function () {
-            openerp = window.openerp.init(true);
-            window.openerp.base.core(openerp);
-            window.openerp.base.chrome(openerp);
-            window.openerp.base.views(openerp);
-            window.openerp.base.search(openerp);
-        }
-    });
-    test('no values', function () {
-        var widget = get_widget();
-        deepEqual(widget.get_values(), {});
-        strictEqual(widget.get_context(), null);
-        strictEqual(widget.get_domain(), null);
-    });
-    test('filled from', function () {
-        var widget = get_widget();
-        widget.$element.find('input:eq(0)').val('1912-06-23');
-
-        deepEqual(widget.get_values(), {from: '1912-06-23'});
-        strictEqual(widget.get_context(), null);
-        deepEqual(widget.get_domain(), [['foo', '>=', '1912-06-23']]);
-    });
-    test('filled to', function () {
-        var widget = get_widget();
-        widget.$element.find('input:eq(1)').val('1954-06-07');
-
-        deepEqual(widget.get_values(), {to: '1954-06-07'});
-        strictEqual(widget.get_context(), null);
-        deepEqual(widget.get_domain(), [['foo', '<=', '1954-06-07']]);
-    });
-    test('filled both', function () {
-        var widget = get_widget();
-        widget.$element.find('input:eq(0)').val('1912-06-23');
-        widget.$element.find('input:eq(1)').val('1954-06-07');
-
-        deepEqual(widget.get_values(), {from: '1912-06-23', to: '1954-06-07'});
-        strictEqual(widget.get_context(), null);
-        deepEqual(widget.get_domain(),
-                [['foo', '>=', '1912-06-23'], ['foo', '<=', '1954-06-07']]);
-    });
-    test('custom context', function () {
-        var widget = get_widget({context: {__id: -1}});
-        widget.$element.find('input:eq(0)').val('1912-06-23');
-        widget.$element.find('input:eq(1)').val('1954-06-07');
-
-        deepEqual(
-            widget.get_context(),
-            {__id: -1,
-            own_values: {
-                self: {from: '1912-06-23', to: '1954-06-07'}}});
-    });
-    test('custom filter_domain', function () {
-        var widget = get_widget({filter_domain: {__id: -42}});
-        widget.$element.find('input:eq(0)').val('1912-06-23');
-        widget.$element.find('input:eq(1)').val('1954-06-07');
-
-        deepEqual(
-            widget.get_domain(),
-            {__id: -42,
-            own_values: {
-                self: {from: '1912-06-23', to: '1954-06-07'}}});
-    });
-});
diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html
index 97a73865041..14df778cd02 100644
--- a/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@ -39,6 +39,5 @@
     </body>
     <script type="text/javascript" src="/base/static/test/class.js"></script>
     <script type="text/javascript" src="/base/static/test/registry.js"></script>
-    <script type="text/javascript" src="/base/static/test/search-date.js"></script>
     <script type="text/javascript" src="/base/static/test/form.js"></script>
 </html>

From 2d13490435766d1e72803535e9c59965738dd93a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 16:00:58 +0200
Subject: [PATCH 12/32] [REM] references to color in list rows, not used
 anymore and template broken anyway

bzr revid: xmo@openerp.com-20110810140058-mbnbp04seohojh0h
---
 addons/base/static/src/xml/base.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 92f95bacc90..a9d20e8938d 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -547,14 +547,9 @@
     </tfoot>
 </table>
 <t t-name="ListView.rows" t-foreach="rows" t-as="row">
-    <t t-call="ListView.row">
-        <t t-set="style" t-value="null"/>
-        <t-if test="row.color">
-            <t t-set="style" t-value="'color: ' + row.color"/>
-        </t-if>
-    </t>
+    <t t-call="ListView.row"/>
 </t>
-<tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity"
+<tr t-name="ListView.row" t-att-class="row_parity"
     t-att-data-index="row_index">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">

From 5e7f787c651a62c80b18776748a87f1c63c6f5b7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 16:15:45 +0200
Subject: [PATCH 13/32] [IMP] simplify code of padding function in date
 formatting, add some doc, fix name

bzr revid: xmo@openerp.com-20110810141545-k98nvymjy5r7sslb
---
 addons/base/static/src/js/formats.js | 29 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js
index 3157997e82d..fb1ada544a4 100644
--- a/addons/base/static/src/js/formats.js
+++ b/addons/base/static/src/js/formats.js
@@ -74,15 +74,16 @@ openerp.base.parse_time = function(str) {
 };
 
 /*
- * Just a simple function to add some '0' if an integer it too small.
+ * Left-pad provided arg 1 with zeroes until reaching size provided by second
+ * argument.
+ *
+ * @param {Number|String} str value to pad
+ * @param {Number} size size to reach on the final padded value
+ * @returns {String} padded string
  */
-var fts = function(str, size) {
+var zpad = function(str, size) {
     str = "" + str;
-    var to_add = "";
-    _.each(_.range(size - str.length), function() {
-        to_add = to_add + "0";
-    });
-    return to_add + str;
+    return new Array(size - str.length).join('0') + str;
 };
 
 /**
@@ -99,9 +100,9 @@ openerp.base.format_datetime = function(obj) {
     if (!obj) {
         return false;
     }
-    return fts(obj.getUTCFullYear(),4) + "-" + fts(obj.getUTCMonth() + 1,2) + "-"
-        + fts(obj.getUTCDate(),2) + " " + fts(obj.getUTCHours(),2) + ":"
-        + fts(obj.getUTCMinutes(),2) + ":" + fts(obj.getUTCSeconds(),2);
+    return zpad(obj.getUTCFullYear(),4) + "-" + zpad(obj.getUTCMonth() + 1,2) + "-"
+         + zpad(obj.getUTCDate(),2) + " " + zpad(obj.getUTCHours(),2) + ":"
+         + zpad(obj.getUTCMinutes(),2) + ":" + zpad(obj.getUTCSeconds(),2);
 };
 
 /**
@@ -115,8 +116,8 @@ openerp.base.format_date = function(obj) {
     if (!obj) {
         return false;
     }
-    return fts(obj.getFullYear(),4) + "-" + fts(obj.getMonth() + 1,2) + "-"
-        + fts(obj.getDate(),2);
+    return zpad(obj.getFullYear(),4) + "-" + zpad(obj.getMonth() + 1,2) + "-"
+         + zpad(obj.getDate(),2);
 };
 
 /**
@@ -130,8 +131,8 @@ openerp.base.format_time = function(obj) {
     if (!obj) {
         return false;
     }
-    return fts(obj.getHours(),2) + ":" + fts(obj.getMinutes(),2) + ":"
-        + fts(obj.getSeconds(),2);
+    return zpad(obj.getHours(),2) + ":" + zpad(obj.getMinutes(),2) + ":"
+         + zpad(obj.getSeconds(),2);
 };
 
 /**

From 34a12f0a78f38adc31351ebf2b2c156e605fb69e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 16:27:48 +0200
Subject: [PATCH 14/32] [FIX] root a bunch of ignores to the base dir of the
 repository

bzr revid: xmo@openerp.com-20110810142748-odai8ff6nh0q8fdm
---
 .bzrignore | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 6e9359571f4..b83a43bf1d4 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,12 +1,11 @@
-RE:lib/(?!populate.sh).*
 .*
 *.egg-info
 *.orig
-bin/
 build/
-dist/
-include/
+RE:^bin/
+RE:^dist/
+RE:^include/
 
-share/
-man/
-lib/
+RE:^share/
+RE:^man/
+RE:^lib/

From 8bade5d04da802d5c64aac4b8df8235a86c6ac2d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Aug 2011 16:30:39 +0200
Subject: [PATCH 15/32] [FIX] database password naming

bzr revid: al@openerp.com-20110810143039-9ifxkl9qjl4kkm0s
---
 addons/base/static/src/xml/base.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index a9d20e8938d..4e581e8c175 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -78,7 +78,7 @@
         </table>
         <table align="center" class="db_option_table">
             <tr>
-                <td><label for="super_admin_pwd">Super admin password:</label></td>
+                <td><label for="super_admin_pwd">Master password:</label></td>
                 <td><input type="password" name="super_admin_pwd"
                            class="required" autofocus="autofocus"/></td>
             </tr>
@@ -103,7 +103,7 @@
                 </td>
             </tr>
             <tr>
-                <td><label for="create_admin_pwd">Super admin password:</label></td>
+                <td><label for="create_admin_pwd">Admin password:</label></td>
                 <td><input type="password" name="create_admin_pwd" class="required"/></td>
             </tr>
             <tr>
@@ -138,7 +138,7 @@
                 </td>
             </tr>
             <tr>
-                <td><label for="drop_password">Password:</label></td>
+                <td><label for="drop_password">Master Password:</label></td>
                 <td><input type="password" name="drop_pwd" class="required"/></td>
             </tr>
             <tr>
@@ -170,7 +170,7 @@
                 </td>
             </tr>
             <tr>
-                <td><label for="backup_pwd">Password:</label></td>
+                <td><label for="backup_pwd">Master Password:</label></td>
                 <td><input type="password" name="backup_pwd" class="required"/></td>
             </tr>
             <tr>
@@ -195,7 +195,7 @@
                          autofocus="autofocus"/></td>
             </tr>
             <tr>
-                <td><label for="restore_pwd">Password:</label></td>
+                <td><label for="restore_pwd">Master Password:</label></td>
                 <td><input type="password" name="restore_pwd" class="required"/></td>
             </tr>
         <tr>
@@ -213,23 +213,23 @@
         <table width="100%">
             <tr>
                 <td class="option_string">
-                    CHANGE DATABASE PASSWORD
+                    CHANGE MASTER PASSWORD
                 </td>
             </tr>
         </table>
         <table align="center" class="db_option_table">
             <tr>
-                <td><label for="old_pwd">Old password:</label></td>
+                <td><label for="old_pwd">Master password:</label></td>
                 <td><input type="password" name="old_pwd" class="required"
                            minlength="1" autofocus="autofocus"/></td>
             </tr>
             <tr>
-            <td><label for="new_pwd">New password:</label></td>
+            <td><label for="new_pwd">New master password:</label></td>
        	    <td><input type="password" name="new_pwd" class="required"
                        minlength="1"/></td>
             </tr>
    	    <tr>
-                <td><label for="confirm_pwd">Confirm password:</label></td>
+                <td><label for="confirm_pwd">Confirm new master password:</label></td>
                 <td><input type="password" name="confirm_pwd" class="required"
                            equalTo="input[name=new_pwd]" minlength="1"/></td>
             </tr>

From e96a9599b1a803cca44851c01c4b65d4541d61d5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Aug 2011 16:54:17 +0200
Subject: [PATCH 16/32] [FIX] event: typo in calendar view, date_delay is for
 durations

bzr revid: odo@openerp.com-20110810145417-arb6e3bedvaxjuf3
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ad203159696..6eafd851559 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -449,7 +449,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="event_id" date_start="date" date_delay="date_closed" string="Event Registration">
+                <calendar color="event_id" date_start="date" date_stop="date_closed" string="Event Registration">
                     <field name="event_id"/>
                     <field name="partner_invoice_id"/>
                 </calendar>

From 5492bc8cf2d6ff77721fe227f4f1826d37f4d3e7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Aug 2011 16:57:07 +0200
Subject: [PATCH 17/32] [FIX] crm phonecalls missing column for attrs
 expression

bzr revid: al@openerp.com-20110810145707-j0ww5xaonazskhtl
---
 addons/crm/crm_phonecall_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2490526bb0e..878f9a2e5d8 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -33,6 +33,7 @@
                 <field name="user_id"/>
                 <field name="categ_id"/>
                 <field name="create_date" invisible="1"/>
+                <field name="opportunity_id" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"

From 84dde229f0d1e12e6825d2768fffc93bffe00535 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Aug 2011 16:58:40 +0200
Subject: [PATCH 18/32] [IMP] use Class for Compound* types instead of manual
 prototypes

bzr revid: xmo@openerp.com-20110810145840-rblh9kouk1pf63by
---
 addons/base/static/src/js/data.js | 85 ++++++++++++++++---------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 9e9f2b42323..4e611771808 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -633,48 +633,51 @@ openerp.base.ReadOnlyDataSetSearch = openerp.base.DataSetSearch.extend({
     on_unlink: function(ids) {}
 });
 
-openerp.base.CompoundContext = function() {
-    this.__ref = "compound_context";
-    this.__contexts = [];
-    this.__eval_context = null;
-    var self = this;
-    _.each(arguments, function(x) {
-        self.add(x);
-    });
-};
-openerp.base.CompoundContext.prototype.add = function(context) {
-    this.__contexts.push(context);
-    return this;
-};
-openerp.base.CompoundContext.prototype.set_eval_context = function(eval_context) {
-    this.__eval_context = eval_context;
-    return this;
-};
-openerp.base.CompoundContext.prototype.get_eval_context = function() {
-    return this.__eval_context;
-};
-
-openerp.base.CompoundDomain = function() {
-    this.__ref = "compound_domain";
-    this.__domains = [];
-    this.__eval_context = null;
-    var self = this;
-    _.each(arguments, function(x) {
-        self.add(x);
-    });
-};
-openerp.base.CompoundDomain.prototype.add = function(domain) {
-    this.__domains.push(domain);
-    return this;
-};
-openerp.base.CompoundDomain.prototype.set_eval_context = function(eval_context) {
-    this.__eval_context = eval_context;
-    return this;
-};
-openerp.base.CompoundDomain.prototype.get_eval_context = function() {
-    return this.__eval_context;
-};
+openerp.base.CompoundContext = openerp.base.Class.extend({
+    init: function () {
+        this.__ref = "compound_context";
+        this.__contexts = [];
+        this.__eval_context = null;
+        var self = this;
+        _.each(arguments, function(x) {
+            self.add(x);
+        });
+    },
+    add: function (context) {
+        this.__contexts.push(context);
+        return this;
+    },
+    set_eval_context: function (eval_context) {
+        this.__eval_context = eval_context;
+        return this;
+    },
+    get_eval_context: function () {
+        return this.__eval_context;
+    }
+});
 
+openerp.base.CompoundDomain = openerp.base.Class.extend({
+    init: function () {
+        this.__ref = "compound_domain";
+        this.__domains = [];
+        this.__eval_context = null;
+        var self = this;
+        _.each(arguments, function(x) {
+            self.add(x);
+        });
+    },
+    add: function(domain) {
+        this.__domains.push(domain);
+        return this;
+    },
+    set_eval_context: function(eval_context) {
+        this.__eval_context = eval_context;
+        return this;
+    },
+    get_eval_context: function() {
+        return this.__eval_context;
+    }
+});
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 0cd8a79009b8df3a880c72dab2a66da16e4f9a5f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 17:42:38 +0200
Subject: [PATCH 19/32] [ADD] Added exception throw when domain references an
 unknown field

bzr revid: fme@openerp.com-20110810154238-h18xpgjtbhqlr67d
---
 addons/base/static/src/js/form.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 3aea5828038..25bc55a86fb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -510,36 +510,40 @@ openerp.base.form.compute_domain = function(expr, fields) {
             }
         }
 
-        var field = fields[ex[0]].get_value ? fields[ex[0]].get_value() : fields[ex[0]].value;
+        var field = fields[ex[0]];
+        if (!field) {
+            throw new Error("Domain references unknown field : " + ex[0]);
+        }
+        var field_value = field.get_value ? fields[ex[0]].get_value() : fields[ex[0]].value;
         var op = ex[1];
         var val = ex[2];
 
         switch (op.toLowerCase()) {
             case '=':
             case '==':
-                stack.push(field == val);
+                stack.push(field_value == val);
                 break;
             case '!=':
             case '<>':
-                stack.push(field != val);
+                stack.push(field_value != val);
                 break;
             case '<':
-                stack.push(field < val);
+                stack.push(field_value < val);
                 break;
             case '>':
-                stack.push(field > val);
+                stack.push(field_value > val);
                 break;
             case '<=':
-                stack.push(field <= val);
+                stack.push(field_value <= val);
                 break;
             case '>=':
-                stack.push(field >= val);
+                stack.push(field_value >= val);
                 break;
             case 'in':
-                stack.push(_(val).contains(field));
+                stack.push(_(val).contains(field_value));
                 break;
             case 'not in':
-                stack.push(!_(val).contains(field));
+                stack.push(!_(val).contains(field_value));
                 break;
             default:
                 this.log("Unsupported operator in modifiers :", op);

From 791fcfb0720a41bec48b3677289c785fbc907202 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 18:16:01 +0200
Subject: [PATCH 20/32] [FIX] Fixed event boundaries padding bug

bzr revid: fme@openerp.com-20110810161601-pk4sm0fuc2or51l4
---
 addons/base_calendar/static/src/js/calendar.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index 5aa594bcf0e..fcbe1084f2f 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -48,14 +48,19 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         this.fields =  this.fields_view.fields;
 
         //* Calendar Fields *
-        this.calendar_fields['date_start'] = {'name': this.date_start, 'kind': this.fields[this.date_start]['type']};
+        this.calendar_fields.date_start = {'name': this.date_start, 'kind': this.fields[this.date_start].type};
 
         if (this.date_delay) {
-             this.calendar_fields['date_delay'] = {'name': this.date_delay, 'kind': this.fields[this.date_delay]['type']};
+            if (this.fields[this.date_delay].type != 'float') {
+                throw new Error("Calendar view has a 'date_delay' type != float");
+            }
+            this.calendar_fields.date_delay = {'name': this.date_delay, 'kind': this.fields[this.date_delay].type};
         }
-
         if (this.date_stop) {
-            this.calendar_fields['date_stop'] = {'name': this.date_stop, 'kind': this.fields[this.date_stop]['type']};
+            this.calendar_fields.date_stop = {'name': this.date_stop, 'kind': this.fields[this.date_stop].type};
+        }
+        if (!this.date_delay && !this.date_stop) {
+            throw new Error("Calendar view has none of the following attributes : 'date_stop', 'date_delay'");
         }
 
         for (var fld = 0; fld < this.fields_view.arch.children.length; fld++) {
@@ -307,10 +312,9 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         var data = {
             name: event_obj.text
         };
-        var date_format = this.calendar_fields.date_start.kind == 'time' ? 'HH:mm:ss' : 'yyyy-MM-dd HH:mm:ss';
-        data[this.date_start] = event_obj.start_date.toString(date_format);
+        data[this.date_start] = openerp.base.format_datetime(event_obj.start_date);
         if (this.date_stop) {
-            data[this.date_stop] = event_obj.end_date.toString(date_format);
+            data[this.date_stop] = openerp.base.format_datetime(event_obj.end_date);
         }
         if (this.date_delay) {
             var tds = (event_obj.start_date.getOrdinalNumber() / 1e3 >> 0) - (event_obj.start_date.getOrdinalNumber() < 0);

From 0b9610e4350748bfe91305f9accadb17a92a4869 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Aug 2011 21:25:09 +0200
Subject: [PATCH 21/32] [IMP] remove actiondialog

bzr revid: al@openerp.com-20110810192509-isdf1h8vb758r07j
---
 addons/base/static/src/js/chrome.js |  4 +---
 addons/base/static/src/js/views.js  | 20 ++------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 41f60be72c9..633f56334de 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -318,9 +318,6 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
             max_height: '100%',
             autoOpen: false,
             buttons: {},
-            beforeClose: function () {
-                self.on_close();
-            }
         };
         for (var f in this) {
             if (f.substr(0, 10) == 'on_button_') {
@@ -384,6 +381,7 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
     close: function() {
         // Closes the dialog but leave it in a state where it could be opened again.
         this.$dialog.dialog('close');
+        this.on_close();
     },
     on_close: function() {
     },
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f72f168a1f3..9bd7660e073 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -14,22 +14,6 @@ openerp.base.client_actions = new openerp.base.Registry();
  */
 openerp.base.views = new openerp.base.Registry();
 
-openerp.base.ActionDialog = openerp.base.Dialog.extend({
-    identifier_prefix: 'action_dialog',
-    on_close: function() {
-        this._super(this, arguments);
-        if (this.close_callback) {
-            this.close_callback();
-        }
-    },
-    stop: function() {
-        this._super(this, arguments);
-        if (this.viewmanager) {
-            this.viewmanager.stop();
-        }
-    }
-});
-
 openerp.base.ActionManager = openerp.base.Widget.extend({
     identifier_prefix: "actionmanager",
     init: function(parent) {
@@ -77,8 +61,8 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
     ir_actions_act_window: function (action, on_closed) {
         if (action.flags.popup) {
             if (this.dialog == null) {
-                this.dialog = new openerp.base.ActionDialog(this, { title: action.name, width: '80%' });
-                this.dialog.close_callback = on_closed;
+                this.dialog = new openerp.base.Dialog(this, { title: action.name, width: '80%' });
+                this.dialog.on_closed.add(on_closed);
                 this.dialog.start();
                 this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
                 this.dialog_viewmanager.appendTo(this.dialog.$element);

From ea999bd1cde4e295f63ea7e07d9615bfcb6f4dfb Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 00:23:54 +0200
Subject: [PATCH 22/32] [FIX] dialog restore close hook fme

bzr revid: al@openerp.com-20110810222354-glykgj1cvvt57upa
---
 addons/base/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 633f56334de..fb1757ebb43 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -318,6 +318,7 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
             max_height: '100%',
             autoOpen: false,
             buttons: {},
+            beforeClose: function () { self.on_close(); }
         };
         for (var f in this) {
             if (f.substr(0, 10) == 'on_button_') {
@@ -381,7 +382,6 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
     close: function() {
         // Closes the dialog but leave it in a state where it could be opened again.
         this.$dialog.dialog('close');
-        this.on_close();
     },
     on_close: function() {
     },

From c605d7a7703468622b0c33ed85b8166dd3845d02 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 01:02:13 +0200
Subject: [PATCH 23/32] [FIX] actionmanager dialog

bzr revid: al@openerp.com-20110810230213-k9qrjv491tetsaqj
---
 addons/base/static/src/js/views.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 9bd7660e073..8865c278cbd 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -40,7 +40,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
             this.inner_viewmanager = null;
         }
     },
-    do_action: function(action, on_closed) {
+    do_action: function(action, on_close) {
         console.log("action",action);
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
@@ -56,22 +56,21 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
             console.log("Action manager can't handle action of type " + action.type, action);
             return;
         }
-        this[type](action, on_closed);
+        this[type](action, on_close);
     },
-    ir_actions_act_window: function (action, on_closed) {
+    ir_actions_act_window: function (action, on_close) {
         if (action.flags.popup) {
             if (this.dialog == null) {
                 this.dialog = new openerp.base.Dialog(this, { title: action.name, width: '80%' });
-                this.dialog.on_closed.add(on_closed);
+                if(on_close)
+                    this.dialog.on_close.add(on_close);
                 this.dialog.start();
-                this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
-                this.dialog_viewmanager.appendTo(this.dialog.$element);
-                this.dialog.open();
             } else {
                 this.dialog_viewmanager.stop();
-                this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
-                this.dialog_viewmanager.appendTo(this.dialog.$element);
             }
+            this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
+            this.dialog_viewmanager.appendTo(this.dialog.$element);
+            this.dialog.open();
         } else  {
             this.dialog_stop();
             this.inner_stop();

From 4fc1277932c74030c57f234a0a2bbd229af77251 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 03:52:32 +0200
Subject: [PATCH 24/32] [FIX] actionmanager ir.action.act_window_close and
 button special

bzr revid: al@openerp.com-20110811015232-sv31mivmb9zvpszs
---
 addons/base/static/src/js/views.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 8865c278cbd..2fddb4a89af 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -9,11 +9,6 @@ openerp.base.views = function(openerp) {
  */
 openerp.base.client_actions = new openerp.base.Registry();
 
-/**
- * Registry for all the main views
- */
-openerp.base.views = new openerp.base.Registry();
-
 openerp.base.ActionManager = openerp.base.Widget.extend({
     identifier_prefix: "actionmanager",
     init: function(parent) {
@@ -85,7 +80,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
         */
     },
     ir_actions_act_window_close: function (action, on_closed) {
-        this.close_dialog();
+        this.dialog_stop();
     },
     ir_actions_server: function (action, on_closed) {
         var self = this;
@@ -273,19 +268,14 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
     }
 });
 
-// Move parts or everything to ActionManager
 openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     init: function(parent, action) {
         this.session = parent.session;
         var dataset;
         if (!action.res_id) {
-            dataset = new openerp.base.DataSetSearch(this, action.res_model, action.context || null, action.domain || null);
+            dataset = new openerp.base.DataSetSearch(this, action.res_model, action.context, action.domain);
         } else {
-            dataset = new openerp.base.DataSetStatic(this, action.res_model, {}, [action.res_id]);
-            if (action.context) {
-                // TODO fme: should normalize all DataSets constructors to (session, model, context, domain, ...)
-                dataset.context = action.context;
-            }
+            dataset = new openerp.base.DataSetStatic(this, action.res_model, action.context, [action.res_id]);
         }
         this._super(parent, dataset, action.views);
         this.action = action;
@@ -471,8 +461,9 @@ openerp.base.View = openerp.base.Widget.extend({
         };
 
         var context = new openerp.base.CompoundContext(dataset.get_context(), action_data.context || {});
+
         if (action_data.special) {
-            // dunno
+            handler({result: {"type":"ir.actions.act_window_close"}});
         } else if (action_data.type=="object") {
             return dataset.call_button(action_data.name, [[record_id], context], handler);
         } else if (action_data.type=="action") {
@@ -554,6 +545,11 @@ openerp.base.View = openerp.base.Widget.extend({
     }
 });
 
+/**
+ * Registry for all the main views
+ */
+openerp.base.views = new openerp.base.Registry();
+
 openerp.base.json_node_to_xml = function(node, single_quote, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     // Maybe usefull for xml view editor

From 51da26530472471459854c37f779979b629c26a7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 04:00:14 +0200
Subject: [PATCH 25/32] [FIX] list button actions

bzr revid: al@openerp.com-20110811020014-skhi0zscvs1n7md5
---
 addons/base/static/src/js/list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 54612b360d4..e34b4b75f54 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -94,7 +94,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
                 self.do_delete(ids);
             },
             'action': function (e, action_name, id, callback) {
-                self.do_action(action_name, id, callback);
+                self.do_button_action(action_name, id, callback);
             },
             'row_link': function (e, id, dataset) {
                 self.do_activate_record(dataset.index, id, dataset);
@@ -454,7 +454,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * @param {Object} id id of the record the action should be called on
      * @param {Function} callback should be called after the action is executed, if non-null
      */
-    do_action: function (name, id, callback) {
+    do_button_action: function (name, id, callback) {
         var   self = this,
             action = _.detect(this.columns, function (field) {
             return field.name === name;

From f31d25f556dbeba70bab7c7188fd84a416bf5133 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 04:42:46 +0200
Subject: [PATCH 26/32] [IMP] cleanups, session in core, keep a ref to
 webclient in window.openerp.sessions for debugging

bzr revid: al@openerp.com-20110811024246-g3it6dtrqidzv0rx
---
 addons/base/static/src/js/boot.js   |   9 +-
 addons/base/static/src/js/chrome.js | 276 +-------------------------
 addons/base/static/src/js/core.js   | 288 ++++++++++++++++++++++++++++
 addons/base/static/src/js/form.js   |   6 +-
 addons/base/static/src/js/views.js  |   8 +-
 5 files changed, 297 insertions(+), 290 deletions(-)

diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js
index 7ac8a6bb1e0..e3d33a1910c 100644
--- a/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@ -14,13 +14,8 @@
 
     /** @lends openerp */
     var openerp = this.openerp =  {
-        /**
-         * Debug flag turns on logging
-         */
+        // debug flag
         debug: true,
-        // element_ids registry linked to all controllers on the page
-        // TODO rename to elements, or keep gtk naming?
-        screen: {},
         // Per session namespace
         // openerp.<module> will map to
         // openerp.sessions.sessionname.<module> using a closure
@@ -40,8 +35,6 @@
                 // this unique id will be replaced by hostname_databasename by
                 // openerp.base.Connection on the first connection
                 _session_id: "session" + session_counter++,
-                screen: openerp.screen,
-                sessions: openerp.sessions,
                 base: {},
                 web_mobile: {}
             };
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index fb1757ebb43..111e212d124 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -4,281 +4,6 @@
 
 openerp.base.chrome = function(openerp) {
 
-openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Session# */{
-    /**
-     * @constructs
-     * @param element_id to use for exception reporting
-     * @param server
-     * @param port
-     */
-    init: function(parent, element_id, server, port) {
-        this._super(parent, element_id);
-        this.server = (server == undefined) ? location.hostname : server;
-        this.port = (port == undefined) ? location.port : port;
-        this.rpc_mode = (server == location.hostname) ? "ajax" : "jsonp";
-        this.debug = true;
-        this.db = "";
-        this.login = "";
-        this.password = "";
-        this.uid = false;
-        this.session_id = false;
-        this.module_list = [];
-        this.module_loaded = {"base": true};
-        this.context = {};
-    },
-    start: function() {
-        this.session_restore();
-    },
-    /**
-     * Executes an RPC call, registering the provided callbacks.
-     *
-     * Registers a default error callback if none is provided, and handles
-     * setting the correct session id and session context in the parameter
-     * objects
-     *
-     * @param {String} url RPC endpoint
-     * @param {Object} params call parameters
-     * @param {Function} success_callback function to execute on RPC call success
-     * @param {Function} error_callback function to execute on RPC call failure
-     * @returns {jQuery.Deferred} jquery-provided ajax deferred
-     */
-    rpc: function(url, params, success_callback, error_callback) {
-        var self = this;
-        // Construct a JSON-RPC2 request, method is currently unused
-        params.session_id = this.session_id;
-
-        // Call using the rpc_mode
-        var deferred = $.Deferred();
-        this.rpc_ajax(url, {
-            jsonrpc: "2.0",
-            method: "call",
-            params: params,
-            id:null
-        }).then(function () {deferred.resolve.apply(deferred, arguments);},
-                function(error) {deferred.reject(error, $.Event());});
-        return deferred.fail(function() {
-            deferred.fail(function(error, event) {
-                if (!event.isDefaultPrevented()) {
-                    self.on_rpc_error(error, event);
-                }
-            });
-        }).then(success_callback, error_callback).promise();
-    },
-    /**
-     * Raw JSON-RPC call
-     *
-     * @returns {jQuery.Deferred} ajax-based deferred object
-     */
-    rpc_ajax: function(url, payload) {
-        var self = this;
-        this.on_rpc_request();
-        // url can be an $.ajax option object
-        if (_.isString(url)) {
-            url = {
-                url: url
-            }
-        }
-        var ajax = _.extend({
-            type: "POST",
-            url: url,
-            dataType: 'json',
-            contentType: 'application/json',
-            data: JSON.stringify(payload),
-            processData: false
-        }, url);
-        var deferred = $.Deferred();
-        $.ajax(ajax).done(function(response, textStatus, jqXHR) {
-            self.on_rpc_response();
-            if (!response.error) {
-                deferred.resolve(response["result"], textStatus, jqXHR);
-                return;
-            }
-            if (response.error.data.type !== "session_invalid") {
-                deferred.reject(response.error);
-                return;
-            }
-            self.uid = false;
-            self.on_session_invalid(function() {
-                self.rpc(url, payload.params,
-                    function() {
-                        deferred.resolve.apply(deferred, arguments);
-                    },
-                    function(error, event) {
-                        event.preventDefault();
-                        deferred.reject.apply(deferred, arguments);
-                    });
-            });
-        }).fail(function(jqXHR, textStatus, errorThrown) {
-            self.on_rpc_response();
-            var error = {
-                code: -32098,
-                message: "XmlHttpRequestError " + errorThrown,
-                data: {type: "xhr"+textStatus, debug: jqXHR.responseText, objects: [jqXHR, errorThrown] }
-            };
-            deferred.reject(error);
-        });
-        return deferred.promise();
-    },
-    on_rpc_request: function() {
-    },
-    on_rpc_response: function() {
-    },
-    on_rpc_error: function(error) {
-    },
-    /**
-     * The session is validated either by login or by restoration of a previous session
-     */
-    on_session_valid: function() {
-        if(!openerp._modules_loaded)
-            this.load_modules();
-    },
-    on_session_invalid: function(contination) {
-    },
-    session_is_valid: function() {
-        return this.uid;
-    },
-    session_login: function(db, login, password, success_callback) {
-        var self = this;
-        this.db = db;
-        this.login = login;
-        this.password = password;
-        var params = { db: this.db, login: this.login, password: this.password };
-        this.rpc("/base/session/login", params, function(result) {
-            self.session_id = result.session_id;
-            self.uid = result.uid;
-            self.session_save();
-            self.on_session_valid();
-            if (success_callback)
-                success_callback();
-        });
-    },
-    session_logout: function() {
-        this.uid = false;
-    },
-    /**
-     * Reloads uid and session_id from local storage, if they exist
-     */
-    session_restore: function () {
-        this.uid = this.get_cookie('uid');
-        this.session_id = this.get_cookie('session_id');
-        this.db = this.get_cookie('db');
-        this.login = this.get_cookie('login');
-        // we should do an rpc to confirm that this session_id is valid and if it is retrieve the information about db and login
-        // then call on_session_valid
-        this.on_session_valid();
-    },
-    /**
-     * Saves the session id and uid locally
-     */
-    session_save: function () {
-        this.set_cookie('uid', this.uid);
-        this.set_cookie('session_id', this.session_id);
-        this.set_cookie('db', this.db);
-        this.set_cookie('login', this.login);
-    },
-    logout: function() {
-        delete this.uid;
-        delete this.session_id;
-        delete this.db;
-        delete this.login;
-        this.set_cookie('uid', '');
-        this.set_cookie('session_id', '');
-        this.set_cookie('db', '');
-        this.set_cookie('login', '');
-        this.on_session_invalid(function() {});
-    },
-    /**
-     * Fetches a cookie stored by an openerp session
-     *
-     * @private
-     * @param name the cookie's name
-     */
-    get_cookie: function (name) {
-        var nameEQ = this.element_id + '|' + name + '=';
-        var cookies = document.cookie.split(';');
-        for(var i=0; i<cookies.length; ++i) {
-            var cookie = cookies[i].replace(/^\s*/, '');
-            if(cookie.indexOf(nameEQ) === 0) {
-                return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
-            }
-        }
-        return null;
-    },
-    /**
-     * Create a new cookie with the provided name and value
-     *
-     * @private
-     * @param name the cookie's name
-     * @param value the cookie's value
-     * @param ttl the cookie's time to live, 1 year by default, set to -1 to delete
-     */
-    set_cookie: function (name, value, ttl) {
-        ttl = ttl || 24*60*60*365;
-        document.cookie = [
-            this.element_id + '|' + name + '=' + encodeURIComponent(JSON.stringify(value)),
-            'max-age=' + ttl,
-            'expires=' + new Date(new Date().getTime() + ttl*1000).toGMTString()
-        ].join(';');
-    },
-    /**
-     * Load additional web addons of that instance and init them
-     */
-    load_modules: function() {
-        var self = this;
-        this.rpc('/base/session/modules', {}, function(result) {
-            self.module_list = result;
-            var modules = self.module_list.join(',');
-            if(self.debug || true) {
-                self.rpc('/base/webclient/csslist', {"mods": modules}, self.do_load_css);
-                self.rpc('/base/webclient/jslist', {"mods": modules}, self.do_load_js);
-            } else {
-                self.do_load_css(["/base/webclient/css?mods="+modules]);
-                self.do_load_js(["/base/webclient/js?mods="+modules]);
-            }
-            openerp._modules_loaded = true;
-        });
-    },
-    do_load_css: function (files) {
-        _.each(files, function (file) {
-            $('head').append($('<link>', {
-                'href': file,
-                'rel': 'stylesheet',
-                'type': 'text/css'
-            }));
-        });
-    },
-    do_load_js: function(files) {
-        var self = this;
-        if(files.length != 0) {
-            var file = files.shift();
-            var tag = document.createElement('script');
-            tag.type = 'text/javascript';
-            tag.src = file;
-            tag.onload = tag.onreadystatechange = function() {
-                if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done )
-                    return;
-                tag.onload_done = true;
-                self.do_load_js(files);
-            };
-            document.head.appendChild(tag);
-        } else {
-            this.on_modules_loaded();
-        }
-    },
-    on_modules_loaded: function() {
-        for(var j=0; j<this.module_list.length; j++) {
-            var mod = this.module_list[j];
-            if(this.module_loaded[mod])
-                continue;
-            openerp[mod] = {};
-            // init module mod
-            if(openerp._openerp[mod] != undefined) {
-                openerp._openerp[mod](openerp);
-                this.module_loaded[mod] = true;
-            }
-        }
-    }
-});
 
 openerp.base.Notification =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
@@ -948,6 +673,7 @@ openerp.base.Preferences = openerp.base.Widget.extend({
 openerp.base.WebClient = openerp.base.Widget.extend({
     init: function(element_id) {
         this._super(null, element_id);
+        openerp.webclient = this;
 
         QWeb.add_template("/base/static/src/xml/base.xml");
         var params = {};
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 80dba3cd10c..7cdaf94446a 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -574,6 +574,18 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
         }
         return false;
     },
+    do_notify: function() {
+        if (this.widget_parent) {
+            return this.widget_parent.do_notify.apply(this,arguments);
+        }
+        return false;
+    },
+    do_warn: function() {
+        if (this.widget_parent) {
+            return this.widget_parent.do_warn.apply(this,arguments);
+        }
+        return false;
+    },
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
@@ -599,5 +611,281 @@ openerp.base.OldWidget = openerp.base.Widget.extend({
     }
 });
 
+openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Session# */{
+    /**
+     * @constructs
+     * @param element_id to use for exception reporting
+     * @param server
+     * @param port
+     */
+    init: function(parent, element_id, server, port) {
+        this._super(parent, element_id);
+        this.server = (server == undefined) ? location.hostname : server;
+        this.port = (port == undefined) ? location.port : port;
+        this.rpc_mode = (server == location.hostname) ? "ajax" : "jsonp";
+        this.debug = true;
+        this.db = "";
+        this.login = "";
+        this.password = "";
+        this.uid = false;
+        this.session_id = false;
+        this.module_list = [];
+        this.module_loaded = {"base": true};
+        this.context = {};
+    },
+    start: function() {
+        this.session_restore();
+    },
+    /**
+     * Executes an RPC call, registering the provided callbacks.
+     *
+     * Registers a default error callback if none is provided, and handles
+     * setting the correct session id and session context in the parameter
+     * objects
+     *
+     * @param {String} url RPC endpoint
+     * @param {Object} params call parameters
+     * @param {Function} success_callback function to execute on RPC call success
+     * @param {Function} error_callback function to execute on RPC call failure
+     * @returns {jQuery.Deferred} jquery-provided ajax deferred
+     */
+    rpc: function(url, params, success_callback, error_callback) {
+        var self = this;
+        // Construct a JSON-RPC2 request, method is currently unused
+        params.session_id = this.session_id;
+
+        // Call using the rpc_mode
+        var deferred = $.Deferred();
+        this.rpc_ajax(url, {
+            jsonrpc: "2.0",
+            method: "call",
+            params: params,
+            id:null
+        }).then(function () {deferred.resolve.apply(deferred, arguments);},
+                function(error) {deferred.reject(error, $.Event());});
+        return deferred.fail(function() {
+            deferred.fail(function(error, event) {
+                if (!event.isDefaultPrevented()) {
+                    self.on_rpc_error(error, event);
+                }
+            });
+        }).then(success_callback, error_callback).promise();
+    },
+    /**
+     * Raw JSON-RPC call
+     *
+     * @returns {jQuery.Deferred} ajax-based deferred object
+     */
+    rpc_ajax: function(url, payload) {
+        var self = this;
+        this.on_rpc_request();
+        // url can be an $.ajax option object
+        if (_.isString(url)) {
+            url = {
+                url: url
+            }
+        }
+        var ajax = _.extend({
+            type: "POST",
+            url: url,
+            dataType: 'json',
+            contentType: 'application/json',
+            data: JSON.stringify(payload),
+            processData: false
+        }, url);
+        var deferred = $.Deferred();
+        $.ajax(ajax).done(function(response, textStatus, jqXHR) {
+            self.on_rpc_response();
+            if (!response.error) {
+                deferred.resolve(response["result"], textStatus, jqXHR);
+                return;
+            }
+            if (response.error.data.type !== "session_invalid") {
+                deferred.reject(response.error);
+                return;
+            }
+            self.uid = false;
+            self.on_session_invalid(function() {
+                self.rpc(url, payload.params,
+                    function() {
+                        deferred.resolve.apply(deferred, arguments);
+                    },
+                    function(error, event) {
+                        event.preventDefault();
+                        deferred.reject.apply(deferred, arguments);
+                    });
+            });
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+            self.on_rpc_response();
+            var error = {
+                code: -32098,
+                message: "XmlHttpRequestError " + errorThrown,
+                data: {type: "xhr"+textStatus, debug: jqXHR.responseText, objects: [jqXHR, errorThrown] }
+            };
+            deferred.reject(error);
+        });
+        return deferred.promise();
+    },
+    on_rpc_request: function() {
+    },
+    on_rpc_response: function() {
+    },
+    on_rpc_error: function(error) {
+    },
+    /**
+     * The session is validated either by login or by restoration of a previous session
+     */
+    on_session_valid: function() {
+        if(!openerp._modules_loaded)
+            this.load_modules();
+    },
+    on_session_invalid: function(contination) {
+    },
+    session_is_valid: function() {
+        return this.uid;
+    },
+    session_login: function(db, login, password, success_callback) {
+        var self = this;
+        this.db = db;
+        this.login = login;
+        this.password = password;
+        var params = { db: this.db, login: this.login, password: this.password };
+        this.rpc("/base/session/login", params, function(result) {
+            self.session_id = result.session_id;
+            self.uid = result.uid;
+            self.session_save();
+            self.on_session_valid();
+            if (success_callback)
+                success_callback();
+        });
+    },
+    session_logout: function() {
+        this.uid = false;
+    },
+    /**
+     * Reloads uid and session_id from local storage, if they exist
+     */
+    session_restore: function () {
+        this.uid = this.get_cookie('uid');
+        this.session_id = this.get_cookie('session_id');
+        this.db = this.get_cookie('db');
+        this.login = this.get_cookie('login');
+        // we should do an rpc to confirm that this session_id is valid and if it is retrieve the information about db and login
+        // then call on_session_valid
+        this.on_session_valid();
+    },
+    /**
+     * Saves the session id and uid locally
+     */
+    session_save: function () {
+        this.set_cookie('uid', this.uid);
+        this.set_cookie('session_id', this.session_id);
+        this.set_cookie('db', this.db);
+        this.set_cookie('login', this.login);
+    },
+    logout: function() {
+        delete this.uid;
+        delete this.session_id;
+        delete this.db;
+        delete this.login;
+        this.set_cookie('uid', '');
+        this.set_cookie('session_id', '');
+        this.set_cookie('db', '');
+        this.set_cookie('login', '');
+        this.on_session_invalid(function() {});
+    },
+    /**
+     * Fetches a cookie stored by an openerp session
+     *
+     * @private
+     * @param name the cookie's name
+     */
+    get_cookie: function (name) {
+        var nameEQ = this.element_id + '|' + name + '=';
+        var cookies = document.cookie.split(';');
+        for(var i=0; i<cookies.length; ++i) {
+            var cookie = cookies[i].replace(/^\s*/, '');
+            if(cookie.indexOf(nameEQ) === 0) {
+                return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
+            }
+        }
+        return null;
+    },
+    /**
+     * Create a new cookie with the provided name and value
+     *
+     * @private
+     * @param name the cookie's name
+     * @param value the cookie's value
+     * @param ttl the cookie's time to live, 1 year by default, set to -1 to delete
+     */
+    set_cookie: function (name, value, ttl) {
+        ttl = ttl || 24*60*60*365;
+        document.cookie = [
+            this.element_id + '|' + name + '=' + encodeURIComponent(JSON.stringify(value)),
+            'max-age=' + ttl,
+            'expires=' + new Date(new Date().getTime() + ttl*1000).toGMTString()
+        ].join(';');
+    },
+    /**
+     * Load additional web addons of that instance and init them
+     */
+    load_modules: function() {
+        var self = this;
+        this.rpc('/base/session/modules', {}, function(result) {
+            self.module_list = result;
+            var modules = self.module_list.join(',');
+            if(self.debug || true) {
+                self.rpc('/base/webclient/csslist', {"mods": modules}, self.do_load_css);
+                self.rpc('/base/webclient/jslist', {"mods": modules}, self.do_load_js);
+            } else {
+                self.do_load_css(["/base/webclient/css?mods="+modules]);
+                self.do_load_js(["/base/webclient/js?mods="+modules]);
+            }
+            openerp._modules_loaded = true;
+        });
+    },
+    do_load_css: function (files) {
+        _.each(files, function (file) {
+            $('head').append($('<link>', {
+                'href': file,
+                'rel': 'stylesheet',
+                'type': 'text/css'
+            }));
+        });
+    },
+    do_load_js: function(files) {
+        var self = this;
+        if(files.length != 0) {
+            var file = files.shift();
+            var tag = document.createElement('script');
+            tag.type = 'text/javascript';
+            tag.src = file;
+            tag.onload = tag.onreadystatechange = function() {
+                if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done )
+                    return;
+                tag.onload_done = true;
+                self.do_load_js(files);
+            };
+            document.head.appendChild(tag);
+        } else {
+            this.on_modules_loaded();
+        }
+    },
+    on_modules_loaded: function() {
+        for(var j=0; j<this.module_list.length; j++) {
+            var mod = this.module_list[j];
+            if(this.module_loaded[mod])
+                continue;
+            openerp[mod] = {};
+            // init module mod
+            if(openerp._openerp[mod] != undefined) {
+                openerp._openerp[mod](openerp);
+                this.module_loaded[mod] = true;
+            }
+        }
+    }
+});
+
 };
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 25bc55a86fb..7e739b6bc90 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -806,7 +806,7 @@ openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({
         var self = this;
         this.$element.find("label").dblclick(function() {
             var widget = self['for'] || self;
-            console.log(widget.element_id , widget);
+            self.log(widget.element_id , widget);
         });
     }
 });
@@ -2213,8 +2213,8 @@ openerp.base.form.FieldBinary = openerp.base.form.Field.extend({
         delete(window[this.iframe]);
         if (size === false) {
             this.notification.warn("File Upload", "There was a problem while uploading your file");
-            // TODO: use openerp web exception handler
-            console.log("Error while uploading file : ", name);
+            // TODO: use openerp web crashmanager
+            this.log("Error while uploading file : ", name);
         } else {
             this.on_file_uploaded_and_valid.apply(this, arguments);
             this.on_ui_change();
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 2fddb4a89af..051a71d3852 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -36,7 +36,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
         }
     },
     do_action: function(action, on_close) {
-        console.log("action",action);
+        this.log("action",action);
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
         action.flags = _.extend({
@@ -48,7 +48,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
             pager : !popup
         }, action.flags || {});
         if (!(type in this)) {
-            console.log("Action manager can't handle action of type " + action.type, action);
+            this.log("Action manager can't handle action of type " + action.type, action);
             return;
         }
         this[type](action, on_close);
@@ -528,10 +528,10 @@ openerp.base.View = openerp.base.Widget.extend({
         }
     },
     on_sidebar_edit_workflow: function() {
-        console.log('Todo');
+        this.log('Todo');
     },
     on_sidebar_customize_object: function() {
-        console.log('Todo');
+        this.log('Todo');
     },
     on_sidebar_import: function() {
     },

From bb381cb21f65aba5032ef19908ba54b846e10b44 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 05:03:09 +0200
Subject: [PATCH 27/32] [FIX] viewmanageraction set action before _super

bzr revid: al@openerp.com-20110811030309-76p0gev9e2dqng2s
---
 addons/base/static/src/js/views.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 051a71d3852..95d90dd1c38 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -277,6 +277,7 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         } else {
             dataset = new openerp.base.DataSetStatic(this, action.res_model, action.context, [action.res_id]);
         }
+        this.action = action;
         this._super(parent, dataset, action.views);
         this.action = action;
         this.flags = this.action.flags || {};

From af721b53d1988a479411e771238cae10350ae6ae Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 05:10:00 +0200
Subject: [PATCH 28/32] [IMP] misc comments

bzr revid: al@openerp.com-20110811031000-z0nkvickg6dkfe0d
---
 addons/base/static/src/js/boot.js   | 13 +++++++------
 addons/base/static/src/js/chrome.js |  3 +--
 addons/base/static/src/js/core.js   |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js
index e3d33a1910c..3d1d1e75e7c 100644
--- a/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@ -1,6 +1,6 @@
-//---------------------------------------------------------
-// OpenERP Web Boostrap
-//---------------------------------------------------------
+/*---------------------------------------------------------
+ * OpenERP Web Boostrap Code
+ *---------------------------------------------------------*/
 
 /**
  * @name openerp
@@ -44,12 +44,13 @@
             }
             return new_instance;
         }
+        // TODO add initrpc to init core only for RPC
     };
 })();
 
-//---------------------------------------------------------
-// OpenERP base module split
-//---------------------------------------------------------
+/*---------------------------------------------------------
+ * OpenERP Web base module split
+ *---------------------------------------------------------*/
 
 openerp.base = function(instance) {
     openerp.base.core(instance);
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 111e212d124..7e7f5ae6ab6 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -1,10 +1,9 @@
 /*---------------------------------------------------------
- * OpenERP base library
+ * OpenERP Web chrome
  *---------------------------------------------------------*/
 
 openerp.base.chrome = function(openerp) {
 
-
 openerp.base.Notification =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 7cdaf94446a..859c96645a1 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------
- * OpenERP controller framework
+ * OpenERP Web core
  *--------------------------------------------------------*/
 
 openerp.base.core = function(openerp) {
@@ -888,4 +888,5 @@ openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Sessi
 });
 
 };
+
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 93a1fa92637c0e428407112d5d15e3edaf5d5376 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 11 Aug 2011 08:28:35 +0200
Subject: [PATCH 29/32] [ADD] some jsdoc before refactoding dataset methods

bzr revid: xmo@openerp.com-20110811062835-smlv47aybl336q9b
---
 addons/base/static/src/js/data.js | 86 ++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 4e611771808..aa409a36bb7 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -268,6 +268,11 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
     },
     /**
      * Read records.
+     *
+     * @param {Array} ids identifiers of the records to read
+     * @param {Array} [fields] fields to read and return, by default all fields are returned
+     * @param {Function} callback function called with read result
+     * @returns {$.Deferred}
      */
     read_ids: function (ids, fields, callback) {
         var self = this;
@@ -282,13 +287,20 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
      * Read a slice of the records represented by this DataSet, based on its
      * domain and context.
      *
+     * @param {Array} [fields] fields to read and return, by default all fields are returned
      * @param {Number} [offset=0] The index from which selected records should be returned
      * @param {Number} [limit=null] The maximum number of records to return
+     * @param {Function} callback function called with read_slice result
+     * @returns {$.Deferred}
      */
     read_slice: function (fields, offset, limit, callback) {
     },
     /**
-     * Read the indexed record.
+     * Reads the current dataset record (from its index)
+     *
+     * @params {Array} [fields] fields to read and return, by default all fields are returned
+     * @params {Function} callback function called with read_index result
+     * @returns {$.Deferred}
      */
     read_index: function (fields, callback) {
         var def = $.Deferred().then(callback);
@@ -304,6 +316,13 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
         }
         return def.promise();
     },
+    /**
+     * Reads default values for the current model
+     *
+     * @param {Array} [fields] fields to get default values for, by default all defaults are read
+     * @param {Function} callback function called with default_get result
+     * @returns {$.Deferred}
+     */
     default_get: function(fields, callback) {
         return this.rpc('/base/dataset/default_get', {
             model: this.model,
@@ -311,6 +330,14 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             context: this.get_context()
         }, callback);
     },
+    /**
+     * Creates a new record in db
+     *
+     * @param {Object} data field values to set on the new record
+     * @param {Function} callback function called with operation result
+     * @param {Function} error_callback function called in case of creation error
+     * @returns {$.Deferred}
+     */
     create: function(data, callback, error_callback) {
         return this.rpc('/base/dataset/create', {
             model: this.model,
@@ -318,6 +345,15 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             context: this.get_context()
         }, callback, error_callback);
     },
+    /**
+     * Saves the provided data in an existing db record
+     *
+     * @param {Number|String} id identifier for the record to alter
+     * @param {Object} data field values to write into the record
+     * @param {Function} callback function called with operation result
+     * @param {Function} error_callback function called in case of write error
+     * @returns {$.Deferred}
+     */
     write: function (id, data, callback, error_callback) {
         return this.rpc('/base/dataset/save', {
             model: this.model,
@@ -326,11 +362,27 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             context: this.get_context()
         }, callback, error_callback);
     },
+    /**
+     * Deletes an existing record from the database
+     *
+     * @param {Number|String} ids identifier of the record to delete
+     * @param {Function} callback function called with operation result
+     * @param {Function} error_callback function called in case of deletion error
+     */
     unlink: function(ids, callback, error_callback) {
         var self = this;
         return this.call_and_eval("unlink", [ids, this.get_context()], null, 1,
             callback, error_callback);
     },
+    /**
+     * Calls an arbitrary RPC method
+     *
+     * @param {String} method name of the method (on the current model) to call
+     * @param {Array} [args] arguments to pass to the method
+     * @param {Function} callback
+     * @param {Function} error_callback
+     * @returns {$.Deferred}
+     */
     call: function (method, args, callback, error_callback) {
         return this.rpc('/base/dataset/call', {
             model: this.model,
@@ -338,6 +390,17 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             args: args || []
         }, callback, error_callback);
     },
+    /**
+     * Calls an arbitrary method, with more crazy
+     *
+     * @param {String} method
+     * @param {Array} [args]
+     * @param {Number} [domain_id] index of a domain to evaluate in the args array
+     * @param {Number} [context_id] index of a context to evaluate in the args array
+     * @param {Function} callback
+     * @param {Function }error_callback
+     * @returns {$.Deferred}
+     */
     call_and_eval: function (method, args, domain_id, context_id, callback, error_callback) {
         return this.rpc('/base/dataset/call', {
             model: this.model,
@@ -347,6 +410,15 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             args: args || []
         }, callback, error_callback);
     },
+    /**
+     * Calls a button method, usually returning some sort of action
+     *
+     * @param {String} method
+     * @param {Array} [args]
+     * @param {Function} callback
+     * @param {Function} error_callback
+     * @returns {$.Deferred}
+     */
     call_button: function (method, args, callback, error_callback) {
         return this.rpc('/base/dataset/call_button', {
             model: this.model,
@@ -356,6 +428,13 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             args: args || []
         }, callback, error_callback);
     },
+    /**
+     * Fetches the "readable name" for records, based on intrinsic rules
+     *
+     * @param {Array} ids
+     * @param {Function} callback
+     * @returns {$.Deferred}
+     */
     name_get: function(ids, callback) {
         return this.call_and_eval('name_get', [ids, this.get_context()], null, 1, callback);
     },
@@ -366,12 +445,17 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
      * @param {String} [operator='ilike'] matching operator to use with the provided name value
      * @param {Number} [limit=100] maximum number of matches to return
      * @param {Function} callback function to call with name_search result
+     * @returns {$.Deferred}
      */
     name_search: function (name, domain, operator, limit, callback) {
         return this.call_and_eval('name_search',
             [name || '', domain || false, operator || 'ilike', this.get_context(), limit || 100],
             1, 3, callback);
     },
+    /**
+     * @param name
+     * @param callback
+     */
     name_create: function(name, callback) {
         return this.call_and_eval('name_create', [name, this.get_context()], null, 1, callback);
     },

From 13c75281b07c1f3169478f137a17e8956e1f88be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 11 Aug 2011 09:00:50 +0200
Subject: [PATCH 30/32] [IMP] change DataSet.read_slice to take an options
 object for optional fields, offset and limit args

bzr revid: xmo@openerp.com-20110811070050-pkz6x39tf0i4e49r
---
 addons/base/static/src/js/data.js             | 48 ++++++++++---------
 addons/base/static/src/js/form.js             | 14 +++---
 addons/base/static/src/js/list.js             | 11 +++--
 addons/base/static/src/js/view_tree.js        |  2 +-
 .../base_calendar/static/src/js/calendar.js   |  8 +++-
 .../base_dashboard/static/src/js/dashboard.js |  9 ++--
 .../base_default_home/static/src/js/home.js   |  2 +-
 addons/base_gantt/static/src/js/gantt.js      |  4 +-
 addons/base_graph/static/src/js/graph.js      |  6 +--
 .../web_mobile/static/src/js/form_mobile.js   |  4 +-
 10 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index aa409a36bb7..2e3d6cf8f03 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -270,12 +270,11 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
      * Read records.
      *
      * @param {Array} ids identifiers of the records to read
-     * @param {Array} [fields] fields to read and return, by default all fields are returned
+     * @param {Array} fields fields to read and return, by default all fields are returned
      * @param {Function} callback function called with read result
      * @returns {$.Deferred}
      */
     read_ids: function (ids, fields, callback) {
-        var self = this;
         return this.rpc('/base/dataset/get', {
             model: this.model,
             ids: ids,
@@ -287,14 +286,14 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
      * Read a slice of the records represented by this DataSet, based on its
      * domain and context.
      *
-     * @param {Array} [fields] fields to read and return, by default all fields are returned
-     * @param {Number} [offset=0] The index from which selected records should be returned
-     * @param {Number} [limit=null] The maximum number of records to return
+     * @params {Object} options
+     * @param {Array} [options.fields] fields to read and return, by default all fields are returned
+     * @param {Number} [options.offset=0] The index from which selected records should be returned
+     * @param {Number} [options.limit=null] The maximum number of records to return
      * @param {Function} callback function called with read_slice result
      * @returns {$.Deferred}
      */
-    read_slice: function (fields, offset, limit, callback) {
-    },
+    read_slice: function (options, callback) { return null; },
     /**
      * Reads the current dataset record (from its index)
      *
@@ -476,9 +475,11 @@ openerp.base.DataSetStatic =  openerp.base.DataSet.extend({
         // all local records
         this.ids = ids || [];
     },
-    read_slice: function (fields, offset, limit, callback) {
-        var self = this;
-        offset = offset || 0;
+    read_slice: function (options, callback) {
+        var self = this,
+            offset = options.offset || 0,
+            limit = options.limit || false,
+            fields = options.fields || false;
         var end_pos = limit && limit !== -1 ? offset + limit : undefined;
         return this.read_ids(this.ids.slice(offset, end_pos), fields, callback);
     },
@@ -515,25 +516,28 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
         // is it necessary ?
         this.ids = [];
     },
-    read_slice: function (fields, offset, limit, callback) {
+    /**
+     * Read a slice of the records represented by this DataSet, based on its
+     * domain and context.
+     *
+     * @params {Object} options
+     * @param {Array} [options.fields] fields to read and return, by default all fields are returned
+     * @param {Number} [options.offset=0] The index from which selected records should be returned
+     * @param {Number} [options.limit=null] The maximum number of records to return
+     * @param {Function} callback function called with read_slice result
+     * @returns {$.Deferred}
+     */
+    read_slice: function (options, callback) {
         var self = this;
-        offset = offset || 0;
-        // cached search, not sure it's a good idea
-        if(this.offset <= offset) {
-            var start = offset - this.offset;
-            if(this.ids.length - start >= limit) {
-                // TODO: check if this could work do only read if possible
-                // return read_ids(ids.slice(start,start+limit),fields,callback)
-            }
-        }
+        var offset = options.offset || 0;
         return this.rpc('/base/dataset/search_read', {
             model: this.model,
-            fields: fields,
+            fields: options.fields || false,
             domain: this.domain,
             context: this.get_context(),
             sort: this.sort(),
             offset: offset,
-            limit: limit
+            limit: options.limit || false
         }, function (result) {
             self.ids = result.ids;
             self.offset = offset;
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 7e739b6bc90..2eb06eba81f 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -451,12 +451,14 @@ openerp.base.form.SidebarAttachments = openerp.base.Widget.extend({
             this.on_attachments_loaded([]);
         } else {
             (new openerp.base.DataSetSearch(
-                    this, 'ir.attachment', this.view.dataset.get_context(),
-                    [['res_model', '=', this.view.dataset.model],
-                     ['res_id', '=', this.view.datarecord.id],
-                     ['type', 'in', ['binary', 'url']]])).read_slice(
-                ['name', 'url', 'type'], false, false,
-                this.on_attachments_loaded);
+                this, 'ir.attachment', this.view.dataset.get_context(),
+                [
+                    ['res_model', '=', this.view.dataset.model],
+                    ['res_id', '=', this.view.datarecord.id],
+                    ['type', 'in', ['binary', 'url']]
+                ])).read_slice(
+                    {fields: ['name', 'url', 'type']},
+                    this.on_attachments_loaded);
         }
     },
     on_attachments_loaded: function(attachments) {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index e34b4b75f54..45da03e470c 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -478,7 +478,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         _.extend(this.dataset, {
             domain: dataset.domain,
             context: dataset.get_context()
-        }).read_slice([], 0, false, function () {
+        }).read_slice({}, function () {
             self.select_record(index);
         });
     },
@@ -1033,10 +1033,11 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                d = new $.Deferred(),
             page = this.datagroup.openable ? this.page : view.page;
 
-        dataset.read_slice(
-            _.filter(_.pluck(_.select(this.columns, function(x) {return x.tag == "field";}), 'name'), _.identity),
-            page * limit, limit,
-            function (records) {
+        dataset.read_slice({
+                fields: _.filter(_.pluck(_.select(this.columns, function(x) {return x.tag == "field";}), 'name'), _.identity),
+                offset: page * limit,
+                limit: limit
+            }, function (records) {
                 if (!self.datagroup.openable) {
                     view.configure_pager(dataset);
                 } else {
diff --git a/addons/base/static/src/js/view_tree.js b/addons/base/static/src/js/view_tree.js
index 9951d9429f8..da426080574 100644
--- a/addons/base/static/src/js/view_tree.js
+++ b/addons/base/static/src/js/view_tree.js
@@ -72,7 +72,7 @@ openerp.base.TreeView = openerp.base.View.extend({
             'toolbar': has_toolbar
         }));
 
-        this.dataset.read_slice(this.fields_list(), 0, false, function (records) {
+        this.dataset.read_slice({fields: this.fields_list()}, function (records) {
             if (!has_toolbar) {
                 // WARNING: will do a second read on the same ids, but only on
                 //          first load so not very important
diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index fcbe1084f2f..b53ed9ba900 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -131,7 +131,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
     },
     load_scheduler: function() {
         var self = this;
-        this.dataset.read_slice([], 0, false, function(events) {
+        this.dataset.read_slice({}, function(events) {
             if (self.session.locale_code) {
                 // TODO: replace $LAB
                 $LAB.setOptions({AlwaysPreserveOrder: true}).script([
@@ -340,7 +340,11 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
                 // TODO: handle non-empty results.group_by with read_group
                 self.dataset.context = self.context = results.context;
                 self.dataset.domain = self.domain = results.domain;
-                self.dataset.read_slice(_.keys(self.fields), 0, self.limit, self.on_events_loaded);
+                self.dataset.read_slice({
+                        fields: _.keys(self.fields),
+                        offset:0,
+                        limit: self.limit
+                    }, self.on_events_loaded);
             });
         });
     },
diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index b4e04dbd22a..422d279a485 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -290,7 +290,7 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
         this.dataset.domain = [['type', '=', 'manual']];
     },
     start: function () {
-        $.when(this.dataset.read_slice(['state', 'action_id', 'category_id']),
+        $.when(this.dataset.read_slice({fields: ['state', 'action_id', 'category_id']}),
                this.dataset.call('progress'))
             .then(this.on_records_loaded);
     },
@@ -353,8 +353,8 @@ openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
     start: function () {
         var self = this;
         this.dataset.read_slice(
-            ['name', 'web_icon_data', 'web_icon_hover_data'],
-            null, null, function (applications) {
+            {fields: ['name', 'web_icon_data', 'web_icon_hover_data']},
+            function (applications) {
                 // Create a matrix of 3*x applications
                 var rows = [];
                 while (applications.length) {
@@ -384,7 +384,8 @@ openerp.base_dashboard.Widgets = openerp.base.View.extend({
         this.widgets = new openerp.base.DataSetSearch(this, 'res.widget');
     },
     start: function () {
-        this.user_widgets.read_slice(['widget_id', 'user_id'], null, null,
+        this.user_widgets.read_slice(
+            {fields: ['widget_id', 'user_id']},
             this.on_widgets_list_loaded);
     },
     on_widgets_list_loaded: function (user_widgets) {
diff --git a/addons/base_default_home/static/src/js/home.js b/addons/base_default_home/static/src/js/home.js
index 1cf2ed3ab25..ebdf7ea7d00 100644
--- a/addons/base_default_home/static/src/js/home.js
+++ b/addons/base_default_home/static/src/js/home.js
@@ -86,7 +86,7 @@ openerp.base_default_home = function (openerp) {
             $.blockUI({
                 message: '<img src="/base_default_home/static/src/img/throbber.gif">'
             });
-            Modules.read_slice(['id'], null, null, function (records) {
+            Modules.read_slice({fields: ['id']}, function (records) {
                 if (!(records.length === 1)) { return; }
                 Modules.call('state_update',
                     [_.pluck(records, 'id'), 'to install', ['uninstalled']],
diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 09174e25ab7..4a38747bf8a 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -81,7 +81,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
     get_events: function() {
 
         var self = this;
-        this.dataset.read_slice(false, false, false, function(result) {
+        this.dataset.read_slice({}, function(result) {
             self.load_event(result);
         });
 
@@ -460,7 +460,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
 
     reload_gantt: function() {
         var self = this;
-        this.dataset.read_slice(false, false, false, function(response) {
+        this.dataset.read_slice({}, function(response) {
             ganttChartControl.clearAll();
             jQuery("#GanttDiv").children().remove();
             self.load_event(response);
diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js
index 5ad85e4a8b0..f7c949dc194 100644
--- a/addons/base_graph/static/src/js/graph.js
+++ b/addons/base_graph/static/src/js/graph.js
@@ -89,7 +89,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
             }
             this.dataset.domain = domain;
             this.dataset.context = this.view_manager.dataset.context;
-            this.dataset.read_slice(_(this.fields).keys(), 0, false, function(res) {
+            this.dataset.read_slice({fields: _(this.fields).keys()}, function(res) {
                 self.schedule_chart(res);
             });
         }
@@ -468,9 +468,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
             }
             self.dataset.context = results.context;
             self.dataset.domain = results.domain;
-            self.dataset.read_slice([], 0, false,function(response){
-                self.load_chart(response);
-            });
+            self.dataset.read_slice({}, $.proxy(self, 'load_chart'));
         });
     }
 });
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 51bfd719c7f..a8c7bcc480e 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -12,7 +12,7 @@ openerp.web_mobile.FormView = openerp.base.Widget.extend({
         view_id = this.action.views[1][0];
 
         this.dataset = new openerp.base.DataSetSearch(this.session, this.action.res_model, null, null);
-        this.dataset.read_slice(false, false, false, function (result) {
+        this.dataset.read_slice({}, function (result) {
 
             for (var i = 0; i < result.length; i++) {
                 if (result[i].id == id) {
@@ -101,4 +101,4 @@ openerp.web_mobile.FormView = openerp.base.Widget.extend({
     },
 });
 
-}
\ No newline at end of file
+}

From 13c30f7b50c7fb769d3b53eb2744e9091a77439b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 11 Aug 2011 10:28:18 +0200
Subject: [PATCH 31/32] [IMP] avoid altering the dataset's domain and context
 in place during list view search

bzr revid: xmo@openerp.com-20110811082818-hhgdmn0k10tnbxm4
---
 addons/base/static/src/js/data.js  | 17 +++++++++--
 addons/base/static/src/js/list.js  | 15 +++++-----
 addons/base/static/src/js/views.js | 45 ++----------------------------
 3 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 2e3d6cf8f03..244c057d544 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -465,7 +465,10 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
             signal: signal
         }, callback);
     },
-    get_context: function() {
+    get_context: function(request_context) {
+        if (request_context) {
+            return new openerp.base.CompoundContext(this.context, request_context);
+        }
         return this.context;
     }
 });
@@ -522,6 +525,8 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
      *
      * @params {Object} options
      * @param {Array} [options.fields] fields to read and return, by default all fields are returned
+     * @param {Object} [options.context] context data to add to the request payload, on top of the DataSet's own context
+     * @param {Array} [options.domain] domain data to add to the request payload, ANDed with the dataset's domain
      * @param {Number} [options.offset=0] The index from which selected records should be returned
      * @param {Number} [options.limit=null] The maximum number of records to return
      * @param {Function} callback function called with read_slice result
@@ -533,8 +538,8 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
         return this.rpc('/base/dataset/search_read', {
             model: this.model,
             fields: options.fields || false,
-            domain: this.domain,
-            context: this.get_context(),
+            domain: this.get_domain(options.domain),
+            context: this.get_context(options.context),
             sort: this.sort(),
             offset: offset,
             limit: options.limit || false
@@ -546,6 +551,12 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
             }
         });
     },
+    get_domain: function (other_domain) {
+        if (other_domain) {
+            return new openerp.base.CompoundDomain(this.domain, other_domain);
+        }
+        return this.domain;
+    },
     /**
      * Reads or changes sort criteria on the dataset.
      *
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 45da03e470c..96df00c81ff 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -399,11 +399,10 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * @param {Object} results results of evaluating domain and process for a search
      */
     do_actual_search: function (results) {
-        this.dataset.context = results.context;
-        this.dataset.domain = results.domain;
         this.groups.datagroup = new openerp.base.DataGroup(
             this, this.model,
-            results.domain, results.context,
+            this.dataset.get_domain(results.domain),
+            this.dataset.get_context(results.context),
             results.group_by);
         this.groups.datagroup.sort = this.dataset._sort;
 
@@ -475,11 +474,11 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      */
     do_activate_record: function (index, id, dataset) {
         var self = this;
-        _.extend(this.dataset, {
-            domain: dataset.domain,
-            context: dataset.get_context()
-        }).read_slice({}, function () {
-            self.select_record(index);
+        this.dataset.read_slice({
+                context: dataset.get_context(),
+                domain: dataset.get_domain()
+            }, function () {
+                self.select_record(index);
         });
     },
     /**
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 95d90dd1c38..fc6e38593d4 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -36,7 +36,6 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
         }
     },
     do_action: function(action, on_close) {
-        this.log("action",action);
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
         action.flags = _.extend({
@@ -232,9 +231,8 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
             this.searchview.hide();
         }
         this.searchview.on_search.add(function(domains, contexts, groupbys) {
-            self.views[self.active_view].controller.do_search.call(
-                self, domains.concat(self.domains()),
-                      contexts.concat(self.contexts()), groupbys);
+            var controller = self.views[self.active_view].controller;
+            controller.do_search.call(controller, domains, contexts, groupbys);
         });
         return this.searchview.start();
     },
@@ -248,23 +246,6 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
     on_remove: function() {
     },
     on_edit: function() {
-    },
-    /**
-     * Domains added on searches by the view manager, to override in subsequent
-     * view manager in order to add new pieces of domains to searches
-     *
-     * @returns an empty list
-     */
-    domains: function () {
-        return [];
-    },
-    /**
-     * Contexts added on searches by the view manager.
-     *
-     * @returns an empty list
-     */
-    contexts: function () {
-        return [];
     }
 });
 
@@ -310,28 +291,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
                     .then(this.searchview.do_search);
             }
         }
-    },
-    /**
-     * adds action domain to the search domains
-     *
-     * @returns the action's domain
-     */
-    domains: function () {
-        if (!this.action.domain) {
-            return [];
-        }
-        return [this.action.domain];
-    },
-    /**
-     * adds action context to the search contexts
-     *
-     * @returns the action's context
-     */
-    contexts: function () {
-        if (!this.action.context) {
-            return [];
-        }
-        return [this.action.context];
     }
 });
 

From adf903f0b005c50963baea4f3a6e4b5231e8b7d9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 11 Aug 2011 10:43:01 +0200
Subject: [PATCH 32/32] [FIX] listview pagination

broken in fme@openerp.com-20110808144120-xlut0922rd61moxc, listview needs to get it from the action descriptor stored in the parent object

bzr revid: xmo@openerp.com-20110811084301-xp42ylhmv2ackhws
---
 addons/base/static/src/js/list.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 96df00c81ff..e7abfdfaf0f 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -61,7 +61,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
     /**
      * Retrieves the view's number of records per page (|| section)
      *
-     * options > defaults > indefinite
+     * options > defaults > parent.action.limit > indefinite
      *
      * @returns {Number|null}
      */
@@ -69,6 +69,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         if (this._limit === undefined) {
             this._limit = (this.options.limit
                         || this.defaults.limit
+                        || (this.widget_parent.action || {}).limit
                         || null);
         }
         return this._limit;