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/24] [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/24] [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/24] [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/24] [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 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 05/24] [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 06/24] [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 07/24] [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 08/24] [???] 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 09/24] [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 10/24] [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 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 11/24] [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 12/24] [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 13/24] [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 14/24] [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 063e28a83defa420c0ced7667839e84ff5bd4926 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 20 Aug 2011 04:53:48 +0000
Subject: [PATCH 15/24] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
---
 addons/account/i18n/ca.po                | 2 +-
 addons/account/i18n/es.po                | 2 +-
 addons/account_analytic_plans/i18n/ca.po | 2 +-
 addons/account_asset/i18n/ca.po          | 2 +-
 addons/account_followup/i18n/ca.po       | 2 +-
 addons/account_payment/i18n/ca.po        | 2 +-
 addons/account_sequence/i18n/ca.po       | 2 +-
 addons/base_module_quality/i18n/ca.po    | 4 ++--
 addons/caldav/i18n/ca.po                 | 2 +-
 addons/crm/i18n/ca.po                    | 2 +-
 addons/crm_claim/i18n/ca.po              | 2 +-
 addons/document_webdav/i18n/ca.po        | 2 +-
 addons/email_template/i18n/ca.po         | 2 +-
 addons/hr_payroll_account/i18n/ca.po     | 2 +-
 addons/hr_timesheet_invoice/i18n/ca.po   | 2 +-
 addons/l10n_in/i18n/ca.po                | 2 +-
 addons/l10n_syscohada/i18n/ca.po         | 2 +-
 addons/marketing/i18n/ca.po              | 2 +-
 addons/mrp/i18n/ca.po                    | 2 +-
 addons/point_of_sale/i18n/ca.po          | 2 +-
 addons/portal/i18n/ca.po                 | 2 +-
 addons/project/i18n/ca.po                | 2 +-
 addons/project_issue/i18n/ca.po          | 2 +-
 addons/project_long_term/i18n/ca.po      | 2 +-
 addons/project_messages/i18n/ca.po       | 2 +-
 addons/project_scrum/i18n/ca.po          | 2 +-
 addons/project_scrum/i18n/zh_CN.po       | 2 +-
 addons/purchase/i18n/ca.po               | 2 +-
 addons/purchase_requisition/i18n/ca.po   | 2 +-
 addons/report_webkit/i18n/ca.po          | 2 +-
 addons/resource/i18n/es_EC.po            | 2 +-
 addons/sale_crm/i18n/ca.po               | 2 +-
 addons/share/i18n/ca.po                  | 2 +-
 addons/stock/i18n/ca.po                  | 2 +-
 addons/stock_planning/i18n/ca.po         | 2 +-
 35 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 77e73347600..cf110b23577 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 90eac677e15..d1cf677ef46 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index 39092a2dca7..8c979a5a9bf 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index a4db4530ca7..3f92d51f740 100755
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_asset
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index 17a5678a5da..10ee4d15f05 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_followup
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index 5a9d22f486a..75e0067fe1e 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_payment
diff --git a/addons/account_sequence/i18n/ca.po b/addons/account_sequence/i18n/ca.po
index 2ce07730a98..6f7523bf4c8 100644
--- a/addons/account_sequence/i18n/ca.po
+++ b/addons/account_sequence/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: account_sequence
diff --git a/addons/base_module_quality/i18n/ca.po b/addons/base_module_quality/i18n/ca.po
index 23531a5767a..ba7ac4851ed 100644
--- a/addons/base_module_quality/i18n/ca.po
+++ b/addons/base_module_quality/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: base_module_quality
@@ -57,7 +57,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
-msgstr ""
+msgstr "O(n) o pitjor"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
index bea034b87e2..be755a581a8 100644
--- a/addons/caldav/i18n/ca.po
+++ b/addons/caldav/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: caldav
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index 48fa2689a0e..6cd1f755618 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: crm
diff --git a/addons/crm_claim/i18n/ca.po b/addons/crm_claim/i18n/ca.po
index 6021fb287ec..831daf236f9 100644
--- a/addons/crm_claim/i18n/ca.po
+++ b/addons/crm_claim/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: crm_claim
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
index f9dbfef689c..7d7d92b786c 100644
--- a/addons/document_webdav/i18n/ca.po
+++ b/addons/document_webdav/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: document_webdav
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index 0bc592ef3c6..6b0e49ba10f 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: email_template
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
index 513d962673e..178543a4bde 100644
--- a/addons/hr_payroll_account/i18n/ca.po
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index da5c7be1913..a33367afd08 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/l10n_in/i18n/ca.po b/addons/l10n_in/i18n/ca.po
index 567bf939223..dfef5cf2438 100644
--- a/addons/l10n_in/i18n/ca.po
+++ b/addons/l10n_in/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: l10n_chart_in
diff --git a/addons/l10n_syscohada/i18n/ca.po b/addons/l10n_syscohada/i18n/ca.po
index 8b80c907cc1..251c2b9b4ae 100644
--- a/addons/l10n_syscohada/i18n/ca.po
+++ b/addons/l10n_syscohada/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: l10n_syscohada
diff --git a/addons/marketing/i18n/ca.po b/addons/marketing/i18n/ca.po
index cc523fa4d35..f7afeb06ca4 100644
--- a/addons/marketing/i18n/ca.po
+++ b/addons/marketing/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: marketing
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index da40538a345..a841711d6d0 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: mrp
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index a48dad4b45a..99dfbcdbd7a 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: point_of_sale
diff --git a/addons/portal/i18n/ca.po b/addons/portal/i18n/ca.po
index d6d5469900a..392ac771b0f 100644
--- a/addons/portal/i18n/ca.po
+++ b/addons/portal/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: portal
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 8cddcd03b1c..e3969112968 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project
diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index c71bdecf47a..a8a9a4069d8 100644
--- a/addons/project_issue/i18n/ca.po
+++ b/addons/project_issue/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_issue
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index fde760c2cd5..6e5b17e27ad 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_long_term
diff --git a/addons/project_messages/i18n/ca.po b/addons/project_messages/i18n/ca.po
index 4a017a2bafe..3e4f91cf3d5 100644
--- a/addons/project_messages/i18n/ca.po
+++ b/addons/project_messages/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_messages
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
index 6e6a19e504f..4ed0a518f05 100644
--- a/addons/project_scrum/i18n/ca.po
+++ b/addons/project_scrum/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
index 2e69a1eaf66..4480e459b37 100644
--- a/addons/project_scrum/i18n/zh_CN.po
+++ b/addons/project_scrum/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-17 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_scrum
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index bdafd718842..373dc8765bc 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: purchase
diff --git a/addons/purchase_requisition/i18n/ca.po b/addons/purchase_requisition/i18n/ca.po
index fb7aa059d8a..d6770a1c94f 100644
--- a/addons/purchase_requisition/i18n/ca.po
+++ b/addons/purchase_requisition/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: purchase_requisition
diff --git a/addons/report_webkit/i18n/ca.po b/addons/report_webkit/i18n/ca.po
index 1411bc43ab4..7550a145bb8 100644
--- a/addons/report_webkit/i18n/ca.po
+++ b/addons/report_webkit/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: report_webkit
diff --git a/addons/resource/i18n/es_EC.po b/addons/resource/i18n/es_EC.po
index 24b02ed4a7e..b3e99a2ff2e 100644
--- a/addons/resource/i18n/es_EC.po
+++ b/addons/resource/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-17 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: resource
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index 344f4d09586..b1ab980b59d 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: sale_crm
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index 2e143294a00..ad46750e101 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: share
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index 0f17dc6c433..758e398bfc7 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:52+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: stock
diff --git a/addons/stock_planning/i18n/ca.po b/addons/stock_planning/i18n/ca.po
index 73d1940e2d7..b446cfb9606 100644
--- a/addons/stock_planning/i18n/ca.po
+++ b/addons/stock_planning/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-08-20 04:53+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #. module: stock_planning

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 16/24] [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 17/24] [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 18/24] [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 19/24] [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 20/24] [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 21/24] [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 22/24] [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 32c17b85d76d9a88b758d65d9d0643dacda369aa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 22 Aug 2011 19:29:50 +0200
Subject: [PATCH 23/24] [IMP] code cleanup, reported by vincent a.

bzr revid: fp@tinyerp.com-20110822172950-75h3qz5p0sjgh02t
---
 addons/stock/product.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 70925a82d10..14350e07728 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -224,8 +224,6 @@ class product_product(osv.osv):
         if context.get('compute_child',True):
             child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)])
             location_ids = child_location_ids or location_ids
-        else:
-            location_ids = location_ids
 
         uoms_o = {}
         product2uom = {}

From eba378a4d6dcc7d3190f14c9f39b73fb513076db Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 23 Aug 2011 05:04:26 +0000
Subject: [PATCH 24/24] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050426-2mnoc0yg5w6nzs0c
---
 debian/po/bg.po                      |  4 +-
 debian/po/ca.po                      |  4 +-
 debian/po/cs.po                      |  4 +-
 debian/po/da.po                      |  4 +-
 debian/po/de.po                      |  4 +-
 debian/po/el.po                      |  4 +-
 debian/po/en_GB.po                   |  4 +-
 debian/po/es.po                      |  4 +-
 debian/po/es_CL.po                   |  4 +-
 debian/po/es_EC.po                   |  4 +-
 debian/po/fa.po                      |  4 +-
 debian/po/fi.po                      |  4 +-
 debian/po/fr.po                      |  4 +-
 debian/po/gl.po                      |  4 +-
 debian/po/he.po                      |  4 +-
 debian/po/hr.po                      |  4 +-
 debian/po/hu.po                      |  4 +-
 debian/po/it.po                      |  4 +-
 debian/po/ja.po                      |  4 +-
 debian/po/ko.po                      |  4 +-
 debian/po/lv.po                      |  4 +-
 debian/po/mn.po                      |  4 +-
 debian/po/nb.po                      |  4 +-
 debian/po/nl.po                      |  4 +-
 debian/po/pl.po                      |  4 +-
 debian/po/pt.po                      |  4 +-
 debian/po/pt_BR.po                   |  4 +-
 debian/po/ro.po                      |  4 +-
 debian/po/ru.po                      |  4 +-
 debian/po/sk.po                      |  4 +-
 debian/po/sq.po                      |  4 +-
 debian/po/sr.po                      |  4 +-
 debian/po/sv.po                      |  4 +-
 debian/po/tr.po                      |  4 +-
 debian/po/uk.po                      |  4 +-
 debian/po/vi.po                      |  4 +-
 debian/po/zh_CN.po                   |  4 +-
 debian/po/zh_TW.po                   |  4 +-
 openerp/addons/base/i18n/af.po       |  4 +-
 openerp/addons/base/i18n/am.po       |  4 +-
 openerp/addons/base/i18n/ar.po       |  4 +-
 openerp/addons/base/i18n/bg.po       |  4 +-
 openerp/addons/base/i18n/bs.po       |  4 +-
 openerp/addons/base/i18n/ca.po       |  4 +-
 openerp/addons/base/i18n/cs.po       |  6 +-
 openerp/addons/base/i18n/da.po       |  4 +-
 openerp/addons/base/i18n/de.po       |  4 +-
 openerp/addons/base/i18n/el.po       |  4 +-
 openerp/addons/base/i18n/en_GB.po    |  4 +-
 openerp/addons/base/i18n/es.po       |  4 +-
 openerp/addons/base/i18n/es_CL.po    |  4 +-
 openerp/addons/base/i18n/es_EC.po    |  4 +-
 openerp/addons/base/i18n/et.po       |  4 +-
 openerp/addons/base/i18n/eu.po       |  4 +-
 openerp/addons/base/i18n/fa.po       |  4 +-
 openerp/addons/base/i18n/fa_AF.po    |  4 +-
 openerp/addons/base/i18n/fi.po       |  4 +-
 openerp/addons/base/i18n/fr.po       |  4 +-
 openerp/addons/base/i18n/gl.po       |  4 +-
 openerp/addons/base/i18n/he.po       |  4 +-
 openerp/addons/base/i18n/hr.po       |  4 +-
 openerp/addons/base/i18n/hu.po       |  4 +-
 openerp/addons/base/i18n/hy.po       |  4 +-
 openerp/addons/base/i18n/id.po       |  4 +-
 openerp/addons/base/i18n/is.po       |  4 +-
 openerp/addons/base/i18n/it.po       |  4 +-
 openerp/addons/base/i18n/ja.po       |  4 +-
 openerp/addons/base/i18n/ko.po       |  4 +-
 openerp/addons/base/i18n/lt.po       |  4 +-
 openerp/addons/base/i18n/lv.po       |  4 +-
 openerp/addons/base/i18n/mk.po       |  4 +-
 openerp/addons/base/i18n/mn.po       |  4 +-
 openerp/addons/base/i18n/nb.po       |  4 +-
 openerp/addons/base/i18n/nl.po       |  4 +-
 openerp/addons/base/i18n/nl_BE.po    |  4 +-
 openerp/addons/base/i18n/pl.po       |  4 +-
 openerp/addons/base/i18n/pt.po       |  8 +--
 openerp/addons/base/i18n/pt_BR.po    |  4 +-
 openerp/addons/base/i18n/ro.po       |  4 +-
 openerp/addons/base/i18n/ru.po       |  4 +-
 openerp/addons/base/i18n/sk.po       |  4 +-
 openerp/addons/base/i18n/sl.po       |  4 +-
 openerp/addons/base/i18n/sq.po       |  4 +-
 openerp/addons/base/i18n/sr.po       |  4 +-
 openerp/addons/base/i18n/sr@latin.po |  4 +-
 openerp/addons/base/i18n/sv.po       |  4 +-
 openerp/addons/base/i18n/th.po       |  4 +-
 openerp/addons/base/i18n/tlh.po      |  4 +-
 openerp/addons/base/i18n/tr.po       |  4 +-
 openerp/addons/base/i18n/uk.po       |  4 +-
 openerp/addons/base/i18n/ur.po       |  4 +-
 openerp/addons/base/i18n/vi.po       |  4 +-
 openerp/addons/base/i18n/zh_CN.po    | 91 ++++++++++++++--------------
 openerp/addons/base/i18n/zh_TW.po    |  4 +-
 94 files changed, 235 insertions(+), 234 deletions(-)

diff --git a/debian/po/bg.po b/debian/po/bg.po
index b8b59ed7477..2be9fbfc542 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 277525e763b..dab45f35285 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index c8d4327e19a..7070c39bfe7 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index 3c1ab98b5c4..92a196aed27 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index db89f7ca666..f7ef796dcdf 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/el.po b/debian/po/el.po
index 30ab6f392ca..25a5a61e586 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index 64be141c7c9..820b8efd210 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index af18e467d53..ef08984f483 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 2cac6a953a1..07c0546022a 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index 5e12c661bce..73646c98738 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fa.po b/debian/po/fa.po
index f02901cb4c6..aa3ff2f702b 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index ead16bd6dff..9d31f4cfd5e 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 7294520b38e..7aa771f0e29 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 5d5861d3253..cad0d0e92fd 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/he.po b/debian/po/he.po
index b6abd19c4f3..728398ce562 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 1d64614f75a..b6b71dd6cba 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hu.po b/debian/po/hu.po
index ec27e63c66c..785983233f9 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index c0c55387657..714ecce6204 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 2b0b8ecae9d..496d03ddf78 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 535f76d42ee..79dca04c8f6 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/lv.po b/debian/po/lv.po
index 4006ca8e7aa..b73c15f4795 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/mn.po b/debian/po/mn.po
index aa80ced1387..d60234e3aad 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 22167473f37..3a54327e6ee 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 0139ddfd1c9..d4924a2d4c9 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index efa21e2cb9e..8cd337f61ba 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 870a10982ea..134470a3eee 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 4ebb91a03d4..febc67232d9 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 454d1208f17..dbcc00c2216 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index a62d56135be..70b4f1c3be5 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 2e64c468c20..40d45226d03 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 2fd401f07b8..792cad95ae0 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sr.po b/debian/po/sr.po
index d28f2812596..c8eb8efe5e5 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index ef404a44c15..ff359bbc4c3 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 "X-Poedit-Language: Swedish\n"
 
 #. Type: string
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 134f48eae01..009c827456a 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 16b418d8c4f..de7020b8ee9 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 9495f3be262..f6e921793d8 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index ce11bdaa420..50c59ed2f03 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 0594a718c6e..dc03e7a9d2c 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index ce51ecf45c9..289eaffc77d 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index f85334c78fb..c049a4d392f 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index ee7f8f0fc06..01f007455ab 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 775497880f4..555264c7049 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 87a6f927bb3..86e4fb4de8c 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 1a2e0cfa1b6..4cace5b61d9 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index f842644827f..e130defc95f 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-08-13 17:34+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 7f21a346790..7f1451b8a30 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 8289e5c376c..2ddf9359e6b 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 334a58a2235..b802b8fdeb3 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 1f8bc5daf79..e0cdb0400eb 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index b77151221a8..81cb3cada41 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index e51d5b9361f..1571b86b51b 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index fa554c25b73..0558be7f560 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index cd1e0799b8c..a5da2202625 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index e5b8d24f9b7..0152f5da6ac 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 75eacf72ac1..8a4a248668a 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index bdfce3a4680..da75466b958 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index c840b901d66..7dcf4ab11e5 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 807f13d3fac..ace489f902f 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 32dea586fa8..6eaa9bf58a0 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index ede6a0babe3..330e9c4bba7 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 16d1bd77537..62ba51b821a 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index a471ee47e9d..e333b152b6c 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index d22a2e16aba..55a38ea1773 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 1028ec1f65e..4e26b857fcb 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 867bda823d6..5342263dc20 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 5240c94c6ad..09390bcb03f 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 6464d1a8f3d..0a4cefda827 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:59+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 1a161d148b8..12287f13df9 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 720a5b0da58..7d6c264ba12 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index b91b48ca5bc..a82c2e94ff0 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 9805c306546..116f44fe324 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index a99e476d842..a964f7951b5 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 5a8a443e3d2..960c16efb5e 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 0eb8fee697b..71e0b31bba5 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:58+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index baf38ceba4d..03e6388d576 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 4b044d0d10f..667e3b8e3ca 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:00+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 4b3dccedea3..20655f28be8 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -580,7 +580,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Form"
-msgstr "Formulário de Parceiros"
+msgstr "Tipo de Organização"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -618,7 +618,7 @@ msgstr "Importar idioma"
 #. module: base
 #: model:ir.model,name:base.model_res_config_users
 msgid "res.config.users"
-msgstr ""
+msgstr "res.config.users"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index f4a0b467163..344b19a8157 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index b5d46379e7d..46537a16e92 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index eae5aae1b32..8ec951dbde0 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 7ea85c64207..f3a0449504e 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index ce6ece7bb5f..31737932ade 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index a709f253137..439f12b44f5 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 92da88ab1e9..19889b98dff 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:01+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 0b045d8aebd..9787b7345fe 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 39bd316d471..f2870d694a0 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 831662befb2..359da71cd6d 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 3d0740a2e54..798e0c670cb 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index dd1ced6bb5a..c5e28425eed 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index f8a053da660..1d28d14eca3 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:02+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 663fb1ad57e..57feba2d53e 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index bce78c257f9..87b57a173c9 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 69143d461fe..4a17bcda152 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -33,7 +33,7 @@ msgstr "圣赫勒拿"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "其他配置"
+msgstr "其它设置"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -296,7 +296,7 @@ msgstr "源对象"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Config Wizard Steps"
-msgstr "配置向导步骤"
+msgstr "设置向导步骤"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
@@ -806,7 +806,7 @@ msgstr "关岛（美属）"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_project
 msgid "Human Resources Dashboard"
-msgstr "人事管理仪表盘"
+msgstr "人力资源控制台"
 
 #. module: base
 #: code:addons/base/res/res_user.py:507
@@ -840,7 +840,7 @@ msgstr "韩国"
 #: model:ir.ui.menu,name:base.menu_workflow_transition
 #: view:workflow.activity:0
 msgid "Transitions"
-msgstr "转换"
+msgstr "转移"
 
 #. module: base
 #: code:addons/orm.py:4020
@@ -996,7 +996,7 @@ msgstr "请求日期"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_dasboard
 msgid "Dashboard"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1041,7 +1041,7 @@ msgstr "不存在代码为“%s”的语言"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:163
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr "当与发布者保障服务器通信时发生错误。"
+msgstr "当与保障服务器通信时发生错误。"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -1996,7 +1996,7 @@ msgstr "亚美尼亚"
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form_all
 msgid "Configuration Parameters"
-msgstr "配置参数"
+msgstr "设置参数"
 
 #. module: base
 #: constraint:ir.cron:0
@@ -2046,7 +2046,7 @@ msgstr "图像"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
-msgstr "重复活动配置"
+msgstr "重复活动设置"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -2262,7 +2262,7 @@ msgstr "ID参照"
 #: model:ir.actions.server,name:base.action_start_configurator
 #: model:ir.ui.menu,name:base.menu_view_base_module_configuration
 msgid "Start Configuration"
-msgstr "开始配置"
+msgstr "开始设置"
 
 #. module: base
 #: model:res.country,name:base.mt
@@ -2961,8 +2961,7 @@ msgid ""
 "\n"
 "Click 'Continue' and enjoy your OpenERP experience..."
 msgstr ""
-"您的帐套已经全部配置完毕。\n"
-"\n"
+"您的帐套已经全部设置完毕。\n"
 "请单击“继续”按钮开始享受您的 OpenERP 体验..."
 
 #. module: base
@@ -3103,7 +3102,7 @@ msgstr "Abkhazian / аҧсуа"
 #. module: base
 #: view:base.module.configuration:0
 msgid "System Configuration Done"
-msgstr "系统配置完成"
+msgstr "系统设置完成"
 
 #. module: base
 #: code:addons/orm.py:929
@@ -3372,7 +3371,7 @@ msgstr ""
 #: view:res.request:0
 #: field:res.request,history:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: base
 #: field:ir.attachment,create_uid:0
@@ -3430,7 +3429,7 @@ msgstr "一般说明"
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
 #: view:res.config.view:0
 msgid "Configure Your Interface"
-msgstr "配置你的界面"
+msgstr "设置你的界面"
 
 #. module: base
 #: field:ir.values,meta:0
@@ -3647,7 +3646,7 @@ msgstr "ir.actions.wizard"
 #: view:ir.filters:0
 #: view:res.request:0
 msgid "Group By"
-msgstr "分组方式"
+msgstr "分组"
 
 #. module: base
 #: view:res.config:0
@@ -3903,7 +3902,7 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr "货币转换器"
+msgstr "币别兑换"
 
 #. module: base
 #: code:addons/orm.py:156
@@ -4113,7 +4112,7 @@ msgstr "未读"
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr "重复错过的"
+msgstr "重做错过的动作"
 
 #. module: base
 #: help:ir.actions.server,state:0
@@ -4129,7 +4128,7 @@ msgstr "对象映射"
 #: help:res.currency,rate:0
 #: help:res.currency.rate,rate:0
 msgid "The rate of the currency to the currency of rate 1"
-msgstr "货币到货币的转换汇率为 1"
+msgstr "币别到其他币别的汇率为 1"
 
 #. module: base
 #: model:res.country,name:base.uk
@@ -4203,7 +4202,7 @@ msgstr "ir.attachment"
 msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
-msgstr "您不能支持此操作。此对象不允许进行“创建新记录”操作，因为此对象是为报表准备的。"
+msgstr "您不能执行此操作。此对象不允许进行“创建新记录”操作，因为此对象是为报告准备的。"
 
 #. module: base
 #: view:base.language.import:0
@@ -4507,7 +4506,9 @@ msgid ""
 "The configuration wizards are used to help you configure a new instance of "
 "OpenERP. They are launched during the installation of new modules, but you "
 "can choose to restart some wizards manually from this menu."
-msgstr "配置向导将帮助您配置一个新的 OpenERP 实例。向导将在安装新模块的时候启动，但是您也可以在此菜单中手工重新启动一些向导。"
+msgstr ""
+"设置向导将帮助您设置一个新的 OpenERP 实例。\r\n"
+"向导将在安装新模块的时候启动，但是您也可以在此菜单中手工重新启动一些向导。"
 
 #. module: base
 #: code:addons/base/res/res_user.py:206
@@ -4625,7 +4626,7 @@ msgstr "此窗口"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contracts"
-msgstr "发布者担保合约"
+msgstr "担保合约"
 
 #. module: base
 #: help:res.log,name:0
@@ -5152,7 +5153,7 @@ msgstr "多米尼加"
 #: sql_constraint:publisher_warranty.contract:0
 msgid ""
 "Your publisher warranty contract is already subscribed in the system !"
-msgstr "您的发布者保障合约已经在系统中订阅。"
+msgstr "您的保障合约已经在系统中订阅。"
 
 #. module: base
 #: help:ir.cron,nextcall:0
@@ -5525,7 +5526,7 @@ msgid ""
 msgstr ""
 "如果用户已提供电子邮件，将发送欢迎邮件给他们.\\n\n"
 "\\n\n"
-"警告:如果“email_from”和“smtp_server”（SMTP）没有配置，将无法发送邮件给新用户。"
+"警告:如果“email_from”和“smtp_server”（SMTP）没有设置，将无法发送邮件给新用户。"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5803,7 +5804,7 @@ msgstr "视图类型：设为“tree”来使用树形控件显示层次数据
 #: code:addons/base/res/res_config.py:421
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
-msgstr "请单击“继续”按钮配置下一个模块..."
+msgstr "请单击“继续”按钮设置下一个模块..."
 
 #. module: base
 #: field:ir.actions.server,record_id:0
@@ -5873,7 +5874,7 @@ msgstr "字段描述"
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: base
 #: view:ir.model.fields:0
@@ -6008,7 +6009,7 @@ msgstr "Spanish (CO) / Español (CO)"
 msgid ""
 "All pending configuration wizards have been executed. You may restart "
 "individual wizards via the list of configuration wizards."
-msgstr "所有挂起的配置向导已被执行，您可以通过配置向导列表重启单个向导。"
+msgstr "所有挂起的设置向导已被执行，您可以通过设置向导列表重启单个向导。"
 
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
@@ -6441,14 +6442,14 @@ msgid ""
 "No rate found \n"
 "for the currency: %s \n"
 "at the date: %s"
-msgstr "找不到货币 %s 日期 %s 的比率。"
+msgstr "找不到币别 %s 日期 %s 的汇率。"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view_custom
 msgid ""
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
-msgstr "自定义视图用于用户重新组织他们的仪表盘视图内容（经由 Web 客户端）"
+msgstr "自定义视图用于用户重新组织他们的控制台视图内容（通过 Web 客户端）"
 
 #. module: base
 #: field:ir.model,name:0
@@ -6634,7 +6635,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.next_id_73
 #: model:ir.ui.menu,name:base.reporting_menu
 msgid "Reporting"
-msgstr "报表"
+msgstr "报告"
 
 #. module: base
 #: model:res.country,name:base.tg
@@ -6718,7 +6719,7 @@ msgstr "州/省名称"
 #. module: base
 #: field:workflow.activity,join_mode:0
 msgid "Join Mode"
-msgstr "联合模式"
+msgstr "合并模式"
 
 #. module: base
 #: field:res.config.users,context_tz:0
@@ -6760,7 +6761,7 @@ msgstr "OpenERP 业务伙伴"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_hr_manager
 msgid "HR Manager Dashboard"
-msgstr "人事经理仪表盘"
+msgstr "人力资源经理控制台"
 
 #. module: base
 #: code:addons/base/module/module.py:253
@@ -7539,7 +7540,7 @@ msgstr "爱沙尼亚"
 #. module: base
 #: model:ir.ui.menu,name:base.dashboard
 msgid "Dashboards"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -7736,7 +7737,7 @@ msgstr "标识此对象模型是否仅存于内存，比如一个不需要持久
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr "业务伙伴参照"
+msgstr "业务伙伴"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
@@ -7753,12 +7754,12 @@ msgstr "注册"
 #. module: base
 #: field:res.request,ref_doc2:0
 msgid "Document Ref 2"
-msgstr "单据参照2"
+msgstr "单据2"
 
 #. module: base
 #: field:res.request,ref_doc1:0
 msgid "Document Ref 1"
-msgstr "单据参照1"
+msgstr "单据1"
 
 #. module: base
 #: model:res.country,name:base.ga
@@ -7921,7 +7922,7 @@ msgstr "保加利亚"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr "发布者保障合同注册成功！"
+msgstr "保障合同注册成功！"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -7941,7 +7942,7 @@ msgstr "法属南部领土"
 #: field:res.currency,name:0
 #: field:res.currency.rate,currency_id:0
 msgid "Currency"
-msgstr "货币"
+msgstr "币别"
 
 #. module: base
 #: field:res.partner.canal,name:0
@@ -8468,7 +8469,7 @@ msgstr "事件日志"
 #: code:addons/base/module/wizard/base_module_configuration.py:37
 #, python-format
 msgid "System Configuration done"
-msgstr "系统配置已完成"
+msgstr "系统设置已完成"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -8536,7 +8537,7 @@ msgstr "3. 如果用户属于多个组，那么第2步的结果将使用“或
 #: code:addons/base/publisher_warranty/publisher_warranty.py:145
 #, python-format
 msgid "Please check your publisher warranty contract name and validity."
-msgstr "请检查您的发布者保障合同名称和有效性。"
+msgstr "请检查您的保障合同名称和有效性。"
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -8634,7 +8635,7 @@ msgstr "台湾"
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
 msgid "Currency Rate"
-msgstr "兑换率"
+msgstr "汇率"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
@@ -8807,7 +8808,7 @@ msgstr "电子邮件与签名"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr "发布者保障合同"
+msgstr "保障合同"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9070,7 +9071,7 @@ msgstr "地区代码"
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr "分割模式"
+msgstr "拆分模式"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -9218,7 +9219,7 @@ msgstr "下一序号将以此数增加."
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr "职能"
+msgstr "功能"
 
 #. module: base
 #: view:res.widget:0
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index ca3b3201309..72e31dab7ae 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
-"X-Generator: Launchpad (build 13674)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:03+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: base
 #: view:ir.filters:0