From 64229a2a93a25c57ddc4ed421827c6a06e72675d Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Thu, 4 Oct 2012 12:13:47 +0530
Subject: [PATCH 1/2] Employee create time, not have a default email address.

bzr revid: vba@tinyerp.com-20121004064347-b6oiab179q4smhs1
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index eafe5d09844..d2214f5e14f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -231,7 +231,7 @@ class hr_employee(osv.osv):
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner').browse(cr, uid, address, context=context)
-            return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
+            return {'value': {'work_phone': address.phone, 'mobile_phone': address.mobile}}
         return {'value': {}}
 
     def onchange_company(self, cr, uid, ids, company, context=None):

From 1c243a435f0256bddf7dabd8a087b8c881ed9e38 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Thu, 4 Oct 2012 13:03:32 +0530
Subject: [PATCH 2/2] View improvement of autometed action form.

bzr revid: vba@tinyerp.com-20121004073332-1bdvfmsc18ev8r1e
---
 addons/base_action_rule/base_action_rule.py   |  2 +-
 .../base_action_rule_view.xml                 | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 7e9bbacab13..fa606fdeefc 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -117,7 +117,7 @@ this if you want the rule to send a reminder by email to the user."),
 the rule to mark CC(mail to any other person defined in actions)."),
         'act_mail_to_email': fields.char('Mail to these Emails', size=128, \
         help="Email-id of the persons whom mail is to be sent"),
-        'act_mail_body': fields.text('Mail body', help="Content of mail"),
+        'act_mail_body': fields.text('Mail body', translate=True, help="Content of mail"),
         'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\
 \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\
 \nNote: This is case sensitive search."),
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 0d268438a41..64d65434cfc 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -56,21 +56,20 @@
                                 </group>
                             </page>
                             <page string="Email Actions">
-                                <group col="4">
-                                    <separator colspan="4" string="Email Reminders"/>
-                                    <field name="act_remind_partner"/>
-                                    <field name="act_remind_attach"/>
-                                    <field name="act_remind_user"/>
-                                    <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                        <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                <group>
+                                    <group name="model" string="Email Information">
+                                        <field name="act_mail_to_user"/>
+                                        <field name="act_email_from" placeholder=""/>
+                                        <field name="act_email_to" placeholder=""/>
+                                    </group>
+                                    <group name="partner" string="Email Reminders">
+                                        <field name="act_remind_partner"/>
+                                        <field name="act_remind_attach"/>
+                                        <field name="act_remind_user"/>
+                                        <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
+                                            <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                        </group>
                                     </group>
-                                    <separator colspan="4" string="Email Information"/>
-                                    <field name="act_email_from" />
-                                    <field name="act_email_to" />
-                                    <field name="act_mail_to_user"/>
-                                    <field colspan="4" name="act_mail_to_email"/>
-                                    <field name="act_mail_to_watchers"/>
-                                    <field colspan="4" name="act_email_cc"/>
                                     <separator colspan="4" string="Email Body"/>
                                     <field colspan="4" name="act_mail_body" height="250"
                                         nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />