From 430b6c07a7f714949d833e7fd0e9b68cc4b2bc86 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 29 Apr 2013 15:48:49 +0530
Subject: [PATCH 01/16] [IMP]HR: Improve Application form some field label
 Improve meeting logs for Application Form Set My Requests instead of My
 Leaves

bzr revid: dbr@tinyerp.com-20130429101849-1iz7d52jvgxwsbfu
---
 addons/hr_holidays/hr_holidays_view.xml |  2 +-
 addons/hr_recruitment/hr_recruitment.py | 26 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5828790c152..cc3813b7240 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e41d80fb348..3ec36886edb 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -186,7 +186,7 @@ class hr_applicant(base_stage, osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Subject', size=128, required=True),
+        'name': fields.char('Application Name', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
@@ -219,7 +219,7 @@ class hr_applicant(base_stage, osv.Model):
         'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"),
         'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
         'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
-        'availability': fields.integer('Availability'),
+        'availability': fields.integer('Availability', help="The number of days in which the applicant will be available to start working"),
         'partner_name': fields.char("Applicant's Name", size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
@@ -306,6 +306,14 @@ class hr_applicant(base_stage, osv.Model):
             return stage_ids[0]
         return False
 
+    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
+         if not duration:
+             duration = _('unknown')
+         else:
+             duration = str(duration)
+         message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
+         return self.message_post(cr, uid, ids, body=message,context=context)
+
     def action_makeMeeting(self, cr, uid, ids, context=None):
         """ This opens Meeting's calendar view to schedule meeting on current applicant
             @return: Dictionary value for created Meeting view
@@ -314,6 +322,7 @@ class hr_applicant(base_stage, osv.Model):
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
+            'default_applicant_id':applicant.id,
             'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
             'default_user_id': uid,
             'default_name': applicant.name,
@@ -562,4 +571,17 @@ class applicant_category(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
+class crm_meeting(osv.Model):
+    _inherit = 'crm.meeting'
+    _columns = {
+    'applicant_id': fields.many2one ('hr.applicant', 'Recruitment')
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, res, context=context)
+        if obj.applicant_id:
+            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj.applicant_id.id] , obj.name, obj.date,obj.duration, context=context)
+        return res
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 76491b781a9614aec7a4ade332ae9cbff8c0e84b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 1 May 2013 18:55:25 +0530
Subject: [PATCH 02/16] [IMP]: Improve typo

bzr revid: dbr@tinyerp.com-20130501132525-04ebuxo5usmsi0av
---
 addons/hr_recruitment/hr_recruitment.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3ec36886edb..1d19fc6b204 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -578,10 +578,10 @@ class crm_meeting(osv.Model):
     }
 
     def create(self, cr, uid, vals, context=None):
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if obj.applicant_id:
-            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj.applicant_id.id] , obj.name, obj.date,obj.duration, context=context)
-        return res
+        meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj_meeting = self.browse(cr, uid, meeting_id, context=context)
+        if obj_meeting.applicant_id:
+            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj_meeting.applicant_id.id] , obj_meeting.name, obj_meeting.date,obj_meeting.duration, context=context)
+        return meeting_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1cdc9245e7fccff0e9bf5d83363a210c71445e3e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 27 May 2013 17:47:04 +0530
Subject: [PATCH 03/16] [IMP]Hr: Improve tooltip and labels

bzr revid: dbr@tinyerp.com-20130527121704-k7fyapvs0ogfdamx
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cc3813b7240..6ff0b2efc9a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help=" My Leave Requests and My Allocation Requests"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f4069ed70ab..4fd0c15202a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -186,7 +186,7 @@ class hr_applicant(base_stage, osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Application Name', size=128, required=True),
+        'name': fields.char('Subject / Application Name', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),

From c7c84a8695b629aa4158721ac551375a94f833c9 Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Tue, 28 May 2013 11:13:39 +0530
Subject: [PATCH 04/16] [IMP]hr_recruitment: Improve code with active id and
 remove the extra field

bzr revid: prajapatijitendra7969@gmail.com-20130528054339-1dqdc6ytwu5nyi75
---
 addons/hr_recruitment/hr_recruitment.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 4fd0c15202a..364a4a851df 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -322,7 +322,6 @@ class hr_applicant(base_stage, osv.Model):
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
-            'default_applicant_id':applicant.id,
             'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
             'default_user_id': uid,
             'default_name': applicant.name,
@@ -576,15 +575,11 @@ class applicant_category(osv.osv):
 
 class crm_meeting(osv.Model):
     _inherit = 'crm.meeting'
-    _columns = {
-    'applicant_id': fields.many2one ('hr.applicant', 'Recruitment')
-    }
 
     def create(self, cr, uid, vals, context=None):
         meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
         obj_meeting = self.browse(cr, uid, meeting_id, context=context)
-        if obj_meeting.applicant_id:
-            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj_meeting.applicant_id.id] , obj_meeting.name, obj_meeting.date,obj_meeting.duration, context=context)
+        self.pool.get('hr.applicant').log_meeting(cr, uid, context.get('active_ids',[]), obj_meeting.name, obj_meeting.date, obj_meeting.duration, context=context)
         return meeting_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cf322c62acd67bef490d2d65cfde90085e648f00 Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Tue, 28 May 2013 12:00:31 +0530
Subject: [PATCH 05/16] [IMP]hr_holidays:Remove the extra space

bzr revid: prajapatijitendra7969@gmail.com-20130528063031-ad6gp45az42q9018
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6ff0b2efc9a..43c659847fc 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help=" My Leave Requests and My Allocation Requests"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests and My Allocation Requests"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>

From 86abcbf3bbc3ac597221c6af5a3d69933da090e5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 29 May 2013 13:08:28 +0530
Subject: [PATCH 06/16] [IMP]hr_recruitment: remove label from tree so .py code
 effect

bzr revid: dbr@tinyerp.com-20130529073828-a77uw29ijqpkw2ib
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 716c1cba8d5..c3757508b38 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,7 +42,7 @@
             <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
                 <field name="message_unread" invisible="1"/>
                 <field name="create_date"/>
-                <field name="name" string="Subject"/>
+                <field name="name"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="partner_phone"/>

From 516d7fbb4330f9d937eaf458c82411b6e855b8bc Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 3 Jun 2013 18:09:20 +0530
Subject: [PATCH 07/16] [IMP]hr_recruit : Improve create method and Improve
 lfilter help as per suggest

bzr revid: dbr@tinyerp.com-20130603123920-6spa009pzvrhzxos
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 addons/hr_recruitment/hr_recruitment.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 43c659847fc..1d6d2227e84 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests and My Allocation Requests"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 364a4a851df..8fc104bf34f 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -577,9 +577,8 @@ class crm_meeting(osv.Model):
     _inherit = 'crm.meeting'
 
     def create(self, cr, uid, vals, context=None):
-        meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj_meeting = self.browse(cr, uid, meeting_id, context=context)
-        self.pool.get('hr.applicant').log_meeting(cr, uid, context.get('active_ids',[]), obj_meeting.name, obj_meeting.date, obj_meeting.duration, context=context)
-        return meeting_id
+        if 'active_ids' in context and 'active_model' in context and context['active_model'] == 'hr.applicant':
+            self.pool.get('hr.applicant').log_meeting(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
+        return super(crm_meeting, self).create(cr, uid, vals, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 33594d9d6755068c2a2bc3855967345e65412174 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 7 Jun 2013 13:21:24 +0530
Subject: [PATCH 08/16] [IMP]hr_recruite: If in any case no duration tn imp msg
 as MP suggest

bzr revid: dbr@tinyerp.com-20130607075124-x70f2dl5vb6e3s8u
---
 addons/hr_recruitment/hr_recruitment.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f1c2f3939c2..affacf10d61 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -308,10 +308,9 @@ class hr_applicant(base_stage, osv.Model):
 
     def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
          if not duration:
-             duration = _('unknown')
+             message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting_date, meeting_subject)
          else:
-             duration = str(duration)
-         message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
+             message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, str(duration))
          return self.message_post(cr, uid, ids, body=message,context=context)
 
     def action_makeMeeting(self, cr, uid, ids, context=None):

From 89d03a854ada9de9cc14c896805f0daa08cfbdfe Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 22 Aug 2013 18:05:34 +0530
Subject: [PATCH 09/16] [IMP]base_calander: Add create method for crm.meeting
 Update the Doc remove crm.meeting inheritance from .py file

bzr revid: dbr@tinyerp.com-20130822123534-zx3uxdjojoj55bqn
---
 addons/base_calendar/crm_meeting.py     |  9 +++++++++
 addons/hr_recruitment/doc/changelog.rst |  2 ++
 addons/hr_recruitment/hr_recruitment.py | 10 +---------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 66823e0b8f4..38d3683fabd 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -64,6 +64,15 @@ class crm_meeting(osv.Model):
         'state': 'open',
     }
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, res, context=context)
+        if 'active_model' in context and context['active_model'] == 'hr.applicant':
+            self.pool.get('hr.applicant').log_meeting_in_parent(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
+        return res
+
     def message_get_subscription_data(self, cr, uid, ids, context=None):
         res = {}
         for virtual_id in ids:
diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
index 404b94ee6d1..7fb714c8ea0 100644
--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -14,3 +14,5 @@ Changelog
   - ``hr.recruitment.stage``: removed ``state`` field.
 
 - Removed ``hired.employee`` wizard.
+
+- Add new method ``log_meeting_in_parent``.
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index cf091925c92..e168749ef35 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -281,7 +281,7 @@ class hr_applicant(osv.Model):
             return stage_ids[0]
         return False
 
-    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
+    def log_meeting_in_parent(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
          if not duration:
              message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting_date, meeting_subject)
          else:
@@ -518,12 +518,4 @@ class applicant_category(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
-class crm_meeting(osv.Model):
-    _inherit = 'crm.meeting'
-
-    def create(self, cr, uid, vals, context=None):
-        if 'active_ids' in context and 'active_model' in context and context['active_model'] == 'hr.applicant':
-            self.pool.get('hr.applicant').log_meeting(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
-        return super(crm_meeting, self).create(cr, uid, vals, context=context)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cb15c354dd73e638c1eaf0287d6aabec7f53daea Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 23 Aug 2013 15:06:17 +0530
Subject: [PATCH 10/16] [IMP]:Update label

bzr revid: dbr@tinyerp.com-20130823093617-3aa3h798n6ydt0m1
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 443ec911e0d..00646c2dc46 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -171,7 +171,7 @@ class hr_applicant(osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Subject / Application Name', size=128, required=True),
+        'name': fields.char('Subject', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),

From d7f420c586893ca792b11f4bdad15a9de38382d5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 29 Aug 2013 18:47:19 +0530
Subject: [PATCH 11/16] [IMP]set log_meeting_in_parent method in base_calender

bzr revid: dbr@tinyerp.com-20130829131719-2nho1zsqv1ccsj6w
---
 addons/base_calendar/crm_meeting.py     | 23 ++++++++++++++++++-----
 addons/hr_recruitment/hr_recruitment.py |  8 +-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 38d3683fabd..d54df072f0e 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -67,11 +67,24 @@ class crm_meeting(osv.Model):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if 'active_model' in context and context['active_model'] == 'hr.applicant':
-            self.pool.get('hr.applicant').log_meeting_in_parent(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
-        return res
+        meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        if context.get('log_meeting_in_parent'):
+            self.log_meeting_in_parent(cr, uid, [meeting_id], context=context)
+        return meeting_id
+
+    def log_meeting_in_parent(self, cr, uid, ids, context=None):
+        if context is None: 
+            context = {}
+        parent_model = context.get('active_model',False)
+        parent_ids = context.get('active_ids', False)
+        for meeting in self.browse(cr, uid, ids, context=context):
+            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+            if meeting.duration:
+                message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting.date, meeting.name, str(meeting.duration))
+            if parent_model and parent_ids:
+                self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
+        return True
+
 
     def message_get_subscription_data(self, cr, uid, ids, context=None):
         res = {}
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 00646c2dc46..df55a1942f3 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -281,13 +281,6 @@ class hr_applicant(osv.Model):
             return stage_ids[0]
         return False
 
-    def log_meeting_in_parent(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
-         if not duration:
-             message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting_date, meeting_subject)
-         else:
-             message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, str(duration))
-         return self.message_post(cr, uid, ids, body=message,context=context)
-
     def action_makeMeeting(self, cr, uid, ids, context=None):
         """ This opens Meeting's calendar view to schedule meeting on current applicant
             @return: Dictionary value for created Meeting view
@@ -300,6 +293,7 @@ class hr_applicant(osv.Model):
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
+            'log_meeting_in_parent': True,
         }
         return res
 

From 1de73ce6dea8b1be5936cb4059d46e76d1c94736 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 30 Aug 2013 13:54:04 +0530
Subject: [PATCH 12/16] [IMP]base_calendar: Improve code

bzr revid: dbr@tinyerp.com-20130830082404-wgk67mq1sltcg2xi
---
 addons/base_calendar/crm_meeting.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index d54df072f0e..ba4b21a65d6 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -77,11 +77,11 @@ class crm_meeting(osv.Model):
             context = {}
         parent_model = context.get('active_model',False)
         parent_ids = context.get('active_ids', False)
-        for meeting in self.browse(cr, uid, ids, context=context):
-            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
-            if meeting.duration:
-                message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting.date, meeting.name, str(meeting.duration))
-            if parent_model and parent_ids:
+        if parent_model and parent_ids:
+            for meeting in self.browse(cr, uid, ids, context=context):
+                message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+                if meeting.duration:
+                    message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
                 self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
         return True
 

From efc8bb37a92fe2079eca0d163e7236b1fb33519f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:42:05 +0530
Subject: [PATCH 13/16] [IMP]Improve code for crm also

bzr revid: dbr@tinyerp.com-20130910131205-39cwpiik2ncs6wcn
---
 addons/base_calendar/crm_meeting.py     | 4 +++-
 addons/crm/crm_lead.py                  | 8 --------
 addons/crm/crm_meeting.py               | 8 --------
 addons/hr_recruitment/hr_recruitment.py | 1 -
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index ba4b21a65d6..11e1794f862 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -68,7 +68,9 @@ class crm_meeting(osv.Model):
         if context is None:
             context = {}
         meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        if context.get('log_meeting_in_parent'):
+        parent_model = context.get('active_model',False)
+        parent_ids = context.get('active_ids', False)
+        if parent_model and parent_ids:
             self.log_meeting_in_parent(cr, uid, [meeting_id], context=context)
         return meeting_id
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c4e2cbdc91d..260e634af9b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -1008,14 +1008,6 @@ class crm_lead(format_address, osv.osv):
         message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
-    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
-        if not duration:
-            duration = _('unknown')
-        else:
-            duration = str(duration)
-        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
-        return self.message_post(cr, uid, ids, body=message, context=context)
-
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
             country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index c31907bebe2..c65576f16c6 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -34,14 +34,6 @@ class crm_meeting(osv.Model):
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
-    def create(self, cr, uid, vals, context=None):
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if obj.opportunity_id:
-            self.pool.get('crm.lead').log_meeting(cr, uid, [obj.opportunity_id.id], obj.name, obj.date, obj.duration, context=context)
-        return res
-
-
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 1cb75c37953..344e10260de 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -295,7 +295,6 @@ class hr_applicant(osv.Model):
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
-            'log_meeting_in_parent': True,
         }
         return res
 

From 1339e242263fd94cf6b3a5658b647a7656a5f1c4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:47:04 +0530
Subject: [PATCH 14/16] [IMP] Label name improve

bzr revid: dbr@tinyerp.com-20130910131704-mawfghrz42jow31r
---
 addons/hr_recruitment/hr_recruitment.py       | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 344e10260de..ff922a1cee3 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -171,7 +171,7 @@ class hr_applicant(osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Subject', size=128, required=True),
+        'name': fields.char('Subject / Application Name', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3bf09d21a17..98f1170ecb7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -44,7 +44,7 @@
                 <field name="last_stage_id" invisible="1"/>
                 <field name="create_date"/>
                 <field name="date_last_stage_update" invisible="1"/>
-                <field name="name" string="Subject"/>
+                <field name="name"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="partner_phone"/>

From d0923892c2eb2c2995a3c67191a933273e989935 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:55:23 +0530
Subject: [PATCH 15/16] [IMP]Improve code

bzr revid: dbr@tinyerp.com-20130910132523-5xbkmrn1gss7p2tv
---
 addons/base_calendar/crm_meeting.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 11e1794f862..93bbe66389b 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -77,14 +77,13 @@ class crm_meeting(osv.Model):
     def log_meeting_in_parent(self, cr, uid, ids, context=None):
         if context is None: 
             context = {}
-        parent_model = context.get('active_model',False)
-        parent_ids = context.get('active_ids', False)
-        if parent_model and parent_ids:
-            for meeting in self.browse(cr, uid, ids, context=context):
-                message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
-                if meeting.duration:
-                    message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
-                self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
+        parent_model = context.get('active_model')
+        parent_ids = context.get('active_ids')
+        for meeting in self.browse(cr, uid, ids, context=context):
+            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+            if meeting.duration:
+                message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
+            self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
         return True
 
 

From 6f44a53ca847a76dcb74510225365e84cdff1114 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 11 Sep 2013 14:38:55 +0530
Subject: [PATCH 16/16] [IMP] Add condition

bzr revid: dbr@tinyerp.com-20130911090855-98upgcnn57bbx63y
---
 addons/base_calendar/crm_meeting.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 93bbe66389b..b5757f34c3f 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -79,11 +79,12 @@ class crm_meeting(osv.Model):
             context = {}
         parent_model = context.get('active_model')
         parent_ids = context.get('active_ids')
-        for meeting in self.browse(cr, uid, ids, context=context):
-            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
-            if meeting.duration:
-                message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
-            self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
+        if parent_model in self.pool and hasattr(self.pool[parent_model], 'message_post'):
+            for meeting in self.browse(cr, uid, ids, context=context):
+                message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+                if meeting.duration:
+                    message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
+                self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
         return True