[FIX] ir.actions.todo are now unskippable

[odoo/odoo.git] / addons / hr / hr_view.xml

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 90fd673..44595fa 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -44,11 +44,12 @@
                                 <field name="sinid" groups="base.group_extended"/>
                                 <field name="identification_id" groups="base.group_extended"/>
                                 <field name="passport_id"/>
+                                <field name="otherid"/>
                             </group>
                             <group col="2" colspan="2" groups="base.group_hr_user">
                                 <separator string="Status" colspan="2"/>
                                 <field name="gender"/>
-                                <field name="marital" widget="selection"/>
+                                <field name="marital"/>
                                 <field name="country_id"/>
                                 <field name="birthday"/>
                             </group>
@@ -110,6 +111,7 @@
                     <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
                     </field>
                     <field name="job_id" widget="selection"/>
+                    <field name="category_ids" select="1" groups="base.group_extended"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
@@ -157,54 +159,13 @@
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
-           <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
-               <field name="name">Employees</field>
-               <field name="resource">ir.ui.menu</field>
-               <field name="user_id" ref="base.user_root"/>
-               <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
-           </record>
-
-        <!--
-        =======================
-        Employee marital status
-        =======================
-        -->
-
-    <record id="hr_hr_employee_marital_status_tree" model="ir.ui.view">
-            <field name="name">hr.hr.employee.marital.status.tree</field>
-            <field name="model">hr.employee.marital.status</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Marital Status">
-                    <field name="name" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
-            <field name="name">hr.hr.employee.marital.status</field>
-            <field name="model">hr.employee.marital.status</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Marital Status">
-                    <field name="name"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_hr_marital_status" model="ir.actions.act_window">
-            <field name="name">Marital Status</field>
-            <field name="res_model">hr.employee.marital.status</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="hr_hr_employee_marital_status_tree"/>
+        <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
+            <field name="name">Employees</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
         </record>
 
-        <menuitem action="action_hr_marital_status" id="hr_menu_marital_status"
-            parent="hr.menu_view_employee_category_configuration_form" sequence="3" groups="base.group_extended"/>
-
         <!--
         =======================
         Employee architecture
@@ -216,6 +177,7 @@
             <field name="model">hr.employee</field>
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
+            <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>