From dbdba64d8c3cecea737990dec6acb5c353dc80d9 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 27 May 2011 12:30:02 +0200
Subject: [PATCH 1/6] [FIX] remove res.widget.user entries when user deleted

bzr revid: rco@openerp.com-20110527103002-3lb35jamn9v737ti
---
 openerp/addons/base/res/res_widget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py
index 81be708a331..71bdd85fc21 100644
--- a/openerp/addons/base/res/res_widget.py
+++ b/openerp/addons/base/res/res_widget.py
@@ -38,7 +38,7 @@ class res_widget_user(osv.osv):
     _order = "sequence"
     _columns = {
         'sequence': fields.integer('Sequence'),
-        'user_id': fields.many2one('res.users','User', select=1),
+        'user_id': fields.many2one('res.users','User', select=1, ondelete='cascade'),
         'widget_id': fields.many2one('res.widget','Widget',required=True, ondelete='cascade'),
     }
 

From 19382763fbe00fd847d3b00efcaa968aa4d44999 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Jun 2011 12:35:02 +0200
Subject: [PATCH 2/6] [FIX] Fixed View controller

bzr revid: fme@openerp.com-20110606103502-wfph1zo7nnt2668p
---
 addons/base/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index fc846f22838..40546ddbbb5 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -473,8 +473,8 @@ class View(openerpweb.Controller):
         else:
             xml = ElementTree.fromstring(fvg['arch'])
         fvg['arch'] = Xml2Json.convert_element(xml)
-        for field in fvg["fields"].values():
-            if field["views"]:
+        for field in fvg['fields'].values():
+            if field.has_key('views') and field['views']:
                 for view in field["views"].values():
                     self.process_view(session, view, None, transform)
 

From 8011b649ee225edef8e73ae5cfea08bd66f524d3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Jun 2011 12:54:36 +0200
Subject: [PATCH 3/6] [ADD] "Reset" feature in dashboards

bzr revid: fme@openerp.com-20110606105436-wpo7xyiiy2o6jyzm
---
 addons/base/controllers/main.py                         | 7 +++++--
 addons/base_dashboard/static/src/js/dashboard.js        | 9 ++++++++-
 addons/base_dashboard/static/src/xml/base_dashboard.xml | 4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 40546ddbbb5..342f9efc6cf 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -489,11 +489,14 @@ class View(openerpweb.Controller):
         return {'result': True}
 
     @openerpweb.jsonrequest
-    def undo_custom(self, request, view_id):
+    def undo_custom(self, request, view_id, reset=False):
         CustomView = request.session.model('ir.ui.view.custom')
         vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)])
         if vcustom:
-            CustomView.unlink([vcustom[0]])
+            if reset:
+                CustomView.unlink(vcustom)
+            else:
+                CustomView.unlink([vcustom[0]])
             return {'result': True}
         return {'result': False}
 
diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index 9d6511fd215..6e6a0a5a1f1 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -18,6 +18,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
 
         // Events
         this.$element.find('.oe-dashboard-link-undo').click(this.on_undo);
+        this.$element.find('.oe-dashboard-link-reset').click(this.on_reset);
         this.$element.find('.oe-dashboard-link-add_widget').click(this.on_add_widget);
         this.$element.find('.oe-dashboard-link-change_layout').click(this.on_change_layout);
         this.$element.find('.oe-dashboard-column .ui-icon-minusthick').click(this.on_fold_action);
@@ -42,6 +43,12 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
             view_id: this.view.fields_view.view_id
         }, this.do_reload);
     },
+    on_reset: function() {
+        this.rpc('/base/view/undo_custom', {
+            view_id: this.view.fields_view.view_id,
+            reset: true
+        }, this.do_reload);
+    },
     on_add_widget: function() {
     },
     on_change_layout: function() {
@@ -112,7 +119,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
             view_id: this.view.fields_view.view_id,
             arch: arch
         }, function() {
-            self.$element.find('.oe-dashboard-link-undo').show();
+            self.$element.find('.oe-dashboard-link-undo, .oe-dashboard-link-reset').show();
         });
     },
     on_load_action: function(result) {
diff --git a/addons/base_dashboard/static/src/xml/base_dashboard.xml b/addons/base_dashboard/static/src/xml/base_dashboard.xml
index 9c43be6996c..fbe34a3892b 100644
--- a/addons/base_dashboard/static/src/xml/base_dashboard.xml
+++ b/addons/base_dashboard/static/src/xml/base_dashboard.xml
@@ -1,6 +1,10 @@
 <template>
 <t t-name="DashBoard">
     <div class="oe-dashboard-links">
+        <button type="button" class="button oe-dashboard-link-reset" t-att-style="view.fields_view.custom_view_id ? null : 'display: none'">
+            <img src="/base/static/src/img/icons/STOCK_GOTO_FIRST.png" width="16" height="16"/>
+            <span>Reset</span>
+        </button>
         <button type="button" class="button oe-dashboard-link-undo" t-att-style="view.fields_view.custom_view_id ? null : 'display: none'">
             <img src="/base/static/src/img/icons/gtk-undo.png" width="16" height="16"/>
             <span>Undo</span>

From 4b88138b59a59021f75ab147cf2ac884f76810ea Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 6 Jun 2011 12:58:26 +0200
Subject: [PATCH 4/6] [IMP] make sure all _constraints methods can receive a
 context arg.

bzr revid: vmt@openerp.com-20110606105826-cq1epnpfnzm3yofa
---
 addons/analytic/analytic.py | 4 ++--
 addons/l10n_ch/invoice.py   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6dfaac21e70..d822c382c91 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -202,8 +202,8 @@ class account_analytic_account(osv.osv):
         'currency_id': _get_default_currency,
     }
 
-    def check_recursion(self, cr, uid, ids, parent=None):
-        return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent)
+    def check_recursion(self, cr, uid, ids, context=None, parent=None):
+        return super(account_analytic_account, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
 
     _order = 'name asc'
     _constraints = [
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 07c62d43d51..af9beac55e0 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -84,7 +84,7 @@ class account_invoice(osv.osv):
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @return a boolean True if valid False if invalid
-    def _check_bvr(self, cr, uid, ids):
+    def _check_bvr(self, cr, uid, ids, context=None):
         """
         Function to validate a bvr reference like :
         0100054150009>132000000000000000000000014+ 1300132412>
@@ -111,7 +111,7 @@ class account_invoice(osv.osv):
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @return a boolean True if valid False if invalid
-    def _check_reference_type(self, cursor, user, ids):
+    def _check_reference_type(self, cursor, user, ids, context=None):
         """Check the customer invoice reference type depending
         on the BVR reference type and the invoice partner bank type"""
         for invoice in self.browse(cursor, user, ids):
@@ -196,4 +196,4 @@ class account_tax_code(osv.osv):
 
 account_tax_code()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From dc91f906f758ab6150ba927f996b43bbee82b268 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Jun 2011 13:10:44 +0200
Subject: [PATCH 5/6] [FIX] Field's set_value method can now change 'touched'
 property

bzr revid: fme@openerp.com-20110606111044-tnc0cgw3s7cowf1e
---
 addons/base/static/src/js/form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 2b09c4ac27c..b49aadd7a2d 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -84,9 +84,9 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
             this.datarecord = record;
             for (var f in this.fields) {
                 var field = this.fields[f];
+                field.touched = false;
                 field.set_value(this.datarecord[f] || false);
                 field.validate();
-                field.touched = false;
             }
             if (!record.id) {
                 // New record: Second pass in order to trigger the onchanges
@@ -750,6 +750,7 @@ openerp.base.form.FieldFloat = openerp.base.form.FieldChar.extend({
     set_value: function(value) {
         if (!value) {
             // As in GTK client, floats default to 0
+            this.touched = this.view.touched = true;
             value = 0;
         }
         this._super.apply(this, [value]);

From 8f5088e127d137cb281ecec3500d92f08c3d4828 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 6 Jun 2011 13:43:06 +0200
Subject: [PATCH 6/6] [imp] added db selection

bzr revid: nicolas.vanhoren@openerp.com-20110606114306-bbb8r3fvtxvvamcq
---
 addons/base/controllers/main.py     |  7 +++++++
 addons/base/static/src/css/base.css |  3 ++-
 addons/base/static/src/js/chrome.js | 24 +++++++++++++++---------
 addons/base/static/src/xml/base.xml | 11 ++++++++++-
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 342f9efc6cf..36ea829a2f9 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -98,6 +98,13 @@ class Session(openerpweb.Controller):
             "session_id": req.session_id,
             "uid": req.session._uid,
         }
+    
+    @openerpweb.jsonrequest
+    def get_databases_list(self, req):
+        proxy = req.session.proxy("db")
+        dbs = proxy.list()
+        
+        return {"db_list": dbs}
 
     @openerpweb.jsonrequest
     def modules(self, req):
diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 7cdf9af0286..fff41c0f557 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -90,7 +90,8 @@ body.openerp {
     padding: 3px;
     text-align: right;
 }
-.openerp .login .oe_box2 td input {
+.openerp .login .oe_box2 td input,
+.openerp .login .oe_box2 td select {
     width: 100%;
 }
 .openerp .login .oe_login_right_pane {
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 2acb66c7ada..6fa95266ba9 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -778,26 +778,29 @@ openerp.base.Login =  openerp.base.Controller.extend({
         this._super(session, element_id);
     },
     start: function() {
-        this.$element.html(QWeb.render("Login", {}));
-        this.$element.find("form").submit(this.on_submit);
+        var self = this;
+        this.rpc("/base/session/get_databases_list", {}, function(result) {
+            self.db_list = result.db_list;
+            self.display();
+        }, function() {
+            self.display();
+        });
     },
+   display: function() {
+        this.$element.html(QWeb.render("Login", this));
+        this.$element.find("form").submit(this.on_submit);
+   },
     on_login_invalid: function() {
-        this.$element
-            .removeClass("login_valid")
-            .addClass("login_invalid");
         this.$element.closest(".openerp").addClass("login-mode");
     },
     on_login_valid: function() {
-        this.$element
-            .removeClass("login_invalid")
-            .addClass("login_valid");
         this.$element.closest(".openerp").removeClass("login-mode");
     },
     on_submit: function(ev) {
         ev.preventDefault();
         var self = this;
         var $e = this.$element;
-        var db = $e.find("form input[name=db]").val();
+        var db = $e.find("form [name=db]").val();
         var login = $e.find("form input[name=login]").val();
         var password = $e.find("form input[name=password]").val();
         //$e.hide();
@@ -806,12 +809,15 @@ openerp.base.Login =  openerp.base.Controller.extend({
             if(self.session.session_is_valid()) {
                 self.on_login_valid();
             } else {
+                self.$element.addClass("login_invalid");
                 self.on_login_invalid();
             }
         });
     },
     do_ask_login: function(continuation) {
         this.on_login_invalid();
+        this.$element
+            .removeClass("login_invalid");
         this.on_login_valid.add({
             position: "last",
             unique: true,
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index ca0a0ff7205..afbd4f81d91 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -61,7 +61,16 @@
                     <tr>
                         <td><label for="db">Database:</label></td>
                         <td class="oe_field_value">
-                            <input type="text" name="db" value="trunk" autofocus="true"/>
+                            <t t-if="!db_list">
+                                <input type="text" name="db" value="trunk" autofocus="true"/>
+                            </t>
+                            <t t-if="db_list">
+                                <select name="db">
+                                    <t t-foreach="db_list" t-as="db">
+                                        <option t-att-value="db" t-att-selected="db == 'trunk'"><t t-esc="db"/></option>
+                                    </t>
+                                </select>
+                            </t>
                         </td>
                     </tr>
                     <tr>