[IMP] hr_recruitmentimprove

bzr revid: pna@tinyerp.com-20120611054603-5gph89jeahglcu08

addons/hr_holidays/report/holidays_summary_report.py

@@ -117,7 +117,7 @@ class report_custom(report_rml):
             else:
                 holiday_type=('validate')
         else:
-            type="Confirmed and Validated"
+            type="Confirmed and Approved"
             holiday_type=('confirm','validate')
         date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))

addons/hr_recruitment/hr_recruitment.py

@@ -324,7 +324,6 @@ class hr_applicant(base_stage, osv.Model):
 
             context.update({
                 'default_applicant_id': opp.id,
-                'default_department_id': opp.department_id.id,
                 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
                 'default_email_from': opp.email_from,
                 'default_state': 'open',
@@ -585,7 +584,6 @@ class crm_meeting(osv.osv):
     _inherit = 'crm.meeting'
     _columns = {
         'applicant_id': fields.many2one('hr.applicant','Applicant Meeting'),
-        'department_id': fields.many2one('hr.department', 'Department',groups="base.group_hr_user,base.group_hr_manager"),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_recruitment/hr_recruitment_view.xml

@@ -515,11 +515,9 @@
                             <separator colspan="2" string="Assignment"/>
                             <field name="user_id" />
                             <field name="organizer"/>
-                            <field name="department_id" widget="selection"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Contacts"/>
-                            <field name="partner_id" string="Applicant"
-                                on_change="onchange_partner_id(partner_id)" />
+                            <field name="applicant_id" string="Application"/>
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>