From 4ce473b8dc0dc53467fcd0520bc593866018f34e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 17 Aug 2011 10:55:32 +0200
Subject: [PATCH 01/60] [ADD] basics for smarter collections to back the
 listview and its components

bzr revid: xmo@openerp.com-20110817085532-4chvix1odshuebvc
---
 addons/base/static/src/js/core.js     |   3 +
 addons/base/static/src/js/list.js     | 159 +++++++++++++++++++++++++-
 addons/base/static/test/list-utils.js | 155 +++++++++++++++++++++++++
 addons/base/static/test/test.html     |   1 +
 4 files changed, 317 insertions(+), 1 deletion(-)
 create mode 100644 addons/base/static/test/list-utils.js

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 96c6cb1372a..5c2e6554785 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -10,6 +10,9 @@ openerp.base.core = function(openerp) {
     var initializing = false,
         fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
     // The base Class implementation (does nothing)
+    /**
+     * @class
+     */
     openerp.base.Class = function(){};
 
     // Create a new Class that inherits from this class
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index a0440221520..7fe995f533f 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1179,7 +1179,164 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         });
     }
 });
+
+/**
+ * @class
+ * @extends openerp.base.Class
+ */
+var Events = {
+    /**
+     * @param {String} event event to listen to on the current object, null for all events
+     * @param {Function} handler event handler to bind to the relevant event
+     * @returns this
+     */
+    bind: function (event, handler) {
+        var calls = this['_callbacks'] || (this._callbacks = {});
+
+        if (event in calls) {
+            calls[event].push(handler);
+        } else {
+            calls[event] = [handler];
+        }
+        return this;
+    },
+    /**
+     * @param {String} event
+     * @returns this
+     */
+    trigger: function (event) {
+        var calls;
+        if (!(calls = this._callbacks)) { return this; }
+        var callbacks = (calls[event] || []).concat(calls[null] || []);
+        for(var i=0, length=callbacks.length; i<length; ++i) {
+            callbacks[i].apply(this, arguments);
+        }
+        return this;
+    }
 };
+var Record = openerp.base.Class.extend(/** @lends Record# */{
+    /**
+     * @constructs
+     * @extends openerp.base.Class
+     * @borrows Events#bind as this.bind
+     * @borrows Events#trigger as this.trigger
+     * @param {Object} [data]
+     */
+    init: function (data) {
+        this.data = data || {};
+    },
+    /**
+     * @param {String} key
+     * @returns {Object}
+     */
+    get: function (key) {
+        return this.data[key];
+    },
+    /**
+     * @param key
+     * @param value
+     * @returns {Record}
+     */
+    set: function (key, value) {
+        this.data[key] = value;
+        this.trigger('change:' + key, this, value);
+        this.trigger('change', this);
+        return this;
+    }
+});
+Record.include(Events);
+var Collection = openerp.base.Class.extend(/** @lends Collection# */{
+    /**
+     * @constructs
+     * @extends openerp.base.Class
+     * @borrows Events#bind as this.bind
+     * @borrows Events#trigger as this.trigger
+     * @param {Array} [records] records to initialize the collection with
+     * @param {Object} [options]
+     */
+    init: function (records, options) {
+        options = options || {};
+        _.bindAll(this, '_onRecordEvent');
+        this.records = [];
+        this._byId = {};
+        this._proxies = {};
+        this._key = options.key;
+        this._parent = options.parent;
 
+        if (records) {
+            this.add(records);
+        }
+    },
+    /**
+     * @param {Object|Array} record
+     * @returns this
+     */
+    add: function (record) {
+        var records = record instanceof Array ? record : [record];
+
+        for(var i=0, length=records.length; i<length; ++i) {
+            var instance = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
+            instance.bind(null, this._onRecordEvent);
+            this._byId[instance.get('id')] = instance;
+            this.records.push(instance);
+        }
+        return this;
+    },
+
+    /**
+     * Get a record by its index in the collection, can also take a group if
+     * the collection is not degenerate
+     *
+     * @param {Number} index
+     * @param {String} [group]
+     * @returns {Record|undefined}
+     */
+    at: function (index, group) {
+        if (group) {
+            var groups = group.split('.');
+            return this._proxies[groups[0]].at(index, groups.join('.'));
+        }
+        return this.records[index];
+    },
+    /**
+     * Get a record by its database id
+     *
+     * @param {Number} id
+     * @returns {Record|undefined}
+     */
+    get: function (id) {
+        if (!_(this._proxies).isEmpty()) {
+            var record = null;
+            _(this._proxies).detect(function (proxy) {
+                return record = proxy.get(id);
+            });
+            return record;
+        }
+        return this._byId[id];
+    },
+    /**
+     * Builds a proxy (insert/retrieve) to a subtree of the collection, by
+     * the subtree's group
+     *
+     * @param {String} section group path section
+     * @returns {Collection}
+     */
+    proxy: function (section) {
+        return this._proxies[section] = new Collection(null, {
+            parent: this,
+            key: section
+        }).bind(null, this._onRecordEvent);
+    },
+
+    _onRecordEvent: function (event, record, options) {
+        this.trigger.apply(this, arguments);
+    }
+});
+Collection.include(Events);
+openerp.base.list = {
+    Events: Events,
+    Record: Record,
+    Collection: Collection
+}
+};
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
-
diff --git a/addons/base/static/test/list-utils.js b/addons/base/static/test/list-utils.js
new file mode 100644
index 00000000000..97431acb597
--- /dev/null
+++ b/addons/base/static/test/list-utils.js
@@ -0,0 +1,155 @@
+$(document).ready(function () {
+    var openerp,
+        create = function (o) {
+            if (typeof Object.create === 'function') {
+                return Object.create(o);
+            }
+            function Cls() {}
+            Cls.prototype = o;
+            return new Cls;
+        };
+    module('list-events', {
+        setup: function () {
+            openerp = window.openerp.init();
+            window.openerp.base.list(openerp);
+        }
+    });
+    test('Simple event triggering', function () {
+        var e = create(openerp.base.list.Events), passed = false;
+        e.bind('foo', function () { passed = true; });
+        e.trigger('foo');
+        ok(passed);
+    });
+    test('Bind all', function () {
+        var e = create(openerp.base.list.Events), event = null;
+        e.bind(null, function (ev) { event = ev; });
+        e.trigger('foo');
+        strictEqual(event, 'foo');
+    });
+    test('Propagate trigger params', function () {
+       var e = create(openerp.base.list.Events), p = false;
+        e.bind(null, function (_, param) { p = param });
+        e.trigger('foo', true);
+        strictEqual(p, true)
+    });
+    test('Bind multiple callbacks', function () {
+        var e = create(openerp.base.list.Events), count;
+        e.bind('foo', function () { count++; })
+         .bind('bar', function () { count++; })
+         .bind(null, function () { count++; })
+         .bind('foo', function () { count++; })
+         .bind(null, function () { count++; })
+         .bind(null, function () { count++; });
+
+        count = 0;
+        e.trigger('foo');
+        strictEqual(count, 5);
+
+        count = 0;
+        e.trigger('bar');
+        strictEqual(count, 4);
+
+        count = 0;
+        e.trigger('baz');
+        strictEqual(count, 3);
+    });
+    test('Mixin events', function () {
+        var cls = openerp.base.Class.extend({
+            method: function () { this.trigger('e'); }
+        });
+        cls.include(openerp.base.list.Events);
+        var instance = new cls, triggered = false;
+
+        instance.bind('e', function () { triggered = true; });
+        instance.method();
+
+        ok(triggered);
+    });
+
+    module('list-records', {
+        setup: function () {
+            openerp = window.openerp.init();
+            window.openerp.base.list(openerp);
+        }
+    });
+    test('Basic record initialization', function () {
+        var r = new openerp.base.list.Record({qux: 3});
+        r.set('foo', 1);
+        r.set('bar', 2);
+        strictEqual(r.get('foo'), 1);
+        strictEqual(r.get('bar'), 2);
+        strictEqual(r.get('qux'), 3);
+    });
+    test('Change all the things', function () {
+        var r = new openerp.base.list.Record(), changed = false, field;
+        r.bind('change', function () { changed = true; });
+        r.bind(null, function (e) { field = field || e.split(':')[1]});
+        r.set('foo', 1);
+        strictEqual(r.get('foo'), 1);
+        ok(changed);
+        strictEqual(field, 'foo');
+    });
+    test('Change single field', function () {
+        var r = new openerp.base.list.Record(), changed = 0;
+        r.bind('change:foo', function () { changed++; });
+        r.set('foo', 1);
+        r.set('bar', 1);
+        strictEqual(r.get('foo'), 1);
+        strictEqual(r.get('bar'), 1);
+        strictEqual(changed, 1);
+    });
+
+    module('list-collections-degenerate', {
+        setup: function () {
+            openerp = window.openerp.init();
+            window.openerp.base.list(openerp);
+        }
+    });
+    test('Fetch from collection', function () {
+        var c = new openerp.base.list.Collection();
+        c.add({id: 1, value: 2});
+        c.add({id: 2, value: 3});
+        c.add({id: 3, value: 5});
+        c.add({id: 4, value: 7});
+        var r = c.at(2), r2 = c.get(1);
+
+        ok(r instanceof openerp.base.list.Record);
+        strictEqual(r.get('id'), 3);
+        strictEqual(r.get('value'), 5);
+
+        ok(r2 instanceof openerp.base.list.Record);
+        strictEqual(r2.get('id'), 1);
+        strictEqual(r2.get('value'), 2);
+    });
+    test('Events propagation', function () {
+        var values = [];
+        var c = new openerp.base.list.Collection([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]);
+        c.bind('change:value', function (e, record, value) {
+            values.push(value);
+        });
+        c.get(1).set('value', 6);
+        c.get(2).set('value', 11);
+        c.get(3).set('value', 21);
+        deepEqual(values, [6, 11, 21]);
+    });
+    test('BTree', function () {
+        var root = new openerp.base.list.Collection(),
+            c = root.proxy('admin'),
+            total = 0;
+        c.add({id: 1, name: "Administrator", login: 'admin'});
+        c.add({id: 3, name: "Demo", login: 'demo'});
+        root.bind('change:wealth', function () {
+            total = (root.get(1).get('wealth') || 0) + (root.get(3).get('wealth') || 0);
+        });
+
+        strictEqual(total, 0);
+        c.at(0).set('wealth', 42);
+        strictEqual(total, 42);
+        c.at(1).set('wealth', 5);
+        strictEqual(total, 47);
+    });
+});
diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html
index 14df778cd02..08ca6524fce 100644
--- a/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@ -40,4 +40,5 @@
     <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/form.js"></script>
+    <script type="text/javascript" src="/base/static/test/list-utils.js"></script>
 </html>

From 2f8e6e62e57898168fd67bfb904ec158b34efbe1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 17 Aug 2011 14:55:41 +0200
Subject: [PATCH 02/60] [FIX] qweb2: incorrect tail call when using foreach()
 with a number (to iterate over a range)

bzr revid: xmo@openerp.com-20110817125541-wh95qu7jjwa7ojef
---
 addons/base/static/lib/qweb/qweb2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/lib/qweb/qweb2.js b/addons/base/static/lib/qweb/qweb2.js
index 89a77bf1b85..8987f1dc40e 100644
--- a/addons/base/static/lib/qweb/qweb2.js
+++ b/addons/base/static/lib/qweb/qweb2.js
@@ -169,7 +169,7 @@ var QWeb2 = {
                     for (var i = 0; i < enu; i++) {
                         _enu.push(i);
                     }
-                    this.foreach(context, enu, as, old_dict, callback);
+                    this.foreach(context, _enu, as, old_dict, callback);
                 } else {
                     var index = 0;
                     for (var k in enu) {

From bd497353714b3d7b05af941815f649c44a3b394c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 17 Aug 2011 15:16:35 +0200
Subject: [PATCH 03/60] [IMP] convert listviews (non-editable anyway) to
 collections

bzr revid: xmo@openerp.com-20110817131635-cv3qcbiarmlk5o3o
---
 addons/base/static/src/js/list.js     | 197 +++++++++++++++-----------
 addons/base/static/src/xml/base.xml   |  10 +-
 addons/base/static/test/list-utils.js |  48 +++++++
 3 files changed, 170 insertions(+), 85 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 7fe995f533f..810f5c4d7d5 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -50,6 +50,8 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
 
         this.columns = [];
 
+        this.records = new Collection();
+
         this.set_groups(new openerp.base.ListView.Groups(this));
 
         if (this.dataset instanceof openerp.base.DataSetStatic) {
@@ -535,7 +537,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             count += record.count || 1;
             _(columns).each(function (column) {
                 var field = column.id,
-                    value = record.values[field];
+                    value = record.values.get(field);
                 switch (column['function']) {
                     case 'sum':
                         sums[field] += value;
@@ -621,7 +623,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.options = opts.options;
         this.columns = opts.columns;
         this.dataset = opts.dataset;
-        this.rows = opts.rows;
+        this.records = opts.records;
 
         this.$_element = $('<tbody class="ui-widget-content">')
             .appendTo(document.body)
@@ -657,7 +659,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
     row_clicked: function () {
         $(this).trigger(
             'row_link',
-            [this.rows[this.dataset.index].data.id.value,
+            [this.records.at(this.dataset.index).get('id'),
              this.dataset]);
     },
     render: function () {
@@ -677,15 +679,12 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         if (!this.options.selectable) {
             return [];
         }
-        var rows = this.rows;
+        var records = this.records;
         var result = {ids: [], records: []};
         this.$current.find('th.oe-record-selector input:checked')
                 .closest('tr').each(function () {
-            var record = {};
-            _(rows[$(this).data('index')].data).each(function (obj, key) {
-                record[key] = obj.value;
-            });
-            result.ids.push(record.id);
+            var record = records.at($(this).data('index'));
+            result.ids.push(record.get('id'));
             result.records.push(record);
         });
         return result;
@@ -707,7 +706,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
      * @returns {Number|String} the identifier of the row's object
      */
     row_id: function (row) {
-        return this.rows[this.row_position(row)].data.id.value;
+        return this.records.at(this.row_position(row)).get('id');
     },
     /**
      * Death signal, cleans up list
@@ -719,41 +718,14 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.$_element.remove();
     },
     get_records: function () {
-        return _(this.rows).map(function (row) {
-            var record = {};
-            _(row.data).each(function (obj, key) {
-                record[key] = obj.value;
-            });
-            return {count: 1, values: record};
-        });
-    },
-    /**
-     * Transforms a record from what is returned by a dataset read (a simple
-     * mapping of ``$fieldname: $value``) to the format expected by list rows
-     * and form views:
-     *
-     *    data: {
-     *         $fieldname: {
-     *             value: $value
-     *         }
-     *     }
-     *
-     * This format allows for the insertion of a bunch of metadata (names,
-     * colors, etc...)
-     *
-     * @param {Object} record original record, in dataset format
-     * @returns {Object} record displayable in a form or list view
-     */
-    transform_record: function (record) {
-        // TODO: colors handling
-        var form_data = {},
-          form_record = {data: form_data};
-
-        _(record).each(function (value, key) {
-            form_data[key] = {value: value};
-        });
-
-        return form_record;
+        var records = [];
+        for(var i=0, length=this.records.length; i<length; ++i) {
+            records.push({
+                count: 1,
+                values: this.records.at(i)
+            })
+        }
+        return records;
     },
     /**
      * Reloads the record at index ``row_index`` in the list's rows.
@@ -774,8 +746,10 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             read_p = this.dataset.read_index(
                 _.pluck(_(this.columns).filter(function (r) {return r.tag === 'field';}), 'name'),
                 function (record) {
-                    var form_record = self.transform_record(record);
-                    self.rows.splice(record_index, 1, form_record);
+                    var r = self.records.get(record.id);
+                    _(record).each(function (value, key) {
+                        r.set(key, value);
+                    });
                     self.dataset.index = old_index;
                 }
             )
@@ -795,7 +769,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         return QWeb.render('ListView.row', {
             columns: this.columns,
             options: this.options,
-            row: this.rows[record_index],
+            record: this.records.at(record_index),
             row_parity: (record_index % 2 === 0) ? 'even' : 'odd',
             row_index: record_index,
             render_cell: openerp.base.format_cell
@@ -807,17 +781,9 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
      * @param {Array} ids identifiers of the records to remove
      */
     drop_records: function (ids) {
-        var self = this;
-        _(this.rows).chain()
-              .map(function (record, index) {
-                return {index: index, id: record.data.id.value};
-            }).filter(function (record) {
-                return _(ids).contains(record.id);
-            }).reverse()
-              .each(function (record) {
-                self.$current.find('tr:eq(' + record.index + ')').remove();
-                self.rows.splice(record.index, 1);
-            })
+        for(var i=ids.length-1; i>=0; --i) {
+            this.records.remove(this.records.get(ids[i]));
+        }
     }
     // drag and drop
 });
@@ -829,11 +795,20 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
      *
      * Provides events similar to those of
      * :js:class:`~openerp.base.ListView.List`
+     *
+     * @constructs
+     * @param {openerp.base.ListView} view
+     * @param {Object} [options]
+     * @param {Collection} [options.records]
+     * @param {Object} [options.options]
+     * @param {Array} [options.columns]
      */
-    init: function (view) {
+    init: function (view, options) {
+        options = options || {};
         this.view = view;
-        this.options = view.options;
-        this.columns = view.columns;
+        this.records = options.records || view.records;
+        this.options = options.options || view.options;
+        this.columns = options.columns || view.columns;
         this.datagroup = null;
 
         this.$row = null;
@@ -925,6 +900,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                 delete self.children[group.value];
             }
             var child = self.children[group.value] = new openerp.base.ListView.Groups(self.view, {
+                records: self.records.proxy(group.value),
                 options: self.options,
                 columns: self.columns
             });
@@ -1019,13 +995,12 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         });
     },
     render_dataset: function (dataset) {
-        var rows = [],
-            self = this,
+        var self = this,
             list = new openerp.base.ListView.List(this, {
                 options: this.options,
                 columns: this.columns,
                 dataset: dataset,
-                rows: rows
+                records: this.records
             });
         this.bind_child_events(list);
 
@@ -1054,11 +1029,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                             .attr('disabled', page === pages - 1);
                 }
 
-                var form_records = _(records).map(
-                    $.proxy(list, 'transform_record'));
-
-                rows.splice(0, rows.length);
-                rows.push.apply(rows, form_records);
+                self.records.reset(records);
                 list.render();
                 d.resolve(list);
             });
@@ -1078,7 +1049,9 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                 var from = ui.item.data('index'),
                       to = ui.item.prev().data('index') || 0;
                 if (from === to) { return; }
-                list.rows.splice(to, 0, list.rows.splice(from, 1)[0]);
+                var to_move = list.records.at(from);
+                list.records.remove(to_move);
+                list.records.add(to_move, {at: to});
 
                 ui.item.parent().children().each(function (i, e) {
                     // reset record-index accelerators on rows and even/odd
@@ -1089,17 +1062,16 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                 });
 
                 // resequencing time!
-                var data, index = to,
+                var record, index = to,
                     // if drag to 1st row (to = 0), start sequencing from 0
                     // (exclusive lower bound)
-                    seq = to ? list.rows[to - 1].data.sequence.value : 0;
-                while (++seq, list.rows[index]) {
-                    data = list.rows[index].data;
-                    data.sequence.value = seq;
+                    seq = to ? list.records.at(to - 1).get('sequence') : 0;
+                while (++seq, record = list.records.at(index)) {
+                    record.set('sequence', seq);
                     // write are independent from one another, so we can just
                     // launch them all at the same time and we don't really
                     // give a fig about when they're done
-                    dataset.write(data.id.value, {sequence: seq});
+                    dataset.write(record.get('id'), {sequence: seq});
                     list.reload_record(index++);
                 }
             }
@@ -1223,14 +1195,14 @@ var Record = openerp.base.Class.extend(/** @lends Record# */{
      * @param {Object} [data]
      */
     init: function (data) {
-        this.data = data || {};
+        this.attributes = data || {};
     },
     /**
      * @param {String} key
      * @returns {Object}
      */
     get: function (key) {
-        return this.data[key];
+        return this.attributes[key];
     },
     /**
      * @param key
@@ -1238,10 +1210,32 @@ var Record = openerp.base.Class.extend(/** @lends Record# */{
      * @returns {Record}
      */
     set: function (key, value) {
-        this.data[key] = value;
+        this.attributes[key] = value;
         this.trigger('change:' + key, this, value);
         this.trigger('change', this);
         return this;
+    },
+    /**
+     * Converts the current record to the format expected by form views:
+     *
+     * .. code-block:: javascript
+     *
+     *    data: {
+     *         $fieldname: {
+     *             value: $value
+     *         }
+     *     }
+     *
+     *
+     * @returns {Object} record displayable in a form view
+     */
+    toForm: function () {
+        var form_data = {};
+        _(this.attributes).each(function (value, key) {
+            form_data[key] = {value: value};
+        });
+
+        return {data: form_data};
     }
 });
 Record.include(Events);
@@ -1257,6 +1251,7 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
     init: function (records, options) {
         options = options || {};
         _.bindAll(this, '_onRecordEvent');
+        this.length = 0;
         this.records = [];
         this._byId = {};
         this._proxies = {};
@@ -1269,16 +1264,24 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
     },
     /**
      * @param {Object|Array} record
+     * @param {Object} [options]
+     * @param {Number} [options.at]
      * @returns this
      */
-    add: function (record) {
+    add: function (record, options) {
+        options = options || {};
         var records = record instanceof Array ? record : [record];
 
         for(var i=0, length=records.length; i<length; ++i) {
             var instance = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
             instance.bind(null, this._onRecordEvent);
             this._byId[instance.get('id')] = instance;
-            this.records.push(instance);
+            if (options.at === undefined) {
+                this.records.push(instance);
+            } else {
+                this.records.splice(options.at + i, 0, instance);
+            }
+            this.length++;
         }
         return this;
     },
@@ -1327,6 +1330,36 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
             key: section
         }).bind(null, this._onRecordEvent);
     },
+    /**
+     * @param {Array} [records]
+     * @returns this
+     */
+    reset: function (records) {
+        this.length = 0;
+        this.records = [];
+        this._byId = {};
+        if (records) {
+            this.add(records);
+        }
+        this.trigger('reset', this);
+        return this;
+    },
+    /**
+     * Removes the provided record from the collection
+     *
+     * @param {Record} record
+     * @returns this
+     */
+    remove: function (record) {
+        var index = _(this.records).indexOf(record);
+        if (index === -1) { return this; }
+
+        this.records.splice(index, 1);
+        delete this._byId[record.get('id')];
+        this.length--;
+        this.trigger('remove', record, this);
+        return this;
+    },
 
     _onRecordEvent: function (event, record, options) {
         this.trigger.apply(this, arguments);
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4f0be9bd552..37994228705 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -555,8 +555,12 @@
         </tr>
     </tfoot>
 </table>
-<t t-name="ListView.rows" t-foreach="rows" t-as="row">
-    <t t-call="ListView.row"/>
+<t t-name="ListView.rows" t-foreach="records.length" t-as="index">
+    <t t-call="ListView.row">
+        <t t-set="record" t-value="records.at(index)"/>
+        <t t-set="row_index" t-value="index"/>
+        <t t-set="row_parity" t-value="index_parity"/>
+    </t>
 </t>
 <tr t-name="ListView.row" t-att-class="row_parity"
     t-att-data-index="row_index">
@@ -573,7 +577,7 @@
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
             t-att-class="'oe-field-cell' + (align ? ' oe-number' : '')"
             t-att-data-field="column.id">
-            <t t-raw="render_cell(row.data, column)"/>
+            <t t-raw="render_cell(record.toForm().data, column)"/>
         </td>
     </t>
     <td t-if="options.deletable" class='oe-record-delete' width="1">
diff --git a/addons/base/static/test/list-utils.js b/addons/base/static/test/list-utils.js
index 97431acb597..a04ae963932 100644
--- a/addons/base/static/test/list-utils.js
+++ b/addons/base/static/test/list-utils.js
@@ -107,10 +107,12 @@ $(document).ready(function () {
     });
     test('Fetch from collection', function () {
         var c = new openerp.base.list.Collection();
+        strictEqual(c.length, 0);
         c.add({id: 1, value: 2});
         c.add({id: 2, value: 3});
         c.add({id: 3, value: 5});
         c.add({id: 4, value: 7});
+        strictEqual(c.length, 4);
         var r = c.at(2), r2 = c.get(1);
 
         ok(r instanceof openerp.base.list.Record);
@@ -121,6 +123,52 @@ $(document).ready(function () {
         strictEqual(r2.get('id'), 1);
         strictEqual(r2.get('value'), 2);
     });
+    test('Add at index', function () {
+        var c = new openerp.base.list.Collection([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]);
+        strictEqual(c.at(1).get('value'), 10);
+        equal(c.at(3), undefined);
+        c.add({id:4, value: 55}, {at: 1});
+        strictEqual(c.at(1).get('value'), 55);
+        strictEqual(c.at(3).get('value'), 20);
+    });
+    test('Remove record', function () {
+        var c = new openerp.base.list.Collection([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]);
+        var record = c.get(2);
+        strictEqual(c.length, 3);
+        c.remove(record);
+        strictEqual(c.length, 2);
+        equal(c.get(2), undefined);
+        strictEqual(c.at(1).get('value'), 20);
+    });
+    test('Reset', function () {
+        var event, obj, c = new openerp.base.list.Collection([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]);
+        c.bind(null, function (e, instance) { event = e; obj = instance; });
+        c.reset();
+        strictEqual(c.length, 0);
+        strictEqual(event, 'reset');
+        strictEqual(obj, c);
+        c.add([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]);
+        c.reset([{id: 42, value: 55}]);
+        strictEqual(c.length, 1);
+        strictEqual(c.get(42).get('value'), 55);
+    });
+
     test('Events propagation', function () {
         var values = [];
         var c = new openerp.base.list.Collection([

From d433eada00cbbe3ac3a387b831e4b957b135cbb6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 17 Aug 2011 15:36:00 +0200
Subject: [PATCH 04/60] [ADD] acknowledgement that the listview backing
 collections are quite strongly inspired by backbone's

bzr revid: xmo@openerp.com-20110817133600-hl93utj2eh7pr5cd
---
 addons/base/static/src/js/list.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 810f5c4d7d5..e6514de6a24 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1241,6 +1241,11 @@ var Record = openerp.base.Class.extend(/** @lends Record# */{
 Record.include(Events);
 var Collection = openerp.base.Class.extend(/** @lends Collection# */{
     /**
+     * Smarter collections, with events, very strongly inspired by Backbone's.
+     *
+     * Using a "dumb" array of records makes synchronization between the
+     * various serious 
+     *
      * @constructs
      * @extends openerp.base.Class
      * @borrows Events#bind as this.bind

From 29cb20313e795693f33e932151907fad05b1f8e2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 18 Aug 2011 14:24:34 +0530
Subject: [PATCH 05/60] [IMP]base:Added field Company registry after TaxID

bzr revid: mma@tinyerp.com-20110818085434-2upimzqd2ty1nysa
---
 openerp/addons/base/base_update.xml    | 1 +
 openerp/addons/base/res/res_company.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 6f4dbf6a1f9..b2e941b28bd 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -229,6 +229,7 @@
                             <field name="fax" on_change="on_change_header(phone, email, fax, website, vat)"/>
                             <field name="website" on_change="on_change_header(phone, email, fax, website, vat)"/>
                             <field name="vat" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="company_registry"/>
                             <separator string="Header/Footer of Reports" colspan="4"/>
                             <group colspan="4" col="3">
                                 <field name="rml_header1" colspan="3"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index b0ebeb8ac27..1aa6eb9597e 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -143,6 +143,7 @@ class res_company(osv.osv):
         'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'), 
         'website': fields.related('partner_id', 'website', string="Website", type="char", size=64), 
         'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32), 
+        'company_registry': fields.char('Company Registry', size=64),
     }
     def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, context={}):
         val = []

From 10117faf2c466b02488d6017654dc3405ff1ed66 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 18 Aug 2011 12:19:36 +0200
Subject: [PATCH 06/60] [FIX] edit event in editable list: use records
 collection

bzr revid: xmo@openerp.com-20110818101936-4jbnt8rhlsjkxxyt
---
 addons/base/static/src/js/list-editable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index e56a807bf08..468e043d9a9 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -241,7 +241,7 @@ openerp.base.list.editable = function (openerp) {
                             this.dataset.index)));
             $(this).trigger(
                 'edit',
-                [this.rows[this.dataset.index].data.id.value, this.dataset]);
+                [this.records.at(this.dataset.index).get('id'), this.dataset]);
         },
         new_record: function () {
             this.dataset.index = null;

From 92e06c997b181cf3f7f3724c3253d70fb981255b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 18 Aug 2011 14:21:06 +0200
Subject: [PATCH 07/60] [ADD] basic implementation of each and map on
 collections

bzr revid: xmo@openerp.com-20110818122106-lt23fl3smbxg4f82
---
 addons/base/static/src/js/list.js     | 38 ++++++++++----
 addons/base/static/test/list-utils.js | 72 +++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index e6514de6a24..2024b1c9881 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -376,6 +376,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * re-renders the content of the list view
      */
     reload_content: function () {
+        this.records.reset();
         this.$element.find('.oe-listview-content').append(
             this.groups.apoptosis().render(
                 $.proxy(this, 'compute_aggregates')));
@@ -537,7 +538,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             count += record.count || 1;
             _(columns).each(function (column) {
                 var field = column.id,
-                    value = record.values.get(field);
+                    value = record.values[field];
                 switch (column['function']) {
                     case 'sum':
                         sums[field] += value;
@@ -685,7 +686,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
                 .closest('tr').each(function () {
             var record = records.at($(this).data('index'));
             result.ids.push(record.get('id'));
-            result.records.push(record);
+            result.records.push(record.attributes);
         });
         return result;
     },
@@ -718,14 +719,9 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.$_element.remove();
     },
     get_records: function () {
-        var records = [];
-        for(var i=0, length=this.records.length; i<length; ++i) {
-            records.push({
-                count: 1,
-                values: this.records.at(i)
-            })
-        }
-        return records;
+        return this.records.map(function (record) {
+            return {count: 1, values: record.attributes};
+        });
     },
     /**
      * Reloads the record at index ``row_index`` in the list's rows.
@@ -1340,6 +1336,9 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
      * @returns this
      */
     reset: function (records) {
+        _(this._proxies).each(function (proxy) {
+            proxy.reset();
+        });
         this.length = 0;
         this.records = [];
         this._byId = {};
@@ -1368,6 +1367,25 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
 
     _onRecordEvent: function (event, record, options) {
         this.trigger.apply(this, arguments);
+    },
+
+    // underscore-type methods
+    each: function (callback) {
+        for(var section in this._proxies) {
+            if (this._proxies.hasOwnProperty(section)) {
+                this._proxies[section].each(callback);
+            }
+        }
+        for(var i=0; i<this.length; ++i) {
+            callback(this.records[i]);
+        }
+    },
+    map: function (callback) {
+        var results = [];
+        this.each(function (record) {
+            results.push(callback(record));
+        });
+        return results;
     }
 });
 Collection.include(Events);
diff --git a/addons/base/static/test/list-utils.js b/addons/base/static/test/list-utils.js
index a04ae963932..ffdc3b66b49 100644
--- a/addons/base/static/test/list-utils.js
+++ b/addons/base/static/test/list-utils.js
@@ -200,4 +200,76 @@ $(document).ready(function () {
         c.at(1).set('wealth', 5);
         strictEqual(total, 47);
     });
+
+    module('list-hofs', {
+        setup: function () {
+            openerp = window.openerp.init();
+            window.openerp.base.list(openerp);
+        }
+    });
+    test('each, degenerate', function () {
+        var c = new openerp.base.list.Collection([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]), ids = [];
+        c.each(function (record) {
+            ids.push(record.get('id'));
+        });
+        deepEqual(
+            ids, [1, 2, 3],
+            'degenerate collections should be iterated in record order');
+    });
+    test('each, deep', function () {
+        var root = new openerp.base.list.Collection(),
+            ids = [];
+        root.proxy('foo').add([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}]);
+        root.proxy('bar').add([
+            {id: 10, value: 5},
+            {id: 20, value: 10},
+            {id: 30, value: 20}]);
+        root.each(function (record) {
+            ids.push(record.get('id'));
+        });
+        // No contract on sub-collection iteration order (for now anyway)
+        ids.sort(function (a, b) { return a - b; });
+        deepEqual(
+            ids, [1, 2, 3, 10, 20, 30],
+            'tree collections should be deeply iterated');
+    });
+    test('map, degenerate', function () {
+        var c = new openerp.base.list.Collection([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}
+        ]);
+        var ids = c.map(function (record) {
+            return record.get('id');
+        });
+        deepEqual(
+            ids, [1, 2, 3],
+            'degenerate collections should be iterated in record order');
+    });
+    test('map, deep', function () {
+        var root = new openerp.base.list.Collection();
+        root.proxy('foo').add([
+            {id: 1, value: 5},
+            {id: 2, value: 10},
+            {id: 3, value: 20}]);
+        root.proxy('bar').add([
+            {id: 10, value: 5},
+            {id: 20, value: 10},
+            {id: 30, value: 20}]);
+        var ids = root.map(function (record) {
+            return record.get('id');
+        });
+        // No contract on sub-collection iteration order (for now anyway)
+        ids.sort(function (a, b) { return a - b; });
+        deepEqual(
+            ids, [1, 2, 3, 10, 20, 30],
+            'tree collections should be deeply iterated');
+    });
 });

From 941d1d09688453b5b421603f79d3c380401e9e1f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 18 Aug 2011 15:27:47 +0200
Subject: [PATCH 08/60] [FIX] reset records on a group apoptosis, cleanout
 proxies when reseting a Collection

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

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 2024b1c9881..d6a8808a63d 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1119,6 +1119,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         });
         this.children = {};
         $(this.elements).remove();
+        this.records.reset();
         return this;
     },
     get_records: function () {
@@ -1339,6 +1340,7 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
         _(this._proxies).each(function (proxy) {
             proxy.reset();
         });
+        this._proxies = {};
         this.length = 0;
         this.records = [];
         this._byId = {};

From d69cd3cb155373237117c4de67823028120cc41e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 12:12:08 +0200
Subject: [PATCH 09/60] [???] try to hook some stuff into reset event

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

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index d6a8808a63d..6f65b124776 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -338,9 +338,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             this.sidebar.$element.show();
         }
         if (this.hidden) {
-            this.$element.find('.oe-listview-content').append(
-                this.groups.apoptosis().render());
-            this.hidden = false;
+            this.reload_content();
         }
     },
     do_hide: function () {
@@ -378,7 +376,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
     reload_content: function () {
         this.records.reset();
         this.$element.find('.oe-listview-content').append(
-            this.groups.apoptosis().render(
+            this.groups.render(
                 $.proxy(this, 'compute_aggregates')));
     },
     /**
@@ -626,6 +624,8 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.dataset = opts.dataset;
         this.records = opts.records;
 
+        this.records.bind('reset', $.proxy(this, 'on_records_reset'));
+
         this.$_element = $('<tbody class="ui-widget-content">')
             .appendTo(document.body)
             .delegate('th.oe-record-selector', 'click', function (e) {
@@ -710,9 +710,9 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         return this.records.at(this.row_position(row)).get('id');
     },
     /**
-     * Death signal, cleans up list
+     * Death signal, cleans up list display
      */
-    apoptosis: function () {
+    on_records_reset: function (ev, records) {
         if (!this.$current) { return; }
         this.$current.remove();
         this.$current = null;
@@ -811,6 +811,8 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         this.children = {};
 
         this.page = 0;
+
+        this.records.bind('reset', $.proxy(this, 'on_records_reset'));
     },
     make_fragment: function () {
         return document.createDocumentFragment();
@@ -871,7 +873,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
     },
     close: function () {
         this.$row.children().last().empty();
-        this.apoptosis();
+        this.records.reset();
     },
     /**
      * Prefixes ``$node`` with floated spaces in order to indent it relative
@@ -892,7 +894,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         var placeholder = this.make_fragment();
         _(datagroups).each(function (group) {
             if (self.children[group.value]) {
-                self.children[group.value].apoptosis();
+                self.records.proxy(group.value).reset();
                 delete self.children[group.value];
             }
             var child = self.children[group.value] = new openerp.base.ListView.Groups(self.view, {
@@ -1025,7 +1027,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                             .attr('disabled', page === pages - 1);
                 }
 
-                self.records.reset(records);
+                self.records.add(records);
                 list.render();
                 d.resolve(list);
             });
@@ -1113,14 +1115,9 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
 
         return {ids: ids, records: records};
     },
-    apoptosis: function () {
-        _(this.children).each(function (child) {
-            child.apoptosis();
-        });
+    on_records_reset: function () {
         this.children = {};
         $(this.elements).remove();
-        this.records.reset();
-        return this;
     },
     get_records: function () {
         if (_(this.children).isEmpty()) {
@@ -1368,6 +1365,8 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
     },
 
     _onRecordEvent: function (event, record, options) {
+        // don't propagate reset events
+        if (event === 'reset') { return; }
         this.trigger.apply(this, arguments);
     },
 

From 32e9a10a1e62b580d1da1e2e2c22589eccd658b9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 12:16:44 +0200
Subject: [PATCH 10/60] [IMP] only trigger change events when a field's value
 was actually changed, provide more information in change event

bzr revid: xmo@openerp.com-20110819101644-edovs858qrz1wb3y
---
 addons/base/static/src/js/list.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 6f65b124776..966f35bbdde 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1204,9 +1204,12 @@ var Record = openerp.base.Class.extend(/** @lends Record# */{
      * @returns {Record}
      */
     set: function (key, value) {
+        if (this.attributes[key] === value) {
+            return this;
+        }
         this.attributes[key] = value;
         this.trigger('change:' + key, this, value);
-        this.trigger('change', this);
+        this.trigger('change', this, key, value);
         return this;
     },
     /**

From ec9a40c8f53e02db554abdf0bbf012488d0466e9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 12:17:23 +0200
Subject: [PATCH 11/60] [IMP] add previous field value to change events

bzr revid: xmo@openerp.com-20110819101723-p73bts37knut34c8
---
 addons/base/static/src/js/list.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 966f35bbdde..cee1adbdb69 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1204,12 +1204,13 @@ var Record = openerp.base.Class.extend(/** @lends Record# */{
      * @returns {Record}
      */
     set: function (key, value) {
-        if (this.attributes[key] === value) {
+        var old_value = this.attributes[key];
+        if (old_value === value) {
             return this;
         }
         this.attributes[key] = value;
-        this.trigger('change:' + key, this, value);
-        this.trigger('change', this, key, value);
+        this.trigger('change:' + key, this, value, old_value);
+        this.trigger('change', this, key, value, old_value);
         return this;
     },
     /**

From 71b057aa3402346ccfc4364d20a81a96b5e632f8 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 19 Aug 2011 16:03:22 +0530
Subject: [PATCH 12/60] [FIX]Fix add remove shortcut problem on switch view and
 update session.

bzr revid: vme@tinyerp.com-20110819103322-7cph3n3ey7z39gkj
---
 addons/base/static/src/js/chrome.js | 16 ++++++++++++----
 addons/base/static/src/js/views.js  |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 3aff7b5e402..ec666cf8c8a 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -584,13 +584,17 @@ openerp.base.Header =  openerp.base.Widget.extend({
             sc.binding = {};
             $(sc.binding).bind({
                 'add': function (e, attrs) {
-                    var $shortcut = $('<li>', {
-                            'data-id': attrs.res_id
+                    shortcuts_ds.create(attrs, function (out) {
+                        var $shortcut = $('<li>', {
+                        'data-shortcut-id':out.result,
+                        'data-id': attrs.res_id
                         }).text(attrs.name)
                         .appendTo(self.$element.find('.oe-shortcuts ul'));
-                    shortcuts_ds.create(attrs, function (out) {
-                        $shortcut.data('shortcut-id', out.result);
+                        attrs.id = out.result;
+                        sc.splice(sc.lenght,0,attrs);
+                        sc.push.apply(sc);
                     });
+                    
                 },
                 'remove-current': function () {
                     var menu_id = self.session.active_id;
@@ -599,6 +603,9 @@ openerp.base.Header =  openerp.base.Widget.extend({
                     var shortcut_id = $shortcut.data('shortcut-id');
                     $shortcut.remove();
                     shortcuts_ds.unlink([shortcut_id]);
+                    sc1 = _.reject(sc, function(shortcut){ return shortcut_id === shortcut.id});
+                    sc.splice(0, sc.length);
+                    sc.push.apply(sc ,sc1);
                 }
             });
         }
@@ -609,6 +616,7 @@ openerp.base.Header =  openerp.base.Widget.extend({
             self.$element.find('.oe-shortcuts')
                 .html(QWeb.render('Shortcuts', {'shortcuts': shortcuts}))
                 .undelegate('li', 'click')
+
                 .delegate('li', 'click', function(e) {
                     e.stopPropagation();
                     var id = $(this).data('id');
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index ad75268156f..7a15f9a37ad 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -342,6 +342,7 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     shortcut_add_remove: function() {
         var self = this;
         var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
+        $shortcut_toggle.unbind("click").click();
         $shortcut_toggle.click(function() {
             if ($shortcut_toggle.hasClass("oe-shortcut-remove")) {
                 $(self.session.shortcuts.binding).trigger('remove-current');

From 1209b60a4268d47acbf84a22b4ff4c91fe8ca21e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 12:39:55 +0200
Subject: [PATCH 13/60] [IMP] bind row and aggregate display refreshes on
 changes in the underlying model(s)

bzr revid: xmo@openerp.com-20110819103955-gx0j7t3kxl8pjy56
---
 addons/base/static/src/js/list-editable.js |  2 +-
 addons/base/static/src/js/list.js          | 62 +++++++++++-----------
 addons/base/static/src/xml/base.xml        |  2 +-
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index 468e043d9a9..c89227a05cb 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -105,7 +105,7 @@ openerp.base.list.editable = function (openerp) {
             }
 
             if (this.edition_index !== null) {
-                this.reload_record(this.edition_index, true).then(function () {
+                this.reload_record(this.edition_index).then(function () {
                     cancelled.resolve();
                 });
             } else {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index cee1adbdb69..c4fd56fa3a6 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -42,6 +42,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * @borrows openerp.base.ActionExecutor#execute_action as #execute_action
      */
     init: function(parent, element_id, dataset, view_id, options) {
+        var self = this;
         this._super(parent, element_id);
         this.set_default_options(_.extend({}, this.defaults, options || {}));
         this.dataset = dataset;
@@ -59,6 +60,13 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         }
 
         this.page = 0;
+        this.records.bind('change', function (event, record, key) {
+            if (!_(self.aggregate_columns).chain()
+                    .pluck('name').contains(key).value()) {
+                return;
+            }
+            self.compute_aggregates();
+        });
     },
     /**
      * Retrieves the view's number of records per page (|| section)
@@ -457,16 +465,11 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * @param {Function} callback should be called after the action is executed, if non-null
      */
     do_button_action: function (name, id, callback) {
-        var   self = this,
-            action = _.detect(this.columns, function (field) {
+        var action = _.detect(this.columns, function (field) {
             return field.name === name;
         });
         if (!action) { return; }
-        this.execute_action(action, this.dataset, id, function () {
-            $.when(callback.apply(this, arguments).then(function () {
-                self.compute_aggregates();
-            }));
-        });
+        this.execute_action(action, this.dataset, id, callback);
     },
     /**
      * Handles the activation of a record (clicking on it)
@@ -625,6 +628,10 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.records = opts.records;
 
         this.records.bind('reset', $.proxy(this, 'on_records_reset'));
+        this.records.bind('change', function (event, record) {
+            var $row = self.$current.find('[data-id=' + record.get('id') + ']');
+            $row.replaceWith(self.render_record($row.data('index')));
+        });
 
         this.$_element = $('<tbody class="ui-widget-content">')
             .appendTo(document.body)
@@ -648,7 +655,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
                       index = self.row_position($row);
 
                 $(self).trigger('action', [field, record_id, function () {
-                    return self.reload_record(index, true);
+                    return self.reload_record(index);
                 }]);
             })
             .delegate('tr', 'click', function (e) {
@@ -707,7 +714,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
      * @returns {Number|String} the identifier of the row's object
      */
     row_id: function (row) {
-        return this.records.at(this.row_position(row)).get('id');
+        return $(row).data('id');
     },
     /**
      * Death signal, cleans up list display
@@ -732,28 +739,20 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
      * @param {Number} record_index index of the record to reload
      * @param {Boolean} fetch fetches the record from remote before reloading it
      */
-    reload_record: function (record_index, fetch) {
-        var self = this;
-        var read_p = null;
-        if (fetch) {
-            // save index to restore it later, if already set
-            var old_index = this.dataset.index;
-            this.dataset.index = record_index;
-            read_p = this.dataset.read_index(
-                _.pluck(_(this.columns).filter(function (r) {return r.tag === 'field';}), 'name'),
-                function (record) {
-                    var r = self.records.get(record.id);
-                    _(record).each(function (value, key) {
-                        r.set(key, value);
-                    });
-                    self.dataset.index = old_index;
-                }
-            )
-        }
+    reload_record: function (record_index) {
+        var r = this.records.at(record_index);
 
-        return $.when(read_p).then(function () {
-            self.$current.children().eq(record_index)
-                .replaceWith(self.render_record(record_index)); });
+        return this.dataset.read_ids(
+            [r.get('id')],
+            _.pluck(_(this.columns).filter(function (r) {
+                    return r.tag === 'field';
+                }), 'name'),
+            function (record) {
+                _(record[0]).each(function (value, key) {
+                    r.set(key, value);
+                });
+            }
+        );
     },
     /**
      * Renders a list record to HTML
@@ -1065,12 +1064,11 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                     // (exclusive lower bound)
                     seq = to ? list.records.at(to - 1).get('sequence') : 0;
                 while (++seq, record = list.records.at(index)) {
-                    record.set('sequence', seq);
                     // write are independent from one another, so we can just
                     // launch them all at the same time and we don't really
                     // give a fig about when they're done
                     dataset.write(record.get('id'), {sequence: seq});
-                    list.reload_record(index++);
+                    record.set('sequence', seq);
                 }
             }
         });
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 37994228705..d67699ac145 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -563,7 +563,7 @@
     </t>
 </t>
 <tr t-name="ListView.row" t-att-class="row_parity"
-    t-att-data-index="row_index">
+    t-att-data-index="row_index" t-att-data-id="record.get('id')">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
 

From 88dfe802fa8965114902e867cef2fead76126446 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 13:59:07 +0200
Subject: [PATCH 14/60] [IMP] use Collection signals to handle record removal

bzr revid: xmo@openerp.com-20110819115907-s7sk4n9qd00hz6d0
---
 addons/base/static/src/js/list.js | 44 +++++++++++++------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index c4fd56fa3a6..9294f264588 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -435,7 +435,9 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         }
         var self = this;
         return $.when(this.dataset.unlink(ids)).then(function () {
-            self.groups.drop_records(ids);
+            _(ids).each(function (id) {
+                self.records.remove(self.records.get(id));
+            });
             self.compute_aggregates();
         });
     },
@@ -627,6 +629,14 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.dataset = opts.dataset;
         this.records = opts.records;
 
+        this.records.bind('remove', function (event, record) {
+            var $row = self.$current.find('[data-id=' + record.get('id') + ']');
+            var index = $row.data('index');
+            $row.nextAll().each(function (row) {
+                $(row).data('index', index++);
+            });
+            $row.remove();
+        });
         this.records.bind('reset', $.proxy(this, 'on_records_reset'));
         this.records.bind('change', function (event, record) {
             var $row = self.$current.find('[data-id=' + record.get('id') + ']');
@@ -769,18 +779,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             row_index: record_index,
             render_cell: openerp.base.format_cell
         });
-    },
-    /**
-     * Stops displaying the records matching the provided ids.
-     *
-     * @param {Array} ids identifiers of the records to remove
-     */
-    drop_records: function (ids) {
-        for(var i=ids.length-1; i>=0; --i) {
-            this.records.remove(this.records.get(ids[i]));
-        }
     }
-    // drag and drop
 });
 openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.base.ListView.Groups# */{
     passtrough_events: 'action deleted row_link',
@@ -1129,19 +1128,6 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                 return child.get_records();
             }).flatten().value();
     },
-    /**
-     * Stops displaying the records with the linked ids, assumes these records
-     * were deleted from the DB.
-     *
-     * This is the up-signal from the `deleted` event on groups and lists.
-     *
-     * @param {Array} ids list of identifier of the records to remove.
-     */
-    drop_records: function (ids) {
-        _.each(this.children, function (child) {
-            child.drop_records(ids);
-        });
-    }
 });
 
 /**
@@ -1356,8 +1342,14 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
      * @returns this
      */
     remove: function (record) {
+        var self = this;
         var index = _(this.records).indexOf(record);
-        if (index === -1) { return this; }
+        if (index === -1) {
+            _(this._proxies).each(function (proxy) {
+                proxy.remove(record);
+            });
+            return this;
+        }
 
         this.records.splice(index, 1);
         delete this._byId[record.get('id')];

From 2d024453a97133609a653cdc1060d65a68913f2d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 15:21:12 +0200
Subject: [PATCH 15/60] [ADD] Collection.indexOf, fix fetching of selected
 records (use record id, not record index)

bzr revid: xmo@openerp.com-20110819132112-y635uaukfrx2s5ii
---
 addons/base/static/src/js/list.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 9294f264588..996822c4a21 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -701,7 +701,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         var result = {ids: [], records: []};
         this.$current.find('th.oe-record-selector input:checked')
                 .closest('tr').each(function () {
-            var record = records.at($(this).data('index'));
+            var record = records.get($(this).data('id'));
             result.ids.push(record.get('id'));
             result.records.push(record.attributes);
         });
@@ -1381,6 +1381,9 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
             results.push(callback(record));
         });
         return results;
+    },
+    indexOf: function (record) {
+        return _(this.records).indexOf(record);
     }
 });
 Collection.include(Events);

From c18eff8665d913aaf07c417543c0fb0c611a7cae Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 19 Aug 2011 17:15:10 +0200
Subject: [PATCH 16/60] [IMP] add events unbinging to events mixin, fix
 Collection.reload() handling by List

bzr revid: xmo@openerp.com-20110819151510-7posqx7mznldurd2
---
 addons/base/static/src/js/list.js     | 56 ++++++++++++++++++++-------
 addons/base/static/test/list-utils.js | 22 +++++++++++
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 996822c4a21..642a0743e9a 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -629,19 +629,24 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         this.dataset = opts.dataset;
         this.records = opts.records;
 
-        this.records.bind('remove', function (event, record) {
-            var $row = self.$current.find('[data-id=' + record.get('id') + ']');
-            var index = $row.data('index');
-            $row.nextAll().each(function (row) {
-                $(row).data('index', index++);
-            });
-            $row.remove();
-        });
-        this.records.bind('reset', $.proxy(this, 'on_records_reset'));
-        this.records.bind('change', function (event, record) {
-            var $row = self.$current.find('[data-id=' + record.get('id') + ']');
-            $row.replaceWith(self.render_record($row.data('index')));
-        });
+        this.record_callbacks = {
+            'remove': function (event, record) {
+                var $row = self.$current.find('[data-id=' + record.get('id') + ']');
+                var index = $row.data('index');
+                $row.nextAll().each(function (row) {
+                    $(row).data('index', index++);
+                });
+                $row.remove();
+            },
+            'reset': $.proxy(this, 'on_records_reset'),
+            'change': function (event, record) {
+                var $row = self.$current.find('[data-id=' + record.get('id') + ']');
+                $row.replaceWith(self.render_record($row.data('index')));
+            }
+        };
+        _(this.record_callbacks).each(function (callback, event) {
+            this.records.bind(event, callback);
+        }, this);
 
         this.$_element = $('<tbody class="ui-widget-content">')
             .appendTo(document.body)
@@ -729,7 +734,10 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
     /**
      * Death signal, cleans up list display
      */
-    on_records_reset: function (ev, records) {
+    on_records_reset: function () {
+        _(this.record_callbacks).each(function (callback, event) {
+            this.records.unbind(event, callback);
+        }, this);
         if (!this.$current) { return; }
         this.$current.remove();
         this.$current = null;
@@ -1127,7 +1135,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
             .map(function (child) {
                 return child.get_records();
             }).flatten().value();
-    },
+    }
 });
 
 /**
@@ -1150,6 +1158,24 @@ var Events = {
         }
         return this;
     },
+    /**
+     * @param {String} event event to unbind on the current object
+     * @param {function} [handler] specific event handler to remove (otherwise unbind all handlers for the event)
+     * @returns this
+     */
+    unbind: function (event, handler) {
+        var calls = this._callbacks || {};
+        if (!(event in calls)) { return this; }
+        if (!handler) {
+            delete calls[event];
+        } else {
+            var handlers = calls[event];
+            handlers.splice(
+                _(handlers).indexOf(handler),
+                1);
+        }
+        return this;
+    },
     /**
      * @param {String} event
      * @returns this
diff --git a/addons/base/static/test/list-utils.js b/addons/base/static/test/list-utils.js
index ffdc3b66b49..0b15b81f544 100644
--- a/addons/base/static/test/list-utils.js
+++ b/addons/base/static/test/list-utils.js
@@ -65,6 +65,28 @@ $(document).ready(function () {
 
         ok(triggered);
     });
+    test('Unbind all handlers', function () {
+        var e = create(openerp.base.list.Events), passed = 0;
+        e.bind('foo', function () { passed++; });
+        e.trigger('foo');
+        strictEqual(passed, 1);
+        e.unbind('foo');
+        e.trigger('foo');
+        strictEqual(passed, 1);
+    });
+    test('Unbind one handler', function () {
+        var e = create(openerp.base.list.Events), p1 = 0, p2 = 0,
+            h1 = function () { p1++; }, h2 = function () { p2++; };
+        e.bind('foo', h1);
+        e.bind('foo', h2);
+        e.trigger('foo');
+        strictEqual(p1, 1);
+        strictEqual(p2, 1);
+        e.unbind('foo', h1);
+        e.trigger('foo');
+        strictEqual(p1, 1);
+        strictEqual(p2, 2);
+    });
 
     module('list-records', {
         setup: function () {

From 885fa0ded0b7417be2fe2aad28a51f2a53ef92a8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 11:04:58 +0200
Subject: [PATCH 17/60] [ADD] handling of adding new records to an existing
 collection, silent option on a bunch of record events

bzr revid: xmo@openerp.com-20110822090458-3wdroe4cxyh30k91
---
 addons/base/static/src/js/formats.js       |  3 ++
 addons/base/static/src/js/list-editable.js |  2 ++
 addons/base/static/src/js/list.js          | 40 ++++++++++++++++++----
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js
index 074cabe5eee..abb05ec9dc4 100644
--- a/addons/base/static/src/js/formats.js
+++ b/addons/base/static/src/js/formats.js
@@ -201,6 +201,9 @@ openerp.base.format_cell = function (row_data, column, value_if_empty) {
         ].join('')
     }
 
+    if (!row_data[column.id]) {
+        return value_if_empty === undefined ? '' : value_if_empty;
+    }
     return openerp.base.format_value(
             row_data[column.id].value, column, value_if_empty);
 }
diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index c89227a05cb..744f3c9a09b 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -209,6 +209,8 @@ openerp.base.list.editable = function (openerp) {
             var self = this;
             this.edition_form.do_save(function (result) {
                 if (result.created && !self.edition_index) {
+                    self.records.add({id: result.result},
+                        {at: self.options.editable === 'top' ? 0 : null});
                     self.edition_index = self.dataset.index;
                 }
                 self.cancel_pending_edition().then(function () {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 642a0743e9a..f35d5318cdc 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -642,6 +642,20 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             'change': function (event, record) {
                 var $row = self.$current.find('[data-id=' + record.get('id') + ']');
                 $row.replaceWith(self.render_record($row.data('index')));
+            },
+            'add': function (ev, records, record, index) {
+                var $row = $('<tr>').attr({
+                        'data-id': record.get('id'),
+                        'data-index': index
+                    });
+                if (index === 0) {
+                    $row.prependTo(self.$current);
+                } else {
+                    $row.insertAfter(self.$current.children().eq(index));
+                }
+                $row.nextAll().each(function (row) {
+                    $(row).data('index', ++index);
+                });
             }
         };
         _(this.record_callbacks).each(function (callback, event) {
@@ -767,8 +781,9 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
                 }), 'name'),
             function (record) {
                 _(record[0]).each(function (value, key) {
-                    r.set(key, value);
+                    r.set(key, value, {silent: true});
                 });
+                r.trigger('change', r);
             }
         );
     },
@@ -1033,7 +1048,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                             .attr('disabled', page === pages - 1);
                 }
 
-                self.records.add(records);
+                self.records.add(records, {silent: true});
                 list.render();
                 d.resolve(list);
             });
@@ -1211,16 +1226,21 @@ var Record = openerp.base.Class.extend(/** @lends Record# */{
     /**
      * @param key
      * @param value
+     * @param {Object} [options]
+     * @param {Boolean} [options.silent=false]
      * @returns {Record}
      */
-    set: function (key, value) {
+    set: function (key, value, options) {
+        options = options || {};
         var old_value = this.attributes[key];
         if (old_value === value) {
             return this;
         }
         this.attributes[key] = value;
-        this.trigger('change:' + key, this, value, old_value);
-        this.trigger('change', this, key, value, old_value);
+        if (!options.silent) {
+            this.trigger('change:' + key, this, value, old_value);
+            this.trigger('change', this, key, value, old_value);
+        }
         return this;
     },
     /**
@@ -1279,6 +1299,7 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
      * @param {Object|Array} record
      * @param {Object} [options]
      * @param {Number} [options.at]
+     * @param {Boolean} [options.silent=false]
      * @returns this
      */
     add: function (record, options) {
@@ -1291,8 +1312,15 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
             this._byId[instance.get('id')] = instance;
             if (options.at === undefined) {
                 this.records.push(instance);
+                if (!options.silent) {
+                    this.trigger('add', this, instance, this.records.length-1);
+                }
             } else {
-                this.records.splice(options.at + i, 0, instance);
+                var insertion_index = options.at + i;
+                this.records.splice(insertion_index, 0, instance);
+                if (!options.silent) {
+                    this.trigger('add', this, instance, insertion_index);
+                }
             }
             this.length++;
         }

From f4a745e3f779f9a1e18c8a17f10fc03d2b29722e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 12:13:08 +0200
Subject: [PATCH 18/60] [FIX] forgot to increment index in resequencer

bzr revid: xmo@openerp.com-20110822101308-2td5peezvg6snmk7
---
 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 f35d5318cdc..d0ee0275c6b 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1075,7 +1075,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                 ui.item.parent().children().each(function (i, e) {
                     // reset record-index accelerators on rows and even/odd
                     var even = i%2 === 0;
-                    $(e).data('index', i)
+                    $(e).attr('data-index', i)
                         .toggleClass('even', even)
                         .toggleClass('odd', !even);
                 });
@@ -1085,7 +1085,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                     // if drag to 1st row (to = 0), start sequencing from 0
                     // (exclusive lower bound)
                     seq = to ? list.records.at(to - 1).get('sequence') : 0;
-                while (++seq, record = list.records.at(index)) {
+                while (++seq, record = list.records.at(index++)) {
                     // write are independent from one another, so we can just
                     // launch them all at the same time and we don't really
                     // give a fig about when they're done

From 63d2dcce401521e5cb9a696026f1530579e287bc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 12:50:28 +0200
Subject: [PATCH 19/60] [IMP] unify refreshing rows striping (and @data-index
 resetting)

bzr revid: xmo@openerp.com-20110822105028-vvzty9jx6nlupq0f
---
 addons/base/static/src/js/list.js | 51 +++++++++++++++++--------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index d0ee0275c6b..689c65b492f 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -631,12 +631,11 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
 
         this.record_callbacks = {
             'remove': function (event, record) {
-                var $row = self.$current.find('[data-id=' + record.get('id') + ']');
+                var $row = self.$current.find(
+                        '[data-id=' + record.get('id') + ']');
                 var index = $row.data('index');
-                $row.nextAll().each(function (row) {
-                    $(row).data('index', index++);
-                });
                 $row.remove();
+                self.refresh_zebra(index);
             },
             'reset': $.proxy(this, 'on_records_reset'),
             'change': function (event, record) {
@@ -644,18 +643,10 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
                 $row.replaceWith(self.render_record($row.data('index')));
             },
             'add': function (ev, records, record, index) {
-                var $row = $('<tr>').attr({
-                        'data-id': record.get('id'),
-                        'data-index': index
-                    });
-                if (index === 0) {
-                    $row.prependTo(self.$current);
-                } else {
-                    $row.insertAfter(self.$current.children().eq(index));
-                }
-                $row.nextAll().each(function (row) {
-                    $(row).data('index', ++index);
-                });
+                $('<tr>').attr({
+                    'data-id': record.get('id')
+                }).insertAfter(self.$current.children(':eq(' + index + ')'));
+                self.refresh_zebra(index, 1);
             }
         };
         _(this.record_callbacks).each(function (callback, event) {
@@ -802,6 +793,26 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             row_index: record_index,
             render_cell: openerp.base.format_cell
         });
+    },
+    /**
+     * Fixes @data-index on all table rows, and fixes the even/odd classes
+     *
+     * @param {Number} [from_index] index from which to resequence
+     * @param {Number} [offset = 0] selection offset for DOM, in case there are rows to ignore in the table
+     */
+    refresh_zebra: function (from_index, offset) {
+        offset = offset || 0;
+        from_index = from_index || 0;
+        var dom_offset = offset + from_index;
+        var sel = dom_offset ? ':gt(' + (dom_offset - 1) + ')' : null;
+        this.$current.children(sel).each(function (i, e) {
+            var index = from_index + i;
+            // reset record-index accelerators on rows and even/odd
+            var even = index%2 === 0;
+            $(e).attr('data-index', index)
+                .toggleClass('even', even)
+                .toggleClass('odd', !even);
+        });
     }
 });
 openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.base.ListView.Groups# */{
@@ -1072,13 +1083,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                 list.records.remove(to_move);
                 list.records.add(to_move, {at: to});
 
-                ui.item.parent().children().each(function (i, e) {
-                    // reset record-index accelerators on rows and even/odd
-                    var even = i%2 === 0;
-                    $(e).attr('data-index', i)
-                        .toggleClass('even', even)
-                        .toggleClass('odd', !even);
-                });
+                list.refresh_zebra();
 
                 // resequencing time!
                 var record, index = to,

From 6ccc41fe2bba7c485955e9ea9a3a470cfc6edff4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 12:56:56 +0200
Subject: [PATCH 20/60] [FIX] insertion at end: 'null' index should be same as
 'undefined' for 'at' kwarg to Collection.add

bzr revid: xmo@openerp.com-20110822105656-f0x1iweoxbh8hcgu
---
 addons/base/static/src/js/list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 689c65b492f..c6e50de85ec 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1315,7 +1315,7 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
             var instance = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
             instance.bind(null, this._onRecordEvent);
             this._byId[instance.get('id')] = instance;
-            if (options.at === undefined) {
+            if (options.at == undefined) {
                 this.records.push(instance);
                 if (!options.silent) {
                     this.trigger('add', this, instance, this.records.length-1);

From c76bb492f20f00de2a05b10f7b1c30b1dca57c49 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 13:10:01 +0200
Subject: [PATCH 21/60] [FIX] row edition

bzr revid: xmo@openerp.com-20110822111001-mnyyvfund3b3j9bm
---
 addons/base/static/src/js/list-editable.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index 744f3c9a09b..a8a4e9d78c6 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -142,6 +142,8 @@ openerp.base.list.editable = function (openerp) {
             this.cancel_pending_edition().then(function () {
                 var $new_row = $('<tr>', {
                         id: _.uniqueId('oe-editable-row-'),
+                        'data-id': $(row).data('id'),
+                        'data-index': $(row).data('index'),
                         'class': $(row).attr('class') + ' oe_forms',
                         click: function (e) {e.stopPropagation();}
                     })
@@ -238,9 +240,7 @@ openerp.base.list.editable = function (openerp) {
          */
         edit_record: function () {
             this.render_row_as_form(
-                this.$current.children(
-                    _.sprintf('[data-index=%d]',
-                            this.dataset.index)));
+                this.$current.children(':eq(' + this.dataset.index + ')'));
             $(this).trigger(
                 'edit',
                 [this.records.at(this.dataset.index).get('id'), this.dataset]);

From 26b7801355cf0879edb32ac143c82af1e26fb08e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 15:12:48 +0200
Subject: [PATCH 22/60] [IMP] keep query parameters around (at least debug)
 when clicking on logo or redirecting from HTTP root to 'correct' root URL

bzr revid: xmo@openerp.com-20110822131248-tl9j6flsw38r7p9e
---
 addons/base/static/src/js/chrome.js | 5 +++++
 addons/base/static/src/xml/base.xml | 2 +-
 openerpweb/openerpweb.py            | 7 ++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 665efa0e3e3..3a8af0a754c 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -566,6 +566,11 @@ openerp.base.Login =  openerp.base.Widget.extend({
 openerp.base.Header =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
+        if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
+            this.qs = '?debug'
+        } else {
+            this.qs = ''
+        }
     },
     start: function() {
         return this.do_update();
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index c4396793f95..343e7a1a7c1 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -326,7 +326,7 @@
     </div>
 </t>
 <t t-name="Header">
-    <a href="/" class="company_logo_link">
+    <a t-att-href="'/' + qs" class="company_logo_link">
         <div class="company_logo" />
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index a48162138dc..b2364692203 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 import datetime
+import urllib
 import dateutil.relativedelta
 import functools
 import optparse
@@ -446,7 +447,11 @@ class Root(object):
             #for the mobile web client we are supposed to use a different url to just add '/mobile'
             raise cherrypy.HTTPRedirect('/web_mobile/static/src/web_mobile.html', 301)
         else:
-            raise cherrypy.HTTPRedirect('/base/webclient/home', 301)
+            if kw:
+                qs = '?' + urllib.urlencode(kw)
+            else:
+                qs = ''
+            raise cherrypy.HTTPRedirect('/base/webclient/home' + qs, 301)
     default.exposed = True
 
 def main(argv):

From b116b3ac5172d2ce25392c4ac9d69571bd5ea856 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 22 Aug 2011 16:33:58 +0200
Subject: [PATCH 23/60] [FIX] complete retardation: do_actual_search is
 supposed to be called with completely reified domains and contexts (from
 evail_domain_and_context), there is no need to go through DataSet.get_domain
 and DataSet.get_context save to break DataGroup's dispatching

bzr revid: xmo@openerp.com-20110822143358-y4xse4gcybx5dopm
---
 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 c5072c13f1b..95db36f82de 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -412,8 +412,8 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
     do_actual_search: function (results) {
         this.groups.datagroup = new openerp.base.DataGroup(
             this, this.model,
-            this.dataset.get_domain(results.domain),
-            this.dataset.get_context(results.context),
+            results.domain,
+            results.context,
             results.group_by);
         this.groups.datagroup.sort = this.dataset._sort;
 

From a97bb0476ca74b2fa43bc58d408b68d78477610e Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 23 Aug 2011 14:31:21 +0530
Subject: [PATCH 24/60] [fix]Optimize code in add event

bzr revid: vme@tinyerp.com-20110823090121-gk2iayz1eavjwdfg
---
 addons/base/static/src/js/chrome.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index ec666cf8c8a..ef8779152bc 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -585,28 +585,26 @@ openerp.base.Header =  openerp.base.Widget.extend({
             $(sc.binding).bind({
                 'add': function (e, attrs) {
                     shortcuts_ds.create(attrs, function (out) {
-                        var $shortcut = $('<li>', {
-                        'data-shortcut-id':out.result,
-                        'data-id': attrs.res_id
+                        $('<li>', {
+                            'data-shortcut-id':out.result,
+                            'data-id': attrs.res_id
                         }).text(attrs.name)
                         .appendTo(self.$element.find('.oe-shortcuts ul'));
                         attrs.id = out.result;
-                        sc.splice(sc.lenght,0,attrs);
-                        sc.push.apply(sc);
+                        sc.push(attrs);
                     });
-                    
-                },
+            },
                 'remove-current': function () {
                     var menu_id = self.session.active_id;
                     var $shortcut = self.$element
-                            .find('.oe-shortcuts li[data-id=' + menu_id + ']');
+                        .find('.oe-shortcuts li[data-id=' + menu_id + ']');
                     var shortcut_id = $shortcut.data('shortcut-id');
                     $shortcut.remove();
                     shortcuts_ds.unlink([shortcut_id]);
-                    sc1 = _.reject(sc, function(shortcut){ return shortcut_id === shortcut.id});
+                    var sc_new = _.reject(sc, function(shortcut){ return shortcut_id === shortcut.id});
                     sc.splice(0, sc.length);
-                    sc.push.apply(sc ,sc1);
-                }
+                    sc.push.apply(sc,sc_new);
+                    }
             });
         }
         return this.rpc('/base/session/sc_list', {}, function(shortcuts) {

From 180ffb18a14715f1af17bfa2f94213d457e6a861 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 23 Aug 2011 12:33:43 +0200
Subject: [PATCH 25/60] [REF] openerp-server: streamlining startup script.

bzr revid: vmt@openerp.com-20110823103343-rvy2zkre8bo9cq6g
---
 openerp-server             | 269 ++++++++++++++++++++-----------------
 openerp/tools/translate.py |   3 +-
 2 files changed, 144 insertions(+), 128 deletions(-)

diff --git a/openerp-server b/openerp-server
index 00da3ac640a..9c9a8c2bde7 100755
--- a/openerp-server
+++ b/openerp-server
@@ -30,9 +30,6 @@ GNU Public Licence.
 (c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
 """
 
-#----------------------------------------------------------
-# python imports
-#----------------------------------------------------------
 import logging
 import os
 import signal
@@ -45,139 +42,128 @@ import openerp
 __author__ = openerp.release.author
 __version__ = openerp.release.version
 
-if os.name == 'posix':
-    import pwd
-    # We DON't log this using the standard logger, because we might mess
-    # with the logfile's permissions. Just do a quick exit here.
-    if pwd.getpwuid(os.getuid())[0] == 'root' :
-        sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
+def check_root_user():
+    """ Exit if the process’s user is 'root' (on POSIX system)."""
+    if os.name == 'posix':
+        import pwd
+        if pwd.getpwuid(os.getuid())[0] == 'root' :
+            sys.stderr.write("Running as user 'root' is a security risk, aborting.\n")
+            sys.exit(1)
+
+def check_postgres_user():
+    """ Exit if the configured database user is 'postgres'."""
+    config = openerp.tools.config
+    logger = logging.getLogger('server')
+    if config['db_user'] == 'postgres':
+        sys.stderr.write("Using the database user 'postgres' is a security risk, aborting.")
         sys.exit(1)
 
-#-----------------------------------------------------------------------
-# parse the command line
-#-----------------------------------------------------------------------
-openerp.tools.config.parse_config(sys.argv[1:])
-config = openerp.tools.config
+def report_configuration():
+    """ Log the server version and some configuration values."""
+    config = openerp.tools.config
+    logger = logging.getLogger('server')
+    logger.info("OpenERP version %s", __version__)
+    for name, value in [('addons paths', config['addons_path']),
+                        ('database hostname', config['db_host'] or 'localhost'),
+                        ('database port', config['db_port'] or '5432'),
+                        ('database user', config['db_user'])]:
+        logger.info("%s: %s", name, value)
 
-#----------------------------------------------------------
-# get logger
-#----------------------------------------------------------
-openerp.netsvc.init_logger()
-logger = logging.getLogger('server')
+# TODO is a \n better?
+def setup_pid_file():
+    config = openerp.tools.config
+    if config['pidfile']:
+        fd = open(config['pidfile'], 'w')
+        pidtext = "%d" % (os.getpid())
+        fd.write(pidtext)
+        fd.close()
 
-logger.info("OpenERP version - %s", __version__)
-for name, value in [('addons_path', config['addons_path']),
-                    ('database hostname', config['db_host'] or 'localhost'),
-                    ('database port', config['db_port'] or '5432'),
-                    ('database user', config['db_user'])]:
-    logger.info("%s - %s", name, value)
+def run_registry(dbname):
+    """ Preload a registry, possibly run a test file, and start the cron."""
+    db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
 
-# Don't allow if the connection to PostgreSQL done by postgres user
-if config['db_user'] == 'postgres':
-    logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
-    sys.exit(1)
+    if config["test_file"]:
+        cr = db.cursor()
+        logger = logging.getLogger('server')
+        logger.info('loading test file %s', config["test_file"])
+        openerp.tools.convert_yaml_import(cr, 'base', file(config["test_file"]), {}, 'test', True)
+        cr.rollback()
+        cr.close()
 
-#----------------------------------------------------------
-# init net service
-#----------------------------------------------------------
-logger.info('initialising distributed objects services')
+    pool.get('ir.cron').restart(db.dbname)
 
-#----------------------------------------------------------
-# Load and update databases if requested
-#----------------------------------------------------------
+def export_translation():
+    config = openerp.tools.config
+    dbname = config['db_name']
+    logger = logging.getLogger('server')
 
-if not ( config["stop_after_init"] or \
-    config["translate_in"] or \
-    config["translate_out"] ):
-    openerp.osv.osv.start_object_proxy()
-    openerp.service.web_services.start_web_services()
+    if config["language"]:
+        msg = "language %s" % (config["language"],)
+    else:
+        msg = "new language"
+    logger.info('writing translation file for %s to %s', msg,
+        config["translate_out"])
+
+    fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
+    buf = file(config["translate_out"], "w")
+    cr = openerp.pooler.get_db(dbname).cursor()
+    openerp.tools.trans_export(config["language"],
+        config["translate_modules"] or ["all"], buf, fileformat, cr)
+    cr.close()
+    buf.close()
+
+    logger.info('translation file written successfully')
+
+def import_translation():
+    config = openerp.tools.config
+    context = {'overwrite': config["overwrite_existing_translations"]}
+    dbname = config['db_name']
+
+    cr = openerp.pooler.get_db(dbname).cursor()
+    openerp.tools.trans_load( cr, config["translate_in"], config["language"],
+        context=context)
+    openerp.tools.trans_update_res_ids(cr)
+    cr.commit()
+    cr.close()
+
+def start_services():
     http_server = openerp.service.http_server
     netrpc_server = openerp.service.netrpc_server
+
+    # Instantiate local services (this is a legacy design).
+    openerp.osv.osv.start_object_proxy()
+    # Export (for RPC) services.
+    openerp.service.web_services.start_web_services()
+
+    # Initialize the HTTP stack.
     http_server.init_servers()
     http_server.init_xmlrpc()
     http_server.init_static_http()
     netrpc_server.init_servers()
 
-if config['db_name']:
-    for dbname in config['db_name'].split(','):
-        db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
-        cr = db.cursor()
+    # Start the main cron thread.
+    openerp.netsvc.start_agent()
 
-        if config["test_file"]:
-            logger.info('loading test file %s', config["test_file"])
-            openerp.tools.convert_yaml_import(cr, 'base', file(config["test_file"]), {}, 'test', True)
-            cr.rollback()
-
-        pool.get('ir.cron').restart(db.dbname)
-
-        cr.close()
-
-#----------------------------------------------------------
-# translation stuff
-#----------------------------------------------------------
-if config["translate_out"]:
-    if config["language"]:
-        msg = "language %s" % (config["language"],)
-    else:
-        msg = "new language"
-    logger.info('writing translation file for %s to %s', msg, config["translate_out"])
-
-    fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
-    buf = file(config["translate_out"], "w")
-    dbname = config['db_name']
-    cr = openerp.pooler.get_db(dbname).cursor()
-    openerp.tools.trans_export(config["language"], config["translate_modules"] or ["all"], buf, fileformat, cr)
-    cr.close()
-    buf.close()
-
-    logger.info('translation file written successfully')
-    sys.exit(0)
-
-if config["translate_in"]:
-    context = {'overwrite': config["overwrite_existing_translations"]}
-    dbname = config['db_name']
-    cr = openerp.pooler.get_db(dbname).cursor()
-    openerp.tools.trans_load(cr,
-                     config["translate_in"], 
-                     config["language"],
-                     context=context)
-    openerp.tools.trans_update_res_ids(cr)
-    cr.commit()
-    cr.close()
-    sys.exit(0)
-
-#----------------------------------------------------------------------------------
-# if we don't want the server to continue to run after initialization, we quit here
-#----------------------------------------------------------------------------------
-if config["stop_after_init"]:
-    sys.exit(0)
-
-openerp.netsvc.start_agent()
-
-#----------------------------------------------------------
-# Launch Servers
-#----------------------------------------------------------
-
-LST_SIGNALS = ['SIGINT', 'SIGTERM']
-
-SIGNALS = dict(
-    [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
-)
+    # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
+    openerp.netsvc.Server.startAll()
 
 quit_signals_received = 0
 
-def handler(signum, frame):
-    """
-    :param signum: the signal number
+def signal_handler(sig, frame):
+    """ Signal handler: exit ungracefully on the second handled signal.
+
+    :param sig: the signal number
     :param frame: the interrupted stack frame or None
     """
     global quit_signals_received
     quit_signals_received += 1
     if quit_signals_received > 1:
+        # logging.shutdown was already called at this point.
         sys.stderr.write("Forced shutdown.\n")
         os._exit(0)
 
-def dumpstacks(signum, frame):
+def dumpstacks(sig, frame):
+    """ Signal handler: dump a stack trace for each existing thread."""
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
     # modified for python 2.5 compatibility
     thread_map = dict(threading._active, **threading._limbo)
@@ -191,20 +177,32 @@ def dumpstacks(signum, frame):
                 code.append("  %s" % (line.strip()))
     logging.getLogger('dumpstacks').info("\n".join(code))
 
-for signum in SIGNALS:
-    signal.signal(signum, handler)
+def setup_signal_handlers():
+    SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
+    map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
+    if os.name == 'posix':
+        signal.signal(signal.SIGQUIT, dumpstacks)
 
-if os.name == 'posix':
-    signal.signal(signal.SIGQUIT, dumpstacks)
+def quit_on_signals():
+    """ Wait for one or two signals then shutdown the server.
+
+    The first SIGINT or SIGTERM signal will initiate a graceful shutdown while
+    a second one if any will force an immediate exit.
+
+    """
+    # Wait for a first signal to be handled. (time.sleep will be interrupted
+    # by the signal handler.)
+    while quit_signals_received == 0:
+        time.sleep(60)
 
-def quit():
     openerp.netsvc.Agent.quit()
     openerp.netsvc.Server.quitAll()
+    config = openerp.tools.config
     if config['pidfile']:
         os.unlink(config['pidfile'])
-    logger = logging.getLogger('shutdown')
-    logger.info("Initiating OpenERP Server shutdown")
-    logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
+    logger = logging.getLogger('server')
+    logger.info("Initiating shutdown")
+    logger.info("Hit CTRL-C again or send a second signal to force the sutdown.")
     logging.shutdown()
 
     # manually join() all threads before calling sys.exit() to allow a second signal
@@ -219,19 +217,36 @@ def quit():
                 time.sleep(0.05)
     sys.exit(0)
 
-if config['pidfile']:
-    fd = open(config['pidfile'], 'w')
-    pidtext = "%d" % (os.getpid())
-    fd.write(pidtext)
-    fd.close()
+if __name__ == "__main__":
 
-openerp.netsvc.Server.startAll()
+    check_root_user()
+    openerp.tools.config.parse_config(sys.argv[1:])
+    check_postgres_user()
+    openerp.netsvc.init_logger()
+    report_configuration()
 
-logger.info('OpenERP server is running, waiting for connections...')
+    config = openerp.tools.config
 
-while quit_signals_received == 0:
-    time.sleep(60)
+    if config["translate_out"]:
+        export_translation()
+        sys.exit(0)
 
-quit()
+    if config["translate_in"]:
+        import_translation()
+        sys.exit(0)
+
+    if config['db_name']:
+        for dbname in config['db_name'].split(','):
+            run_registry(dbname)
+
+    if config["stop_after_init"]:
+        sys.exit(0)
+
+    setup_pid_file()
+    setup_signal_handlers()
+    start_services()
+    logger = logging.getLogger('server')
+    logger.info('OpenERP server is running, waiting for connections...')
+    quit_on_signals()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 4b9adb144bd..277965c5449 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -458,7 +458,8 @@ def trans_export(lang, modules, buffer, format, cr):
             tar.close()
 
         else:
-            raise Exception(_('Bad file format'))
+            raise Exception(_('Unrecognized extension: must be one of '
+                '.csv, .po, or .tgz (received .%s).' % format))
 
     newlang = not bool(lang)
     if newlang:

From 37643a0909c265ed2d62aaafec995f638933de14 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 23 Aug 2011 16:13:00 +0200
Subject: [PATCH 26/60] [ADD] basics of on_write, split
 ListView.reload_record(index) in ListView.reload_record(record) and
 ListView.reload_record_at_index(index)

migrate most calls to reload_record(record)

bzr revid: xmo@openerp.com-20110823141300-zujxs2oaunqwhprt
---
 addons/base/static/src/js/list-editable.js | 19 ++++++++++++-
 addons/base/static/src/js/list.js          | 31 +++++++++++++---------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index 8810d902346..1932688783d 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -105,7 +105,7 @@ openerp.base.list_editable = function (openerp) {
             }
 
             if (this.edition_index !== null) {
-                this.reload_record(this.edition_index).then(function () {
+                this.reload_record_at_index(this.edition_index).then(function () {
                     cancelled.resolve();
                 });
             } else {
@@ -201,6 +201,21 @@ openerp.base.list_editable = function (openerp) {
                 });
             });
         },
+        handle_onwrite: function (record_id, index) {
+            var self = this;
+            var on_write_callback = self.view.fields_view.arch.attrs.on_write;
+            if (!on_write_callback) { return; }
+            this.dataset.call(on_write_callback, [record_id], function (ids) {
+                _(ids).each(function (id) {
+                    var record = self.records.get(id);
+                    if (!record) {
+                        record = new openerp.base.list.Record({id: id});
+                        self.records.add(record, {at: index});
+                    }
+                    self.reload_record(record);
+                });
+            });
+        },
         /**
          * Saves the current row, and triggers the edition of its following
          * sibling if asked.
@@ -215,6 +230,8 @@ openerp.base.list_editable = function (openerp) {
                         {at: self.options.editable === 'top' ? 0 : null});
                     self.edition_index = self.dataset.index;
                 }
+                self.handle_onwrite(self.dataset.ids[self.dataset.index],
+                                    self.dataset.index);
                 self.cancel_pending_edition().then(function () {
                     $(self).trigger('saved', [self.dataset]);
                     if (!edit_next) {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 95db36f82de..b2faaa55faf 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -672,11 +672,10 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
                 var $target = $(e.currentTarget),
                       field = $target.closest('td').data('field'),
                        $row = $target.closest('tr'),
-                  record_id = self.row_id($row),
-                      index = self.row_position($row);
+                  record_id = self.row_id($row);
 
                 $(self).trigger('action', [field, record_id, function () {
-                    return self.reload_record(index);
+                    return self.reload_record(self.records.get(record_id));
                 }]);
             })
             .delegate('tr', 'click', function (e) {
@@ -757,25 +756,31 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
     /**
      * Reloads the record at index ``row_index`` in the list's rows.
      *
-     * By default, simply re-renders the record. If the ``fetch`` parameter is
-     * provided and ``true``, will first fetch the record anew.
-     *
      * @param {Number} record_index index of the record to reload
-     * @param {Boolean} fetch fetches the record from remote before reloading it
+     * @returns {$.Deferred} promise to the finalization of the reloading
      */
-    reload_record: function (record_index) {
+    reload_record_at_index: function (record_index) {
         var r = this.records.at(record_index);
 
+        return this.reload_record(r);
+    },
+    /**
+     * Reloads the provided record by re-reading its content from the server.
+     *
+     * @param {Record} record
+     * @returns {$.Deferred} promise to the finalization of the reloading
+     */
+    reload_record: function (record) {
         return this.dataset.read_ids(
-            [r.get('id')],
+            [record.get('id')],
             _.pluck(_(this.columns).filter(function (r) {
                     return r.tag === 'field';
                 }), 'name'),
-            function (record) {
-                _(record[0]).each(function (value, key) {
-                    r.set(key, value, {silent: true});
+            function (records) {
+                _(records[0]).each(function (value, key) {
+                    record.set(key, value, {silent: true});
                 });
-                r.trigger('change', r);
+                record.trigger('change', record);
             }
         );
     },

From 00a7458bc42f7f3f94e166cb9f656a192c4542fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 23 Aug 2011 16:42:35 +0200
Subject: [PATCH 27/60] [IMP] remember to insert the relevant record ids into
 the dataset if they're not there

bzr revid: xmo@openerp.com-20110823144235-g09rkurd1ndrrkme
---
 addons/base/static/src/js/list-editable.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index 1932688783d..e14eb02b3a2 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -211,6 +211,7 @@ openerp.base.list_editable = function (openerp) {
                     if (!record) {
                         record = new openerp.base.list.Record({id: id});
                         self.records.add(record, {at: index});
+                        self.dataset.ids.splice(index, 0, id);
                     }
                     self.reload_record(record);
                 });

From ae4d1d5e3bdaf54121bcc9f17de06f009d0075f7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 10:53:03 +0200
Subject: [PATCH 28/60] [IMP] to maintain correct synchro, listview should
 avoid relying on indexes as much as possible. Get rid on indexes on rows, and
 of List.row_position

bzr revid: xmo@openerp.com-20110824085303-6h3wggzynpic0mcz
---
 addons/base/static/src/js/list-editable.js | 10 ++---
 addons/base/static/src/js/list.js          | 44 +++++++++-------------
 addons/base/static/src/xml/base.xml        |  3 +-
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index e14eb02b3a2..8d94bb0f601 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -143,7 +143,6 @@ openerp.base.list_editable = function (openerp) {
                 var $new_row = $('<tr>', {
                         id: _.uniqueId('oe-editable-row-'),
                         'data-id': $(row).data('id'),
-                        'data-index': $(row).data('index'),
                         'class': $(row).attr('class') + ' oe_forms',
                         click: function (e) {e.stopPropagation();}
                     })
@@ -201,14 +200,16 @@ openerp.base.list_editable = function (openerp) {
                 });
             });
         },
-        handle_onwrite: function (record_id, index) {
+        handle_onwrite: function (source_record_id) {
             var self = this;
             var on_write_callback = self.view.fields_view.arch.attrs.on_write;
             if (!on_write_callback) { return; }
-            this.dataset.call(on_write_callback, [record_id], function (ids) {
+            this.dataset.call(on_write_callback, [source_record_id], function (ids) {
                 _(ids).each(function (id) {
                     var record = self.records.get(id);
                     if (!record) {
+                        var index = self.records.indexOf(
+                                self.records.get(source_record_id));
                         record = new openerp.base.list.Record({id: id});
                         self.records.add(record, {at: index});
                         self.dataset.ids.splice(index, 0, id);
@@ -231,8 +232,7 @@ openerp.base.list_editable = function (openerp) {
                         {at: self.options.editable === 'top' ? 0 : null});
                     self.edition_index = self.dataset.index;
                 }
-                self.handle_onwrite(self.dataset.ids[self.dataset.index],
-                                    self.dataset.index);
+                self.handle_onwrite(self.dataset.ids[self.dataset.index]);
                 self.cancel_pending_edition().then(function () {
                     $(self).trigger('saved', [self.dataset]);
                     if (!edit_next) {
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index b2faaa55faf..aa6f960bec9 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -641,7 +641,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             'reset': $.proxy(this, 'on_records_reset'),
             'change': function (event, record) {
                 var $row = self.$current.find('[data-id=' + record.get('id') + ']');
-                $row.replaceWith(self.render_record($row.data('index')));
+                $row.replaceWith(self.render_record(record));
             },
             'add': function (ev, records, record, index) {
                 $('<tr>').attr({
@@ -680,7 +680,9 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             })
             .delegate('tr', 'click', function (e) {
                 e.stopPropagation();
-                self.dataset.index = self.row_position(e.currentTarget);
+                self.dataset.index = self.records.indexOf(
+                    self.records.get(
+                        self.row_id(e.currentTarget)));
                 self.row_clicked(e);
             });
     },
@@ -717,15 +719,6 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
         });
         return result;
     },
-    /**
-     * Returns the index of the row in the list of rows.
-     *
-     * @param {Object} row the selected row
-     * @returns {Number} the position of the row in this.rows
-     */
-    row_position: function (row) {
-        return $(row).data('index');
-    },
     /**
      * Returns the identifier of the object displayed in the provided table
      * row
@@ -787,21 +780,21 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
     /**
      * Renders a list record to HTML
      *
-     * @param {Number} record_index index of the record to render in ``this.rows``
+     * @param {Record} record index of the record to render in ``this.rows``
      * @returns {String} QWeb rendering of the selected record
      */
-    render_record: function (record_index) {
+    render_record: function (record) {
+        var index = this.records.indexOf(record);
         return QWeb.render('ListView.row', {
             columns: this.columns,
             options: this.options,
-            record: this.records.at(record_index),
-            row_parity: (record_index % 2 === 0) ? 'even' : 'odd',
-            row_index: record_index,
+            record: record,
+            row_parity: (index % 2 === 0) ? 'even' : 'odd',
             render_cell: openerp.base.format_cell
         });
     },
     /**
-     * Fixes @data-index on all table rows, and fixes the even/odd classes
+     * Fixes fixes the even/odd classes
      *
      * @param {Number} [from_index] index from which to resequence
      * @param {Number} [offset = 0] selection offset for DOM, in case there are rows to ignore in the table
@@ -815,8 +808,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             var index = from_index + i;
             // reset record-index accelerators on rows and even/odd
             var even = index%2 === 0;
-            $(e).attr('data-index', index)
-                .toggleClass('even', even)
+            $(e).toggleClass('even', even)
                 .toggleClass('odd', !even);
         });
     }
@@ -1080,14 +1072,12 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         // ondrop, move relevant record & fix sequences
         list.$current.sortable({
             stop: function (event, ui) {
-                var from = ui.item.data('index'),
-                      to = ui.item.prev().data('index') || 0;
-                if (from === to) { return; }
-                var to_move = list.records.at(from);
-                list.records.remove(to_move);
-                list.records.add(to_move, {at: to});
+                var to_move = list.records.get(ui.item.data('id')),
+                    target_id = ui.item.prev().data('id');
 
-                list.refresh_zebra();
+                list.records.remove(to_move);
+                var to = target_id ? list.records.indexOf(list.records.get(target_id)) : 0;
+                list.records.add(to_move, { at: to });
 
                 // resequencing time!
                 var record, index = to,
@@ -1101,6 +1091,8 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
                     dataset.write(record.get('id'), {sequence: seq});
                     record.set('sequence', seq);
                 }
+
+                list.refresh_zebra();
             }
         });
     },
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 89b452a6760..879d98d15a6 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -554,12 +554,11 @@
 <t t-name="ListView.rows" t-foreach="records.length" t-as="index">
     <t t-call="ListView.row">
         <t t-set="record" t-value="records.at(index)"/>
-        <t t-set="row_index" t-value="index"/>
         <t t-set="row_parity" t-value="index_parity"/>
     </t>
 </t>
 <tr t-name="ListView.row" t-att-class="row_parity"
-    t-att-data-index="row_index" t-att-data-id="record.get('id')">
+        t-att-data-id="record.get('id')">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
 

From 2afcf2130b33653cf471bfcb49e2d8e542bd064a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 14:21:24 +0200
Subject: [PATCH 29/60] [ADD] pluck method to collection

bzr revid: xmo@openerp.com-20110824122124-xr4g92x6jlw85rbg
---
 addons/base/static/src/js/list.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index aa6f960bec9..b84c286fd57 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1437,6 +1437,11 @@ var Collection = openerp.base.Class.extend(/** @lends Collection# */{
         });
         return results;
     },
+    pluck: function (fieldname) {
+        return this.map(function (record) {
+            return record.get(fieldname);
+        });
+    },
     indexOf: function (record) {
         return _(this.records).indexOf(record);
     }

From a0486acd740ac07ebb94fa3867307da769e7b854 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 14:22:51 +0200
Subject: [PATCH 30/60] [FIX] some more usages of indexes in list and list
 edition (should now be index-free except as transient values), and implement
 on_write support

remove ListView.List#reload_record_at_index as everything is now id-based to avoid desync issues

bzr revid: xmo@openerp.com-20110824122251-9vw96qbn7snnkq3j
---
 addons/base/static/src/js/list-editable.js | 47 ++++++++++++++--------
 addons/base/static/src/js/list.js          | 25 ++++++------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index 8d94bb0f601..1cd43fd6ea8 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -92,7 +92,7 @@ openerp.base.list_editable = function (openerp) {
             if (!this.options.editable) {
                 return this._super(event);
             }
-            this.edit_record();
+            this.edit_record($(event.currentTarget).data('id'));
         },
         /**
          * Checks if a record is being edited, and if so cancels it
@@ -104,8 +104,8 @@ openerp.base.list_editable = function (openerp) {
                 return cancelled.promise();
             }
 
-            if (this.edition_index !== null) {
-                this.reload_record_at_index(this.edition_index).then(function () {
+            if (this.edition_id != null) {
+                this.reload_record(self.records.get(this.edition_id)).then(function () {
                     cancelled.resolve();
                 });
             } else {
@@ -115,13 +115,14 @@ openerp.base.list_editable = function (openerp) {
                 self.edition_form.stop();
                 self.edition_form.$element.remove();
                 delete self.edition_form;
-                delete self.edition_index;
+                delete self.edition_id;
                 delete self.edition;
             });
             return cancelled.promise();
         },
         /**
-         * Adapts this list's view description to be suitable to the inner form view of a row being edited.
+         * Adapts this list's view description to be suitable to the inner form
+         * view of a row being edited.
          *
          * @returns {Object} fields_view_get's view section suitable for putting into form view of editable rows.
          */
@@ -140,9 +141,10 @@ openerp.base.list_editable = function (openerp) {
         render_row_as_form: function (row) {
             var self = this;
             this.cancel_pending_edition().then(function () {
+                var record_id = $(row).data('id');
                 var $new_row = $('<tr>', {
                         id: _.uniqueId('oe-editable-row-'),
-                        'data-id': $(row).data('id'),
+                        'data-id': record_id,
                         'class': $(row).attr('class') + ' oe_forms',
                         click: function (e) {e.stopPropagation();}
                     })
@@ -175,7 +177,7 @@ openerp.base.list_editable = function (openerp) {
                     self.$current.append($new_row);
                 }
                 self.edition = true;
-                self.edition_index = self.dataset.index;
+                self.edition_id = record_id;
                 self.edition_form = _.extend(new openerp.base.FormView(
                         self, $new_row.attr('id'), self.dataset, false), {
                     template: 'ListView.row.form',
@@ -208,8 +210,9 @@ openerp.base.list_editable = function (openerp) {
                 _(ids).each(function (id) {
                     var record = self.records.get(id);
                     if (!record) {
+                        // insert after the source record
                         var index = self.records.indexOf(
-                                self.records.get(source_record_id));
+                            self.records.get(source_record_id)) + 1;
                         record = new openerp.base.list.Record({id: id});
                         self.records.add(record, {at: index});
                         self.dataset.ids.splice(index, 0, id);
@@ -227,12 +230,16 @@ openerp.base.list_editable = function (openerp) {
         save_row: function (edit_next) {
             var self = this;
             this.edition_form.do_save(function (result) {
-                if (result.created && !self.edition_index) {
+                if (result.created && !self.edition_id) {
                     self.records.add({id: result.result},
                         {at: self.options.editable === 'top' ? 0 : null});
-                    self.edition_index = self.dataset.index;
+                    self.edition_id = result.result;
                 }
-                self.handle_onwrite(self.dataset.ids[self.dataset.index]);
+                var edited_record = self.records.get(self.edition_id),
+                    next_record = self.records.at(
+                            self.records.indexOf(edited_record) + 1);
+
+                self.handle_onwrite(self.edition_id);
                 self.cancel_pending_edition().then(function () {
                     $(self).trigger('saved', [self.dataset]);
                     if (!edit_next) {
@@ -242,8 +249,16 @@ openerp.base.list_editable = function (openerp) {
                         self.new_record();
                         return;
                     }
-                    self.dataset.next();
-                    self.edit_record();
+                    var next_record_id;
+                    if (next_record) {
+                        next_record_id = next_record.get('id');
+                        self.dataset.index = _(self.dataset.ids)
+                                .indexOf(next_record_id);
+                    } else {
+                        self.dataset.index = 0;
+                        next_record_id = self.records.at(0).get('id');
+                    }
+                    self.edit_record(next_record_id);
                 });
             }, this.options.editable === 'top');
         },
@@ -256,12 +271,12 @@ openerp.base.list_editable = function (openerp) {
         /**
          * Edits record currently selected via dataset
          */
-        edit_record: function () {
+        edit_record: function (record_id) {
             this.render_row_as_form(
-                this.$current.children(':eq(' + this.dataset.index + ')'));
+                this.$current.find('[data-id=' + record_id + ']'));
             $(this).trigger(
                 'edit',
-                [this.records.at(this.dataset.index).get('id'), this.dataset]);
+                [record_id, this.dataset]);
         },
         new_record: function () {
             this.dataset.index = null;
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index b84c286fd57..0e5544961b4 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -644,9 +644,19 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
                 $row.replaceWith(self.render_record(record));
             },
             'add': function (ev, records, record, index) {
-                $('<tr>').attr({
+                var $new_row = $('<tr>').attr({
                     'data-id': record.get('id')
-                }).insertAfter(self.$current.children(':eq(' + index + ')'));
+                });
+
+                if (index === 0) {
+                    $new_row.prependTo(self.$current);
+                } else {
+                    var previous_record = records.at(index-1),
+                        $previous_sibling = self.$current.find(
+                                '[data-id=' + previous_record.get('id') + ']');
+                    $new_row.insertAfter($previous_sibling);
+                }
+
                 self.refresh_zebra(index, 1);
             }
         };
@@ -746,17 +756,6 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             return {count: 1, values: record.attributes};
         });
     },
-    /**
-     * Reloads the record at index ``row_index`` in the list's rows.
-     *
-     * @param {Number} record_index index of the record to reload
-     * @returns {$.Deferred} promise to the finalization of the reloading
-     */
-    reload_record_at_index: function (record_index) {
-        var r = this.records.at(record_index);
-
-        return this.reload_record(r);
-    },
     /**
      * Reloads the provided record by re-reading its content from the server.
      *

From 777857b269d821ea621b0563f4e03c429c8f4472 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 15:16:06 +0200
Subject: [PATCH 31/60] [FIX] weird race condition on listview init: in some
 cases, would not wait for the initial view loading before letting the
 viewmanager launch a search, making initial load overwrite search ending with
 an empty list

bzr revid: xmo@openerp.com-20110824131606-yokgoe3dz9ltaz2l
---
 addons/base/static/src/js/list.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 0e5544961b4..47c04537ddc 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -363,20 +363,21 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * @param {Object} [context] context to send the server while loading the view
      */
     reload_view: function (grouped, context) {
-        var self = this;
-        var callback = function (field_view_get) {
+        var self = this, d = $.Deferred();
+        d.then(function (field_view_get) {
             self.on_loaded(field_view_get, grouped);
-        };
+        });
         if (this.embedded_view) {
-            return $.Deferred().then(callback).resolve({fields_view: this.embedded_view});
+            d.resolve({fields_view: this.embedded_view});
         } else {
-            return this.rpc('/base/listview/load', {
+            this.rpc('/base/listview/load', {
                 model: this.model,
                 view_id: this.view_id,
                 context: this.dataset.get_context(context),
                 toolbar: this.options.sidebar
-            }, callback);
+            }, function () { d.resolve.apply(this, arguments); });
         }
+        return d.promise();
     },
     /**
      * re-renders the content of the list view

From 04cb566ad9b44523325f6a4d3fb175f327cf15b0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 16:52:05 +0200
Subject: [PATCH 32/60] [IMP] datetime search field: use date widget, make
 field's default domain span the whole day (using range)

search API improvement: Field gains a make_domain method, called by get_domain to build the default domain for the field.

make_domain is called with the field's name, operator and current values (fully computed), the default implementation is to just shove them all into a domain.

This lets fields customize the default domain for the field without having to reimplement (or breaking) the filter_domain handling

bzr revid: xmo@openerp.com-20110824145205-2wnig9duebja9jrk
---
 addons/base/static/src/js/search.js | 31 ++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 63ccec088a6..7573c39d399 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -590,6 +590,20 @@ openerp.base.search.Field = openerp.base.search.Input.extend( /** @lends openerp
             {}, context,
             {own_values: {self: val}});
     },
+    /**
+     * Function creating the returned domain for the field, override this
+     * methods in children if you only need to customize the field's domain
+     * without more complex alterations or tests (and without the need to
+     * change override the handling of filter_domain)
+     *
+     * @param {String} name the field's name
+     * @param {String} operator the field's operator (either attribute-specified or default operator for the field
+     * @param {Number|String} value parsed value for the field
+     * @returns {Array<Array>} domain to include in the resulting search
+     */
+    make_domain: function (name, operator, value) {
+        return [[name, operator, value]];
+    },
     get_domain: function () {
         var val = this.get_value();
         if (val === null || val === '') {
@@ -598,11 +612,10 @@ openerp.base.search.Field = openerp.base.search.Input.extend( /** @lends openerp
 
         var domain = this.attrs['filter_domain'];
         if (!domain) {
-            return [[
+            return this.make_domain(
                 this.attrs.name,
                 this.attrs.operator || this.default_operator,
-                this.get_value()
-            ]];
+                val);
         }
         return _.extend({}, domain, {own_values: {self: val}});
     }
@@ -724,6 +737,10 @@ openerp.base.search.DateField = openerp.base.search.Field.extend( /** @lends ope
     }
 });
 openerp.base.search.DateTimeField = openerp.base.search.DateField.extend({
+    make_domain: function (name, operator, value) {
+        return ['&', [name, '>=', value + ' 00:00:00'],
+                     [name, '<=', value + ' 23:59:59']];
+    }
 });
 openerp.base.search.ManyToOneField = openerp.base.search.CharField.extend({
     init: function (view_section, field, view) {
@@ -781,16 +798,16 @@ openerp.base.search.ManyToOneField = openerp.base.search.CharField.extend({
         }
         return this._super(defaults);
     },
-    get_domain: function () {
+    make_domain: function (name, operator, value) {
         if (this.id && this.name) {
-            if (this.$element.val() === this.name) {
-                return [[this.attrs.name, '=', this.id]];
+            if (value === this.name) {
+                return [[name, '=', this.id]];
             } else {
                 delete this.id;
                 delete this.name;
             }
         }
-        return this._super();
+        return this._super(name, operator, value);
     }
 });
 

From 88200c8bbfe252b5ec8ce8f41e137eb8a289c244 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Aug 2011 16:56:47 +0200
Subject: [PATCH 33/60] [IMP] add docstring to
 openerp.base.search.DateTimeField

bzr revid: xmo@openerp.com-20110824145647-h4mbaz4sjjjccacv
---
 addons/base/static/src/js/search.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 7573c39d399..99f07784160 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -736,7 +736,18 @@ openerp.base.search.DateField = openerp.base.search.Field.extend( /** @lends ope
         return this.$element.val();
     }
 });
-openerp.base.search.DateTimeField = openerp.base.search.DateField.extend({
+/**
+ * Implementation of the ``datetime`` openerp field type:
+ *
+ * * Uses the same widget as the ``date`` field type (a simple date)
+ *
+ * * Builds a slighly more complex, it's a datetime range (includes time)
+ *   spanning the whole day selected by the date widget
+ *
+ * @class
+ * @extends openerp.base.DateField
+ */
+openerp.base.search.DateTimeField = openerp.base.search.DateField.extend(/** @lends openerp.base.search.DateTimeField# */{
     make_domain: function (name, operator, value) {
         return ['&', [name, '>=', value + ' 00:00:00'],
                      [name, '<=', value + ' 23:59:59']];

From ffeff63fb69e64ecdb62810c5c1d7d4fc9d80239 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 24 Aug 2011 17:13:57 +0200
Subject: [PATCH 34/60] [ADD] Translate dialog (WIP)

bzr revid: fme@openerp.com-20110824151357-nln9mnkw13uyng32
---
 addons/base/static/src/css/base.css |   9 ++-
 addons/base/static/src/js/form.js   |  13 +++-
 addons/base/static/src/js/views.js  | 111 +++++++++++++++++++++++++++-
 addons/base/static/src/xml/base.xml |  42 ++++++++++-
 4 files changed, 170 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 242167480f3..cd420ea8c0d 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -878,13 +878,20 @@ label.error {
     position: relative;
     vertical-align: top;
 }
-.openerp img.ui-datepicker-trigger, .openerp img.ui-datepicker-trigger {
+.openerp img.ui-datepicker-trigger {
     margin-left: -20px;
     vertical-align: middle;
     cursor: pointer;
     position: relative;
     top: -1px;
 }
+.openerp img.oe_field_translate {
+    margin-left: -21px;
+    vertical-align: top;
+    cursor: pointer;
+    position: relative;
+    top: 4px;
+}
 
 /* http://www.quirksmode.org/dom/inputfile.html
  * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 5da048a17b9..7a4d3c92d89 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -38,6 +38,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi
         this.registry = openerp.base.form.widgets;
         this.has_been_loaded = $.Deferred();
         this.$form_header = null;
+        this.translatable_fields = [];
         _.defaults(this.options, {"always_show_new_button": true});
     },
     start: function() {
@@ -461,7 +462,7 @@ openerp.base.form.SidebarAttachments = openerp.base.Widget.extend({
                     ['res_model', '=', this.view.dataset.model],
                     ['res_id', '=', this.view.datarecord.id],
                     ['type', 'in', ['binary', 'url']]
-                ])).read_slice(['name', 'url', 'type'], this.on_attachments_loaded);
+                ])).read_slice(['name', 'url', 'type'], {}, this.on_attachments_loaded);
         }
     },
     on_attachments_loaded: function(attachments) {
@@ -839,6 +840,13 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         this.invalid = false;
         this.dirty = false;
     },
+    start: function() {
+        this._super.apply(this, arguments);
+        if (this.field.translate) {
+            this.view.translatable_fields.push(this);
+            this.$element.find('.oe_field_translate').click(this.on_translate);
+        }
+    },
     set_value: function(value) {
         this.value = value;
         this.invalid = false;
@@ -850,6 +858,9 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
     },
     on_value_changed: function() {
     },
+    on_translate: function() {
+        this.view.open_translate_dialog(this);
+    },
     get_value: function() {
         return this.value;
     },
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index cb9b7d364cf..c6782150297 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -4,6 +4,8 @@
 
 openerp.base.views = function(openerp) {
 
+var _t = openerp.base._t;
+
 /**
  * Registry for all the client actions key: tag value: widget
  */
@@ -450,6 +452,106 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
     }
 });
 
+openerp.base.TranslateDialog = openerp.base.Dialog.extend({
+    dialog_title: _t("Translations"),
+    init: function(view) {
+        this['on_button' + _t("Save")] = this.on_button_Save;
+        this['on_button' + _t("Close")] = this.on_button_Close;
+        this._super(view, {
+            width: '80%',
+            height: '80%'
+        });
+        this.view = view;
+        this.view_type = view.fields_view.type || '';
+        this.$fields_form = null;
+        this.$view_form = null;
+        this.$sidebar_form = null;
+        this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name });
+        this.languages = null;
+        this.languages_loaded = $.Deferred();
+        (new openerp.base.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
+            [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }, this.on_languages_loaded);
+    },
+    start: function() {
+        var self = this;
+        this._super();
+        $.when(this.languages_loaded).then(function() {
+            self.$element.html(QWeb.render('TranslateDialog', { widget: self }));
+            self.$element.tabs();
+            if (!(self.view.translatable_fields && self.view.translatable_fields.length)) {
+                self.hide_tabs('fields');
+                self.select_tab('view');
+            }
+            self.$fields_form = self.$element.find('.oe_translation_form');
+        });
+        return this;
+    },
+    on_languages_loaded: function(langs) {
+        this.languages = langs;
+        this.languages_loaded.resolve();
+    },
+    do_load_fields_values: function(callback) {
+        var self = this,
+            deffered = [];
+        this.$fields_form.find('.oe_trad_field').val('').removeClass('touched');
+        _.each(self.languages, function(lg) {
+            var deff = $.Deferred();
+            deffered.push(deff);
+            self.rpc('/base/dataset/get', {
+                model: self.view.dataset.model,
+                ids: [self.view.datarecord.id],
+                fields: self.translatable_fields_keys,
+                context: self.view.dataset.get_context({
+                    'lang': lg.code
+                })
+            }, function(values) {
+                _.each(self.translatable_fields_keys, function(f) {
+                    self.$fields_form.find('.oe_trad_field[name="' + lg.code + '-' + f + '"]').val(values[0][f] || '');
+                });
+                deff.resolve();
+            });
+        });
+        $.when.apply(null, deffered).then(callback);
+    },
+    show_tabs: function() {
+        for (var i = 0; i < arguments.length; i++) {
+            this.$element.find('ul.oe_translate_tabs li a[href$="' + arguments[i] + '"]').parent().show();
+        }
+    },
+    hide_tabs: function() {
+        for (var i = 0; i < arguments.length; i++) {
+            this.$element.find('ul.oe_translate_tabs li a[href$="' + arguments[i] + '"]').parent().hide();
+        }
+    },
+    select_tab: function(name) {
+        this.show_tabs(name);
+        var index = this.$element.find('ul.oe_translate_tabs li a[href$="' + arguments[i] + '"]').parent().index() - 1;
+        this.$element.tabs('select', index);
+    },
+    open: function(field) {
+        var self = this,
+            super = this._super;
+        $.when(this.languages_loaded).then(function() {
+            if (self.view.translatable_fields && self.view.translatable_fields.length) {
+                self.do_load_fields_values(function() {
+                    super.call(self);
+                    if (field) {
+                        // TODO: focus and scroll to field
+                    }
+                });
+            } else {
+                super.call(self);
+            }
+        });
+    },
+    on_button_Save: function() {
+        this.close();
+    },
+    on_button_Close: function() {
+        this.close();
+    }
+});
+
 openerp.base.View = openerp.base.Widget.extend({
     set_default_options: function(options) {
         this.options = options || {};
@@ -461,6 +563,12 @@ openerp.base.View = openerp.base.Widget.extend({
             action_views_ids: {}
         });
     },
+    open_translate_dialog: function(field) {
+        if (!this.translate_dialog) {
+            this.translate_dialog = new openerp.base.TranslateDialog(this).start();
+        }
+        this.translate_dialog.open(field);
+    },
     /**
      * Fetches and executes the action identified by ``action_data``.
      *
@@ -542,7 +650,7 @@ openerp.base.View = openerp.base.Widget.extend({
             }, {
                 label: "Translate",
                 callback: this.on_sidebar_translate,
-                classname: 'oe_hide oe_sidebar_translate'
+                classname: 'oe_sidebar_translate'
             }, {
                 label: "View Log",
                 callback: this.on_sidebar_view_log,
@@ -570,6 +678,7 @@ openerp.base.View = openerp.base.Widget.extend({
         export_view.start();
     },
     on_sidebar_translate: function() {
+        this.open_translate_dialog();
     },
     on_sidebar_view_log: function() {
     }
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 879d98d15a6..69aac831386 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -453,6 +453,40 @@
         </ul>
     </div>
 </t>
+<t t-name="TranslateDialog">
+    <ul class="oe_translate_tabs">
+        <li><a t-attf-href="##{widget.element_id}_fields">Fields</a></li>
+        <li><a t-attf-href="##{widget.element_id}_view">View labels</a></li>
+        <li><a t-attf-href="##{widget.element_id}_sidebar">Sidebar Relates</a></li>
+    </ul>
+    <div t-attf-id="#{widget.element_id}_fields">
+        <table t-if="widget.view.translatable_fields" class="oe_frame oe_forms oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+            <td class="oe_form_separator" width="1%" nowrap="nowrap">
+                <div class="separator horizontal">Field</div>
+            </td>
+            <th t-foreach="widget.languages" align="left">
+                <div class="separator horizontal"><t t-esc="name"/></div>
+            </th>
+        </tr>
+        <tr t-foreach="widget.view.translatable_fields" t-as="field">
+            <td class="oe_form_frame_cell" width="1%" nowrap="nowrap">
+                <label class="oe_form_label"><t t-esc="field.string"/>:</label>
+            </td>
+            <td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell">
+                <input t-if="field.type == 'char'" type="text" t-attf-name="#{lg.code}-#{field.name}" value="" class="oe_trad_field" style="width: 100%"/>
+                <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" class="oe_trad_field" style="width: 100%"></textarea>
+            </td>
+        </tr>
+        </table>
+    </div>
+    <div t-attf-id="#{widget.element_id}_view">
+        Translate view
+    </div>
+    <div t-attf-id="#{widget.element_id}_sidebar">
+        Translate sidebar
+    </div>
+</t>
 <t t-name="TreeView">
     <h2 class="oe_view_title"><t t-esc="title"/></h2>
     <select t-if="toolbar" style="width: 30%">
@@ -702,8 +736,10 @@
     <input type="text" size="1"
         t-att-name="widget.name"
         t-att-id="widget.element_id + '_field'"
-        t-att-class="'field_' + widget.type" style="width: 100%"
+        t-att-class="'field_' + widget.type"
+        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     />
+    <img class="oe_field_translate" t-if="widget.field.translate" src="/base/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldEmail">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -734,11 +770,13 @@
     </table>
 </t>
 <t t-name="FieldText">
-    <textarea rows="6" style="width: 100%;"
+    <textarea rows="6"
         t-att-name="widget.name"
         t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
+        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     ></textarea>
+    <img class="oe_field_translate" t-if="widget.field.translate" src="/base/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldDate">
     <input type="text" size="1" style="width: 100%"

From 764de99262779b122be2ee6b52740f0ac917c824 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 24 Aug 2011 17:57:23 +0200
Subject: [PATCH 35/60] [IMP] res_company/res_user: removed unused methods
 _get_child_ids/company_get.

bzr revid: vmt@openerp.com-20110824155723-6wk2v8rb1gekbavv
---
 openerp/addons/base/res/res_company.py | 5 -----
 openerp/addons/base/res/res_user.py    | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index b0ebeb8ac27..fc63ac42dd9 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -189,11 +189,6 @@ class res_company(osv.osv):
                 return rule.company_dest_id.id
         return user.company_id.id
 
-    def _get_child_ids(self, cr, uid, uid2, context={}):
-        company = self.pool.get('res.users').company_get(cr, uid, uid2)
-        ids = self._get_company_children(cr, uid, company)
-        return ids
-
     @tools.cache()
     def _get_company_children(self, cr, uid=None, company=None):
         if not company:
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index a2bf9721e42..09360996396 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -346,10 +346,6 @@ class users(osv.osv):
         'menu_tips':True
     }
 
-    @tools.cache()
-    def company_get(self, cr, uid, uid2, context=None):
-        return self._get_company(cr, uid, context=context, uid2=uid2)
-
     # User can write to a few of her own fields (but not her groups for example)
     SELF_WRITEABLE_FIELDS = ['menu_tips','view', 'password', 'signature', 'action_id', 'company_id', 'user_email']
 
@@ -369,7 +365,6 @@ class users(osv.osv):
         res = super(users, self).write(cr, uid, ids, values, context=context)
 
         # clear caches linked to the users
-        self.company_get.clear_cache(cr.dbname)
         self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
         clear = partial(self.pool.get('ir.rule').clear_cache, cr)
         map(clear, ids)

From de955d098388688206f10c4858b178ad054acd88 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 10:18:33 +0200
Subject: [PATCH 36/60] [REV] xmo@openerp.com-20110824131606-yokgoe3dz9ltaz2l,
 has nothing to do with the issue and does not actually fix it (just fudges
 some timing so it happens slightly less often)

bzr revid: xmo@openerp.com-20110825081833-a1vbcdm59mrzf2d0
---
 addons/base/static/src/js/list.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 47c04537ddc..9797b5dff99 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -120,7 +120,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      */
     start: function() {
         this.$element.addClass('oe-listview');
-        return this.reload_view();
+        return this.reload_view(null, null, true);
     },
     /**
      * Called after loading the list view's description, sets up such things
@@ -362,22 +362,22 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * @param {Boolean} [grouped] Should the list be displayed grouped
      * @param {Object} [context] context to send the server while loading the view
      */
-    reload_view: function (grouped, context) {
-        var self = this, d = $.Deferred();
-        d.then(function (field_view_get) {
+    reload_view: function (grouped, context, initial) {
+        var self = this;
+        var callback = function (field_view_get) {
+            console.log('loaded', initial ? 'initial' : 'subsequent');
             self.on_loaded(field_view_get, grouped);
-        });
+        };
         if (this.embedded_view) {
-            d.resolve({fields_view: this.embedded_view});
+            return $.Deferred().then(callback).resolve({fields_view: this.embedded_view});
         } else {
-            this.rpc('/base/listview/load', {
+            return this.rpc('/base/listview/load', {
                 model: this.model,
                 view_id: this.view_id,
                 context: this.dataset.get_context(context),
                 toolbar: this.options.sidebar
-            }, function () { d.resolve.apply(this, arguments); });
+            }, callback);
         }
-        return d.promise();
     },
     /**
      * re-renders the content of the list view

From d2da68ad8b66e2c93c4552cb47bde7a34378c635 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 10:22:21 +0200
Subject: [PATCH 37/60] [FIX] actually fix race condition on listview init:
 incorrect on_mode_switch override in
 xmo@openerp.com-20110816123510-gcx0dk8b2sgox5oi did not propagate primise
 from ViewManager's on_mode_switch

bzr revid: xmo@openerp.com-20110825082221-tasmo3je0wu4iw6h
---
 addons/base/static/src/js/views.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index c6782150297..7f6d78d9495 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -325,8 +325,9 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         }
     },
     on_mode_switch: function (view_type) {
-        this._super(view_type);
-        this.shortcut_check(this.views[view_type]);
+        return $.when(
+            this._super(view_type),
+            this.shortcut_check(this.views[view_type]));
     },
     shortcut_check : function(view) {
         var self = this;

From 6e7a9a1a3c7e00e7aa24fcfb37b22c815e0c257c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 25 Aug 2011 11:42:12 +0200
Subject: [PATCH 38/60] [IMP] Form fields now uses niv's parse/format methods

bzr revid: fme@openerp.com-20110825094212-31l90vq66riiabl4
---
 addons/base/static/src/js/form.js | 94 ++++++-------------------------
 1 file changed, 17 insertions(+), 77 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 7a4d3c92d89..3280b7e0d81 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -949,7 +949,7 @@ openerp.base.form.FieldChar = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
+        var show_value = openerp.base.format_value(value, this, '');
         this.$element.find('input').val(show_value);
     },
     update_dom: function() {
@@ -957,16 +957,16 @@ openerp.base.form.FieldChar = openerp.base.form.Field.extend({
         this.$element.find('input').attr('disabled', this.readonly);
     },
     set_value_from_ui: function() {
-        this.value = this.$element.find('input').val();
+        this.value = openerp.base.parse_value(this.$element.find('input').val(), this);
         this._super();
     },
     validate: function() {
         this.invalid = false;
-        var value = this.$element.find('input').val();
-        if (value === "") {
-            this.invalid = this.required;
-        } else if (this.validation_regex) {
-            this.invalid = !this.validation_regex.test(value);
+        try {
+            var value = openerp.base.parse_value(this.$element.find('input').val(), this, '');
+            this.invalid = this.required && value === '';
+        } catch(e) {
+            this.invalid = true;
         }
     },
     focus: function() {
@@ -978,7 +978,6 @@ openerp.base.form.FieldEmail = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldEmail";
-        this.validation_regex = /@/;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -993,8 +992,7 @@ openerp.base.form.FieldEmail = openerp.base.form.FieldChar.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
-        this.$element.find('a').attr('href', 'mailto:' + show_value);
+        this.$element.find('a').attr('href', 'mailto:' + this.$element.find('input').val());
     }
 });
 
@@ -1017,44 +1015,13 @@ openerp.base.form.FieldUrl = openerp.base.form.FieldChar.extend({
 });
 
 openerp.base.form.FieldFloat = openerp.base.form.FieldChar.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.validation_regex = /^-?\d+(\.\d+)?$/;
-    },
     set_value: function(value) {
-        this._super.apply(this, [value]);
         if (value === false || value === undefined) {
             // As in GTK client, floats default to 0
             value = 0;
             this.dirty = true;
         }
-        var show_value = value.toFixed(2);
-        this.$element.find('input').val(show_value);
-    },
-    set_value_from_ui: function() {
-        this.value = Number(this.$element.find('input').val().replace(/,/g, '.'));
-        this._super();
-    }
-});
-
-openerp.base.form.FieldInteger = openerp.base.form.FieldFloat.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.validation_regex = /^-?\d+$/;
-    },
-    set_value: function(value) {
         this._super.apply(this, [value]);
-        if (value === false || value === undefined) {
-            // TODO fme: check if GTK client default integers to 0 (like it does with floats)
-            value = 0;
-            this.dirty = true;
-        }
-        var show_value = parseInt(value, 10);
-        this.$element.find('input').val(show_value);
-    },
-    set_value_from_ui: function() {
-        this.value = Number(this.$element.find('input').val());
-        this._super();
     }
 });
 
@@ -1063,7 +1030,6 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
         this._super(view, node);
         this.template = "FieldDate";
         this.jqueryui_object = 'datetimepicker';
-        this.validation_regex = /^\d+-\d+-\d+( \d+:\d+(:\d+)?)?$/;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -1103,8 +1069,6 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
         var value = this.$element.find('input').val();
         if (value === "") {
             this.invalid = this.required;
-        } else if (this.validation_regex) {
-            this.invalid = !this.validation_regex.test(value);
         } else {
             this.invalid = !this.$element.find('input')[this.jqueryui_object]('getDate');
         }
@@ -1120,39 +1084,15 @@ openerp.base.form.FieldDate = openerp.base.form.FieldDatetime.extend({
     init: function(view, node) {
         this._super(view, node);
         this.jqueryui_object = 'datepicker';
-        this.validation_regex = /^\d+-\d+-\d+$/;
     },
     parse: openerp.base.str_to_date,
     format: openerp.base.date_to_str
 });
 
-openerp.base.form.FieldFloatTime = openerp.base.form.FieldChar.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.validation_regex = /^\d+:\d+$/;
-    },
-    set_value: function(value) {
-        this._super.apply(this, [value]);
-        if (value === false || value === undefined) {
-            // As in GTK client, floats default to 0
-            value = 0;
-            this.dirty = true;
-        }
-        var show_value = _.sprintf("%02d:%02d", Math.floor(value), Math.round((value % 1) * 60));
-        this.$element.find('input').val(show_value);
-    },
-    set_value_from_ui: function() {
-        var time = this.$element.find('input').val().split(':');
-        this.set_value(parseInt(time[0], 10) + parseInt(time[1], 10) / 60);
-        this._super();
-    }
-});
-
 openerp.base.form.FieldText = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldText";
-        this.validation_regex = null;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -1160,7 +1100,7 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
+        var show_value = openerp.base.format_value(value, this, '');
         this.$element.find('textarea').val(show_value);
     },
     update_dom: function() {
@@ -1168,16 +1108,16 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
         this.$element.find('textarea').attr('disabled', this.readonly);
     },
     set_value_from_ui: function() {
-        this.value = this.$element.find('textarea').val();
+        this.value = openerp.base.parse_value(this.$element.find('textarea').val(), this);
         this._super();
     },
     validate: function() {
         this.invalid = false;
-        var value = this.$element.find('textarea').val();
-        if (value === "") {
-            this.invalid = this.required;
-        } else if (this.validation_regex) {
-            this.invalid = !this.validation_regex.test(value);
+        try {
+            var value = openerp.base.parse_value(this.$element.find('textarea').val(), this, '');
+            this.invalid = this.required && value === '';
+        } catch(e) {
+            this.invalid = true;
         }
     },
     focus: function() {
@@ -2440,9 +2380,9 @@ openerp.base.form.widgets = new openerp.base.Registry({
     'reference' : 'openerp.base.form.FieldReference',
     'boolean' : 'openerp.base.form.FieldBoolean',
     'float' : 'openerp.base.form.FieldFloat',
-    'integer': 'openerp.base.form.FieldInteger',
+    'integer': 'openerp.base.form.FieldFloat',
+    'float_time': 'openerp.base.form.FieldFloat',
     'progressbar': 'openerp.base.form.FieldProgressBar',
-    'float_time': 'openerp.base.form.FieldFloatTime',
     'image': 'openerp.base.form.FieldBinaryImage',
     'binary': 'openerp.base.form.FieldBinaryFile'
 });

From 3da1145220c86e8e2b52c883ce34078fa4fde2a6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 25 Aug 2011 11:48:06 +0200
Subject: [PATCH 39/60] [IMP] Improved form's datetime widget so the content is
 always visible even when view size is shrinked down

bzr revid: fme@openerp.com-20110825094806-hfiagqp54gf9rzha
---
 addons/base/static/src/css/base.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index cd420ea8c0d..46364c4fa1d 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -870,6 +870,9 @@ label.error {
 .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .button {
     height: 22px;
 }
+.openerp .oe_forms input.field_datetime {
+    min-width: 11em;
+}
 .openerp .oe_forms .button {
     color: #4c4c4c;
     white-space: nowrap;

From 455928127fa2ed44a6f7fda14cab57052031c89f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 12:06:43 +0200
Subject: [PATCH 40/60] [FIX] safari/javascriptcore blows up on 'super' because
 it thinks it's a keyword

bzr revid: xmo@openerp.com-20110825100643-k7nbcla8h38siozr
---
 addons/base/static/src/js/views.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 7f6d78d9495..9e981e7c3e2 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -531,17 +531,17 @@ openerp.base.TranslateDialog = openerp.base.Dialog.extend({
     },
     open: function(field) {
         var self = this,
-            super = this._super;
+            sup = this._super;
         $.when(this.languages_loaded).then(function() {
             if (self.view.translatable_fields && self.view.translatable_fields.length) {
                 self.do_load_fields_values(function() {
-                    super.call(self);
+                    sup.call(self);
                     if (field) {
                         // TODO: focus and scroll to field
                     }
                 });
             } else {
-                super.call(self);
+                sup.call(self);
             }
         });
     },

From 5864a23352e200eeab37b0b1e6b8c466e8261e5b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 12:27:56 +0200
Subject: [PATCH 41/60] [REM] leftover debugging code

bzr revid: xmo@openerp.com-20110825102756-b3d8jf7yud0m98ol
---
 addons/base/static/src/js/list.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 9797b5dff99..e83454deebb 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -365,7 +365,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
     reload_view: function (grouped, context, initial) {
         var self = this;
         var callback = function (field_view_get) {
-            console.log('loaded', initial ? 'initial' : 'subsequent');
             self.on_loaded(field_view_get, grouped);
         };
         if (this.embedded_view) {

From 259892f837588c7b47c81cfe513d245e4526226f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 12:33:36 +0200
Subject: [PATCH 42/60] [FIX] selector for config overview widget: widget root
 has moved, .oe-dashboard-config-overview is now on this. so don't include it

bzr revid: xmo@openerp.com-20110825103336-nwyybou1hghaudud
---
 addons/base_dashboard/static/src/js/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index 8cf94a43362..e5b06a13461 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -321,7 +321,7 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
         $progress.progressbar({value: $progress.data('completion')});
 
         var self = this;
-        this.$element.find('div.oe-dashboard-config-overview ul')
+        this.$element.find('dl')
             .delegate('input', 'click', function (e) {
                 // switch todo status
                 e.stopImmediatePropagation();

From a5bb1a265b2eb1c217742db34330f28aa0fb78e8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 14:10:51 +0200
Subject: [PATCH 43/60] [fix] small bug with dates localization

bzr revid: nicolas.vanhoren@openerp.com-20110825121051-x86pjeyfnnb65ucr
---
 addons/base/static/src/js/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index fca993ffef9..57b3a8cb637 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -567,8 +567,8 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
                         self.do_load_js(file_list.concat(files));
                     });
                 } else {
-                    self.do_load_css(file_list.concat(["/base/webclient/css?mods="+modules]));
-                    self.do_load_js(["/base/webclient/js?mods="+modules]);
+                    self.do_load_css(["/base/webclient/css?mods="+modules]);
+                    self.do_load_js(file_list.concat(["/base/webclient/js?mods="+modules]));
                 }
                 openerp._modules_loaded = true;
             });

From 93aa853ae6c047d91e0958607fad73b1a4c5a271 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 14:17:53 +0200
Subject: [PATCH 44/60] [imp] changed format/parse functions for dates to use
 date.js format instead of the openerp one

bzr revid: nicolas.vanhoren@openerp.com-20110825121753-w3acs2fhbwm157a6
---
 addons/base/static/src/js/formats.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js
index c141aad908c..ed25b28c16d 100644
--- a/addons/base/static/src/js/formats.js
+++ b/addons/base/static/src/js/formats.js
@@ -45,8 +45,8 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
             if (typeof(value) == "string")
                 value = openerp.base.str_to_datetime(value);
             try {
-                return value.format(_.sprintf("%s %s", openerp.base._t.database.parameters.date_format, 
-                    openerp.base._t.database.parameters.time_format));
+                return value.toString(_.sprintf("%s %s", Date.CultureInfo.formatPatterns.shortDate, 
+                    Date.CultureInfo.formatPatterns.longTime));
             } catch (e) {
                 return value.format("%m/%d/%Y %H:%M:%S");
             }
@@ -55,7 +55,7 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
             if (typeof(value) == "string")
                 value = openerp.base.str_to_date(value);
             try {
-                return value.format(openerp.base._t.database.parameters.date_format);
+                return value.toString(Date.CultureInfo.formatPatterns.shortDate);
             } catch (e) {
                 return value.format("%m/%d/%Y");
             }
@@ -63,7 +63,7 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
             if (typeof(value) == "string")
                 value = openerp.base.str_to_time(value);
             try {
-                return value.format(openerp.base._t.database.parameters.time_format);
+                return value.toString(Date.CultureInfo.formatPatterns.longTime);
             } catch (e) {
                 return value.format("%H:%M:%S");
             }
@@ -108,17 +108,27 @@ openerp.base.parse_value = function (value, descriptor, value_if_empty) {
         case 'progressbar':
             return openerp.base.parse_value(value, {type: "float"});
         case 'datetime':
-            var tmp = Date.parse(value);
+            var tmp = Date.parseExact(value, _.sprintf("%s %s", Date.CultureInfo.formatPatterns.shortDate, 
+                    Date.CultureInfo.formatPatterns.longTime));
+            if (tmp !== null)
+                return tmp;
+            tmp = Date.parse(value);
             if (tmp !== null)
                 return tmp;
             throw value + " is not a valid datetime";
         case 'date':
-            var tmp = Date.parse(value);
+            var tmp = Date.parseExact(Date.CultureInfo.formatPatterns.shortDate);
+            if (tmp !== null)
+                return tmp;
+            tmp = Date.parse(value);
             if (tmp !== null)
                 return tmp;
             throw value + " is not a valid date";
         case 'time':
-            var tmp = Date.parse(value);
+            var tmp = Date.parseExact(Date.CultureInfo.formatPatterns.longTime);
+            if (tmp !== null)
+                return tmp;
+            tmp = Date.parse(value);
             if (tmp !== null)
                 return tmp;
             throw value + " is not a valid time";

From b5a429d008536f6410e82b24ee12ec481b6d6397 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 14:30:49 +0200
Subject: [PATCH 45/60] [FIX] fnct_inv in client actions params, fix docstring
 for fnct_inv (fnct_inv only takes a single record id, not a sequence of ids)

bzr revid: xmo@openerp.com-20110825123049-bmvebm86gqgr6w43
---
 openerp/addons/base/ir/ir_actions.py | 5 ++---
 openerp/osv/fields.py                | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 0b60d389287..67c36b277dd 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -936,10 +936,9 @@ class act_client(osv.osv):
             for record in self.browse(cr, uid, ids, context=context)
         ])
 
-    def _set_params(self, cr, uid, ids, field_name, field_value, arg, context):
+    def _set_params(self, cr, uid, id, field_name, field_value, arg, context):
         assert isinstance(field_value, dict), "params can only be dictionaries"
-        for record in self.browse(cr, uid, ids, context=context):
-            record.write({field_name: repr(field_value)})
+        self.write(cr, uid, id, {'params_store': repr(field_value)}, context=context)
 
     _columns = {
         'tag': fields.char('Client action tag', size=64, required=True,
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 782cc8e796a..fb973d2e521 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -852,12 +852,13 @@ class function(_column):
     This callable implements the write operation for the function field
     and must have the following signature:
 
-    .. function:: fnct_inv(model, cr, uid, ids, field_name, field_value, fnct_inv_arg, context)
+    .. function:: fnct_inv(model, cr, uid, id, field_name, field_value, fnct_inv_arg, context)
 
         Callable that implements the ``write`` operation for the function field.
 
         :param orm_template model: model to which the field belongs (should be ``self`` for
                                    a model method)
+        :param int id: the identifier of the object to write on
         :param str field_name: name of the field to set
         :param fnct_inv_arg: arbitrary value passed when declaring the function field
         :return: True

From b8cd28fb355de91b9ec736be4f42d77afef0a137 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 14:34:45 +0200
Subject: [PATCH 46/60] [FIX] widgets client action handler: one action per
 widget

bzr revid: xmo@openerp.com-20110825123445-ayhaeipasl4imvqt
---
 .../base_dashboard/static/src/js/dashboard.js | 61 +++++++++----------
 .../static/src/xml/base_dashboard.xml         |  9 ++-
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index e5b06a13461..3f9da51b157 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -372,39 +372,36 @@ openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
     }
 });
 openerp.base.client_actions.add(
-    'board.home.widgets', 'openerp.base_dashboard.Widgets');
-openerp.base_dashboard.Widgets = openerp.base.View.extend({
-    template: 'HomeWidgets',
-    start: function () {
-        return new openerp.base.DataSetSearch(
-                this, 'res.widget.user', null,
-                ['|', ['user_id', '=', false],
-                      ['user_id', '=', parseInt(this.session.uid, 10)]])
-            .read_slice(['widget_id', 'user_id'], {}, this.on_widgets_list_loaded);
+    'board.home.widgets', 'openerp.base_dashboard.Widget');
+openerp.base_dashboard.Widget = openerp.base.View.extend(/** @lends openerp.base_dashboard.Widgets# */{
+    template: 'HomeWidget',
+    /**
+     * Initializes a "HomeWidget" client widget: handles the display of a given
+     * res.widget objects in an OpenERP view (mainly a dashboard).
+     *
+     * @constructs
+     * @extends openerp.base.View
+     * @param {Object} parent
+     * @param {Object} options
+     * @param {Number} options.widget_id
+     */
+    init: function (parent, options) {
+        this._super(parent);
+        this.widget_id = options.widget_id;
     },
-    on_widgets_list_loaded: function (user_widgets) {
-        var self = this;
-        var widget_user = {};
-        _(user_widgets).each(function (widget) {
-            widget['widget_id'] = widget['widget_id'][0];
-            widget_user[widget['widget_id']] = {
-                removable: widget['user_id'] !== false,
-                user_widget_id: widget['id']
-            };
-        });
-        new openerp.base.DataSetSearch(this, 'res.widget')
-            .read_ids(_(user_widgets).pluck('widget_id'), ['title'], function (widgets) {
-                _(widgets).each(function (widget) {
-                    _.extend(widget, widget_user[widget['id']]);
-                });
-                var url = _.sprintf(
-                    '/base_dashboard/widgets/content?session_id=%s&widget_id=',
-                    self.session.session_id);
-                self.$element.html(QWeb.render('HomeWidgets', {
-                    widgets: widgets,
-                    url: url
-                }));
-            });
+    start: function () {
+        return new openerp.base.DataSet(this, 'res.widget').read_ids(
+                [this.widget_id], ['title'], this.on_widget_loaded);
+    },
+    on_widget_loaded: function (widgets) {
+        var widget = widgets[0];
+        var url = _.sprintf(
+            '/base_dashboard/widgets/content?session_id=%s&widget_id=%d',
+            this.session.session_id, widget.id);
+        this.$element.html(QWeb.render('HomeWidget.content', {
+            widget: widget,
+            url: url
+        }));
     }
 });
 };
diff --git a/addons/base_dashboard/static/src/xml/base_dashboard.xml b/addons/base_dashboard/static/src/xml/base_dashboard.xml
index 51657dfd068..b60e466964b 100644
--- a/addons/base_dashboard/static/src/xml/base_dashboard.xml
+++ b/addons/base_dashboard/static/src/xml/base_dashboard.xml
@@ -107,10 +107,9 @@
         </td>
     </tr>
 </table>
-<div t-name="HomeWidgets" class="oe-dashboard-home-widgets"/>
-<div t-name="HomeWidgets.content" class="oe-dashboard-home-widgets-widget"
-     t-foreach="widgets" t-as="widget">
+<div t-name="HomeWidget" class="oe-dashboard-home-widget"/>
+<t t-name="HomeWidget.content">
     <h3><t t-esc="widget.title"/></h3>
-    <iframe width="100%" frameborder="0" t-att-src="url + widget.id"/>
-</div>
+    <iframe width="100%" frameborder="0" t-att-src="url"/>
+</t>
 </template>

From bd8c79a4c48e19e105262ed8b20f12fdd35c42b0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 15:24:56 +0200
Subject: [PATCH 47/60] [FIX] not modifying the dataset's state is good and so
 is not breaking datagroup dispatching, but it would still be a good idea to
 not forget the dataset's content en route, myself

bzr revid: xmo@openerp.com-20110825132456-0wmhnrhmjszn4ce2
---
 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 e83454deebb..f2e37a1d683 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -398,8 +398,8 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      */
     do_search: function (domains, contexts, groupbys) {
         return this.rpc('/base/session/eval_domain_and_context', {
-            domains: domains,
-            contexts: contexts,
+            domains: [this.dataset.get_domain()].concat(domains),
+            contexts: [this.dataset.get_context()].concat(contexts),
             group_by_seq: groupbys
         }, $.proxy(this, 'do_actual_search'));
     },

From d8c48d874a5d22645e539c7f07fde1ede6e14828 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 16:21:26 +0200
Subject: [PATCH 48/60] [imp] made the context menu in m2o lazy loads

bzr revid: nicolas.vanhoren@openerp.com-20110825142126-ozmlaopwzhh5xlju
---
 addons/base/static/src/js/form.js | 66 ++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 3280b7e0d81..dd9c8f0a3f0 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1306,36 +1306,46 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         this.$input = this.$element.find("input");
         this.$drop_down = this.$element.find(".oe-m2o-drop-down-button");
         this.$menu_btn = this.$element.find(".oe-m2o-cm-button");
-
-        // context menu
-        var bindings = {};
-        bindings[this.cm_id + "_search"] = function() {
-            self._search_create_popup("search");
-        };
-        bindings[this.cm_id + "_create"] = function() {
-            self._search_create_popup("form");
-        };
-        bindings[this.cm_id + "_open"] = function() {
-            if (!self.value) {
-                return;
-            }
-            var pop = new openerp.base.form.FormOpenPopup(self.view);
-            pop.show_element(self.field.relation, self.value[0],self.build_context(), {});
-            pop.on_write_completed.add_last(function() {
-                self.set_value(self.value[0]);
-            });
-        };
-        var cmenu = this.$menu_btn.contextMenu(this.cm_id, {'leftClickToo': true,
-            bindings: bindings, itemStyle: {"color": ""},
-            onContextMenu: function() {
-                if(self.value) {
-                    $("#" + self.cm_id + "_open").removeClass("oe-m2o-disabled-cm");
-                } else {
-                    $("#" + self.cm_id + "_open").addClass("oe-m2o-disabled-cm");
+        
+        var init_context_menu_def = $.Deferred().then(function(e) {
+            // context menu
+            var bindings = {};
+            bindings[self.cm_id + "_search"] = function() {
+                self._search_create_popup("search");
+            };
+            bindings[self.cm_id + "_create"] = function() {
+                self._search_create_popup("form");
+            };
+            bindings[self.cm_id + "_open"] = function() {
+                if (!self.value) {
+                    return;
                 }
-                return true;
-            }
+                var pop = new openerp.base.form.FormOpenPopup(self.view);
+                pop.show_element(self.field.relation, self.value[0],self.build_context(), {});
+                pop.on_write_completed.add_last(function() {
+                    self.set_value(self.value[0]);
+                });
+            };
+            var cmenu = self.$menu_btn.contextMenu(self.cm_id, {'leftClickToo': true,
+                bindings: bindings, itemStyle: {"color": ""},
+                onContextMenu: function() {
+                    if(self.value) {
+                        $("#" + self.cm_id + "_open").removeClass("oe-m2o-disabled-cm");
+                    } else {
+                        $("#" + self.cm_id + "_open").addClass("oe-m2o-disabled-cm");
+                    }
+                    return true;
+                }
+            });
+            setTimeout(function() {
+                self.$menu_btn.trigger(e);
+            }, 0);
         });
+        
+        var ctx_callback = function(e) {init_context_menu_def.resolve(e); e.preventDefault()};
+        
+        this.$menu_btn.bind('contextmenu', ctx_callback);
+        this.$menu_btn.click(ctx_callback);
 
         // some behavior for input
         this.$input.keyup(function() {

From 2ca0749fd5508ade6a754738e82debe8b2dd868a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 16:37:45 +0200
Subject: [PATCH 49/60] [imp] made m2o context menu even more lazy loading

bzr revid: nicolas.vanhoren@openerp.com-20110825143745-lqii7wov08s5ipbp
---
 addons/base/static/src/js/form.js   | 10 ++++------
 addons/base/static/src/xml/base.xml | 14 +++++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index dd9c8f0a3f0..903e7d9f23b 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1307,8 +1307,10 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         this.$drop_down = this.$element.find(".oe-m2o-drop-down-button");
         this.$menu_btn = this.$element.find(".oe-m2o-cm-button");
         
+        // context menu
         var init_context_menu_def = $.Deferred().then(function(e) {
-            // context menu
+            var $cmenu = $("#" + self.cm_id);
+            $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self}));
             var bindings = {};
             bindings[self.cm_id + "_search"] = function() {
                 self._search_create_popup("search");
@@ -1337,13 +1339,9 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                     return true;
                 }
             });
-            setTimeout(function() {
-                self.$menu_btn.trigger(e);
-            }, 0);
+            setTimeout(function() {self.$menu_btn.trigger(e);}, 0);
         });
-        
         var ctx_callback = function(e) {init_context_menu_def.resolve(e); e.preventDefault()};
-        
         this.$menu_btn.bind('contextmenu', ctx_callback);
         this.$menu_btn.click(ctx_callback);
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 69aac831386..cf3299c9c8f 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -805,13 +805,17 @@
             <img src="/base/static/src/img/down-arrow.png" /></span>
         <span class="oe-m2o-cm-button" t-att-id="widget.name + '_open'">
             <img src="/base/static/src/img/icons/gtk-index.png"/></span>
-        <div t-att-id="widget.cm_id" class="contextMenu" style="display:none"><ul>
-            <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li>
-            <li t-att-id="widget.cm_id + '_create'">Create...</li>
-            <li t-att-id="widget.cm_id + '_search'">Search...</li>
-        </ul></div>
+        <div t-att-id="widget.cm_id" class="contextMenu" style="display:none">
+        </div>
     </div>
 </t>
+<t t-name="FieldMany2One.context_menu">
+    <ul>
+        <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li>
+        <li t-att-id="widget.cm_id + '_create'">Create...</li>
+        <li t-att-id="widget.cm_id + '_search'">Search...</li>
+    </ul>
+</t>
 <t t-name="FieldOne2Many">
     <div t-att-id="widget.element_id">
     </div>

From 3cfa39028166c25481b6e7b4e7467d290b33e3cb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 16:41:31 +0200
Subject: [PATCH 50/60] [IMP] attempt to fix height of widgets in home page

bzr revid: xmo@openerp.com-20110825144131-8xe3ukrdoph9p9v1
---
 addons/base_dashboard/controllers.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/base_dashboard/controllers.py b/addons/base_dashboard/controllers.py
index d24649a21cc..b0f5fbf817e 100644
--- a/addons/base_dashboard/controllers.py
+++ b/addons/base_dashboard/controllers.py
@@ -1,11 +1,28 @@
 # -*- coding: utf-8 -*-
 import openerpweb
 
+WIDGET_CONTENT_PATTERN = """<!DOCTYPE html>
+<html>
+    <head><title>[[Widget %(id)d]]</title></head>
+    <body>
+        %(content)s
+        <script type="text/javascript">
+            var load = window.onload;
+            window.onload = function () {
+                if (load) {
+                    load();
+                }
+                window.frameElement.style.height = document.height + 'px';
+            }
+        </script>
+    </body>
+</html>
+"""
 class Widgets(openerpweb.openerpweb.Controller):
     _cp_path = '/base_dashboard/widgets'
 
     @openerpweb.httprequest
     def content(self, request, widget_id):
-        return request.session.model('res.widget').read(
+        return WIDGET_CONTENT_PATTERN % request.session.model('res.widget').read(
             [widget_id], ['content'], request.session.eval_context(request.context)
-        )[0]['content']
+        )[0]

From 238a0200a0cf67f9bf167b48c77ec1037b5da761 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Aug 2011 16:57:41 +0200
Subject: [PATCH 51/60] [FIX] when loading records in the listview, remember to
 set dataset index to 0 so switching to formview does not try to create a new
 record

lp bug: https://launchpad.net/bugs/816830 fixed

bzr revid: xmo@openerp.com-20110825145741-gduqtgrqw4bbuugl
---
 addons/base/static/src/js/list.js | 49 ++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index f2e37a1d683..a02b05ba5ab 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -382,10 +382,19 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
      * re-renders the content of the list view
      */
     reload_content: function () {
+        var self = this;
         this.records.reset();
         this.$element.find('.oe-listview-content').append(
-            this.groups.render(
-                $.proxy(this, 'compute_aggregates')));
+            this.groups.render(function () {
+                if (self.dataset.index == null) {
+                    var has_one = false;
+                    self.records.each(function () { has_one = true; });
+                    if (has_one) {
+                        self.dataset.index = 0;
+                    }
+                }
+                self.compute_aggregates();
+            }));
     },
     /**
      * Event handler for a search, asks for the computation/folding of domains
@@ -1039,25 +1048,25 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
         var fields = _.pluck(_.select(this.columns, function(x) {return x.tag == "field"}), 'name');
         var options = { offset: page * limit, limit: limit };
         dataset.read_slice(fields, options , function (records) {
-                if (!self.datagroup.openable) {
-                    view.configure_pager(dataset);
-                } else {
-                    var pages = Math.ceil(dataset.ids.length / limit);
-                    self.$row
-                        .find('.oe-pager-state')
-                            .text(_.sprintf('%d/%d', page + 1, pages))
-                        .end()
-                        .find('button[data-pager-action=previous]')
-                            .attr('disabled', page === 0)
-                        .end()
-                        .find('button[data-pager-action=next]')
-                            .attr('disabled', page === pages - 1);
-                }
+            if (!self.datagroup.openable) {
+                view.configure_pager(dataset);
+            } else {
+                var pages = Math.ceil(dataset.ids.length / limit);
+                self.$row
+                    .find('.oe-pager-state')
+                        .text(_.sprintf('%d/%d', page + 1, pages))
+                    .end()
+                    .find('button[data-pager-action=previous]')
+                        .attr('disabled', page === 0)
+                    .end()
+                    .find('button[data-pager-action=next]')
+                        .attr('disabled', page === pages - 1);
+            }
 
-                self.records.add(records, {silent: true});
-                list.render();
-                d.resolve(list);
-            });
+            self.records.add(records, {silent: true});
+            list.render();
+            d.resolve(list);
+        });
         return d.promise();
     },
     setup_resequence_rows: function (list, dataset) {

From 9225fe407499b4fb942f3ef0ec4b42f43537caf6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 17:17:01 +0200
Subject: [PATCH 52/60] [imp] added display of relateds

bzr revid: nicolas.vanhoren@openerp.com-20110825151701-frwri4f5ge6rnsvf
---
 addons/base/static/src/js/data.js   | 10 ++---
 addons/base/static/src/js/form.js   | 65 ++++++++++++++++-------------
 addons/base/static/src/xml/base.xml |  9 +++-
 3 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 04c23224806..668898dd66c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -396,18 +396,18 @@ openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.Data
      *
      * @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 {Number} [domain_index] index of a domain to evaluate in the args array
+     * @param {Number} [context_index] 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) {
+    call_and_eval: function (method, args, domain_index, context_index, callback, error_callback) {
         return this.rpc('/base/dataset/call', {
             model: this.model,
             method: method,
-            domain_id: domain_id || null,
-            context_id: context_id || null,
+            domain_id: domain_index || null,
+            context_id: context_index || null,
             args: args || []
         }, callback, error_callback);
     },
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 903e7d9f23b..99da0062810 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1309,37 +1309,44 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         
         // context menu
         var init_context_menu_def = $.Deferred().then(function(e) {
-            var $cmenu = $("#" + self.cm_id);
-            $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self}));
-            var bindings = {};
-            bindings[self.cm_id + "_search"] = function() {
-                self._search_create_popup("search");
-            };
-            bindings[self.cm_id + "_create"] = function() {
-                self._search_create_popup("form");
-            };
-            bindings[self.cm_id + "_open"] = function() {
-                if (!self.value) {
-                    return;
-                }
-                var pop = new openerp.base.form.FormOpenPopup(self.view);
-                pop.show_element(self.field.relation, self.value[0],self.build_context(), {});
-                pop.on_write_completed.add_last(function() {
-                    self.set_value(self.value[0]);
-                });
-            };
-            var cmenu = self.$menu_btn.contextMenu(self.cm_id, {'leftClickToo': true,
-                bindings: bindings, itemStyle: {"color": ""},
-                onContextMenu: function() {
-                    if(self.value) {
-                        $("#" + self.cm_id + "_open").removeClass("oe-m2o-disabled-cm");
-                    } else {
-                        $("#" + self.cm_id + "_open").addClass("oe-m2o-disabled-cm");
+            var rdataset = new openerp.base.DataSetStatic(self, "ir.values", self.build_context());
+            rdataset.call("get", ['action', 'client_action_relate',
+                [[self.field.relation, false]], false, rdataset.get_context()], false, 0)
+                .then(function(result) {
+                self.related_entries = result;
+                
+                var $cmenu = $("#" + self.cm_id);
+                $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self}));
+                var bindings = {};
+                bindings[self.cm_id + "_search"] = function() {
+                    self._search_create_popup("search");
+                };
+                bindings[self.cm_id + "_create"] = function() {
+                    self._search_create_popup("form");
+                };
+                bindings[self.cm_id + "_open"] = function() {
+                    if (!self.value) {
+                        return;
                     }
-                    return true;
-                }
+                    var pop = new openerp.base.form.FormOpenPopup(self.view);
+                    pop.show_element(self.field.relation, self.value[0],self.build_context(), {});
+                    pop.on_write_completed.add_last(function() {
+                        self.set_value(self.value[0]);
+                    });
+                };
+                var cmenu = self.$menu_btn.contextMenu(self.cm_id, {'leftClickToo': true,
+                    bindings: bindings, itemStyle: {"color": ""},
+                    onContextMenu: function() {
+                        if(self.value) {
+                            $("#" + self.cm_id + " .oe_m2o_menu_item_mandatory").removeClass("oe-m2o-disabled-cm");
+                        } else {
+                            $("#" + self.cm_id + " .oe_m2o_menu_item_mandatory").addClass("oe-m2o-disabled-cm");
+                        }
+                        return true;
+                    }, menuStyle: {width: "200px"}
+                });
+                setTimeout(function() {self.$menu_btn.trigger(e);}, 0);
             });
-            setTimeout(function() {self.$menu_btn.trigger(e);}, 0);
         });
         var ctx_callback = function(e) {init_context_menu_def.resolve(e); e.preventDefault()};
         this.$menu_btn.bind('contextmenu', ctx_callback);
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index cf3299c9c8f..0c17e70cfc7 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -813,7 +813,14 @@
     <ul>
         <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li>
         <li t-att-id="widget.cm_id + '_create'">Create...</li>
-        <li t-att-id="widget.cm_id + '_search'">Search...</li>
+        <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_mandatory">Search...</li>
+        <t t-set="i" t-value="0"/>
+        <t t-foreach="widget.related_entries" t-as="entry">
+            <li t-att-id="widget.cm_id + '_related_' + i" style="color:grey" class="oe_m2o_menu_item_mandatory">
+                ... <t t-esc="(entry[2] || {})['name'] || ''"/>
+            </li>
+            <t t-set="i" t-value="i+1"/>
+        </t>
     </ul>
 </t>
 <t t-name="FieldOne2Many">

From fc766e16fe8a6da5de0f0a9b68a83d4696861ddb Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 19:04:10 +0200
Subject: [PATCH 53/60] [imp] refactoring to allow correct context handling in
 clean_action

bzr revid: nicolas.vanhoren@openerp.com-20110825170410-omj3wrugqmslck8w
---
 addons/base/controllers/main.py   | 31 +++++++++++++++----------------
 addons/base/static/src/js/form.js | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index d5eaafaecee..7d96031a4aa 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -423,25 +423,25 @@ def eval_context_and_domain(session, context, domain=None):
 
     return e_context, e_domain
 
-def load_actions_from_ir_values(req, key, key2, models, meta, context):
+def load_actions_from_ir_values(req, key, key2, models, meta):
+    context = req.session.eval_context(req.context)
     Values = req.session.model('ir.values')
     actions = Values.get(key, key2, models, meta, context)
 
-    return [(id, name, clean_action(action, req.session, context=context))
+    return [(id, name, clean_action(req, action))
             for id, name, action in actions]
 
-def clean_action(action, session, context=None):
+def clean_action(req, action):
+    context = req.session.eval_context(req.context)
+    eval_ctx = req.session.evaluation_context(context)
     action.setdefault('flags', {})
-    if action['type'] != 'ir.actions.act_window':
-        return action
+    
     # values come from the server, we can just eval them
     if isinstance(action.get('context'), basestring):
-        localvars = session.evaluation_context(context=context)
-        action['context'] = eval( action['context'], localvars ) or {}
+        action['context'] = eval( action['context'], eval_ctx ) or {}
 
     if isinstance(action.get('domain'), basestring):
-        localvars = session.evaluation_context( action.get('context', {}))
-        action['domain'] = eval( action['domain'], localvars ) or []
+        action['domain'] = eval( action['domain'], eval_ctx ) or []
 
     return fix_view_modes(action)
 
@@ -559,8 +559,7 @@ class Menu(openerpweb.Controller):
     @openerpweb.jsonrequest
     def action(self, req, menu_id):
         actions = load_actions_from_ir_values(req,'action', 'tree_but_open',
-                                             [('ir.ui.menu', menu_id)], False,
-                                             req.session.eval_context(req.context))
+                                             [('ir.ui.menu', menu_id)], False)
         return {"action": actions}
 
 class DataSet(openerpweb.Controller):
@@ -696,7 +695,7 @@ class DataSet(openerpweb.Controller):
     def call_button(self, req, model, method, args, domain_id=None, context_id=None):
         action = self.call_common(req, model, method, args, domain_id, context_id)
         if isinstance(action, dict) and action.get('type') != '':
-            return {'result': clean_action(action, req.session)}
+            return {'result': clean_action(req, action)}
         return {'result': False}
 
     @openerpweb.jsonrequest
@@ -1040,13 +1039,13 @@ class Action(openerpweb.Controller):
             action = req.session.model(action_type[0]['type']).read([action_id], False,
                                                                     context)
             if action:
-                value = clean_action(action[0], req.session)
+                value = clean_action(req, action[0])
         return {'result': value}
 
     @openerpweb.jsonrequest
     def run(self, req, action_id):
-        return clean_action(req.session.model('ir.actions.server').run(
-            [action_id], req.session.eval_context(req.context)), req.session)
+        return clean_action(req, req.session.model('ir.actions.server').run(
+            [action_id], req.session.eval_context(req.context)))
 
 class TreeView(View):
     _cp_path = "/base/treeview"
@@ -1059,7 +1058,7 @@ class TreeView(View):
     def action(self, req, model, id):
         return load_actions_from_ir_values(
             req,'action', 'tree_but_open',[(model, id)],
-            False, req.session.eval_context(req.context))
+            False)
 
 def export_csv(fields, result):
     fp = StringIO()
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 99da0062810..4138f6d50b5 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1334,6 +1334,11 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                         self.set_value(self.value[0]);
                     });
                 };
+                _.each(_.range(self.related_entries.length), function(i) {
+                    bindings[self.cm_id + "_related_" + i] = function() {
+                        self.open_related(self.related_entries[i]);
+                    };
+                });
                 var cmenu = self.$menu_btn.contextMenu(self.cm_id, {'leftClickToo': true,
                     bindings: bindings, itemStyle: {"color": ""},
                     onContextMenu: function() {
@@ -1544,6 +1549,22 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         if (this.value === null) {
             this.invalid = this.required;
         }
+    },
+    open_related: function(related) {
+        var self = this;
+        if (!self.value)
+            return;
+        self.rpc("/base/action/load", {
+            action_id: related[2].id,
+            context: {
+                active_id: self.value[0],
+                active_ids: self.value[1],
+                active_model: self.field.relation
+            }
+        }, function(result) {
+            //TODO niv
+            debugger;
+        });
     }
 });
 

From 27eff948b572090192c837c4afb37c796286ebf2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Aug 2011 19:14:51 +0200
Subject: [PATCH 54/60] [imp] refactoring to put "req" instead or "request"
 everywhere in the server-side code

bzr revid: nicolas.vanhoren@openerp.com-20110825171451-9idtdh6dqcxrk873
---
 addons/base/controllers/main.py | 68 ++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 7d96031a4aa..1e6bd6b8500 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -571,15 +571,15 @@ class DataSet(openerpweb.Controller):
                                                               req.session.eval_context(req.context))}
 
     @openerpweb.jsonrequest
-    def search_read(self, request, model, fields=False, offset=0, limit=False, domain=None, sort=None):
-        return self.do_search_read(request, model, fields, offset, limit, domain, sort)
-    def do_search_read(self, request, model, fields=False, offset=0, limit=False, domain=None
+    def search_read(self, req, model, fields=False, offset=0, limit=False, domain=None, sort=None):
+        return self.do_search_read(req, model, fields, offset, limit, domain, sort)
+    def do_search_read(self, req, model, fields=False, offset=0, limit=False, domain=None
                        , sort=None):
         """ Performs a search() followed by a read() (if needed) using the
         provided search criteria
 
-        :param request: a JSON-RPC request object
-        :type request: openerpweb.JsonRequest
+        :param req: a JSON-RPC request object
+        :type req: openerpweb.JsonRequest
         :param str model: the name of the model to search on
         :param fields: a list of the fields to return in the result records
         :type fields: [str]
@@ -592,10 +592,10 @@ class DataSet(openerpweb.Controller):
                   matching fields selection set)
         :rtype: list
         """
-        Model = request.session.model(model)
+        Model = req.session.model(model)
 
         context, domain = eval_context_and_domain(
-            request.session, request.context, domain)
+            req.session, req.context, domain)
 
         ids = Model.search(domain, 0, False, sort or False, context)
         # need to fill the dataset with all ids for the (domain, context) pair,
@@ -617,22 +617,22 @@ class DataSet(openerpweb.Controller):
 
 
     @openerpweb.jsonrequest
-    def read(self, request, model, ids, fields=False):
-        return self.do_search_read(request, model, ids, fields)
+    def read(self, req, model, ids, fields=False):
+        return self.do_search_read(req, model, ids, fields)
 
     @openerpweb.jsonrequest
-    def get(self, request, model, ids, fields=False):
-        return self.do_get(request, model, ids, fields)
+    def get(self, req, model, ids, fields=False):
+        return self.do_get(req, model, ids, fields)
 
-    def do_get(self, request, model, ids, fields=False):
+    def do_get(self, req, model, ids, fields=False):
         """ Fetches and returns the records of the model ``model`` whose ids
         are in ``ids``.
 
         The results are in the same order as the inputs, but elements may be
         missing (if there is no record left for the id)
 
-        :param request: the JSON-RPC2 request object
-        :type request: openerpweb.JsonRequest
+        :param req: the JSON-RPC2 request object
+        :type req: openerpweb.JsonRequest
         :param model: the model to read from
         :type model: str
         :param ids: a list of identifiers
@@ -643,8 +643,8 @@ class DataSet(openerpweb.Controller):
         :returns: a list of records, in the same order as the list of ids
         :rtype: list
         """
-        Model = request.session.model(model)
-        records = Model.read(ids, fields, request.session.eval_context(request.context))
+        Model = req.session.model(model)
+        records = Model.read(ids, fields, req.session.eval_context(req.context))
 
         record_map = dict((record['id'], record) for record in records)
 
@@ -672,9 +672,9 @@ class DataSet(openerpweb.Controller):
         return {'result': r}
 
     @openerpweb.jsonrequest
-    def unlink(self, request, model, ids=()):
-        Model = request.session.model(model)
-        return Model.unlink(ids, request.session.eval_context(request.context))
+    def unlink(self, req, model, ids=()):
+        Model = req.session.model(model)
+        return Model.unlink(ids, req.session.eval_context(req.context))
 
     def call_common(self, req, model, method, args, domain_id=None, context_id=None):
         domain = args[domain_id] if domain_id and len(args) - 1 >= domain_id  else []
@@ -717,9 +717,9 @@ class DataSet(openerpweb.Controller):
 class DataGroup(openerpweb.Controller):
     _cp_path = "/base/group"
     @openerpweb.jsonrequest
-    def read(self, request, model, fields, group_by_fields, domain=None, sort=None):
-        Model = request.session.model(model)
-        context, domain = eval_context_and_domain(request.session, request.context, domain)
+    def read(self, req, model, fields, group_by_fields, domain=None, sort=None):
+        Model = req.session.model(model)
+        context, domain = eval_context_and_domain(req.session, req.context, domain)
 
         return Model.read_group(
             domain or [], fields, group_by_fields, 0, False,
@@ -728,13 +728,13 @@ class DataGroup(openerpweb.Controller):
 class View(openerpweb.Controller):
     _cp_path = "/base/view"
 
-    def fields_view_get(self, request, model, view_id, view_type,
+    def fields_view_get(self, req, model, view_id, view_type,
                         transform=True, toolbar=False, submenu=False):
-        Model = request.session.model(model)
-        context = request.session.eval_context(request.context)
+        Model = req.session.model(model)
+        context = req.session.eval_context(req.context)
         fvg = Model.fields_view_get(view_id, view_type, context, toolbar, submenu)
         # todo fme?: check that we should pass the evaluated context here
-        self.process_view(request.session, fvg, context, transform)
+        self.process_view(req.session, fvg, context, transform)
         return fvg
 
     def process_view(self, session, fvg, context, transform):
@@ -767,20 +767,20 @@ class View(openerpweb.Controller):
                 field["context"] = self.parse_context(field["context"], session)
 
     @openerpweb.jsonrequest
-    def add_custom(self, request, view_id, arch):
-        CustomView = request.session.model('ir.ui.view.custom')
+    def add_custom(self, req, view_id, arch):
+        CustomView = req.session.model('ir.ui.view.custom')
         CustomView.create({
-            'user_id': request.session._uid,
+            'user_id': req.session._uid,
             'ref_id': view_id,
             'arch': arch
-        }, request.session.eval_context(request.context))
+        }, req.session.eval_context(req.context))
         return {'result': True}
 
     @openerpweb.jsonrequest
-    def undo_custom(self, request, view_id, reset=False):
-        CustomView = request.session.model('ir.ui.view.custom')
-        context = request.session.eval_context(request.context)
-        vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)],
+    def undo_custom(self, req, view_id, reset=False):
+        CustomView = req.session.model('ir.ui.view.custom')
+        context = req.session.eval_context(req.context)
+        vcustom = CustomView.search([('user_id', '=', req.session._uid), ('ref_id' ,'=', view_id)],
                                     0, False, False, context)
         if vcustom:
             if reset:

From 393f146d7797ef8c7d8d0b0edfa938785c0c7052 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Aug 2011 14:44:18 +0200
Subject: [PATCH 55/60] [imp] make related in m2o work

bzr revid: nicolas.vanhoren@openerp.com-20110826124418-d2vw72ulgse75hgh
---
 addons/base/static/src/js/form.js  | 5 ++---
 addons/base/static/src/js/views.js | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 4138f6d50b5..55bf743e293 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1558,12 +1558,11 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
             action_id: related[2].id,
             context: {
                 active_id: self.value[0],
-                active_ids: self.value[1],
+                active_ids: [self.value[0]],
                 active_model: self.field.relation
             }
         }, function(result) {
-            //TODO niv
-            debugger;
+            self.do_action(result.result);
         });
     }
 });
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index bd05856f55a..ee5529262f7 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -376,8 +376,7 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
         this.sections = {};
     },
     start: function() {
-        var self = this;
-        this._super(this, arguments);
+        this._super(this);
         this.$element.html(QWeb.render('Sidebar'));
         this.$element.find(".toggle-sidebar").click(function(e) {
             self.do_toggle();

From a7031474367971851a8d58ffde388ea0903b4097 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Aug 2011 15:03:35 +0200
Subject: [PATCH 56/60] [imp] made related work from form view

bzr revid: nicolas.vanhoren@openerp.com-20110826130335-fjt0c5f7s7ug2jdl
---
 addons/base/static/src/js/form.js  |  4 ++++
 addons/base/static/src/js/list.js  |  5 ++++-
 addons/base/static/src/js/views.js | 20 +++++++++++++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 55bf743e293..212f48717bd 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -441,6 +441,10 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi
             values[key] = val;
         });
         return values;
+    },
+    get_selected_ids: function() {
+        var id = this.dataset.ids[this.dataset.index];
+        return id ? [id] : [];
     }
 });
 
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index a02b05ba5ab..5289cdb435c 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -597,8 +597,11 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             $footer_cells.filter(_.sprintf('[data-field=%s]', column.id))
                 .html(openerp.base.format_cell(aggregation, column));
         });
+    },
+    get_selected_ids: function() {
+        //TODO niv: this is false
+        debugger;
     }
-    // TODO: implement reorder (drag and drop rows)
 });
 openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.ListView.List# */{
     /**
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index ee5529262f7..1e07c461b2c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -432,9 +432,23 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
                     item.callback();
                 }
                 if (item.action) {
-                    item.action.flags = item.action.flags || {};
-                    item.action.flags.new_window = true;
-                    self.do_action(item.action);
+                    var ids = self.widget_parent.get_selected_ids();
+                    if (ids.length == 0) {
+                        //TODO niv: maybe show a warning?
+                        return false;
+                    }
+                    self.rpc("/base/action/load", {
+                        action_id: item.action.id,
+                        context: {
+                            active_id: ids[0],
+                            active_ids: ids,
+                            active_model: self.widget_parent.dataset.model
+                        }
+                    }, function(result) {
+                        result.result.flags = result.result.flags || {};
+                        result.result.flags.new_window = true;
+                        self.do_action(result.result);
+                    });
                 }
                 return false;
             });

From 7a9ff57a0e74ef6ab197c74a7dd08ad8225fbf48 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Aug 2011 15:28:35 +0200
Subject: [PATCH 57/60] [imp] made related work with list view too

bzr revid: nicolas.vanhoren@openerp.com-20110826132835-ex26y5hyti3acgzk
---
 addons/base/static/src/js/list.js  | 4 ++--
 addons/base/static/src/js/views.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 5289cdb435c..786c8cb2068 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -599,8 +599,8 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         });
     },
     get_selected_ids: function() {
-        //TODO niv: this is false
-        debugger;
+        var ids = this.groups.get_selection().ids;
+        return ids;
     }
 });
 openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.ListView.List# */{
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 1e07c461b2c..689a72ef7f1 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -377,6 +377,7 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
     },
     start: function() {
         this._super(this);
+        var self = this;
         this.$element.html(QWeb.render('Sidebar'));
         this.$element.find(".toggle-sidebar").click(function(e) {
             self.do_toggle();

From d692a02d5ba05df8befccce43a5e28067d9f0e0a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Aug 2011 15:31:13 +0200
Subject: [PATCH 58/60] [imp] fixed related behavior for calendar

bzr revid: nicolas.vanhoren@openerp.com-20110826133113-7glw38cszv5pwdqw
---
 addons/base_calendar/static/src/js/calendar.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index 19818b66380..7a0b561ccef 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -327,6 +327,10 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         if (this.sidebar) {
             this.sidebar.$element.hide();
         }
+    },
+    get_selected_ids: function() {
+        // no way to select a record anyway
+        return [];
     }
 });
 

From 2a3fe9819d35f82fa98806e31a5d993a8d64669a Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 26 Aug 2011 15:33:01 +0200
Subject: [PATCH 59/60] [REF] openerp-server: separated the --test-file
 mechanism from the main code path.

bzr revid: vmt@openerp.com-20110826133301-8y7intt7vhsg5gm9
---
 openerp-server | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/openerp-server b/openerp-server
index 9c9a8c2bde7..e9423a79859 100755
--- a/openerp-server
+++ b/openerp-server
@@ -51,15 +51,20 @@ def check_root_user():
             sys.exit(1)
 
 def check_postgres_user():
-    """ Exit if the configured database user is 'postgres'."""
+    """ Exit if the configured database user is 'postgres'.
+
+    This function assumes the configuration has been initialized.
+    """
     config = openerp.tools.config
-    logger = logging.getLogger('server')
     if config['db_user'] == 'postgres':
         sys.stderr.write("Using the database user 'postgres' is a security risk, aborting.")
         sys.exit(1)
 
 def report_configuration():
-    """ Log the server version and some configuration values."""
+    """ Log the server version and some configuration values.
+
+    This function assumes the configuration has been initialized.
+    """
     config = openerp.tools.config
     logger = logging.getLogger('server')
     logger.info("OpenERP version %s", __version__)
@@ -69,8 +74,11 @@ def report_configuration():
                         ('database user', config['db_user'])]:
         logger.info("%s: %s", name, value)
 
-# TODO is a \n better?
 def setup_pid_file():
+    """ Create a file with the process id written in it.
+
+    This function assumes the configuration has been initialized.
+    """
     config = openerp.tools.config
     if config['pidfile']:
         fd = open(config['pidfile'], 'w')
@@ -78,19 +86,21 @@ def setup_pid_file():
         fd.write(pidtext)
         fd.close()
 
-def run_registry(dbname):
+def preload_registry(dbname):
+    """ Preload a registry, and start the cron."""
+    db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
+    pool.get('ir.cron').restart(db.dbname)
+
+def run_test_file(dbname, test_file):
     """ Preload a registry, possibly run a test file, and start the cron."""
     db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
 
-    if config["test_file"]:
-        cr = db.cursor()
-        logger = logging.getLogger('server')
-        logger.info('loading test file %s', config["test_file"])
-        openerp.tools.convert_yaml_import(cr, 'base', file(config["test_file"]), {}, 'test', True)
-        cr.rollback()
-        cr.close()
-
-    pool.get('ir.cron').restart(db.dbname)
+    cr = db.cursor()
+    logger = logging.getLogger('server')
+    logger.info('loading test file %s', test_file)
+    openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
+    cr.rollback()
+    cr.close()
 
 def export_translation():
     config = openerp.tools.config
@@ -147,6 +157,8 @@ def start_services():
     # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
     openerp.netsvc.Server.startAll()
 
+# Variable keeping track of the number of calls to the signal handler defined
+# below. This variable is monitored by ``quit_on_signals()``.
 quit_signals_received = 0
 
 def signal_handler(sig, frame):
@@ -178,6 +190,7 @@ def dumpstacks(sig, frame):
     logging.getLogger('dumpstacks').info("\n".join(code))
 
 def setup_signal_handlers():
+    """ Register the signal handler defined above. """
     SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
     map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
     if os.name == 'posix':
@@ -227,6 +240,10 @@ if __name__ == "__main__":
 
     config = openerp.tools.config
 
+    if config["test_file"]:
+        run_test_file(config['db_name'], config['test_file'])
+        sys.exit(0)
+
     if config["translate_out"]:
         export_translation()
         sys.exit(0)
@@ -237,7 +254,7 @@ if __name__ == "__main__":
 
     if config['db_name']:
         for dbname in config['db_name'].split(','):
-            run_registry(dbname)
+            preload_registry(dbname)
 
     if config["stop_after_init"]:
         sys.exit(0)

From b8d25dc2b812488e0134c4f7387de3dd0d848c7f Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 26 Aug 2011 15:43:11 +0200
Subject: [PATCH 60/60] [FIX] openerp-server: forgot to remove the utf-8 quote
 as stated on the merge prop by xrg.

bzr revid: vmt@openerp.com-20110826134311-446b2gwkuyy5i1r1
---
 openerp-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-server b/openerp-server
index e9423a79859..2698307ff42 100755
--- a/openerp-server
+++ b/openerp-server
@@ -43,7 +43,7 @@ __author__ = openerp.release.author
 __version__ = openerp.release.version
 
 def check_root_user():
-    """ Exit if the process’s user is 'root' (on POSIX system)."""
+    """ Exit if the process's user is 'root' (on POSIX system)."""
     if os.name == 'posix':
         import pwd
         if pwd.getpwuid(os.getuid())[0] == 'root' :