[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121128114002-yk9zk24rk79v4pkd

3 files changed, 93 insertions, 1 deletions

diff --git a/addons/auth_reset_password/i18n/tr.po b/addons/auth_reset_password/i18n/tr.po
new file mode 100644
index 00000000000..3feaf33754c
--- /dev/null
+++ b/addons/auth_reset_password/i18n/tr.po
@@ -0,0 +1,83 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 22:15+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+"\n"
+"<p>Bu epostayla ilişkili OpenERP hesabı için bir parola sıfırlama isteği "
+"istendi.</p>\n"
+"\n"
+"<p>Şifrenizi şu adresten değiştirebilirsiniz.  <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Not: Eğer bu parola değiştirme isteğini siz yapmadıysanız bu mesajı "
+"görmezden gelebilirsiniz. </p>"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Parolayı Sıfırla"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Parola sıfırlandı"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Hata: Geçersiz EAN barkodu"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Seçilen şirket bu kullanıcı için izin verilen şirketler arasında yok"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Parolayı sıfırla"
diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py
index b1039031812..cfac20c76f9 100644
--- a/addons/auth_reset_password/res_users.py
+++ b/addons/auth_reset_password/res_users.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
 
 from datetime import datetime, timedelta
 
@@ -54,6 +55,8 @@ class res_users(osv.osv):
         template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_reset_password', 'reset_password_email')
         assert template._name == 'email.template'
         for user in self.browse(cr, uid, ids, context):
+            if not user.email:
+                raise osv.except_osv(_("Cannot send email: user has no email address."), user.name)
             self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
 
         return True
diff --git a/addons/auth_reset_password/res_users_view.xml b/addons/auth_reset_password/res_users_view.xml
index 9952162ae65..628e95b6ff9 100644
--- a/addons/auth_reset_password/res_users_view.xml
+++ b/addons/auth_reset_password/res_users_view.xml
@@ -7,11 +7,17 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
+                <!-- Reset Password button -->
                 <xpath expr="//sheet/*[1]" position="before">
                     <div class="oe_right oe_button_box">
-                        <button string="Reset Password" type="object" name="action_reset_password"/>
+                        <button string="Reset Password" type="object" name="action_reset_password"
+                            help="Send a special url by email to make the user (re)set their password."/>
                     </div>
                 </xpath>
+                <!-- password is never required; one can use Reset Password -->
+                <field name="new_password" position="attributes">
+                    <attribute name="attrs">{}</attribute>
+                </field>
             </field>
         </record>