[MERGE] HR Improvement

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

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index cf5f6dd..185fe53 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -65,8 +65,9 @@
                             <group col="4" colspan="2">
                                 <separator string="Job Information" colspan="4"/>
                                 <field name="parent_id" select="1" colspan="4"/>
-
-                                <field name="category_id" colspan="4" widget="selection"/>
+                                                               <field name="coach_id" select="1" colspan="4"/>
+<!--                                <field name="category_id" colspan="4" widget="selection"/>-->
+                                <field name="job_id" select="1" colspan="4"/>
                             </group>
                         </page>
                         <page string="Notes">
@@ -92,6 +93,21 @@
                 </tree>
             </field>
         </record>
+        <record id="view_employee_filter" model="ir.ui.view">
+               <field name="name">Employees</field>
+               <field name="model">hr.employee</field>
+               <field name="type">search</field>
+               <field name="arch" type="xml">
+                   <search string="Employees">
+                       <group col='6' colspan='2'>
+                               <field name="name"/>
+                               <field name="parent_id" widget="selection">
+                               <filter icon="terp-partner" domain="[('parent_id','child_of',uid)]"  help="Employees under me"/>
+                         </field>
+                       </group>
+                   </search>
+                </field>
+         </record>
         <record id="open_view_employee_tree" model="ir.actions.act_window">
             <field name="name">Employees Structure</field>
             <field name="res_model">hr.employee</field>
@@ -99,6 +115,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
+            <field name="search_view_id" ref="view_employee_filter"/>
         </record>
 
         <record id="open_view_employee_list" model="ir.actions.act_window">
@@ -107,6 +124,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_employee_filter"/>
         </record>
       <!--  <menuitem
             id="menu_open_view_employee_list"
@@ -125,6 +143,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="search_view_id" ref="view_employee_filter"/>
         </record>
         <!--<menuitem
             action="open_view_employee_list_my"
@@ -160,11 +179,11 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem 
-                action="action_hr_marital_status" 
-                id="hr_menu_marital_status" 
+        <menuitem
+                action="action_hr_marital_status"
+                id="hr_menu_marital_status"
                 parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
-                
+
         <!--
         =======================
         Employee architecture
@@ -265,8 +284,8 @@
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('category_id','child_of',[active_id])]</field>
-            <field name="context">{'category_id':active_id}</field>
+<!--            <field name="domain">[('category_id','child_of',[active_id])]</field>-->
+<!--            <field name="context">{'category_id':active_id}</field>-->
         </record>
 
         <record id="hr_employee_category_open" model="ir.values">
@@ -279,5 +298,77 @@
 
         <menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
+               <record id="view_crm_job_form" model="ir.ui.view">
+            <field name="name">crm.job.form</field>
+            <field name="model">crm.job</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Job">
+                    <field name="name" select="1"/>
+                    <field name="ref"/>
+                    <field name="department_id" select="1"/>
+                    <newline/>
+                    <notebook colspan="4">
+                        <page string="Employee">
+                               <field name="employee_ids" colspan='4' nolabel="1"  mode="tree,form"/>
+                                   <field name="expected_employees"/>
+                                   <field name="no_of_employee"/>
+                                               </page>
+                                               <page string="Description">
+                               <field name="description" colspan='4'/>
+                                   <field name="description"/>
+                                               </page>
+                                       </notebook>
+                </form>
+            </field>
+        </record>
+               <record id="view_crm_job_tree" model="ir.ui.view">
+            <field name="name">crm.job.tree</field>
+            <field name="model">crm.job</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Job">
+                    <field name="name" select="1"/>
+                    <field name="ref"/>
+                    <field name="expected_employees"/>
+                    <field name="department_id" />
+                    <field name="no_of_employee"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_job_filter" model="ir.ui.view">
+               <field name="name">Job</field>
+               <field name="model">crm.job</field>
+               <field name="type">search</field>
+               <field name="arch" type="xml">
+                   <search string="Job">
+                       <group col='3' colspan='4'>
+                               <field name="name"/>
+                               <field name="department_id" widget="selection">
+                                <filter icon="terp-crm"
+                                                               domain="[('department_id','=',context.get('department_id',False))]"
+                                                               help="My Departments Jobs"/>
+                        </field>
+                       </group>
+                   </search>
+                </field>
+         </record>
+        <record model="ir.actions.act_window" id="action_crm_job">
+               <field name="name">Job</field>
+               <field name="res_model">crm.job</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">tree,form</field>
+               <field name="view_id" ref="view_crm_job_tree"/>
+               <field name="search_view_id" ref="view_job_filter"/>
+           </record>
+
+           <menuitem icon="terp-hr" id="base.menu_hr" name="Human Resources"/>
+           <menuitem
+               name="Recruitment"
+               id="base.menu_crm_case_job_req_main"
+               parent="base.menu_hr"/>
+
+        <menuitem name="Job" parent="base.menu_crm_case_job_req_main" id="menu_crm_job" action="action_crm_job" sequence="2"/>
+
     </data>
 </openerp>