[FIX] ir.actions.todo are now unskippable

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

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 51b12af..08fa5e0 100644 (file)
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,10 +13,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                    <field name="parent_id" select="2"/>
-                    <field colspan="4" name="manager_id" select="1"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="parent_id"/>
+                        <field name="manager_id" select="1"/>
+                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    </group>
                     <notebook colspan="4" >
                         <page string="Members">
                             <field colspan="4" name="member_ids" nolabel="1"/>
@@ -35,46 +37,57 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Companies">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="manager_id"/>
                 </tree>
             </field>
         </record>
-        <record id="open_module_tree_department_tree" model="ir.actions.act_window">
+         <record id="view_department_filter" model="ir.ui.view">
             <field name="name">Departments</field>
-            <field name="res_model">hr.department</field>
-            <field name="view_type">tree</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-        </record>
-       <menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
-
+            <field name="model">hr.department</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Departments">
+                    <field name="name"/>
+                    <field name="manager_id" />
+                </search>
+             </field>
+         </record>
 
         <record id="open_module_tree_department" model="ir.actions.act_window">
             <field name="name">Departments</field>
             <field name="res_model">hr.department</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_department_filter"/>
+            <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
         </record>
 
-        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
-        <!-- res.users inherit -->
-        <record model="ir.ui.view" id="view_users_form_inherit">
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
+
+       <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
             <field name="type">form</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Departements Informations">
-                        <separator string="Managers" colspan="4"/>
-                        <field name="parent_id" nolabel="1" colspan="4"/>
-                        <separator string="Subordinates" colspan="4"/>
-                        <field name="child_ids" nolabel="1" colspan="4"/>
+                    <page string="Departments" groups="base.group_extended">
+                        <field name="context_department_id" completion="1" widget="selection" string="Department"/>
                     </page>
                 </notebook>
             </field>
         </record>
-
-    </data>
+        <record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
+            <field name="name">view.department.form.hr.inherited1</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <page string="Current Activity" position="inside">
+                    <field name="context_department_id" widget="selection" readonly="0"/>
+                </page>
+            </field>
+        </record>
+        </data>
 </openerp>