From c5d1c296329a9b5845a3ee74b4dd1be41ecd2a7c Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 29 Nov 2012 13:03:27 +0530
Subject: [PATCH 1/7] [FIX]Change Timesheet(hr_timesheet) module name

bzr revid: vja@tinyerp.com-20121129073327-q8ij3lpvxel0p7as
---
 addons/hr_timesheet/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index bff25e8e55d..fa14c45f84a 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Timesheets',
+    'name': 'Time Tracking',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 23,

From 50bb815990ddf6f0ec20751e561b78155e967beb Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 29 Nov 2012 18:17:28 +0530
Subject: [PATCH 2/7] [FIX]Add buttons in Email form

bzr revid: vja@tinyerp.com-20121129124728-7wg53p69cqrkw7dp
---
 addons/mail/mail_mail_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 72d41e33a84..7cfda6f78e3 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -6,6 +6,11 @@
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
+                    <header>
+                        <button name="send" string="Send Now" type="object" states='outgoing'/>
+                        <button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
+                        <button name="cancel" string="Cancel" type="object" states='outgoing'/>
+                    </header>
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>

From 8ecfebe2d6cbe92404419edc6267d216658286d7 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 29 Nov 2012 18:20:35 +0530
Subject: [PATCH 3/7] [FIX]put onchange for module_purchase_analytic_plans

bzr revid: vja@tinyerp.com-20121129125035-4d8v28aw4afud9hh
---
 addons/purchase/res_config.py       | 4 +++-
 addons/purchase/res_config_view.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 13a54031254..206ff27d807 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -66,7 +66,9 @@ Example: Product: this product is deprecated, do not purchase more than 5.
         'default_invoice_method': 'manual',
     }
 
-
+    def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
+        """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """
+        return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}}
 
 
 class account_config_settings(osv.osv_memory):
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 7f1cfc64f39..9ef8bc9f743 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -67,7 +67,7 @@
                                 <label for="module_purchase_requisition"/>
                             </div>
                             <div>
-                                <field name="module_purchase_analytic_plans" class="oe_inline"/>
+                                <field name="module_purchase_analytic_plans" class="oe_inline" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
                                 <label for="module_purchase_analytic_plans"/>
                             </div>
                             <div>

From 8207b38ab1cfdba660404668861654182556a26a Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 3 Dec 2012 18:53:58 +0530
Subject: [PATCH 4/7] [FIX]set message when email send successfully to user in
 reset password

bzr revid: vja@tinyerp.com-20121203132358-uiaoi5xgejxtzkul
---
 addons/auth_reset_password/res_users.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py
index cfac20c76f9..3e1f00a7db1 100644
--- a/addons/auth_reset_password/res_users.py
+++ b/addons/auth_reset_password/res_users.py
@@ -57,6 +57,14 @@ class res_users(osv.osv):
         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)
-
+            msg_id = None
+            msg_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
+            if not msg_id:
+                raise osv.except_osv(_("The email to reset the password has not been sent. Configure the outgoing server and retry resetting the password"), "")
+            else :
+                warning = {
+                    'title': _("Reset Password"),
+                    'message': _("An email has been sent to %s, the user will be able to change his password using the link provided in the email. The old password is still valid until the user changes his password.")% user.email
+                }
+                return {'warning':warning}
         return True

From 77d3f168ca610dbbe710d33337ee18f03e45f630 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 6 Dec 2012 17:52:19 +0530
Subject: [PATCH 5/7] [FIX]Minor change

bzr revid: vja@tinyerp.com-20121206122219-tcod9bad69fgr836
---
 addons/auth_signup/res_users.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 5fd7917f444..8a4d3f657d5 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -246,7 +246,16 @@ class res_users(osv.Model):
         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)
+            msg_id = None
+            msg_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
+            if not msg_id:
+                 raise osv.except_osv(_("The email to reset the password has not been sent. Configure the outgoing server and retry resetting the password"), "")
+            else :
+                 warning = {
+                     'title': _("Reset Password"),
+                     'message': _("An email has been sent to %s, the user will be able to change his password using the link provided in the email. The old password is still valid until the user changes his password.")% user.email
+                 }
+                 return {'warning':warning}
 
         return True
 

From a27a7f13820576051c34e5c006dc76dccba6a8f7 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Fri, 7 Dec 2012 16:42:02 +0530
Subject: [PATCH 6/7] [FIX]Improve code

bzr revid: vja@tinyerp.com-20121207111202-we3glsa463f8lgh6
---
 addons/auth_signup/res_users.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 8a4d3f657d5..43b896a71f3 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -246,16 +246,16 @@ class res_users(osv.Model):
         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)
-            msg_id = None
-            msg_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
-            if not msg_id:
-                 raise osv.except_osv(_("The email to reset the password has not been sent. Configure the outgoing server and retry resetting the password"), "")
+            mail_server = self.pool.get('ir.mail_server').search(cr, uid, [], order='sequence', limit=1) or None
+            if not mail_server:
+                raise osv.except_osv(_("The email to reset the password has not been sent. Configure the outgoing server and retry resetting the password"), "")
             else :
-                 warning = {
+                 self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
+                 message = {
                      'title': _("Reset Password"),
                      'message': _("An email has been sent to %s, the user will be able to change his password using the link provided in the email. The old password is still valid until the user changes his password.")% user.email
                  }
-                 return {'warning':warning}
+                 return {'message': message}
 
         return True
 
@@ -263,6 +263,4 @@ class res_users(osv.Model):
         # overridden to automatically invite user to sign up
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        if context and context.get('reset_password') and user.email:
-            user.action_reset_password()
         return user_id

From 9c1c90d233393fcfeefc4863e87c3833f95ad380 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Wed, 15 May 2013 14:52:03 +0530
Subject: [PATCH 7/7] [FIX]Improve send now button

bzr revid: vja@tinyerp.com-20130515092203-vjiw604jz8ln894i
---
 addons/mail/mail_mail_view.xml | 2 +-
 addons/purchase/res_config.py  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 055f2134a43..7384cc24a75 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
                     <header>
-                        <button name="send" string="Send Now" type="object" states='outgoing'/>
+                        <button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
                         <button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
                         <button name="cancel" string="Cancel" type="object" states='outgoing'/>
                     </header>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 7d76338a099..f5f2dfcdda5 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -67,14 +67,12 @@ Example: Product: this product is deprecated, do not purchase more than 5.
 
     def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
         """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """
-
         if not module_purchase_analytic_plans:
             return {}
         return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}}
 
 
 
-
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {