diff options
| author | Bharat (OpenERP) <bde@tinyerp.com> | 2011-10-14 11:10:47 +0530 |
|---|---|---|
| committer | Bharat (OpenERP) <bde@tinyerp.com> | 2011-10-14 11:10:47 +0530 |
| commit | c27bc7faf1c9f8aec26eeb6901a4438d0e302bd7 (patch) | |
| tree | 7b844a4b8aa693ad59430d9aebeef0c8b0f18003 | |
| parent | f4c4e839261ee6adabc4045eed84a9f864140aac (diff) | |
[FIX] hr : Added category_id field in tree viewof hr.holidays in hr_holidays/hr_holidays_view.xml
lp bug: https://launchpad.net/bugs/872245 fixed
bzr revid: bde@tinyerp.com-20111014054047-gp46a6fqbpadu0es
| -rw-r--r-- | addons/hr_holidays/hr_holidays_view.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index b6d6a64ed26..0b3d5ab58c7 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -203,6 +203,7 @@ <field name="department_id" invisible="1"/> <field name="type"/> <field name="name"/> + <field name="category_id"/> <field name="number_of_days" string="Number of Days" sum="Remaining Days"/> <field name="date_from"/> <field name="date_to"/> @@ -427,9 +428,9 @@ <!-- Shortcuts --> <act_window name="Leaves" domain="[('type','=','remove')]" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" res_model="hr.holidays" src_model="hr.employee" view_id="view_holiday" id="act_hr_employee_holiday_request"/> - + <!-- Assing leave --> - + <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view"> <field name="name">hr.employee.leave.tree</field> <field name="model">hr.employee</field> @@ -440,7 +441,7 @@ <field name="remaining_leaves" string="Remaining Legal Leaves"/> </tree> </field> - </record> + </record> <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal"> <field name="name">Allocate Leaves for Employees</field> @@ -458,7 +459,7 @@ </record> <!-- Hr employee inherit Legal Leaves --> - + <record id="view_employee_form_leave_inherit" model="ir.ui.view"> <field name="name">hr.employee.leave.form.inherit</field> <field name="model">hr.employee</field> |