From 1b3d045ceed3fad80bc5740c41731791ec09b6cd Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 31 Oct 2012 15:37:37 +0530
Subject: [PATCH 01/14] [FIX] added *.id* field manually.

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

bzr revid: vme@tinyerp.com-20121031100737-u0r015etp6jilo80
---
 addons/web/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 72ffd9567f6..4dabc4c2846 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1767,7 +1767,9 @@ class Export(View):
     def fields_info(self, req, model, export_fields):
         info = {}
         fields = self.fields_get(req, model)
-
+        if ".id" in export_fields:
+            fields['.id'] = fields.pop('id', {'string': 'ID'})
+            
         # To make fields retrieval more efficient, fetch all sub-fields of a
         # given field at the same time. Because the order in the export list is
         # arbitrary, this requires ordering all sub-fields of a given field

From 16203707c3aa0772de2f9e5f1962e33671d80409 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Thu, 22 Nov 2012 09:26:30 +0100
Subject: [PATCH 02/14] [IMP] change order for top menu item sequence number

bzr revid: api@openerp.com-20121122082630-ujk49g77z1mb8gqg
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 28b9e960ebe..a12fa1285b3 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -6,7 +6,7 @@
         <menuitem name="Sales"
             id="menu_base_partner"
             groups="base.group_sale_salesman"
-            sequence="30"/>
+            sequence="20"/>
 
             <menuitem id="base.menu_sales" parent="base.menu_base_partner" name="Sales" sequence="1" />
             <menuitem id="menu_base_config" parent="menu_base_partner" name="Configuration" sequence="30" groups="group_system"/>

From e1d6502f7c62518163810492d74c6c70388ce401 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 22 Nov 2012 10:43:47 +0100
Subject: [PATCH 03/14] [FIX] problem with sidebar_eval_context

bzr revid: nicolas.vanhoren@openerp.com-20121122094347-q8evcsk7np2ja8xb
---
 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 08f15242c7d..81662ac6487 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1334,7 +1334,7 @@ instance.web.View = instance.web.Widget.extend({
         new instance.web.DataExport(this, this.dataset).open();
     },
     sidebar_eval_context: function () {
-        return $.when();
+        return $.when({});
     },
     /**
      * Asks the view to reload itself, if the reloading is asynchronous should

From 425ea97a392246306efa69794a804c38c7727a64 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 22 Nov 2012 11:07:38 +0100
Subject: [PATCH 04/14] [IMP] Corrected small stuff in Dialog widget and added
 documentation.

bzr revid: nicolas.vanhoren@openerp.com-20121122100738-8hi8lcsnh5yf7xwt
---
 addons/web/static/src/js/chrome.js | 57 ++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3bc2a010702..e800012afb1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -52,8 +52,27 @@ instance.web.dialog = function(element) {
     return result;
 };
 
+/**
+    A useful class to handle dialogs.
+
+    Attributes:
+    - $buttons: A jQuery element targeting a dom part where buttons can be added. It always exists
+    during the lifecycle of the dialog.
+*/
 instance.web.Dialog = instance.web.Widget.extend({
     dialog_title: "",
+    /**
+        Constructor.
+
+        @param {Widget} parent
+        @param {dictionary} options A dictionary that will be forwarded to jQueryUI Dialog. Additionaly, that
+            dictionary can contain the following keys:
+            - buttons: The buttons key is not propagated to jQueryUI Dialog. It must be a dictionary (key = button label,
+                value = click handler) or a list of dictionaries (each element in the dictionary is send to the corresponding
+                method of a jQuery element targeting the <button> tag).
+            - destroy_on_close: Default to true. If true and the dialog is closed, it is automatically destroyed.
+        @param {jQuery object} content Some content to replace this.$el .
+    */
     init: function (parent, options, content) {
         var self = this;
         this._super(parent);
@@ -121,20 +140,18 @@ instance.web.Dialog = instance.web.Widget.extend({
             this._super();
         }
     },
+    /**
+        Open the popup. Init the dialog if it is not already inited.
+
+        @param {dictionary} options Additional options, see the options param in init().
+        @return this
+    */
     open: function(options) {
-        var o = this._get_options(options);
-        if (o.buttons) {
-            this._add_buttons(o.buttons);
-            delete(o.buttons);
-        }
         if (!this.dialog_inited) {
-            this.init_dialog(o);
+            this.init_dialog(options);
         }
-        instance.web.dialog(this.$el, o).dialog('open');
+        this.$el.dialog('open');
         this.$el.dialog("widget").append(this.$buttons);
-        if (o.height === 'auto' && o.max_height) {
-            this.$el.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
-        }
         return this;
     },
     _add_buttons: function(buttons) {
@@ -153,13 +170,30 @@ instance.web.Dialog = instance.web.Widget.extend({
             });
         });
     },
+    /**
+        Initialize the popup.
+
+        @param {dictionary} options Additional options, see the options param in init().
+        @return The result returned by start().
+    */
     init_dialog: function(options) {
+        var options = this._get_options(options);
+        if (options.buttons) {
+            this._add_buttons(options.buttons);
+            delete(options.buttons);
+        }
         this.renderElement();
         instance.web.dialog(this.$el, options);
+        if (options.height === 'auto' && options.max_height) {
+            this.$el.css({ 'max-height': options.max_height, 'overflow-y': 'auto' });
+        }
         this.dialog_inited = true;
         var res = this.start();
         return res;
     },
+    /**
+        Close the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
+    */
     close: function() {
         if (this.dialog_inited && this.$el.is(":data(dialog)")) {
             this.$el.dialog('close');
@@ -174,6 +208,9 @@ instance.web.Dialog = instance.web.Widget.extend({
             this.__tmp_dialog_closing = undefined;
         }
     },
+    /**
+        Destroy the popup, also closes it.
+    */
     destroy: function () {
         this.$buttons.remove();
         _.each(this.getChildren(), function(el) {

From 7e13ccb265d2515cd141c735cf02f658034ef477 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 22 Nov 2012 11:09:53 +0100
Subject: [PATCH 05/14] [FIX] typo in doc

bzr revid: nicolas.vanhoren@openerp.com-20121122100953-2z1vbvqqmn1jsz88
---
 addons/web/static/src/js/chrome.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index e800012afb1..4fd835e90be 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -70,7 +70,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             - buttons: The buttons key is not propagated to jQueryUI Dialog. It must be a dictionary (key = button label,
                 value = click handler) or a list of dictionaries (each element in the dictionary is send to the corresponding
                 method of a jQuery element targeting the <button> tag).
-            - destroy_on_close: Default to true. If true and the dialog is closed, it is automatically destroyed.
+            - destroy_on_close: Default true. If true and the dialog is closed, it is automatically destroyed.
         @param {jQuery object} content Some content to replace this.$el .
     */
     init: function (parent, options, content) {
@@ -141,7 +141,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         }
     },
     /**
-        Open the popup. Init the dialog if it is not already inited.
+        Opens the popup. Inits the dialog if it is not already inited.
 
         @param {dictionary} options Additional options, see the options param in init().
         @return this
@@ -171,7 +171,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         });
     },
     /**
-        Initialize the popup.
+        Initializes the popup.
 
         @param {dictionary} options Additional options, see the options param in init().
         @return The result returned by start().
@@ -192,7 +192,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         return res;
     },
     /**
-        Close the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
+        Closes the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
     */
     close: function() {
         if (this.dialog_inited && this.$el.is(":data(dialog)")) {
@@ -209,7 +209,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         }
     },
     /**
-        Destroy the popup, also closes it.
+        Destroys the popup, also closes it.
     */
     destroy: function () {
         this.$buttons.remove();

From be10b95f9842b900fb0f1652d486f515323bd52f Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 22 Nov 2012 11:41:59 +0100
Subject: [PATCH 06/14] [FIX]typo in description of product (description is not
 for internal use since it is used in invoice)

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

bzr revid: csn@openerp.com-20121122104159-8vslohs2aqw5wtvi
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7b4197305d4..f1554f08346 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -96,7 +96,7 @@
                                         <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
                                 </group>
-                                <field name="description" placeholder="describe the product characteristics for internal use..."/>
+                                <field name="description" placeholder="describe the product characteristics..."/>
                             </page>
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">

From f1f21379fa9f16a0186a5aa6844ff8880069a740 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 22 Nov 2012 11:45:23 +0100
Subject: [PATCH 07/14] [FIX] crm: problem in kanban of opportunities,
 incorrect use of the api, trying to use mathematical operations on an already
 formatted value

bzr revid: nicolas.vanhoren@openerp.com-20121122104523-cdjnxt96njyxvgsw
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 465982ee3aa..6e5e6918c46 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -317,7 +317,7 @@
                                     <div>
                                         <b><field name="name"/></b>
                                         <t t-if="record.planned_revenue.raw_value">
-                                            - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
+                                            - <b><t t-esc="record.planned_revenue.value"/>
                                             <field name="company_currency"/></b>
                                         </t>
                                     </div>

From c2bcf50d988c193eb64606132fb8844159c9b578 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 22 Nov 2012 14:02:20 +0100
Subject: [PATCH 08/14] [IMP] Made the logo a simple link.

bzr revid: nicolas.vanhoren@openerp.com-20121122130220-z9h2kezgxnh02vlj
---
 addons/web/static/src/js/chrome.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4fd835e90be..f355322b489 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1094,9 +1094,7 @@ instance.web.WebClient = instance.web.Client.extend({
     start: function() {
         var self = this;
         return $.when(this._super()).then(function() {
-            self.$el.on('click', '.oe_logo', function() {
-                self.action_manager.do_action('home');
-            });
+            self.$(".oe_logo").attr("href", $.param.fragment("" + window.location, "", 2));
             if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
                 $("body").addClass("kitten-mode-activated");
                 if ($.blockUI) {

From 9b59a88a5cf04ca529f84320f2cb5b1415f722b8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 22 Nov 2012 14:35:55 +0100
Subject: [PATCH 09/14] [IMP] Put pager in SelectCreatePopup.

bzr revid: nicolas.vanhoren@openerp.com-20121122133555-a5cf1m5sbgs2kv1i
---
 addons/web/static/src/css/base.css    | 117 +++++++++++++-------------
 addons/web/static/src/css/base.sass   |  86 ++++++++++---------
 addons/web/static/src/js/view_form.js |   1 +
 addons/web/static/src/xml/base.xml    |   5 ++
 4 files changed, 110 insertions(+), 99 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f361a3c879d..45cd8ef70aa 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1180,7 +1180,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1205,7 +1205,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -1387,60 +1387,6 @@
 .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_buttons {
   white-space: nowrap;
 }
-.openerp .oe_view_manager .oe_view_manager_pager {
-  line-height: 26px;
-}
-.openerp .oe_view_manager .oe_view_manager_pager .oe_list_pager_single_page .oe_pager_group {
-  display: none;
-}
-.openerp .oe_view_manager .oe_pager_value {
-  float: left;
-  margin-right: 8px;
-}
-.openerp .oe_view_manager ul.oe_pager_group {
-  padding: 0;
-  margin: 0;
-}
-.openerp .oe_view_manager .oe_pager_group {
-  float: left;
-  height: 24px;
-  line-height: 24px;
-  display: inline-block;
-  border: 1px solid #ababab;
-  cursor: pointer;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-}
-.openerp .oe_view_manager .oe_pager_group li {
-  height: 24px;
-  line-height: 24px;
-  padding: 0;
-  margin: 0;
-  list-style-type: none;
-  float: left;
-  border-right: 1px solid #ababab;
-}
-.openerp .oe_view_manager .oe_pager_group li:last-child {
-  border: none;
-}
-.openerp .oe_view_manager .oe_pager_group a {
-  color: #4c4c4c;
-  padding: 0 8px;
-}
-.openerp .oe_view_manager .oe_pager_group a:hover {
-  text-decoration: none;
-}
-.openerp .oe_view_manager .oe_pager_group .active {
-  background: #999999;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-}
-.openerp .oe_view_manager .oe_pager_group .active a {
-  color: white;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
-}
 .openerp .oe_view_manager .oe_view_manager_switch {
   padding: 0;
   margin: 0 0 0 8px;
@@ -1489,6 +1435,60 @@
 .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after {
   content: "f";
 }
+.openerp .oe_list_pager {
+  line-height: 26px;
+}
+.openerp .oe_list_pager .oe_pager_value {
+  float: left;
+  margin-right: 8px;
+}
+.openerp .oe_list_pager ul.oe_pager_group {
+  padding: 0;
+  margin: 0;
+}
+.openerp .oe_list_pager .oe_pager_group {
+  float: left;
+  height: 24px;
+  line-height: 24px;
+  display: inline-block;
+  border: 1px solid #ababab;
+  cursor: pointer;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+.openerp .oe_list_pager .oe_pager_group li {
+  height: 24px;
+  line-height: 24px;
+  padding: 0;
+  margin: 0;
+  list-style-type: none;
+  float: left;
+  border-right: 1px solid #ababab;
+}
+.openerp .oe_list_pager .oe_pager_group li:last-child {
+  border: none;
+}
+.openerp .oe_list_pager .oe_pager_group a {
+  color: #4c4c4c;
+  padding: 0 8px;
+}
+.openerp .oe_list_pager .oe_pager_group a:hover {
+  text-decoration: none;
+}
+.openerp .oe_list_pager .oe_pager_group .active {
+  background: #999999;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
+}
+.openerp .oe_list_pager .oe_pager_group .active a {
+  color: white;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
+}
+.openerp .oe_list_pager.oe_list_pager_single_page .oe_pager_group {
+  display: none;
+}
 .openerp .oe_view_manager_current {
   height: 100%;
 }
@@ -1520,6 +1520,9 @@
 .openerp .oe_popup_form > .oe_formview > .oe_form_pager {
   display: none !important;
 }
+.openerp .oe_popup_list_pager {
+  float: right;
+}
 .openerp .oe_searchview {
   cursor: text;
   position: relative;
@@ -2131,7 +2134,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b2f71befbaa..442c9d5e026 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1121,47 +1121,6 @@ $sheet-padding: 16px
             .oe_view_manager_buttons
                 white-space: nowrap
         // }}}
-        // ViewManager.pager {{{
-        .oe_view_manager_pager
-            line-height: 26px
-            .oe_list_pager_single_page .oe_pager_group
-                display: none
-        .oe_pager_value
-            float: left
-            margin-right: 8px
-        ul.oe_pager_group
-            padding: 0
-            margin: 0
-        .oe_pager_group
-            float: left
-            height: 24px
-            line-height: 24px
-            display: inline-block
-            border: 1px solid #ababab
-            cursor: pointer
-            @include radius(5px)
-            li
-                height: 24px
-                line-height: 24px
-                padding: 0
-                margin: 0
-                list-style-type: none
-                float: left
-                border-right: 1px solid #ababab
-                &:last-child
-                    border: none
-            a
-                color: #4c4c4c
-                padding: 0 8px
-                &:hover
-                    text-decoration: none
-            .active
-                background: #999
-                @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
-                a
-                    color: #fff
-                    text-shadow: 0 1px 2px rgba(0,0,0,0.4)
-        // }}}
         // ViewManager.switches {{{
         .oe_view_manager_switch
             padding: 0
@@ -1202,6 +1161,47 @@ $sheet-padding: 16px
             .oe_vm_switch_diagram:after
                 content: "f"
         // }}}
+    // List pager {{{
+    .oe_list_pager
+        line-height: 26px
+        .oe_pager_value
+            float: left
+            margin-right: 8px
+        ul.oe_pager_group
+            padding: 0
+            margin: 0
+        .oe_pager_group
+            float: left
+            height: 24px
+            line-height: 24px
+            display: inline-block
+            border: 1px solid #ababab
+            cursor: pointer
+            @include radius(5px)
+            li
+                height: 24px
+                line-height: 24px
+                padding: 0
+                margin: 0
+                list-style-type: none
+                float: left
+                border-right: 1px solid #ababab
+                &:last-child
+                    border: none
+            a
+                color: #4c4c4c
+                padding: 0 8px
+                &:hover
+                    text-decoration: none
+            .active
+                background: #999
+                @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
+                a
+                    color: #fff
+                    text-shadow: 0 1px 2px rgba(0,0,0,0.4)
+    .oe_list_pager.oe_list_pager_single_page .oe_pager_group
+        display: none
+    // }}}
     // ViewManager application {{{
     .oe_view_manager_current
         height: 100%
@@ -1222,9 +1222,11 @@ $sheet-padding: 16px
         > .oe_view_manager_header
             display: none
     // }}}
-    // Viewmanager popup {{{
+    // FormPopup {{{
     .oe_popup_form > .oe_formview > .oe_form_pager
         display: none !important
+    .oe_popup_list_pager
+        float: right
     // }}}
     // SearchView {{{
     .oe_searchview
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 64bbc6d7efd..7170bdcec72 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4631,6 +4631,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                         'import_enabled': false,
                         '$buttons': self.$buttonpane,
                         'disable_editable_mode': true,
+                        '$pager': self.$('.oe_popup_list_pager'),
                     }, self.options.list_view_options || {}));
             self.view_list.on('edit:before', self, function (e) {
                 e.cancel = true;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 703e3fffcb3..6476462ff19 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1304,6 +1304,11 @@
                     <div class="oe_popup_search" style="width:100%"></div>
                 </td>
             </tr>
+            <tr style="width:100%">
+                <td style="width:100%">
+                    <div class="oe_popup_list_pager"></div>
+                </td>
+            </tr>
             <tr style="width:100%">
                 <td style="width:100%">
                     <div class="oe_popup_list" style="width:100%"></div>

From f50f0bd0897a569b5e9990b6bc0928b6d4ea59b5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 22 Nov 2012 15:29:30 +0100
Subject: [PATCH 10/14] [IMP] auth_signup: do not shadow the `deferred`
 returned by Login.start._super()

bzr revid: odo@openerp.com-20121122142930-bq263k9p01l99sa2
---
 addons/auth_signup/static/src/js/auth_signup.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 3025069dece..9642a15f5c9 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -32,9 +32,11 @@ openerp.auth_signup = function(instance) {
 
             // in case of a signup, retrieve the user information from the token
             if (self.params.db && self.params.token) {
-                d = self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token})
+                d.done(function() {
+                    self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token})
                         .done(self.on_token_loaded)
-                        .fail(self.on_token_failed);
+                        .fail(self.on_token_failed)
+                });
             }
             return d;
         },

From f3955000e7ba714cf1ca5d94b37227234bf9fedb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 22 Nov 2012 15:29:42 +0100
Subject: [PATCH 11/14] [FIX] auth_openid: properly inherit Login.start and
 return a `deferred`

bzr revid: odo@openerp.com-20121122142942-jz8chz5xtf2lj7t4
---
 .../auth_openid/static/src/js/auth_openid.js  | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
index a8901ee80f1..f8615481a40 100644
--- a/addons/auth_openid/static/src/js/auth_openid.js
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -5,42 +5,44 @@ var QWeb = instance.web.qweb;
 
 instance.web.Login = instance.web.Login.extend({
     start: function() {
-        this._super.apply(this, arguments);
         var self = this;
-
-        this._default_error_message = this.$el.find('.oe_login_error_message').text();
-
-        this.$openid_selected_button = $();
-        this.$openid_selected_input = $();
-        this.$openid_selected_provider = null;
-
-
-        var openIdProvider = null;
-        if (this.has_local_storage && this.remember_credentials) {
-            openIdProvider = localStorage.getItem('openid-provider');
-        }
-
-        if (openIdProvider) {
-            $openid_selected_provider = openIdProvider;
-            this.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true);
-
-            if (this.has_local_storage && this.remember_credentials) {
-                this.$openid_selected_input.find('input').val(localStorage.getItem('openid-login'));
+        var d = self._super.apply(this, arguments).done(function() {
+    
+            self._default_error_message = self.$el.find('.oe_login_error_message').text();
+    
+            self.$openid_selected_button = $();
+            self.$openid_selected_input = $();
+            self.$openid_selected_provider = null;
+    
+    
+            var openIdProvider = null;
+            if (self.has_local_storage && self.remember_credentials) {
+                openIdProvider = localStorage.getItem('openid-provider');
             }
-        }
-        else {
-            this.do_openid_select('a[data-url=""]', 'login,password', true);
-        }
-
-        this.$el.find('a[data-url]').click(function (event) {
-            event.preventDefault();
-            var selected_oidh = $(this).attr('href').substr(1);
-            if (selected_oidh != self.$openid_selected_provider) {
-                self.do_openid_select(this, selected_oidh);
+    
+            if (openIdProvider) {
+                $openid_selected_provider = openIdProvider;
+                self.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true);
+    
+                if (self.has_local_storage && self.remember_credentials) {
+                    self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login'));
+                }
             }
+            else {
+                self.do_openid_select('a[data-url=""]', 'login,password', true);
+            }
+    
+            self.$el.find('a[data-url]').click(function (event) {
+                event.preventDefault();
+                var selected_oidh = $(this).attr('href').substr(1);
+                if (selected_oidh != self.$openid_selected_provider) {
+                    self.do_openid_select(this, selected_oidh);
+                }
+            });
+    
+            self._check_error();
         });
-
-        this._check_error();
+        return d;
     },
 
 

From 13bef50e386857fd0f911f22a0ee9332863bc176 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 22 Nov 2012 23:01:56 +0100
Subject: [PATCH 12/14] [IMP] project demo data

bzr revid: al@openerp.com-20121122220156-tny8try141h7160x
---
 addons/project/project_data.xml | 16 +++++-----------
 addons/project/project_demo.xml |  4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 08981bd126a..7e4e8e85077 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -44,37 +44,31 @@
             <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
-        <record id="project_tt_negotiation" model="project.task.type">
-            <field name="sequence">3</field>
-            <field name="name">Negotiation</field>
-            <field name="state">pending</field>
-            <field name="case_default" eval="False"/>
-            <field name="fold" eval="True"/>
-        </record>
         <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">4</field>
+            <field name="sequence">3</field>
             <field name="name">Development</field>
             <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">5</field>
+            <field name="sequence">4</field>
             <field name="name">Testing</field>
             <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">6</field>
+            <field name="sequence">5</field>
             <field name="name">Merge</field>
             <field name="state">open</field>
             <field name="case_default" eval="False"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_deployment" model="project.task.type">
-            <field name="sequence">7</field>
+            <field name="sequence">6</field>
             <field name="name">Done</field>
             <field name="state">done</field>
             <field name="case_default" eval="True"/>
+            <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
             <field name="sequence">7</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 698a1a99627..ee887c2728c 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -36,7 +36,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
         </record>
 
         <record id="project_project_2" model="project.project">
@@ -114,7 +114,7 @@
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
-            <field name="stage_id" ref="project_tt_negotiation"/>
+            <field name="stage_id" ref="project_tt_testing"/>
             <field name="color">4</field>
         </record>
         <record id="project_task_4" model="project.task">

From f5254e03ff4e628322805dea41109020718e7448 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 22 Nov 2012 23:12:00 +0100
Subject: [PATCH 13/14] [FIX] res.users last_login typodowan

bzr revid: al@openerp.com-20121122221200-2ut9pdc3z40b26r1
---
 openerp/addons/base/res/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 5d376ccf07f..4565f861b40 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -398,7 +398,7 @@ class res_users(osv.osv):
                 # prevent/delay login in that case. It will also have been logged
                 # as a SQL error, if anyone cares.
                 try:
-                    cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exception=False)
+                    cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exceptions=False)
                     cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", (user_id,))
                 except Exception:
                     _logger.debug("Failed to update last_login for db:%s login:%s", db, login, exc_info=True)

From ba1e6454da71d8be862aadfae06a94ab1f6ba4cb Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 23 Nov 2012 00:54:55 +0100
Subject: [PATCH 14/14] [FIX] project state pending backward compatibility at
 least one stage should be linked with state pending to be able to write state

bzr revid: al@openerp.com-20121122235455-7g7pp1beoeb6kz8s
---
 addons/project/project_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7e4e8e85077..4d4ead3e90e 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -35,7 +35,7 @@
         <record id="project_tt_specification" model="project.task.type">
             <field name="sequence">2</field>
             <field name="name">Specification</field>
-            <field name="state">draft</field>
+            <field name="state">pending</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_design" model="project.task.type">