[IMP]hr_holidays: remove done state and change report

bzr revid: kjo@tinyerp.com-20120611053226-dix0kl57bnipw8dq

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7f2b358..a5adc50 100644 (file)
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -110,7 +110,7 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('done', 'Done')], 'Status', readonly=True, required=True, help='By default all job are \'In position\', set it \'In Recruitment\' if recruitment process is going on for this job position.'),
+        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement')], 'Status', readonly=True, required=True, help='By default all job are \'In position\', set it \'In Recruitment\' if recruitment process is going on for this job position.'),
     }
     _defaults = {
         'expected_employees': 1,
@@ -138,10 +138,6 @@ class hr_job(osv.osv):
         self.write(cr, uid, ids, {'state': 'open', 'no_of_recruitment': 0})
         return True
 
-    def job_done(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'done', 'no_of_recruitment': 0})
-        return True
-
 hr_job()
 
 class hr_employee(osv.osv):

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 97b4370..70a903b 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -347,7 +347,7 @@
                 <form layout="manual">
                 <header>
                     <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                    <button name="job_done" string="Recruitment Done" states="recruit" type="object"/>
+                    <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                 </header>
                 <sheet string="Job" layout="auto">

diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
index 1c7c628..566b408 100644 (file)
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
-            <field name="name">Leaves To Validate</field>
+            <field name="name">Leaves To Approved</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e68169d..7820493 100644 (file)
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -397,11 +397,11 @@ class hr_holidays(osv.osv):
         for obj in self.browse(cr, uid, ids):
             if obj.holiday_status_id.double_validation:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>validated</b>. A second validation is necessary and is now pending.")
+                    _("The %s request has been <b>Approved</b>. A second validation is necessary and is now pending.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
             else:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>validated</b>. The validation process is now over.")
+                    _("The %s request has been <b>Approved</b>. The validation process is now over.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
     
     def holidays_valid2_notificate(self, cr, uid, ids, context=None):

diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index c656859..3810bbc 100644 (file)
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/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="Approved and Confirmed"
             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))))

diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index c5a117f..b05b747 100644 (file)
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.holidays.summary.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                       <form string="Employee's Leaves">
+                       <form string="Leaves Summary">
                            <group col="4" colspan="6">
                                    <field name="date_from"/>
                                    <newline/>
@@ -25,7 +25,7 @@
         </record>
 
         <record id="action_hr_holidays_summary_employee" model="ir.actions.act_window">
-            <field name="name">Employee's Leaves</field>
+            <field name="name">Leaves Summary</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.employee</field>
             <field name="view_type">form</field>
@@ -35,7 +35,7 @@
 
                <record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="name">Employee's Leaves</field>
+            <field name="name">Leaves Summary</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
             <field name="key">action</field>