diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-09-20 11:03:27 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-09-20 11:03:27 +0200 |
| commit | ae7f67d90bb60cb7b2fd5f3d22a52bc288bfbae3 (patch) | |
| tree | 3911c526e4938b8245feb8fc7f19cde33345f6f8 | |
| parent | 8c83c0dcb8c5effc067c8161bc1fd87597893ec9 (diff) | |
| parent | 3fa4a257fc6c23bc282a87871994303d57f071a0 (diff) | |
[MERGE] hr_holidays
bzr revid: fp@tinyerp.com-20120920090327-gz0t0u2maqh7cdu8
| -rw-r--r-- | addons/hr/hr_view.xml | 2 | ||||
| -rw-r--r-- | addons/hr_holidays/hr_holidays_view.xml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 00ed2afbef2..5d4c2ae9d45 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -180,7 +180,7 @@ <field name="name">Employees</field> <field name="res_model">hr.employee</field> <field name="view_type">form</field> - <field name="view_mode">tree,form</field> + <field name="view_mode">form,tree</field> <field name="view_id" eval="False"/> <field name="search_view_id" ref="view_employee_filter"/> </record> diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 5a2e0603b88..552b75fe918 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -92,7 +92,7 @@ <header> <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/> <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/> - <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user" class="oe_highlight"/> + <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user"/> <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user" /> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/> </header> @@ -137,7 +137,7 @@ <header> <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/> <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/> - <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/> + <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user"/> <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user" /> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/> </header> @@ -483,6 +483,7 @@ <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> + <field name="priority" eval="20"/> <field name="arch" type="xml"> <tree string="Assign Leaves" editable="bottom"> <field name="name" string="Employee"/> |