[MERGE] sync with trunk (state -> stage removed some test)

bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k

23 files changed, 57 insertions, 56 deletions

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index d0a4fda9632..4651d27fe7d 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -120,7 +120,7 @@ class res_users(osv.osv):
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
             encrypted = md5crypt(value, gen_salt())
-            cr.execute('update res_users set password_crypt=%s where id=%s', (encrypted, int(id)))
+            cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
         del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):
@@ -143,7 +143,7 @@ class res_users(osv.osv):
         cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
-            if password and not stored_password_crypt:
+            if stored_password and not stored_password_crypt:
                 salt = gen_salt()
                 stored_password_crypt = md5crypt(stored_password, salt)
                 cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
@@ -151,14 +151,15 @@ class res_users(osv.osv):
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
             # check md5crypt
-            if stored_password_crypt[:len(magic_md5)] == magic_md5:
-                salt = stored_password_crypt[len(magic_md5):11]
-                if stored_password_crypt == md5crypt(password, salt):
-                    return
-            elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
-                salt = stored_password_crypt[len(magic_md5):11]
-                if stored_password_crypt == md5crypt(password, salt):
-                    return
+            if stored_password_crypt:
+                if stored_password_crypt[:len(magic_md5)] == magic_md5:
+                    salt = stored_password_crypt[len(magic_md5):11]
+                    if stored_password_crypt == md5crypt(password, salt):
+                        return
+                elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
+                    salt = stored_password_crypt[len(magic_md5):11]
+                    if stored_password_crypt == md5crypt(password, salt):
+                        return
             # Reraise password incorrect
             raise
 
diff --git a/addons/auth_crypt/i18n/ar.po b/addons/auth_crypt/i18n/ar.po
index 20c85828671..203c5c33c86 100644
--- a/addons/auth_crypt/i18n/ar.po
+++ b/addons/auth_crypt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/cs.po b/addons/auth_crypt/i18n/cs.po
index 0ae0746fbdb..aa3736f438e 100644
--- a/addons/auth_crypt/i18n/cs.po
+++ b/addons/auth_crypt/i18n/cs.po
@@ -14,15 +14,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-01 05:06+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
 msgid "Encrypted Password"
-msgstr ""
+msgstr "Šifrované heslo"
 
 #. module: auth_crypt
 #: model:ir.model,name:auth_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
diff --git a/addons/auth_crypt/i18n/de.po b/addons/auth_crypt/i18n/de.po
index af9d0dc9593..719299aa786 100644
--- a/addons/auth_crypt/i18n/de.po
+++ b/addons/auth_crypt/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/en_GB.po b/addons/auth_crypt/i18n/en_GB.po
index c0485b1c311..9f8a818421b 100644
--- a/addons/auth_crypt/i18n/en_GB.po
+++ b/addons/auth_crypt/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/es.po b/addons/auth_crypt/i18n/es.po
index 7fdea1f7378..6586ee7e8ad 100644
--- a/addons/auth_crypt/i18n/es.po
+++ b/addons/auth_crypt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/fr.po b/addons/auth_crypt/i18n/fr.po
index 61cba43afc7..ee16b956c53 100644
--- a/addons/auth_crypt/i18n/fr.po
+++ b/addons/auth_crypt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/hr.po b/addons/auth_crypt/i18n/hr.po
index 1e8876f7380..c1e062c6a21 100644
--- a/addons/auth_crypt/i18n/hr.po
+++ b/addons/auth_crypt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/hu.po b/addons/auth_crypt/i18n/hu.po
index 03b51f265ac..3f1dcef8263 100644
--- a/addons/auth_crypt/i18n/hu.po
+++ b/addons/auth_crypt/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-20 04:42+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/it.po b/addons/auth_crypt/i18n/it.po
index 93f3591299c..e18183de48a 100644
--- a/addons/auth_crypt/i18n/it.po
+++ b/addons/auth_crypt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/lt.po b/addons/auth_crypt/i18n/lt.po
index 03f0bd5249f..c25de8280cd 100644
--- a/addons/auth_crypt/i18n/lt.po
+++ b/addons/auth_crypt/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/mk.po b/addons/auth_crypt/i18n/mk.po
index a346737eb9f..18d5d6e357c 100644
--- a/addons/auth_crypt/i18n/mk.po
+++ b/addons/auth_crypt/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/mn.po b/addons/auth_crypt/i18n/mn.po
index 98dbc7d35e9..8c9a72a8a29 100644
--- a/addons/auth_crypt/i18n/mn.po
+++ b/addons/auth_crypt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/nl.po b/addons/auth_crypt/i18n/nl.po
index dda3179df82..01aca963a24 100644
--- a/addons/auth_crypt/i18n/nl.po
+++ b/addons/auth_crypt/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/nl_BE.po b/addons/auth_crypt/i18n/nl_BE.po
index abb65c8700f..fb23c8a23ad 100644
--- a/addons/auth_crypt/i18n/nl_BE.po
+++ b/addons/auth_crypt/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/pt.po b/addons/auth_crypt/i18n/pt.po
index 795848e2325..d78f3d29998 100644
--- a/addons/auth_crypt/i18n/pt.po
+++ b/addons/auth_crypt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/pt_BR.po b/addons/auth_crypt/i18n/pt_BR.po
index bbedd2d126f..c4b7a04fa36 100644
--- a/addons/auth_crypt/i18n/pt_BR.po
+++ b/addons/auth_crypt/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/ro.po b/addons/auth_crypt/i18n/ro.po
index 7f89ec57075..6c1aaf7b324 100644
--- a/addons/auth_crypt/i18n/ro.po
+++ b/addons/auth_crypt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/ru.po b/addons/auth_crypt/i18n/ru.po
index 305f7aa682e..58fa6a04ec8 100644
--- a/addons/auth_crypt/i18n/ru.po
+++ b/addons/auth_crypt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/sl.po b/addons/auth_crypt/i18n/sl.po
index ebdf1a2a12e..e34c32f6d8f 100644
--- a/addons/auth_crypt/i18n/sl.po
+++ b/addons/auth_crypt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/sv.po b/addons/auth_crypt/i18n/sv.po
index 09d8ac04aa1..c6519448c66 100644
--- a/addons/auth_crypt/i18n/sv.po
+++ b/addons/auth_crypt/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/tr.po b/addons/auth_crypt/i18n/tr.po
index 365173412d0..90956e09662 100644
--- a/addons/auth_crypt/i18n/tr.po
+++ b/addons/auth_crypt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0
diff --git a/addons/auth_crypt/i18n/zh_CN.po b/addons/auth_crypt/i18n/zh_CN.po
index c387c7ea6d9..ee131eb8544 100644
--- a/addons/auth_crypt/i18n/zh_CN.po
+++ b/addons/auth_crypt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-09-03 05:48+0000\n"
+"X-Generator: Launchpad (build 16753)\n"
 
 #. module: auth_crypt
 #: field:res.users,password_crypt:0