From 4937b6bdd6624a9f2c2ebb5384b4559adf2ff462 Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Tue, 12 Jul 2011 16:07:03 +0200
Subject: [PATCH 01/21] [IMP] get_hostname tools function based on
 ir.config_parameter on the key network.hostname

bzr revid: tfr@openerp.com-20110712140703-gvfnjs1y3r51kagn
---
 openerp/tools/misc.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index dc66142fc4a..0e14211ce60 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -248,6 +248,15 @@ def flatten(list):
             r.append(e)
     return r
 
+def get_hostname(obj, cr, uid):
+    parameter_pool = obj.pool.get('ir.config_parameter')
+    ids = parameter_pool.search(cr, uid, [('key', '=', 'network.hostname')])
+    if ids:
+        return parameter_pool.browse(cr, uid, ids)[0].value
+    else:
+        return 'localhost'
+    
+
 def reverse_enumerate(l):
     """Like enumerate but in the other sens
     

From 17d87a95992e7fd006ca996a2d8bebf4217534d9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Jul 2011 16:19:34 +0200
Subject: [PATCH 02/21] [FIX] group titles should display 'Undefined' for false
 values, rather than 'false'

bzr revid: xmo@openerp.com-20110712141934-qk3zfckzh32b8xu1
---
 addons/base/static/src/js/list-editable.js |   7 +-
 addons/base/static/src/js/list.js          | 100 +++++++++++----------
 2 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/addons/base/static/src/js/list-editable.js b/addons/base/static/src/js/list-editable.js
index a460dfcff41..4aa06cc8152 100644
--- a/addons/base/static/src/js/list-editable.js
+++ b/addons/base/static/src/js/list-editable.js
@@ -247,7 +247,12 @@ openerp.base.list.editable = function (openerp) {
             this.render_row_as_form();
         }
     });
-    openerp.base.list = {form: {}};
+    if (!openerp.base.list) {
+        openerp.base.list = {};
+    }
+    if (!openerp.base.list.form) {
+        openerp.base.list.form = {};
+    }
     openerp.base.list.form.WidgetFrame = openerp.base.form.WidgetFrame.extend({
         template: 'ListView.row.frame'
     });
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 7922f690784..bfa429fd454 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1,5 +1,50 @@
 openerp.base.list = function (openerp) {
 openerp.base.views.add('list', 'openerp.base.ListView');
+openerp.base.list = {
+    /**
+     * Formats the rendring of a given value based on its field type
+     *
+     * @param {Object} row_data record whose values should be displayed in the cell
+     * @param {Object} column column descriptor
+     * @param {"button"|"field"} column.tag base control type
+     * @param {String} column.type widget type for a field control
+     * @param {String} [column.string] button label
+     * @param {String} [column.icon] button icon
+     * @param {String} [value_if_empty=''] what to display if the field's value is ``false``
+     */
+    render_cell: function (row_data, column, value_if_empty) {
+        var attrs = column.modifiers_for(row_data);
+        if (attrs.invisible) { return ''; }
+        if (column.tag === 'button') {
+            return [
+                '<button type="button" title="', column.string || '', '">',
+                    '<img src="/base/static/src/img/icons/', column.icon, '.png"',
+                        ' alt="', column.string || '', '"/>',
+                '</button>'
+            ].join('')
+        }
+
+        var record = row_data[column.id];
+        if (record.value === false) {
+            return value_if_empty === undefined ?  '' : value_if_empty;
+        }
+        switch (column.widget || column.type) {
+            case 'many2one':
+                // name_get value format
+                return record.value[1];
+            case 'float_time':
+                return _.sprintf("%02d:%02d",
+                        Math.floor(record.value),
+                        Math.round((record.value % 1) * 60));
+            case 'progressbar':
+                return _.sprintf(
+                    '<progress value="%.2f" max="100.0">%.2f%%</progress>',
+                        record.value, record.value);
+            default:
+                return record.value;
+        }
+    }
+};
 openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListView# */ {
     defaults: {
         // records can be selected one by one
@@ -634,7 +679,7 @@ openerp.base.ListView.List = Class.extend( /** @lends openerp.base.ListView.List
         this.$current = this.$_element.clone(true);
         this.$current.empty().append(
             QWeb.render('ListView.rows', _.extend({
-                render_cell: this.render_cell}, this)));
+                render_cell: openerp.base.list.render_cell}, this)));
     },
     /**
      * Gets the ids of all currently selected records, if any
@@ -765,49 +810,9 @@ openerp.base.ListView.List = Class.extend( /** @lends openerp.base.ListView.List
             row: this.rows[record_index],
             row_parity: (record_index % 2 === 0) ? 'even' : 'odd',
             row_index: record_index,
-            render_cell: this.render_cell
+            render_cell: openerp.base.list.render_cell
         });
     },
-    /**
-     * Formats the rendring of a given value based on its field type
-     *
-     * @param {Object} row_data record whose values should be displayed in the cell
-     * @param {Object} column column descriptor
-     * @param {"button"|"field"} column.tag base control type
-     * @param {String} column.type widget type for a field control
-     * @param {String} [column.string] button label
-     * @param {String} [column.icon] button icon
-     */
-    render_cell: function (row_data, column) {
-        var attrs = column.modifiers_for(row_data);
-        if (attrs.invisible) { return ''; }
-        if (column.tag === 'button') {
-            return [
-                '<button type="button" title="', column.string || '', '">',
-                    '<img src="/base/static/src/img/icons/', column.icon, '.png"',
-                        ' alt="', column.string || '', '"/>',
-                '</button>'
-            ].join('')
-        }
-
-        var record = row_data[column.id];
-        if (record.value === false) { return ''; }
-        switch (column.widget || column.type) {
-            case 'many2one':
-                // name_get value format
-                return record.value[1];
-            case 'float_time':
-                return _.sprintf("%02d:%02d",
-                        Math.floor(record.value),
-                        Math.round((record.value % 1) * 60));
-            case 'progressbar':
-                return _.sprintf(
-                    '<progress value="%.2f" max="100.0">%.2f%%</progress>',
-                        record.value, record.value);
-            default:
-                return record.value;
-        }
-    },
     /**
      * Stops displaying the records matching the provided ids.
      *
@@ -959,10 +964,15 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
             placeholder.appendChild($row[0]);
 
             var $group_column = $('<th class="oe-group-name">').appendTo($row);
+            // Don't fill this if group_by_no_leaf but no group_by
             if (group.grouped_on) {
-                // Don't fill this if group_by_no_leaf but no group_by
-                $group_column
-                    .text((group.value instanceof Array ? group.value[1] : group.value));
+                var row_data = {};
+                row_data[group.grouped_on] = group;
+                var group_column = _(self.columns).detect(function (column) {
+                    return column.id === group.grouped_on; });
+                $group_column.text(openerp.base.list.render_cell(
+                        row_data, group_column, "Undefined"
+                ));
                 if (group.openable) {
                     // Make openable if not terminal group & group_by_no_leaf
                     $group_column

From 9e0738b97dc8e28983bbfe59436181978ac87ab6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Jul 2011 16:34:08 +0200
Subject: [PATCH 03/21] [FIX] column visibility, due to removal of attribute
 computation and replacement with modifiers mapping

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

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index bfa429fd454..99e96dc6d2d 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -308,6 +308,9 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
                         'invisible': domain_computer(modifiers.invisible, fields)
                     };
                 };
+                if (modifiers['tree_invisible']) {
+                    column.invisible = '1';
+                }
             } else {
                 column.modifiers_for = noop;
             }

From f6acf3129535d5441c391fdaed83b2a897d83efe Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Tue, 12 Jul 2011 17:20:27 +0200
Subject: [PATCH 04/21] [IMP] get hostname using get_param + add default value
 in get_param

bzr revid: tfr@openerp.com-20110712152027-oj6b42o0bttijkst
---
 openerp/addons/base/ir/ir_config_parameter.py | 4 ++--
 openerp/tools/misc.py                         | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py
index b1688b9a669..f8c0348e8f6 100644
--- a/openerp/addons/base/ir/ir_config_parameter.py
+++ b/openerp/addons/base/ir/ir_config_parameter.py
@@ -62,7 +62,7 @@ class ir_config_parameter(osv.osv):
             if not ids:
                 self.set_param(cr, 1, key, func())
 
-    def get_param(self, cr, uid, key, context=None):
+    def get_param(self, cr, uid, key, default=False, context=None):
         """ Get the value of a parameter.
         
         @param key: The key of the parameter.
@@ -72,7 +72,7 @@ class ir_config_parameter(osv.osv):
         """
         ids = self.search(cr, uid, [('key','=',key)], context=context)
         if not ids:
-            return False
+            return default
         param = self.browse(cr, uid, ids[0], context=context)
         value = param.value
         return value
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index dc66142fc4a..fd72728d3e8 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -248,6 +248,10 @@ def flatten(list):
             r.append(e)
     return r
 
+def get_hostname(obj, cr, uid):
+    return obj.pool.get('ir.config_parameter').get_param(cr, uid, 'network.hostname', default="localhost")
+    
+
 def reverse_enumerate(l):
     """Like enumerate but in the other sens
     

From 822b3936697ac9f30ca00d8d6bd7511ce30333b5 Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Tue, 12 Jul 2011 17:37:30 +0200
Subject: [PATCH 05/21] [RM] remove get hostname

bzr revid: tfr@openerp.com-20110712153730-u29ss55hee7qs1et
---
 openerp/tools/misc.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index fd72728d3e8..dc66142fc4a 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -248,10 +248,6 @@ def flatten(list):
             r.append(e)
     return r
 
-def get_hostname(obj, cr, uid):
-    return obj.pool.get('ir.config_parameter').get_param(cr, uid, 'network.hostname', default="localhost")
-    
-
 def reverse_enumerate(l):
     """Like enumerate but in the other sens
     

From d1209c847bdc252eef3a7627439d22c35163579f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Jul 2011 12:37:25 +0200
Subject: [PATCH 06/21] [FIX] sorting list views

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

bzr revid: xmo@openerp.com-20110713103725-y9fnpp36z78bjbhn
---
 addons/base/controllers/main.py   |  4 ++--
 addons/base/static/src/js/data.js | 38 +++++++++++++++++++++----------
 addons/base/static/src/js/list.js |  3 ++-
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index a1fcc51818c..8138594c6eb 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -531,13 +531,13 @@ class DataSet(openerpweb.Controller):
 class DataGroup(openerpweb.Controller):
     _cp_path = "/base/group"
     @openerpweb.jsonrequest
-    def read(self, request, model, fields, group_by_fields, domain=None):
+    def read(self, request, model, fields, group_by_fields, domain=None, sort=None):
         Model = request.session.model(model)
         context, domain = eval_context_and_domain(request.session, request.context, domain)
 
         return Model.read_group(
             domain or [], fields, group_by_fields, 0, False,
-            dict(context, group_by=group_by_fields))
+            dict(context, group_by=group_by_fields), sort or False)
 
 class View(openerpweb.Controller):
     _cp_path = "/base/view"
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index a49e6cf901f..b01ceeaed5c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -1,6 +1,23 @@
 
 openerp.base.data = function(openerp) {
 
+/**
+ * Serializes the sort criterion array of a dataset into a form which can be
+ * consumed by OpenERP's RPC APIs.
+ *
+ * @param {Array} criterion array of fields, from first to last criteria, prefixed with '-' for reverse sorting
+ * @returns {String} SQL-like sorting string (``ORDER BY``) clause
+ */
+openerp.base.serialize_sort = function (criterion) {
+    return _.map(criterion,
+        function (criteria) {
+            if (criteria[0] === '-') {
+                return criteria.slice(1) + ' DESC';
+            }
+            return criteria + ' ASC';
+        }).join(', ');
+};
+
 openerp.base.DataGroup =  openerp.base.Controller.extend( /** @lends openerp.base.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
@@ -130,7 +147,8 @@ openerp.base.ContainerDataGroup = openerp.base.DataGroup.extend(
             context: this.context,
             domain: this.domain,
             fields: _.uniq(this.group_by.concat(fields)),
-            group_by_fields: this.group_by
+            group_by_fields: this.group_by,
+            sort: openerp.base.serialize_sort(this.sort)
         }, function () { }).then(function (response) {
             var data_groups = _(response).map(
                     _.bind(self.transform_group, self));
@@ -174,7 +192,7 @@ openerp.base.ContainerDataGroup = openerp.base.DataGroup.extend(
                         self.session, self.model, group.__domain,
                         child_context, child_context.group_by,
                         self.level + 1),
-                    group);
+                    group, {sort: self.sort});
             }));
         });
     }
@@ -197,8 +215,8 @@ openerp.base.GrouplessDataGroup = openerp.base.DataGroup.extend(
     },
     list: function (fields, ifGroups, ifRecords) {
         ifRecords(_.extend(
-                new openerp.base.DataSetSearch(this.session, this.model),
-                {domain: this.domain, context: this.context}));
+            new openerp.base.DataSetSearch(this.session, this.model),
+            {domain: this.domain, context: this.context, _sort: this.sort}));
     }
 });
 
@@ -444,16 +462,12 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
      */
     sort: function (field, force_reverse) {
         if (!field) {
-            return _.map(this._sort, function (criteria) {
-                if (criteria[0] === '-') {
-                    return criteria.slice(1) + ' DESC';
-                }
-                return criteria + ' ASC';
-            }).join(', ');
+            return openerp.base.serialize_sort(this._sort);
         }
-
         var reverse = force_reverse || (this._sort[0] === field);
-        this._sort = _.without(this._sort, field, '-' + field);
+        this._sort.splice.apply(
+            this._sort, [0, this._sort.length].concat(
+                _.without(this._sort, field, '-' + field)));
 
         this._sort.unshift((reverse ? '-' : '') + field);
         return undefined;
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 99e96dc6d2d..333bc2f0029 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -209,7 +209,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             self.dataset.sort($(this).data('id'));
 
             // TODO: should only reload content (and set the right column to a sorted display state)
-            self.reload_view();
+            self.reload_content();
         });
 
         this.$element.find('.oe-list-pager')
@@ -449,6 +449,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             this.session, this.model,
             results.domain, results.context,
             results.group_by);
+        this.groups.datagroup.sort = this.dataset._sort;
 
         if (_.isEmpty(results.group_by) && !results.context['group_by_no_leaf']) {
             results.group_by = null;

From 3496acfab4fde8ae095999fa8a053d5bcfa9bf58 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Jul 2011 13:18:15 +0200
Subject: [PATCH 07/21] [FIX] reintroduce little arrows indicating the current
 sorting orientation in list views

bzr revid: xmo@openerp.com-20110713111815-v0rhnt31vykx2xcu
---
 addons/base/static/src/css/base.css |  8 ++++++--
 addons/base/static/src/js/list.js   | 15 ++++++++++-----
 addons/base/static/src/xml/base.xml |  6 ++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index e91bbd922ec..53470bb266a 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -609,10 +609,14 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
 .openerp .oe-listview td.oe-record-delete {
     text-align: right;
 }
-.openerp .oe-listview th.oe-sortable,
-.openerp .oe-listview th.oe-sortable .ui-icon {
+.openerp .oe-listview th.oe-sortable {
     cursor: pointer;
 }
+.openerp .oe-listview th.oe-sortable .ui-icon {
+    height: 1em;
+    display: inline;
+    display: inline-block;
+}
 
 .openerp .oe-listview .oe-field-cell {
     cursor: pointer;
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 333bc2f0029..49cd10c10b6 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -192,8 +192,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
 
         this.setup_columns(this.fields_view.fields, grouped);
 
-        if (!this.fields_view.sorted) { this.fields_view.sorted = {}; }
-
         this.$element.html(QWeb.render("ListView", this));
 
         // Head hook
@@ -203,12 +201,19 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         this.$element.find('.oe-list-delete')
                 .attr('disabled', true)
                 .click(this.do_delete_selected);
-        this.$element.find('thead').delegate('th[data-id]', 'click', function (e) {
+        this.$element.find('thead').delegate('th.oe-sortable[data-id]', 'click', function (e) {
             e.stopPropagation();
 
-            self.dataset.sort($(this).data('id'));
+            var $this = $(this);
+            self.dataset.sort($this.data('id'));
+            if ($this.find('span').length) {
+                $this.find('span').toggleClass(
+                    'ui-icon-triangle-1-s ui-icon-triangle-1-n');
+            } else {
+                $this.append('<span class="ui-icon ui-icon-triangle-1-s">')
+                     .siblings('.oe-sortable').find('span').remove();
+            }
 
-            // TODO: should only reload content (and set the right column to a sorted display state)
             self.reload_content();
         });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 603c75cdb74..ef0c1848f1e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -283,10 +283,8 @@
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
                     t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
-                    <t t-if="column.tag !== 'button'">
-                        <t t-esc="column.string"/>
-                        <span t-att-class="(fields_view.sorted.field === column.id) ? ('ui-icon' + (fields_view.sorted.reversed ? ' ui-icon-triangle-1-n' : ' ui-icon-triangle-1-s')) : ''"/>
-                    </t>
+                    <t t-if="column.tag !== 'button'"
+                        ><t t-esc="column.string"/></t>
                 </th>
             </t>
             <th t-if="options.deletable" width="1"/>

From 3c985b0201a9128f9d090e7bfb3648850b613699 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 13 Jul 2011 17:37:12 +0200
Subject: [PATCH 08/21] [FIX] remove incorrect res_currency name_get

bzr revid: al@openerp.com-20110713153712-j2v1nlm9q5e2319d
---
 openerp/addons/base/res/res_currency.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py
index d8a4edfe0df..d81248a735d 100644
--- a/openerp/addons/base/res/res_currency.py
+++ b/openerp/addons/base/res/res_currency.py
@@ -131,13 +131,6 @@ class res_currency(osv.osv):
             else:
                 return (from_amount * rate)
 
-    def name_search(self, cr, uid, name, args=[], operator='ilike', context={}, limit=100):
-        args2 = args[:]
-        if name:
-            args += [('name', operator, name)]
-        ids = self.search(cr, uid, args, limit=limit)
-        res = self.name_get(cr, uid, ids, context)
-        return res
 res_currency()
 
 class res_currency_rate(osv.osv):

From c6bcc855e19cfd77e6b5b7d6577825726553644b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Jul 2011 11:56:19 +0200
Subject: [PATCH 09/21] [FIX] DataSet.read_slice needs to return the relevant
 deferred so callers can add new callbacks or use $.when multiplexing

bzr revid: xmo@openerp.com-20110714095619-4owz98azxy9xkpi0
---
 addons/base/static/src/js/data.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index b01ceeaed5c..c1b64b93307 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -396,7 +396,7 @@ openerp.base.DataSetStatic =  openerp.base.DataSet.extend({
         var self = this;
         offset = offset || 0;
         var end_pos = limit && limit !== -1 ? offset + limit : undefined;
-        this.read_ids(this.ids.slice(offset, end_pos), fields, callback);
+        return this.read_ids(this.ids.slice(offset, end_pos), fields, callback);
     },
     set_ids: function (ids) {
         this.ids = ids;
@@ -433,7 +433,7 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
                 // return read_ids(ids.slice(start,start+limit),fields,callback)
             }
         }
-        this.rpc('/base/dataset/search_read', {
+        return this.rpc('/base/dataset/search_read', {
             model: this.model,
             fields: fields,
             domain: this.domain,
@@ -444,7 +444,9 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
         }, function (result) {
             self.ids = result.ids;
             self.offset = offset;
-            callback(result.records);
+            if (callback) {
+                callback(result.records);
+            }
         });
     },
     /**

From 7578658e69b5106ec281c699886a5186735644c5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Jul 2011 11:57:31 +0200
Subject: [PATCH 10/21] [FIX] indentation in Session.rpc and Session.rpc_ajax,
 use early bailout to make code flow simpler and reduce indentation
 significantly

bzr revid: xmo@openerp.com-20110714095731-2kuqyl0p289ouut7
---
 addons/base/static/src/js/chrome.js | 54 ++++++++++++++++-------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 0e07b62ae39..5eb0261100e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -365,7 +365,7 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
             params: params,
             id:null
         }).then(function () {deferred.resolve.apply(deferred, arguments);},
-        function(error) {deferred.reject(error, $.Event());});
+                function(error) {deferred.reject(error, $.Event());});
         return deferred.fail(function() {
             deferred.fail(function(error, event) {
                 if (!event.isDefaultPrevented()) {
@@ -398,31 +398,35 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         }, url);
         var deferred = $.Deferred();
         $.ajax(ajax).done(function(response, textStatus, jqXHR) {
-                self.on_rpc_response();
-                if (response.error) {
-                    if (response.error.data.type == "session_invalid") {
-                        self.uid = false;
-                        self.on_session_invalid(function() {
-                            self.rpc(url, payload.params,
-                                function() {deferred.resolve.apply(deferred, arguments);},
-                                function(error, event) {event.preventDefault();
-                                    deferred.reject.apply(deferred, arguments);});
-                        });
-                    } else {
-                        deferred.reject(response.error);
-                    }
-                } else {
-                    deferred.resolve(response["result"], textStatus, jqXHR);
-                }
-            }).fail(function(jqXHR, textStatus, errorThrown) {
-                self.on_rpc_response();
-                var error = {
-                    code: -32098,
-                    message: "XmlHttpRequestError " + errorThrown,
-                    data: {type: "xhr"+textStatus, debug: jqXHR.responseText, objects: [jqXHR, errorThrown] }
-                };
-                deferred.reject(error);
+            self.on_rpc_response();
+            if (!response.error) {
+                deferred.resolve(response["result"], textStatus, jqXHR);
+                return;
+            }
+            if (response.error.data.type !== "session_invalid") {
+                deferred.reject(response.error);
+                return;
+            }
+            self.uid = false;
+            self.on_session_invalid(function() {
+                self.rpc(url, payload.params,
+                    function() {
+                        deferred.resolve.apply(deferred, arguments);
+                    },
+                    function(error, event) {
+                        event.preventDefault();
+                        deferred.reject.apply(deferred, arguments);
+                    });
             });
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+            self.on_rpc_response();
+            var error = {
+                code: -32098,
+                message: "XmlHttpRequestError " + errorThrown,
+                data: {type: "xhr"+textStatus, debug: jqXHR.responseText, objects: [jqXHR, errorThrown] }
+            };
+            deferred.reject(error);
+        });
         return deferred.promise();
     },
     on_rpc_request: function() {

From 9d814c830b5e3146b939c986f70268cbd0ac169c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Jul 2011 12:05:22 +0200
Subject: [PATCH 11/21] [FIX] remove bloody crazy (and useless) indirection
 keys in DataSet.call and DataSet.get_result RPC methods

bzr revid: xmo@openerp.com-20110714100522-94rp1otj1n4hrf2x
---
 addons/base/controllers/main.py   | 7 +++----
 addons/base/static/src/js/form.js | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 8138594c6eb..d6a81124c4d 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -508,7 +508,7 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def call(self, req, model, method, args, domain_id=None, context_id=None):
-        return {'result': self.call_common(req, model, method, args, domain_id, context_id)}
+        return self.call_common(req, model, method, args, domain_id, context_id)
 
     @openerpweb.jsonrequest
     def call_button(self, req, model, method, args, domain_id=None, context_id=None):
@@ -524,9 +524,8 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def default_get(self, req, model, fields):
-        m = req.session.model(model)
-        r = m.default_get(fields, req.session.eval_context(req.context))
-        return {'result': r}
+        Model = req.session.model(model)
+        return Model.default_get(fields, req.session.eval_context(req.context))
 
 class DataGroup(openerpweb.Controller):
     _cp_path = "/base/group"
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 60511c49c17..701b4113bf4 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -269,9 +269,8 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
     on_button_new: function() {
         var self = this;
         $.when(this.has_been_loaded).then(function() {
-            self.dataset.default_get(_.keys(self.fields_view.fields), function(result) {
-                self.on_record_loaded(result.result);
-            });
+            self.dataset.default_get(
+                _.keys(self.fields_view.fields), self.on_record_loaded);
         });
     },
     /**

From e32df7bb5d594cce1adb22e1cc9a951014f18d83 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Jul 2011 12:09:33 +0200
Subject: [PATCH 12/21] [ADD] Add a dialog function + xml view debug mode

bzr revid: fme@openerp.com-20110714100933-ce42j7ca2yzw0bsr
---
 addons/base/static/src/js/form.js   | 24 ++++++++++++++++++++----
 addons/base/static/src/xml/base.xml |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 701b4113bf4..0313c3d9ac0 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -79,6 +79,10 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         this.$form_header.find('button.oe_form_button_cancel').click(this.do_cancel);
         this.$form_header.find('button.oe_form_button_new').click(this.on_button_new);
 
+        this.$form_header.find('button.oe_get_xml_view').click(function() {
+            $('<xmp>' + openerp.base.json_node_to_xml(self.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
+        });
+
         this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
         this.has_been_loaded.resolve();
     },
@@ -1238,6 +1242,21 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
     });
 })();
 
+openerp.base.form.dialog = function(content, options) {
+    options = _.extend({
+        autoOpen: true,
+        width: '90%',
+        height: '90%',
+        min_width: '800px',
+        min_height: '600px'
+    }, options || {});
+    options.autoOpen = true;
+    var dialog = new openerp.base.Dialog(null, options);
+    dialog.$dialog = $(content).dialog(dialog.options);
+    console.log(dialog.options)
+    return dialog.$dialog;
+}
+
 openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
@@ -1826,10 +1845,7 @@ openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({
         this.context = context || {};
         this.options = _.defaults(options || {}, {"initial_view": "search", "auto_create": true});
         this.initial_ids = this.options.initial_ids;
-        jQuery(this.render()).dialog({title: '',
-                    modal: true,
-                    width: 960,
-                    height: 600});
+        openerp.base.form.dialog(this.render());
         this.start();
     },
     start: function() {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index ef0c1848f1e..8aa392a3fd1 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -334,8 +334,8 @@
     <t t-raw="frame.render()"/>
 </t>
 <t t-name="FormView">
-    <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header" t-att-id="view.element_id + '_header'">
+        <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/> <button class="oe_get_xml_view">xml</button></h2>
         <div class="oe_form_buttons" t-if="view.flags.action_buttons !== false">
             <!--<button type="button" class="oe_form_button_save">
                 <span class="oe_form_on_update">Save</span>

From 8504e6158bd943bd210ade35171327d1185303e5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Jul 2011 12:55:52 +0200
Subject: [PATCH 13/21] [IMP] sql_db: default cursor = serialized, deprecate
 serialized_cursor, add doc

In the context of OpenERP transaction, we really need the
'snapshot isolation' level provided by PostgreSQL because
not being able to make repeatable reads within the same
transaction is a very dangerous source of corrupted data,
especially in a very concurrent system.
The performance impact of switching from the default
read_committed level to serializable/repeatable_read level
has been measured and and was not distinguishable from
the standard deviation - so it seems quite acceptable.
User of PostgreSQL 9.1 might want to update to psycopg2
version 2.4.2 or later to properly use the regular
snapshot isolation level, and not the newer, more
expensive serializable level (see comments in Cursor
docstring).

bzr revid: odo@openerp.com-20110714105552-9tgofrjtdgjmgc4b
---
 openerp/sql_db.py | 101 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 16 deletions(-)

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index 43a508f9082..18efb62eb18 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -37,7 +37,8 @@ __all__ = ['db_connect', 'close_db']
 
 from threading import currentThread
 import logging
-from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
+from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE,\
+    ISOLATION_LEVEL_REPEATABLE_READ
 from psycopg2.psycopg1 import cursor as psycopg1cursor
 from psycopg2.pool import PoolError
 
@@ -79,12 +80,64 @@ re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$');
 sql_counter = 0
 
 class Cursor(object):
-    """ Cursor is an open transaction to Postgres, utilizing a TCP connection
-    
-        A lightweight wrapper around psycopg2's `psycopg1cursor` objects
-        
-        This is the object behind the `cr` variable used all over the OpenERP
-        code.
+    """Represents an open transaction to the PostgreSQL DB backend,
+       acting as a lightweight wrapper around psycopg2's
+       ``psycopg1cursor`` objects.
+
+        ``Cursor`` is the object behind the ``cr`` variable used all
+        over the OpenERP code.
+
+        .. rubric:: Transaction Isolation
+
+        One very important property of database transactions is the
+        level of isolation between concurrent transactions.
+        The SQL standard defines four levels of transaction isolation,
+        ranging from the most strict *Serializable* level, to the least
+        strict *Read Uncommitted* level. These levels are defined in
+        terms of the phenomena that must not occur between concurrent
+        transactions, such as *dirty read*, etc.
+        In the context of a generic business data management software
+        such as OpenERP, we need the best guarantees that no data
+        corruption can ever be cause by simply running multiple
+        transactions in parallel. Therefore, the preferred level would
+        be the *serializable* level, which ensures that a set of
+        transactions is guaranteed to produce the same effect as
+        running them one at a time in some order.
+
+        However, most database management systems implement a limited
+        serializable isolation in the form of
+        `snapshot isolation <http://en.wikipedia.org/wiki/Snapshot_isolation>`_,
+        providing most of the same advantages as True Serializability,
+        with a fraction of the performance cost.
+        With PostgreSQL up to version 9.0, this snapshot isolation was
+        the implementation of both the ``REPEATABLE READ`` and
+        ``SERIALIZABLE`` levels of the SQL standard.
+        As of PostgreSQL 9.1, the previous snapshot isolation implementation
+        was kept for ``REPEATABLE READ``, while a new ``SERIALIZABLE``
+        level was introduced, providing some additional heuristics to
+        detect a concurrent update by parallel transactions, and forcing
+        one of them to rollback.
+
+        OpenERP implements its own level of locking protection
+        for transactions that are highly likely to provoke concurrent
+        updates, such as stock reservations or document sequences updates.
+        Therefore we mostly care about the properties of snapshot isolation,
+        but we don't really need additional heuristics to trigger transaction
+        rollbacks, as we are taking care of triggering instant rollbacks
+        ourselves when it matters (and we can save the additional performance
+        hit of these heuristics).
+
+        As a result of the above, we have selected ``REPEATABLE READ`` as
+        the default transaction isolation level for OpenERP cursors, as
+        it will be mapped to the desired ``snapshot isolation`` level for
+        all supported PostgreSQL version (8.3 - 9.x).
+
+        Note: up to psycopg2 v.2.4.2, psycopg2 itself remapped the repeatable
+        read level to serializable before sending it to the database, so it would
+        actually select the new serializable mode on PostgreSQL 9.1. Make
+        sure you use psycopg2 v2.4.2 or newer if you use PostgreSQL 9.1 and
+        the performance hit is a concern for you.
+
     """
     IN_MAX = 1000 # decent limit on size of IN queries - guideline = Oracle limit
     __logger = None
@@ -100,7 +153,7 @@ class Cursor(object):
             return f(self, *args, **kwargs)
         return wrapper
 
-    def __init__(self, pool, dbname, serialized=False):
+    def __init__(self, pool, dbname, serialized=True):
         if self.__class__.__logger is None:
             self.__class__.__logger = logging.getLogger('db.cursor')
         self.sql_from_log = {}
@@ -115,7 +168,11 @@ class Cursor(object):
                                 # is raised by any of the following initialisations
         self._pool = pool
         self.dbname = dbname
+
+        # Whether to enable snapshot isolation level for this cursor.
+        # see also the docstring of Cursor.  
         self._serialized = serialized
+
         self._cnx = pool.borrow(dsn(dbname))
         self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
         self.__closed = False   # real initialisation value
@@ -227,9 +284,6 @@ class Cursor(object):
             self.__closer = frame_codeinfo(currentframe(),3)
         self.print_log()
 
-        if not self._serialized:
-            self.rollback() # Ensure we close the current transaction.
-
         self._obj.close()
 
         # This force the cursor to be freed, and thus, available again. It is
@@ -248,8 +302,23 @@ class Cursor(object):
 
     @check
     def autocommit(self, on):
-        offlevel = [ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE][bool(self._serialized)]
-        self._cnx.set_isolation_level([offlevel, ISOLATION_LEVEL_AUTOCOMMIT][bool(on)])
+        if on:
+            isolation_level = ISOLATION_LEVEL_AUTOCOMMIT
+        else:
+            # If a serializable cursor was requested, we
+            # use the appropriate PotsgreSQL isolation level
+            # that maps to snaphsot isolation.
+            # For all supported PostgreSQL versions (8.3-9.x),
+            # this is currently the ISOLATION_REPEATABLE_READ.
+            # See also the docstring of this class.
+            # NOTE: up to psycopg 2.4.2, repeatable read
+            #       is remapped to serializable before being
+            #       sent to the database, so it is in fact
+            #       unavailable for use with pg 9.1.
+            isolation_level = ISOLATION_LEVEL_REPEATABLE_READ \
+                                  if self._serialized \
+                                  else ISOLATION_LEVEL_READ_COMMITTED
+        self._cnx.set_isolation_level(isolation_level)
 
     @check
     def commit(self):
@@ -383,13 +452,13 @@ class Connection(object):
         self.dbname = dbname
         self._pool = pool
 
-    def cursor(self, serialized=False):
+    def cursor(self, serialized=True):
         cursor_type = serialized and 'serialized ' or ''
         self.__logger.log(logging.DEBUG_SQL, 'create %scursor to %r', cursor_type, self.dbname)
         return Cursor(self._pool, self.dbname, serialized=serialized)
 
-    def serialized_cursor(self):
-        return self.cursor(True)
+    # serialized_cursor is deprecated - cursors are serialized by default
+    serialized_cursor = cursor
 
     def __nonzero__(self):
         """Check if connection is possible"""

From 34f8f7fff7d00cba1306b9c77563deb426a1458c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 14 Jul 2011 15:17:24 +0200
Subject: [PATCH 14/21] [fix] some type correction in crm_lead_report

bzr revid: nicolas.vanhoren@openerp.com-20110714131724-m7ocv24z3j666ah2
---
 addons/crm/report/crm_lead_report.py                | 2 +-
 addons/crm_partner_assign/report/crm_lead_report.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 10dfceeb867..8d798fc8542 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -63,7 +63,7 @@ class crm_lead_report(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="('type', '=', 'lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type', '=', 'lead')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True, select=True),
         'creation_date': fields.date('Creation Date', readonly=True, select=True),
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 8fa9963a945..9e7824ebd80 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -63,7 +63,7 @@ class crm_lead_report_assign(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('type', '=', 'lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'lead')]"),
         'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),

From b5028303392af35e50e41683a9a6a994214aedaf Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Jul 2011 15:18:49 +0200
Subject: [PATCH 15/21] [IMP] Changed reference field to FieldChar

bzr revid: fme@openerp.com-20110714131849-ff301kdaqndqp9n4
---
 addons/base/static/src/js/form.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 0313c3d9ac0..e7f62d02969 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -239,6 +239,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         if (result.value) {
             for (var f in result.value) {
                 var field = this.fields[f];
+                // If field is not defined in the view, just ignore it
                 if (field) {
                     var value = result.value[f];
                     processed.push(field.name);
@@ -249,8 +250,6 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
                             this.do_onchange(field, processed);
                         }
                     }
-                } else {
-                    // this is a common case, the normal behavior should be to ignore it
                 }
             }
             this.on_form_changed();
@@ -266,7 +265,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
             });
         }
         if (result.domain) {
-            // Will be removed ?
+            // TODO: 
         }
         this.ready = true;
     },
@@ -2034,10 +2033,10 @@ openerp.base.form.FormOpenPopup = openerp.base.BaseWidget.extend({
     }
 });
 
-openerp.base.form.FieldReference = openerp.base.form.Field.extend({
+openerp.base.form.FieldReference = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "FieldReference";
+        //this.template = "FieldReference";
     }
 });
 

From 7416171ae1b2a8495c5405b2de5afff40e848161 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Jul 2011 15:29:57 +0200
Subject: [PATCH 16/21] [FIX] Binary fields : readonly modifiers

bzr revid: fme@openerp.com-20110714132957-xm7k4q24kafk7bjy
---
 addons/base/static/src/js/form.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index e7f62d02969..e7edac4aa6e 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -2054,6 +2054,10 @@ openerp.base.form.FieldBinary = openerp.base.form.Field.extend({
     },
     set_value_from_ui: function() {
     },
+    update_dom: function() {
+        this._super.apply(this, arguments);
+        this.$element.find('.oe-binary').toggle(!this.readonly);
+    },
     human_filesize : function(size) {
         var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
         var i = 0;
@@ -2151,6 +2155,13 @@ openerp.base.form.FieldBinaryImage = openerp.base.form.FieldBinary.extend({
         this._super.apply(this, arguments);
         this.$image = this.$element.find('img.oe-binary-image');
     },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        this.set_image_maxwidth();
+        var url = '/base/binary/image?session_id=' + this.session.session_id + '&model=' +
+            this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime())
+        this.$image.attr('src', url);
+    },
     set_image_maxwidth: function() {
         this.$image.css('max-width', this.$element.width());
     },
@@ -2166,13 +2177,6 @@ openerp.base.form.FieldBinaryImage = openerp.base.form.FieldBinary.extend({
     on_clear: function() {
         this._super.apply(this, arguments);
         this.$image.attr('src', '/base/static/src/img/placeholder.png');
-    },
-    set_value: function(value) {
-        this._super.apply(this, arguments);
-        this.set_image_maxwidth();
-        var url = '/base/binary/image?session_id=' + this.session.session_id + '&model=' +
-            this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime())
-        this.$image.attr('src', url);
     }
 });
 

From 90bb70473e57c58a6d18e61e83bf823673e3c564 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 14 Jul 2011 15:52:00 +0200
Subject: [PATCH 17/21] [fix] big fix related to domains and contexts defined
 in a model

bzr revid: nicolas.vanhoren@openerp.com-20110714135200-03e9ovknnz9lusni
---
 addons/base/controllers/main.py   | 61 ++++++++++++++++++-------------
 addons/base/static/src/js/form.js | 14 ++++---
 2 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index d6a81124c4d..20419e03d3e 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -573,6 +573,10 @@ class View(openerpweb.Controller):
             if field.has_key('views') and field['views']:
                 for view in field["views"].values():
                     self.process_view(session, view, None, transform)
+            if field.get('domain'):
+                field["domain"] = self.parse_domain(field["domain"], session)
+            if field.get('context'):
+                field["context"] = self.parse_domain(field["context"], session)
 
     @openerpweb.jsonrequest
     def add_custom(self, request, view_id, arch):
@@ -610,27 +614,38 @@ class View(openerpweb.Controller):
                 self.parse_domains_and_contexts(elem, session)
         return root
 
-    def parse_domain(self, elem, attr_name, session):
-        """ Parses an attribute of the provided name as a domain, transforms it
+    def parse_domain(self, domain, session):
+        """ Parses an arbitrary string containing a domain, transforms it
         to either a literal domain or a :class:`openerpweb.nonliterals.Domain`
 
-        :param elem: the node being parsed
-        :type param: xml.etree.ElementTree.Element
-        :param str attr_name: the name of the attribute which should be parsed
+        :param domain: the domain to parse, if the domain is not a string it is assumed to
+        be a literal domain and is returned as-is
         :param session: Current OpenERP session
         :type session: openerpweb.openerpweb.OpenERPSession
         """
-        domain = elem.get(attr_name, '').strip()
-        if domain:
-            try:
-                elem.set(
-                    attr_name,
-                    openerpweb.ast.literal_eval(
-                        domain))
-            except ValueError:
-                # not a literal
-                elem.set(attr_name,
-                         openerpweb.nonliterals.Domain(session, domain))
+        if not isinstance(domain, (str, unicode)):
+            return domain
+        try:
+            return openerpweb.ast.literal_eval(domain)
+        except ValueError:
+            # not a literal
+            return openerpweb.nonliterals.Domain(session, domain)
+        
+    def parse_context(self, context, session):
+        """ Parses an arbitrary string containing a context, transforms it
+        to either a literal context or a :class:`openerpweb.nonliterals.Context`
+
+        :param context: the context to parse, if the context is not a string it is assumed to
+        be a literal domain and is returned as-is
+        :param session: Current OpenERP session
+        :type session: openerpweb.openerpweb.OpenERPSession
+        """
+        if not isinstance(context, (str, unicode)):
+            return context
+        try:
+            return openerpweb.ast.literal_eval(context)
+        except ValueError:
+            return openerpweb.nonliterals.Context(session, context)
 
     def parse_domains_and_contexts(self, elem, session):
         """ Converts domains and contexts from the view into Python objects,
@@ -643,18 +658,14 @@ class View(openerpweb.Controller):
                         non-literal objects
         :type session: openerpweb.openerpweb.OpenERPSession
         """
-        self.parse_domain(elem, 'domain', session)
-        self.parse_domain(elem, 'filter_domain', session)
+        for el in ['domain', 'filter_domain']:
+            domain = elem.get(el, '').strip()
+            if domain:
+                elem.set(el, self.parse_domain(domain, session))
         for el in ['context', 'default_get']:
             context_string = elem.get(el, '').strip()
             if context_string:
-                try:
-                    elem.set(el,
-                             openerpweb.ast.literal_eval(context_string))
-                except ValueError:
-                    elem.set(el,
-                             openerpweb.nonliterals.Context(
-                                 session, context_string))
+                elem.set(el, self.parse_context(context_string, session))
 
 class FormView(View):
     _cp_path = "/base/formview"
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index e7edac4aa6e..523f47e5f33 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -828,8 +828,10 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
      * the fields'context with the action's context.
      */
     build_context: function() {
-        var a_context = this.view.dataset.get_context() || {};
-        var f_context = this.field.context || {};
+        // I previously belevied contexts should be herrited, but now I doubt it
+        //var a_context = this.view.dataset.get_context() || {};
+        var f_context = this.field.context || null;
+        // maybe the default_get should only be used when we do a default_get?
         var v_context1 = this.node.attrs.default_get || {};
         var v_context2 = this.node.attrs.context || {};
         var v_context = new openerp.base.CompoundContext(v_context1, v_context2);
@@ -837,17 +839,19 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
             var fields_values = this._build_view_fields_values();
             v_context.set_eval_context(fields_values);
         }
-        var ctx = new openerp.base.CompoundContext(a_context, f_context, v_context);
+        // if there is a context on the node, overrides the model's context
+        var ctx = f_context || v_context;
         return ctx;
     },
     build_domain: function() {
-        var f_domain = this.field.domain || [];
+        var f_domain = this.field.domain || null;
         var v_domain = this.node.attrs.domain || [];
         if (!(v_domain instanceof Array) || true) { //TODO niv: remove || true
             var fields_values = this._build_view_fields_values();
             v_domain = new openerp.base.CompoundDomain(v_domain).set_eval_context(fields_values);
         }
-        return new openerp.base.CompoundDomain(f_domain, v_domain);
+        // if there is a domain on the node, overrides the model's domain
+        return f_domain || v_domain;
     }
 });
 

From 55f5cf3eff3153738bdfa5223520ac9f6151dadb Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 14 Jul 2011 16:14:02 +0200
Subject: [PATCH 18/21] [fix] small css problem in advanced filters

bzr revid: nicolas.vanhoren@openerp.com-20110714141402-t5coqe7mflz8dmsp
---
 addons/base/static/src/css/base.css | 4 ++++
 addons/base/static/src/xml/base.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 53470bb266a..d220c8b406b 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -577,6 +577,10 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     display: none;
 }
 
+.openerp .searchview_extended_delete_prop {
+    text-decoration: none;
+}
+
 .openerp .searchview_extended_delete_group span,
 .openerp .searchview_extended_delete_prop span {
     font-size: 0.9em;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 8aa392a3fd1..8f9d063ffba 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -809,7 +809,7 @@
         <select class="searchview_extended_prop_op"/>
         <span class="searchview_extended_prop_value"/>
         <a class="searchview_extended_delete_prop"
-                href="javascript:void(0)"><span></span></a>
+                href="javascript:void(0)"><span> </span></a>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">

From 29bea062506b4392ca6386cab7acde587bd2b09b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Jul 2011 16:46:27 +0200
Subject: [PATCH 19/21] [IMP] Dashboard: improved layout

bzr revid: fme@openerp.com-20110714144627-ldyh2kpv64h08c1j
---
 .../static/src/css/dashboard.css              | 20 ++++++++++++++-----
 .../base_dashboard/static/src/js/dashboard.js |  5 ++++-
 .../static/src/xml/base_dashboard.xml         | 10 +++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/addons/base_dashboard/static/src/css/dashboard.css b/addons/base_dashboard/static/src/css/dashboard.css
index b9815593221..df4e9195440 100644
--- a/addons/base_dashboard/static/src/css/dashboard.css
+++ b/addons/base_dashboard/static/src/css/dashboard.css
@@ -7,14 +7,17 @@
 }
 .openerp .oe-dashboard-action {
     margin: 0 0.5em 0.5em 0;
+    padding: 2px;
 }
+.openerp .oe-dashboard-action:hover {
+    border: 1px dashed #ccc;
+    padding: 1px;
+}
+
 .openerp .oe-dashboard-action .oe-dashboard-action-header {
-    margin: 0.3em;
-    padding-bottom: 4px;
-    padding-left: 0.2em
+    font-size: 125%;
 }
 .openerp a.oe-dashboard-action-rename {
-    float: left;
     padding-right: 4px;
     position: relative;
     top: 1px;
@@ -43,7 +46,7 @@
 }
 
 .openerp .oe-dashboard-action .oe-dashboard-action-content {
-    padding: 0.4em;
+    /*padding: 0.4em;*/
 }
 
 .openerp .oe-dashboard .ui-sortable-placeholder {
@@ -126,3 +129,10 @@
     top: 0px;
     right: 0px;
 }
+
+.openerp .oe-dashboard-action .view-manager-main-content {
+    padding: 2px;
+}
+.openerp .oe-dashboard-action-header .ui-icon, .openerp .oe-dashboard-action-header .oe-dashboard-action-rename {
+    display: none;
+}
diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index 1c30b1541ed..3a70aa649ea 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -40,7 +40,10 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
             });
         });
 
-        this.$element.find('a.oe-dashboard-action-rename').live('click', this.on_rename);
+        //this.$element.find('a.oe-dashboard-action-rename').live('click', this.on_rename);
+        this.$element.find('.oe-dashboard-action').live('mouseover mouseout', function(event) {
+            $(this).find('.oe-dashboard-action-header .ui-icon, .oe-dashboard-action-header .oe-dashboard-action-rename').toggle(event.type == 'mouseover');
+        });
     },
     on_undo: function() {
         this.rpc('/base/view/undo_custom', {
diff --git a/addons/base_dashboard/static/src/xml/base_dashboard.xml b/addons/base_dashboard/static/src/xml/base_dashboard.xml
index 3d45efafaa2..0b03d77ceee 100644
--- a/addons/base_dashboard/static/src/xml/base_dashboard.xml
+++ b/addons/base_dashboard/static/src/xml/base_dashboard.xml
@@ -29,15 +29,15 @@
     </table>
 </t>
 <t t-name="DashBoard.action">
-    <div t-att-data-id="action.attrs.name" class="oe-dashboard-action ui-widget ui-widget-content ui-helper-clearfix ui-corner-all">
-        <div class="oe-dashboard-action-header ui-widget-header ui-corner-all">
-            <a href="#" class="oe-dashboard-action-rename"><img src="/base/static/src/img/icons/gtk-edit.png" width="16" height="16"/></a>
-            <span class="oe-dashboard-action-title"><t t-esc="action.attrs.string"/></span>
+    <div t-att-data-id="action.attrs.name" class="oe-dashboard-action">
+        <h2 class="oe-dashboard-action-header oe_view_title">
+            <t t-esc="action.attrs.string"/>
+            <!--<a href="#" class="oe-dashboard-action-rename"><img src="/base/static/src/img/icons/gtk-edit.png" width="16" height="16"/></a>-->
             <input class="oe-dashboard-action-input" type="text" name="title" value="" style="display: none"/>
             <span class='ui-icon ui-icon-closethick'></span>
             <span class='ui-icon ui-icon-minusthick oe-dashboard-fold' t-if="!action.attrs.fold"></span>
             <span class='ui-icon ui-icon-plusthick oe-dashboard-fold' t-if="action.attrs.fold"></span>
-        </div>
+        </h2>
         <div t-att-id="view.element_id + '_action_' + action.attrs.name" class="oe-dashboard-action-content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
     </div>
 </t>

From 823f2efd057452e817a2bc828f7da3c1717b155c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 14 Jul 2011 17:11:13 +0200
Subject: [PATCH 20/21] [IMP] dashboard css

bzr revid: al@openerp.com-20110714151113-49vur1m55m7z0ybm
---
 addons/base_dashboard/static/src/css/dashboard.css | 1 +
 addons/base_graph/static/src/xml/base_graph.xml    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_dashboard/static/src/css/dashboard.css b/addons/base_dashboard/static/src/css/dashboard.css
index df4e9195440..65c62ced5f4 100644
--- a/addons/base_dashboard/static/src/css/dashboard.css
+++ b/addons/base_dashboard/static/src/css/dashboard.css
@@ -16,6 +16,7 @@
 
 .openerp .oe-dashboard-action .oe-dashboard-action-header {
     font-size: 125%;
+    font-weight: bold;
 }
 .openerp a.oe-dashboard-action-rename {
     padding-right: 4px;
diff --git a/addons/base_graph/static/src/xml/base_graph.xml b/addons/base_graph/static/src/xml/base_graph.xml
index f8dee0a91c6..cb5b1b2b0c4 100644
--- a/addons/base_graph/static/src/xml/base_graph.xml
+++ b/addons/base_graph/static/src/xml/base_graph.xml
@@ -1,6 +1,6 @@
 <template>
     <t t-name="GraphView">
         <h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
-        <div t-att-id="elem_id+'-'+chart+'chart'" style="height:300px;position:relative;border:1px solid #A4BED4;"></div>
+        <div t-att-id="elem_id+'-'+chart+'chart'" style="height:300px;position:relative;"></div>
     </t>
-</template>
\ No newline at end of file
+</template>

From 55be9c8aa0c678d9adcedd48275d3e293e535203 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Jul 2011 17:36:47 +0200
Subject: [PATCH 21/21] [FIX] fields fixer in process_view: contexts should be
 parsed via parse_context, has_key should not be used, dict.get ~ in +
 __getitem__

bzr revid: xmo@openerp.com-20110714153647-qilykek2df0uhp3t
---
 addons/base/controllers/main.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 20419e03d3e..701bb0f1723 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -569,14 +569,15 @@ class View(openerpweb.Controller):
         else:
             xml = ElementTree.fromstring(arch)
         fvg['arch'] = Xml2Json.convert_element(xml)
-        for field in fvg['fields'].values():
-            if field.has_key('views') and field['views']:
-                for view in field["views"].values():
+
+        for field in fvg['fields'].itervalues():
+            if field.get('views'):
+                for view in field["views"].itervalues():
                     self.process_view(session, view, None, transform)
             if field.get('domain'):
                 field["domain"] = self.parse_domain(field["domain"], session)
             if field.get('context'):
-                field["context"] = self.parse_domain(field["context"], session)
+                field["context"] = self.parse_context(field["context"], session)
 
     @openerpweb.jsonrequest
     def add_custom(self, request, view_id, arch):