diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-07-31 12:29:16 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-07-31 12:29:16 +0530 |
| commit | 02ad31ff3746e512a2b1fa42d73f2b24dde87759 (patch) | |
| tree | bfc165156b8b7dec7ffcdff48a218c6f98a99e79 | |
| parent | b3830bf5f3d56151cd70630c6e6aa3ef7b5919f4 (diff) | |
| parent | b48531d1daa723b68feff99276485fae93ca8dd5 (diff) | |
[MERGE]:hr config
bzr revid: apa@tinyerp.com-20120731065916-xrrwten6evmt3nbs
| -rw-r--r-- | addons/hr/res_config_view.xml | 17 | ||||
| -rw-r--r-- | addons/hr_recruitment/res_config_view.xml | 3 |
2 files changed, 9 insertions, 11 deletions
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index 520dd4dd94f..68a35653fc2 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -20,11 +20,15 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <separator string="Additional Features"/> + <separator string="Human Resources Management"/> <group> <label for="id" string="Additional Features"/> <div> <div> + <field name="module_hr_holidays" class="oe_inline"/> + <label for="module_hr_holidays"/> + </div> + <div> <field name="module_hr_expense" class="oe_inline"/> <label for="module_hr_expense"/> </div> @@ -33,17 +37,13 @@ <label for="module_hr_evaluation"/> </div> <div> - <field name="module_hr_holidays" class="oe_inline"/> - <label for="module_hr_holidays"/> + <field name="module_hr_contract" class="oe_inline"/> + <label for="module_hr_contract"/> </div> <div> <field name="module_hr_recruitment" class="oe_inline"/> <label for="module_hr_recruitment"/> </div> - <div> - <field name="module_hr_contract" class="oe_inline"/> - <label for="module_hr_contract"/> - </div> <div name="hr_payroll"> <field name="module_hr_payroll" class="oe_inline"/> <label for="module_hr_payroll"/> @@ -53,9 +53,8 @@ </div> </div> </group> - <separator string="Timesheets"/> <group name="timesheet_grp"> - <label for="id" string="Timesheet Features"/> + <label for="id" string="Time Tracking"/> <div> <div> <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/> diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml index 442eca839d6..61ce127794a 100644 --- a/addons/hr_recruitment/res_config_view.xml +++ b/addons/hr_recruitment/res_config_view.xml @@ -8,9 +8,8 @@ <field name="inherit_id" ref="hr.view_human_resources_configuration"/> <field name="arch" type="xml"> <group name="timesheet_grp" position="after"> - <separator string="Recruitment"/> <group> - <label for="id" string="Recruitment Features"/> + <label for="id" string="Recruitment"/> <div> <div> <field name="module_document_ftp" class="oe_inline"/> |