From 3334b1c5b3bf0e34d8b6b5c701cc90dd788d4f87 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 18:12:04 +0200
Subject: [PATCH 01/14] [WIP] focus

bzr revid: fme@openerp.com-20120801161204-33fag4hhnhdl0g1k
---
 addons/web/static/src/js/view_form.js | 28 +++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0aabfbb5480..46595df5256 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -79,6 +79,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         _.defaults(this.options, {
             "not_interactible_on_create": false,
             "initial_mode": "view",
+            "disable_autofocus": false,
         });
         this.is_initialized = $.Deferred();
         this.mutating_mutex = new $.Mutex();
@@ -269,9 +270,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         if (this.$pager) {
             this.$pager.show();
         }
+        this.$element.show().css({
+            opacity: '0',
+            filter: 'alpha(opacity = 0)'
+        });
         this.$element.add(this.$buttons).removeClass('oe_form_dirty');
-        this.$element.css('visibility', 'visible');
-        this._super();
 
         var shown = this.has_been_loaded;
         if (options.reload !== false) {
@@ -291,6 +294,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             if (options.editable) {
                 self.to_edit_mode();
             }
+            self.$element.css({
+                opacity: '1',
+                filter: 'alpha(opacity = 100)'
+            });
         });
     },
     do_hide: function () {
@@ -350,6 +357,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 self.do_push_state({id:record.id});
             }
             self.$element.add(self.$buttons).removeClass('oe_form_dirty');
+            self.autofocus();
         });
     },
     /**
@@ -649,13 +657,21 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             _.each(this.fields,function(field){
                 field.set({"force_readonly": false});
             });
-            var fields_order = self.fields_order.slice(0);
-            if (self.default_focus_field) {
-                fields_order.unshift(self.default_focus_field.name);
+            this.autofocus();
+        }
+    },
+    autofocus: function() {
+        if (this.get("actual_mode") === "edit" && !this.options.disable_autofocus) {
+            var fields_order = this.fields_order.slice(0);
+            console.log('default focus = ', this.default_focus);
+            if (this.default_focus_field) {
+                fields_order.unshift(this.default_focus_field.name);
             }
+            console.log(fields_order);
             for (var i = 0; i < fields_order.length; i += 1) {
-                var field = self.fields[fields_order[i]];
+                var field = this.fields[fields_order[i]];
                 if (!field.get('effective_invisible') && !field.get('effective_readonly')) {
+                    console.log('FOCUS ', field.name);
                     field.focus();
                     break;
                 }

From 22cc5e45e7048c4e3f6b40587c5018bd647a600a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 18:20:24 +0200
Subject: [PATCH 02/14] [FIX] Do not focus unfocusable fields

bzr revid: fme@openerp.com-20120801162024-kzg70c729o371ami
---
 addons/web/static/src/js/view_form.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 46595df5256..1b104e972d0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -663,17 +663,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     autofocus: function() {
         if (this.get("actual_mode") === "edit" && !this.options.disable_autofocus) {
             var fields_order = this.fields_order.slice(0);
-            console.log('default focus = ', this.default_focus);
             if (this.default_focus_field) {
                 fields_order.unshift(this.default_focus_field.name);
             }
-            console.log(fields_order);
             for (var i = 0; i < fields_order.length; i += 1) {
                 var field = this.fields[fields_order[i]];
                 if (!field.get('effective_invisible') && !field.get('effective_readonly')) {
-                    console.log('FOCUS ', field.name);
-                    field.focus();
-                    break;
+                    if (field.focus() !== false) {
+                        break;
+                    }
                 }
             }
         }

From 52de6e12a2b6fe31a1b431c756378ee8a216ee79 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 18:49:33 +0200
Subject: [PATCH 03/14] [IMP] Improved focus. Removed delay_focus

bzr revid: fme@openerp.com-20120801164933-4nwphx7rt4l4n6ys
---
 addons/web/static/src/js/view_form.js | 30 +++++++++++----------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1b104e972d0..9bb549b9747 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -669,8 +669,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             for (var i = 0; i < fields_order.length; i += 1) {
                 var field = this.fields[fields_order[i]];
                 if (!field.get('effective_invisible') && !field.get('effective_readonly')) {
+                    console.log("trying to focus ", field.name, field);
                     if (field.focus() !== false) {
+                        console.log("----------------- YIPEEEEEEEE");
                         break;
+                    } else {
                     }
                 }
             }
@@ -1976,14 +1979,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         }
     },
     focus: function() {
-    },
-    /**
-     * Utility method to focus an element, but only after a small amount of time.
-     */
-    delay_focus: function($elem) {
-        setTimeout(function() {
-            $elem[0].focus();
-        }, 50);
+        return false;
     },
     /**
      * Utility method to get the widget options defined in the field xml description.
@@ -2082,7 +2078,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
         return this.get('value') === '' || this._super();
     },
     focus: function() {
-        this.$element.find('input:first')[0].focus();
+        this.$element.find('input:first').focus();
     }
 });
 
@@ -2302,8 +2298,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc
         return this.get('value') === '' || this._super();
     },
     focus: function() {
-        if (this.datewidget && this.datewidget.$input)
-            this.delay_focus(this.datewidget.$input);
+        if (this.datewidget && this.datewidget.$input) {
+            this.datewidget.$input.focus();
+        }
     }
 });
 
@@ -2358,7 +2355,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
         return this.get('value') === '' || this._super();
     },
     focus: function($element) {
-        this.delay_focus(this.$textarea);
+        this.$textarea.focus();
     },
     do_resize: function(max_height) {
         max_height = parseInt(max_height, 10);
@@ -2451,7 +2448,7 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this.$checkbox[0].checked = value_;
     },
     focus: function() {
-        this.delay_focus(this.$checkbox);
+        this.$checkbox.focus();
     }
 });
 
@@ -2543,7 +2540,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
         return !! value_;
     },
     focus: function() {
-        this.delay_focus(this.$element.find('select:first'));
+        this.$element.find('select:first').focus();
     }
 });
 
@@ -2933,7 +2930,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         return ! this.get("value");
     },
     focus: function () {
-        this.delay_focus(this.$input);
+        this.$input.focus();
     }
 });
 
@@ -4691,9 +4688,6 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
             elem.css("color", color);
         }
     },
-    focus: function() {
-        return false;
-    },
 });
 
 /**

From d880351b6ae82c1ae66ba5c402d193c74ef11926 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 1 Aug 2012 18:58:41 +0200
Subject: [PATCH 04/14] [REM] Removed console.logs

bzr revid: fme@openerp.com-20120801165841-nj5jig9txn9m55nh
---
 addons/web/static/src/js/view_form.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9bb549b9747..67f1b5c5629 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -669,9 +669,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             for (var i = 0; i < fields_order.length; i += 1) {
                 var field = this.fields[fields_order[i]];
                 if (!field.get('effective_invisible') && !field.get('effective_readonly')) {
-                    console.log("trying to focus ", field.name, field);
                     if (field.focus() !== false) {
-                        console.log("----------------- YIPEEEEEEEE");
                         break;
                     } else {
                     }

From 1f1770ffb782331b20b05b390348b3240faef393 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 2 Aug 2012 11:39:17 +0200
Subject: [PATCH 05/14] [IMP] Disable autofocus on editable lists

bzr revid: fme@openerp.com-20120802093917-3wc9qgek6e2mba5p
---
 addons/web/static/src/js/view_list_editable.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 6c38495d0dc..67909f9c749 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -602,6 +602,7 @@ openerp.web.list_editable = function (instance) {
             this.form = new (this.options.formView)(
                 this, this.delegate.dataset, false, {
                     initial_mode: 'edit',
+                    disable_autofocus: true,
                     $buttons: $(),
                     $pager: $()
             });

From 152cc49c3fcefc6e5678cacf85ca5d2455a11f0a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 2 Aug 2012 11:53:26 +0200
Subject: [PATCH 06/14] [FIX] Autofocus on create mode

bzr revid: fme@openerp.com-20120802095326-o6gc8jyvd44u9xg2
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 67f1b5c5629..1132d096d03 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -661,7 +661,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
     },
     autofocus: function() {
-        if (this.get("actual_mode") === "edit" && !this.options.disable_autofocus) {
+        if (this.get("actual_mode") !== "view" && !this.options.disable_autofocus) {
             var fields_order = this.fields_order.slice(0);
             if (this.default_focus_field) {
                 fields_order.unshift(this.default_focus_field.name);

From e57c69409536b0b5e6706a8b6ec7e5072dfe9784 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 2 Aug 2012 15:46:48 +0200
Subject: [PATCH 07/14] [FIX] Review the layout of the partners

bzr revid: stw@openerp.com-20120802134648-djca908iguoukemd
---
 openerp/addons/base/res/res_partner.py       |  4 ++--
 openerp/addons/base/res/res_partner_view.xml | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index d94a7092b45..f6292bdb5bb 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -138,7 +138,7 @@ class res_partner(osv.osv):
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
         'title': fields.many2one('res.partner.title','Title'),
-        'parent_id': fields.many2one('res.partner','Company'),
+        'parent_id': fields.many2one('res.partner', 'Owned by'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
@@ -164,7 +164,7 @@ class res_partner(osv.osv):
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
+        'state_id': fields.many2one("res.country.state", 'State'),
         'country_id': fields.many2one('res.country', 'Country'),
         'country': fields.related('country_id', type='many2one', relation='res.country', string='Country'),   # for backward compatibility
         'email': fields.char('Email', size=240),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 27caa708cb6..d30e0a9dd03 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -101,23 +101,23 @@
                 <sheet>
                     <field name="photo" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
-                        <div class="oe_edit_only">
-                            <label for="name" string="Customer Name"/>
-                            (<field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
-                        </div>
                         <h1>
-                            <field name="name" default_focus="1"/>
+                            <field name="name" default_focus="1" placeholder="Name" />
                         </h1>
-                        <field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
+                        <field name="parent_id"
+                            string="Work for Company"
+                            domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                            attrs="{'invisible': [('is_company','=', True)]}"
+                            on_change="onchange_address(use_parent_address, parent_id)"/>
+                        <div class="oe_edit_only">
+                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Company?"/>
+                            <field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
+                        </div>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> </div>
 
                     <group>
                         <group>
-                            <field name="parent_id"
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                attrs="{'invisible': [('is_company','=', True)]}"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>,
                             <label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
                             <div attrs="{'invisible': [('parent_id','=', False)]}">
                                 <field class="oe_inline"

From 7639597d214848540dc5535abd4e5180d29968ab Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 2 Aug 2012 16:03:43 +0200
Subject: [PATCH 08/14] [FIX] sale: Don't copy the sale orders when we
 duplicate a partner

bzr revid: stw@openerp.com-20120802140343-3xv3vkmwov1h52by
---
 addons/sale/res_partner.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 84c1a9c96ad..d7bcd5804ee 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -31,6 +31,14 @@ class res_partner(osv.osv):
             res[partner.id] = len(partner.sale_order_ids)
         return res
 
+    def copy(self, cr, uid, record_id, default=None, context=None):
+        if default is None:
+            default = {}
+
+        default.update({'sale_order_ids': []})
+
+        super(res_partner, self).copy(cr, uid, record_id, default, context)
+
     _columns = {
         'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'),
         'sale_order_ids': fields.one2many('sale.order','partner_id','Sales Order')

From 112da954ffb38452c3c948f015f85d38edcdeb2d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 2 Aug 2012 16:04:05 +0200
Subject: [PATCH 09/14] [FIX] sale: Don't copy the leads, opportunities,
 meetings when we duplicate a partner

bzr revid: stw@openerp.com-20120802140405-wr89huxznwsss4ui
---
 addons/crm/res_partner.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index acf212a2305..31c45969f8e 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -46,6 +46,14 @@ class res_partner(osv.osv):
         'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'),
     }
 
+    def copy(self, cr, uid, record_id, default=None, context=None):
+        if default is None:
+            default = {}
+
+        default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
+
+        super(res_partner, self).copy(cr, uid, record_id, default, context)
+
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
         search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
         value = {

From 2f9d78e611e0f70063000d31231ae91c43e0b863 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 2 Aug 2012 16:24:42 +0200
Subject: [PATCH 10/14] [FIX] incorrect replacement calling method on this in
 context where should be self

bzr revid: xmo@openerp.com-20120802142442-3ywttaf9f0q4igk3
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 3a03e7bc911..83c8078231b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -713,7 +713,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
         this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).then(function(records) {
             if (records.length) {
                 self.set_record(records[0]);
-                this.replaceElement($(self.render()));
+                self.replaceElement($(self.render()));
                 self.$element.data('widget', self);
                 self.bind_events();
                 self.group.compute_cards_auto_height();

From c2ad177f93b9397960acdc5969017898ac754391 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 2 Aug 2012 16:32:46 +0200
Subject: [PATCH 11/14] [FIX] Fix bug in breadcrumb when a client action is
 present in the breadcrumb items

bzr revid: fme@openerp.com-20120802143246-7pgeueme3i6h1emc
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 6779b762850..5c238034586 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -528,7 +528,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                     }
                     return controller.get('title');
                 });
-                if (next && next.action.res_id && self.active_view === 'form' && self.model === next.action.res_model && id === next.action.res_id) {
+                if (next && next.action && next.action.res_id && self.active_view === 'form' && self.model === next.action.res_model && id === next.action.res_id) {
                     // If the current active view is a formview and the next item in the breadcrumbs
                     // is an action on same object (model / res_id), then we omit the current formview's title
                     titles.pop();

From d9aaf5c2d1efdb58e73f13e6c0279f9ef46f185c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 2 Aug 2012 16:36:50 +0200
Subject: [PATCH 12/14] [IMP] Cleaned dialog class to be closer to the Widget
 design

bzr revid: nicolas.vanhoren@openerp.com-20120802143650-czejc71u5atle2rs
---
 addons/web/static/src/js/chrome.js | 58 +++++++++++++++++-------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index d09f144571f..86fb457582d 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -57,7 +57,7 @@ instance.web.Dialog = instance.web.Widget.extend({
     init: function (parent, options, content) {
         var self = this;
         this._super(parent);
-        this.setElement(content || this.make(this.tagName));
+        this.content_to_set = content;
         this.dialog_options = {
             modal: true,
             destroy_on_close: true,
@@ -81,11 +81,6 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (options) {
             _.extend(this.dialog_options, options);
         }
-        if (this.dialog_options.autoOpen) {
-            this.open();
-        } else {
-            instance.web.dialog(this.$element, this.get_options());
-        }
     },
     get_options: function(options) {
         var self = this,
@@ -114,31 +109,44 @@ instance.web.Dialog = instance.web.Widget.extend({
         } else if (val.slice(-1) == "%") {
             return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10));
         } else {
-            return parseInt(val, 10);
+            return parseInt(val, 10);        
+        }
+    },
+    renderElement: function() {
+        if (this.content_to_set) {
+            this.setElement(this.content_to_set);
+        } else if (this.template) {
+            this._super();
         }
     },
     open: function(options) {
-        // TODO fme: bind window on resize
-        if (this.template) {
-            this.$element.html(this.renderElement());
-        }
+        if (! this.dialog_inited)
+            this.init_dialog();
         var o = this.get_options(options);
-        instance.web.dialog(this.$element, o).dialog('open');
+        instance.web.dialog(this.$element, o).dialog('open');     
         if (o.height === 'auto' && o.max_height) {
             this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
         }
         return this;
     },
+    init_dialog: function(options) {
+        this.renderElement();
+        var o = this.get_options(options);
+        instance.web.dialog(this.$element, o);
+        var res = this.start();
+        this.dialog_inited = true;
+        return res;
+    },
     close: function() {
         this.$element.dialog('close');
     },
     on_close: function() {
-	if (this.__tmp_dialog_destroying)
-	    return;
+        if (this.__tmp_dialog_destroying)
+            return;
         if (this.dialog_options.destroy_on_close) {
-	    this.__tmp_dialog_closing = true;
+            this.__tmp_dialog_closing = true;
             this.destroy();
-	    this.__tmp_dialog_closing = undefined;
+            this.__tmp_dialog_closing = undefined;
         }
     },
     on_resized: function() {
@@ -148,10 +156,10 @@ instance.web.Dialog = instance.web.Widget.extend({
             el.destroy();
         });
         if (! this.__tmp_dialog_closing) {
-	    this.__tmp_dialog_destroying = true;
-	    this.close();
-	    this.__tmp_dialog_destroying = undefined;
-	}
+            this.__tmp_dialog_destroying = true;
+            this.close();
+            this.__tmp_dialog_destroying = undefined;
+        }
         if (! this.isDestroyed()) {
             this.$element.dialog('destroy');
         }
@@ -261,11 +269,11 @@ instance.web.Loading = instance.web.Widget.extend({
 
         this.count += increment;
         if (this.count > 0) {
-	    if (instance.connection.debug) {
-		this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count));
-	    } else {
-		this.$element.text(_t("Loading"));
-	    }
+            if (instance.connection.debug) {
+                this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count));
+            } else {
+                this.$element.text(_t("Loading"));
+            }
             this.$element.show();
             this.getParent().$element.addClass('oe_wait');
         } else {

From 2c57c15491395e9edd0ad0cebcf3b12f6e02ee03 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 2 Aug 2012 16:46:23 +0200
Subject: [PATCH 13/14] [IMP] Mass rename \t to 4 spaces

bzr revid: nicolas.vanhoren@openerp.com-20120802144623-ykl5te005ytnv584
---
 addons/web/static/src/js/corelib.js     |  4 ++--
 addons/web/static/src/js/coresetup.js   | 22 +++++++++++-----------
 addons/web/static/src/js/data.js        |  6 +++---
 addons/web/static/src/js/data_import.js |  2 +-
 addons/web/static/src/js/views.js       |  2 +-
 addons/web/static/src/xml/base.xml      |  8 ++++----
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index de2b094aacc..a46d6314ebe 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1377,7 +1377,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
             processData: false
         }, url);
         if (this.synch)
-        	ajax.async = false;
+            ajax.async = false;
         return $.ajax(ajax);
     },
     rpc_jsonp: function(url, payload) {
@@ -1396,7 +1396,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
             data: data
         }, url);
         if (this.synch)
-        	ajax.async = false;
+            ajax.async = false;
         var payload_str = JSON.stringify(payload);
         var payload_url = $.param({r:payload_str});
         if(payload_url.length < 2000) {
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 0011b7c2450..2f2fb4f7832 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -393,13 +393,13 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         timer = setTimeout(waitLoop, CHECK_INTERVAL);
     },
     synchronized_mode: function(to_execute) {
-    	var synch = this.synch;
-    	this.synch = true;
-    	try {
-    		return to_execute();
-    	} finally {
-    		this.synch = synch;
-    	}
+        var synch = this.synch;
+        this.synch = true;
+        try {
+            return to_execute();
+        } finally {
+            this.synch = synch;
+        }
     }
 });
 
@@ -540,10 +540,10 @@ $.async_when = function() {
 // special tweak for the web client
 var old_async_when = $.async_when;
 $.async_when = function() {
-	if (instance.connection.synch)
-		return $.when.apply(this, arguments);
-	else
-		return old_async_when.apply(this, arguments);
+    if (instance.connection.synch)
+        return $.when.apply(this, arguments);
+    else
+        return old_async_when.apply(this, arguments);
 };
 
 /** Setup blockui */
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index fdb15d598af..2589afe5503 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -803,7 +803,7 @@ instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends openerp.web.Da
         return this.ids.length;
     },
     alter_ids: function(n_ids) {
-    	this.ids = n_ids;
+        this.ids = n_ids;
     },
 });
 instance.web.DataSetStatic =  instance.web.DataSet.extend({
@@ -1042,7 +1042,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                         self.cache.push({id: id, values: record});
                     } else {
                         // I assume cache value is prioritary
-                    	cached.values = _.defaults(_.clone(cached.values), record);
+                        cached.values = _.defaults(_.clone(cached.values), record);
                     }
                 });
                 return_records();
@@ -1067,7 +1067,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
         return this._super(method, args, callback, error_callback);
     },
     alter_ids: function(n_ids) {
-    	this._super(n_ids);
+        this._super(n_ids);
         this.on_change();
     },
 });
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 6059f292df9..620878569ce 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -156,7 +156,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
         });
     },
     toggle_import_button: function (newstate) {
-    	instance.web.dialog(this.$element, 'widget')
+        instance.web.dialog(this.$element, 'widget')
                 .find('.oe_import_dialog_button')
                 .button('option', 'disabled', !newstate);
     },
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5c238034586..af4ae68737a 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -435,7 +435,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                         container.hide();
                         controller.do_hide();
                     }
-		    // put the <footer> in the dialog's buttonpane
+                    // put the <footer> in the dialog's buttonpane
                     if (self.$element.parent('.ui-dialog-content') && self.$element.find('footer')) {
                         self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonset').hide()
                         self.$element.find('footer').appendTo(
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 979e97efc04..49897cc0e52 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -406,10 +406,10 @@
 <t t-name="ViewManager">
     <div class="oe_view_manager">
         <table class="oe_view_manager_header">
-	    <col width="20%"/>
-	    <col width="25%"/>
-	    <col width="20%"/>
-	    <col width="35%"/>
+            <col width="20%"/>
+            <col width="25%"/>
+            <col width="20%"/>
+            <col width="35%"/>
             <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                         <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">

From 5ee6c09b3164309a05aac70501205f15787339f3 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 2 Aug 2012 16:54:30 +0200
Subject: [PATCH 14/14] [FIX] sale: Change some layouts

bzr revid: stw@openerp.com-20120802145430-ebmecs6ise4h6na0
---
 addons/sale/sale_view.xml                       | 17 +++++++++++------
 addons/sale/wizard/sale_make_invoice_advance.py |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 48e823250dc..3bb78ae1c04 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -164,7 +164,7 @@
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
-                            <button name="action_view_delivery" string="Open Delivery Order" type="object" class="oe_highlight"
+                            <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
                                 type="action" states="manual" class="oe_highlight"/>
@@ -287,14 +287,18 @@
                             <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
+                                <div class="oe_subtotal_footer_separator oe_inline">
+                                    <label for="amount_total" />
+                                    <button name="button_dummy"
+                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                </div>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
                             </group>
                             <group name="sale_margin_grp">
                             </group>
-                            <div class="oe_clear">
-                                <label for="note"/>
-                            </div>
-                            <field name="note" class="oe_inline"/>
+                            <div class="oe_clear"/>
+                            <label for="note"/>
+                            <field name="note"/>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
@@ -364,6 +368,7 @@
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id"/>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 39999a8d1b7..a09325d663d 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -28,7 +28,7 @@ class sale_advance_payment_inv(osv.osv_memory):
 
     _columns = {
         'advance_payment_method':fields.selection(
-            [('all', 'All'), ('percentage','Percentage'), ('fixed','Fixed Price'),
+            [('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
                 ('lines', 'Some Order Lines')],
             'Type', required=True,
             help="""Use All to create the final invoice.