From 873461674a47bb6b6ba76ff07eab79b2c802c835 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 3 Mar 2010 19:46:20 +0530
Subject: [PATCH] [ADD]:added search views on resource module

bzr revid: rvo@tinyerp.co.in-20100303141620-qjnk3hlbaip8x3vj
---
 addons/mrp/mrp_view.xml                   |  6 +-
 addons/project/project_view.xml           | 21 ++-----
 addons/project_long_term/project_view.xml |  7 +--
 addons/resource/resource_view.xml         | 72 ++++++++++++++++++++++-
 4 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a94d12f23e3..3d58d595ac5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1041,9 +1041,9 @@
 		<!-- Menu for Resource for MRP-->
 		<menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_resource_resource_tree" parent="menu_pm_resources_mrp" />
-		<menuitem action="resource.action_resource_calendar_form" id="menu_resource_calendar_form" parent="menu_pm_resources_mrp"/>
-		<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="menu_pm_resources_mrp"/>
+		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+    	<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 73249f58384..749222a2275 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -505,15 +505,6 @@
 
         <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
-        <act_window
-            domain="[('project_id', '=', active_id)]"
-            id="act_project_project_2_project_task_new"
-            name="Create a Task"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="form,tree,calendar,graph"
-            view_type="form"/>
-
         <act_window
             domain="[('project_id', '=', active_id)]"
             id="act_project_project_2_project_task_all"
@@ -524,15 +515,15 @@
             view_type="form"/>
 
          <act_window
-            domain="[('project_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]"
-            id="act_project_project_2_project_task_opened"
-            name="Tasks in Progress"
-            res_model="project.task"
+            domain="[('project_id', '=', active_id)]"
+            id="act_project_phases"
+            name="Phases"
+            res_model="project.phase"
             src_model="project.project"
-            view_mode="tree,form,calendar,graph"
+            view_mode="tree,form"
             view_type="form"/>
 
-        <record id="task_company" model="ir.ui.view">
+         <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml
index e2f0c0207f2..9977933238e 100644
--- a/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@ -163,10 +163,9 @@
 		<!-- Menu for Resource for Long Term Project -->
 		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_resource_resource_tree1" parent="menu_pm_resources_project1"/>
-		<menuitem action="resource.action_resource_calendar_form" id="menu_resource_calendar_form1" parent="menu_pm_resources_project1"/>
-		<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree1" parent="menu_pm_resources_project1"/>
-
+		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
+		<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ece75a4cb54..bd2f63d5853 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -15,11 +15,27 @@
                 </form>
             </field>
         </record>
+
+        <record id="view_resource_calendar_tree" model="ir.ui.view">
+            <field name="name">resource.calendar.tree</field>
+            <field name="model">resource.calendar</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Resource Calendar">
+                    <field name="name"/>
+                    <field name="manager" select="1"/>
+                    <field name="company_id" select="1"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="action_resource_calendar_form" model="ir.actions.act_window">
             <field name="name">Resource Calendar</field>
             <field name="res_model">resource.calendar</field>
             <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_resource_calendar_search"/>
         </record>
 
         <record id="view_resource_calendar_week_tree" model="ir.ui.view">
@@ -98,7 +114,7 @@
             <field name="model">resource.resource</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Resource">
+                <tree string="Resources">
                     <field name="name" />
                     <field name="company_id" />
                     <field name="calendar_id" />
@@ -112,6 +128,7 @@
             <field name="name">Resources</field>
             <field name="res_model">resource.resource</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_resource_resource_search"/>
         </record>
 
         <record id="resource_calendar_leave_form" model="ir.ui.view">
@@ -148,6 +165,59 @@
             <field name="name">Resource Leaves</field>
             <field name="res_model">resource.calendar.leaves</field>
             <field name="view_mode">tree,form,calendar</field>
+            <field name="search_view_id" ref="view_resource_calendar_leaves_search"/>
+        </record>
+
+
+		<!-- Search Views -->
+
+		<record id="view_resource_resource_search" model="ir.ui.view">
+            <field name="name">resource.resource.search</field>
+            <field name="model">resource.resource</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Resource">
+                   <group col='15' colspan='4'>
+                       <field name="name" string="Resource Name"/>
+                       <field name="code" string="Code"/>
+                       <field name="user_id" string="User" widget="selection"/>
+                       <field name="calendar_id" string="Working Calendar" widget="selection"/>
+                       <field name="resource_type" string="Resource Type"/>
+                       <field name="company_id" string="Company" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
+       <record id="view_resource_calendar_search" model="ir.ui.view">
+            <field name="name">resource.calendar.search</field>
+            <field name="model">resource.calendar</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Resource Calendar">
+                   <group col='15' colspan='4'>
+                       <field name="name" string="Working Calendar"/>
+                       <field name="manager" string="Workgroup Manager" widget="selection"/>
+                       <field name="company_id" string="Company" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
+        <record id="view_resource_calendar_leaves_search" model="ir.ui.view">
+            <field name="name">resource.calendar.leaves.search</field>
+            <field name="model">resource.calendar.leaves</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Resource Calendar Leaves">
+                   <group col='15' colspan='4'>
+                       <field name="name" string="Name"/>
+                       <field name="company_id" string="Company" widget="selection"/>
+                       <field name="calendar_id" string="Working Time" widget="selection"/>
+                       <field name="resource_id" string="Resource" widget="selection"/>
+                   </group>
+               </search>
+            </field>
         </record>
 
     </data>