From 0cbad1808976fcd7eddac27f1404a4e3c218bf65 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 5 Jul 2012 11:22:13 +0530
Subject: [PATCH] [FIX] he job mail alias improvemetns

bzr revid: jam@tinyerp.com-20120705055213-7c040f709z8jyhsk
---
 addons/hr_recruitment/hr_recruitment.py       |    8 ++++++--
 addons/hr_recruitment/hr_recruitment_view.xml |    8 +++++++-
 addons/mail/mail_group.py                     |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index a7b2b9d..4251b29 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -572,8 +572,12 @@ class hr_job(osv.osv):
     def create(self, cr, uid, vals, context=None):
         alias_pool = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            alias_id = alias_pool.create_unique_alias(cr, uid, {'alias_name': "job."+vals['name'], 'alias_model_id': self._name}, context=context)
-            vals.update({'alias_id': alias_id})
+            name = vals.get('alias_name') or vals['name']
+            alias_id = alias_pool.create_unique_alias(cr, uid, 
+                    {'alias_name': "job_"+name, 
+                    'alias_model_id': self._name}, context=context)
+            alias = alias_pool.read(cr, uid, alias_id, ['alias_name'],context)
+            vals.update({'alias_id': alias_id, 'alias_name': alias['alias_name']})
         res = super( hr_job, self).create(cr, uid, vals, context)
         alias_pool.write(cr, uid, [vals['alias_id']], {"alias_defaults": {'job_id': res}}, context)
         return res
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 56d0da9..3375dd9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -349,7 +349,13 @@
                 </div>
             </field>
             <field name="company_id" version="7.0" position="after">
-                <field name="alias_id" required="0" domain="[('alias_model_id','=','hr.applicant')]"/>
+                <group colspan="4">
+                    <div>
+                        <label for="alias_name"/>
+                        <field name="alias_name" required="0" class="oe_inline"/>@
+                        <field name="alias_domain" class="oe_inline"/>
+                    </div>
+                </group>
             </field>
         </field>
     </record>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index d6966d1..9cbaaa7 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -158,7 +158,7 @@ class mail_group(osv.osv):
         if not vals.get('alias_id'):
             name = vals.get('alias_name') or vals['name']
             alias_id = alias_pool.create_unique_alias(cr, uid, 
-                    {'alias_name': "mail_group."+name, 
+                    {'alias_name': "mail_group_"+name, 
                     'alias_model_id': self._name}, context=context)
             alias = alias_pool.read(cr, uid, alias_id, ['alias_name'],context)
             vals.update({'alias_id': alias_id, 'alias_name': alias['alias_name']})
-- 
1.7.10.4