From a54fab78d62830151e3f7db140351dadae9e63b1 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 22 Oct 2009 19:31:58 +0530
Subject: [PATCH 1/7] [IMP]: Improved search views

bzr revid: uco@tinyerp.co.in-20091022140158-390fxqzz2lsr16mw
---
 addons/account/account_view.xml               | 52 ++++++++++++++++++
 addons/account/project/project_view.xml       |  2 +-
 addons/base_contact/base_contact_view.xml     | 30 ++++++++++-
 addons/crm_configuration/crm_bugs_view.xml    | 25 ++++-----
 addons/crm_configuration/crm_jobs_view.xml    | 27 +++++-----
 addons/crm_configuration/crm_lead_view.xml    | 24 ++++-----
 addons/crm_configuration/crm_meeting_view.xml | 30 +++++------
 .../crm_opportunity_view.xml                  | 26 ++++-----
 addons/mrp/mrp_view.xml                       | 32 ++++++++---
 addons/product/product_view.xml               | 16 ++++--
 addons/project/project_view.xml               | 53 ++++++++++++-------
 addons/project_gtd/project_gtd_view.xml       | 18 +++++++
 addons/purchase/purchase_view.xml             | 17 +++---
 addons/sale/sale_view.xml                     | 41 +++++++++++---
 addons/stock/stock_view.xml                   | 11 ++--
 15 files changed, 273 insertions(+), 131 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7386fe0bd88..21806398e29 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -788,6 +788,26 @@
                 </form>
             </field>
         </record>
+		
+		<record id="view_account_move_line_filter" model="ir.ui.view">
+            <field name="name">account.move.line.select</field>
+            <field name="model">account.move.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Move Lines">
+                	<group col='10' colspan='4'>
+                		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                        <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
+						<separator orientation="vertical"/>
+						<field name="date" select='1'/>
+						<field name="account_id" select='1'/>
+						<field name="partner_id" select='1'/>
+						<field name="debit" select='1'/>
+						<field name="credit" select='1'/>
+                	</group>
+                </search>
+            </field>
+        </record>
 
         <record id="action_move_line_select" model="ir.actions.act_window">
             <field name="name">Entry Lines</field>
@@ -796,6 +816,17 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
         </record>
+        
+        <record id="action_view_move_line" model="ir.actions.act_window">
+            <field name="name">Lines to reconcile</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('account_id.reconcile', '=', True),('reconcile_id','=',False)]</field>
+            <field eval="False" name="view_id"/>
+            <field eval="True" name="filter"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>            
+        </record>
 
         <!--
     Account.Entry Edition
@@ -894,12 +925,32 @@
             </field>
         </record>
 
+		<record id="view_account_move_filter" model="ir.ui.view">
+            <field name="name">account.move.select</field>
+            <field name="model">account.move</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Move">
+                	<group col='8' colspan='4'>
+                		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+						<separator orientation="vertical"/>
+						<field name="date" select='1'/>
+						<field name="name" select='1'/>
+						<field name="journal_id" select='1'/>
+						<field name="partner_id" select='1'/>
+                	</group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_move_line_form" model="ir.actions.act_window">
             <field name="name">Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
         <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_reporting"/>
         <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
@@ -921,6 +972,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
         <record id="action_move_line_search_view1" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 94e311db9c5..2916a9f1a28 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -53,7 +53,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
-                            <field name="partner_id" select="1"/>
+                            <field name="partner_id"/>
                             <newline/>
                             <field name="date_start"/>
                             <field name="date" select="2"/>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 58650e3eed7..da7f70b57e3 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -168,6 +168,22 @@
             </field>
         </field>
     </record>
+    
+    <record id="view_res_partner_filter" model="ir.ui.view">
+	    <field name="name">res.partner.select</field>
+	    <field name="model">res.partner</field>
+	    <field name="type">search</field>
+	    <field name="inherit_id" ref="base.view_res_partner_filter"/>
+	    <field name="arch" type="xml">
+	        <search string="Search Partner">
+	        	<group col='6' colspan='4'>
+		        	<field name="address" mode="tree,form" select="1">
+		                <field name="job_ids" select="1"/>
+			        </field>
+			    </group>
+	       </search>
+	    </field>
+    </record>
 
 <!-- don't display the categories, since it is displayed in an other tab-->
         <record model="ir.ui.view" id="view_partner_form_inherit2">
@@ -319,7 +335,19 @@
             </field>
         </field>
     </record>
-
+	
+	<record id="view_res_partner_address_filter" model="ir.ui.view">
+	    <field name="name">res.partner.address.select</field>
+	    <field name="model">res.partner.address</field>
+	    <field name="type">search</field>
+	    <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
+	    <field name="arch" type="xml">
+	        <search string="Search Contact">
+               	<field name="job_ids" select='1'/>
+	       </search>
+	    </field>
+    </record>
+    
     <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index a1908c0689e..09dbe583538 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -134,21 +134,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bugs">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Bugs" domain="[('user_id','=',uid)]" separator="1" help="Bugs Related to Current User"/>
-                   <filter icon="gtk-execute" string="Fixed Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Fixed')]" separator="1" help="All Fixed Bugs"/>
-                   <filter icon="gtk-execute" string="Waiting Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Awaiting Response')]" separator="1" help="All Waiting Bugs"/>
-                   <filter icon="gtk-execute" string="Future Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Future')]" separator="1" help="All Future Bugs"/>
-               </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Bugs"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Bugs"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Bugs"/>
-                   </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
-               </group>
+                <group col="10" colspan="4">
+               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-crm" string="Open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-crm" string="Pending" domain="[('state','=','pending')]"/>
+               		<separator orientation="vertical"/>
+               		<field name="id" select='1' widget="char" size="16"/>
+               		<field name="section_id" select='1'/>
+               		<field name="category2_id" string="Version" select='1'/>
+               		<field name="user_id" select='1'/>
+               	</group>
             </search>
          </field>
     </record>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 4c3f1d8ed37..8268c9cbbce 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -157,21 +157,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Jobs">
-                   <group col="5" colspan="1">
-                       <filter icon="gtk-execute" string="My Jobs" domain="[('user_id','=',uid)]" separator="1" help="Jobs Related to Current User"/>
-                       <filter icon="gtk-execute" string="Initial Jobs" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Initial Jobs Demand')]" separator="1" help="All Initial Jobs"/>
-                       <filter icon="gtk-execute" string="First Interview" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','First Interview')]" separator="1" help="First Interview"/>
-                       <filter icon="gtk-execute" string="Second Interview" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Second Interview')]" separator="1" help="Second Interview"/>
-                   </group>
-                   <group col="4" colspan="4">
-                       <field name="state" select="1">
-                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Jobs"/>
-                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Jobs"/>
-                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Jobs"/>
-                       </field>
-                       <field name="name" select='1'/>
-                       <field name="user_id" select="1" widget="selection"/>
-                   </group>
+                    <group col="12" colspan="4">
+	               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" />
+	                    <filter icon="terp-crm" string="Open" domain="[('state','=','open')]" />
+	                    <filter icon="terp-crm" string="Pending" domain="[('state','=','pending')]" />
+	               		<separator orientation="vertical"/>
+	               		<field name="id" select='1' widget="char" size="16"/>
+	               		<field name="section_id" select='1'/>
+	               		<field name="partner_id" string="Candidate Name" select='1'/>
+	               		<field name="email_from" select='1'/>
+	               		<field name="user_id" select='1'/>
+	               		<field name="categ_id" string="Applied Job" select="1"/>
+					</group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index eb171394414..61c85bf97a4 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -169,20 +169,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Prospects">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Prospects" domain="[('user_id','=',uid)]" separator="1" help="Prospects Related to Current User"/>
-                   <filter icon="gtk-execute" string="Assigned Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','Assigned')]" separator="1" help="All Assigned Prospects"/>
-                   <filter icon="gtk-execute" string="In Process Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','In Process')]" separator="1" help="In Process Prospects"/>
-                   <filter icon="gtk-execute" string="Converted Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','Converted')]" separator="1" help="Converted Prospects"/>
-               </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Prospects"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Prospects"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Prospects"/>
-                   </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
+               <group col="10" colspan="4">
+               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" help="Draft Prospects"/>
+                    <filter icon="terp-crm" string="Open" domain="[('state','=','open')]" help="Open Prospects"/>
+                    <filter icon="terp-crm" string="Pending" domain="[('state','=','pending')]" help="Pending Prospects"/>
+               		<separator orientation="vertical"/>
+               		<field name="id" select='1' widget="char" size="16"/>
+               		<field name="section_id" select='1'/>
+               		<field name="partner_id" select='1'/>
+               		<field name="email_from" select='1'/>
+               		<field name="user_id" select='1'/>
                </group>
            </search>
         </field>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 6f5ebcd9e88..1e0985577cf 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -154,21 +154,17 @@
         <field name="model">crm.case</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Search Meetings">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Meetings" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
-               </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Meetings"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Meetings"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Meetings"/>
-                   </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
-                   </group>
-               </search>
-            </field>
-        </record>
-     </data>
+            	<search string="Search Meetings">
+               		<group col="10" colspan="4">
+	               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" />
+	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" />
+	               		<separator orientation="vertical"/>
+	               		<field name="section_id" select='1'/>
+	               		<field name="partner_id" select='1'/>
+	               		<field name="user_id" select='1'/>
+	               	</group>
+                </search>
+        	</field>
+    	</record>
+	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 45ae181368a..50b724796e6 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -150,21 +150,17 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-               <group col="5" colspan="1">
-                   <filter icon="gtk-execute" string="My Opportunities" domain="[('user_id','=',uid)]" separator="1" help="Opportunities Related to Current User"/>
-                   <filter icon="gtk-execute" string="Prospecting" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Prospecting')]" separator="1" help="All Prospecting Prospects"/>
-                   <filter icon="gtk-execute" string="Proposition" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Value Proposition')]" separator="1" help="Value Proposition Prospects"/>
-                   <filter icon="gtk-execute" string="Analysis" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Needs Analysis')]" separator="1" help="Needs Analysis Prospects"/>
-                   </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Opportunities"/>
-                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Opportunities"/>
-                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Opportunities"/>
-                   </field>
-                   <field name="name" select='1'/>
-                   <field name="user_id" select="1" widget="selection"/>
-                   </group>
+               <group col="10" colspan="4">
+               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" />
+                    <filter icon="terp-crm" string="Open" domain="[('state','=','open')]" />
+                    <filter icon="terp-crm" string="Pending" domain="[('state','=','pending')]" />
+               		<separator orientation="vertical"/>
+               		<field name="id" select='1' widget="char" size="16"/>
+               		<field name="section_id" select='1'/>
+               		<field name="partner_id" select='1'/>
+               		<field name="email_from" select='1'/>
+               		<field name="user_id" select='1'/>
+               	</group>
            </search>
         </field>
     </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 04a93ac71ee..492f1c1ea34 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -525,15 +525,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Production">
-                   <group col='6' colspan='4'>
-                       <field name="state" select="1">
-                           <filter icon="terp-mrp" domain="[('state','=','confirmed')]" help="Confirmed Production Orders"/>
-                           <filter icon="terp-mrp" domain="[('state','=','ready')]" help="Production orders which are ready to produce"/>
-                           <filter icon="terp-mrp" domain="[('state','=','in_production')]" help="Production orders which are in production"/>
-                       </field>
+                   <group col='8' colspan='4'>
+                       <filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Production orders which are ready to produce"/>
+                       <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Production orders which are in production"/>
                        <separator orientation="vertical"/>
                        <field name="name" select='1'/>
-                   </group>
+					   <field name="product_id" select='1'/>
+					   <field name="routing_id" select='1'/>	
+                       <field name="origin" select='1'/>
+					</group>
                </search>
             </field>
         </record>
@@ -748,12 +748,30 @@
                 </form>
             </field>
         </record>
+        <record id="view_mrp_procurement_filter" model="ir.ui.view">
+            <field name="name">mrp.procurement.select</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Procurement">
+                   	<group col='8' colspan='4'>
+                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/>
+                       <separator orientation="vertical"/>
+                       <field name="name" select='1'/>
+					   <field name="product_id" select='1'/>
+					   <field name="date_planned" select='1'/>	
+                       <field name="state" select='1'/>
+					</group>
+				</search>
+            </field>
+        </record>
         <record id="mrp_procurement_action" model="ir.actions.act_window">
             <field name="name">Procurement Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 528e3ecde22..040b015768f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -16,10 +16,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <field name="name" select="1"/>
-                   <field name="default_code" select="1"/>
-                   <field name="categ_id" select="1" widget="selection"/>
-                   <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+                   <group col='8' colspan='4'>
+                		<filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
+		               	<filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+	                  	<field name="name" select="1"/>
+	                  	<field name="default_code" select="1"/>
+	               </group>
+	               <newline/>
+	               <group col='8' colspan='4'>
+	               		<field name="categ_id" select="1" widget="selection"/>
+	                  	<separator orientation="vertical"/>
+	                  	<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+	                </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e51112c6af3..3a4ca9e46dd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -114,13 +114,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                   <group col='6' colspan='4'>
-                       <field name="state" select="1">
-                           <filter icon="terp-project" domain="[('state','=','open')]" help="Open Projects"/>
-                           <filter icon="terp-project" domain="[('state','=','pending')]" help="Pending Projects"/>
-                       </field>
-                       <separator orientation="vertical"/>
-                       <field name="name" select='1'/>
+                   <group col='8' colspan='4'>
+                   		<filter icon="terp-project" string="My Projects" domain="[('manager', '=', uid)]" help="My Projects"/>
+                   		<filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
+                       	<separator orientation="vertical"/>
+                       	<field name="name" select='1'/>
+                       	<field name="partner_id" select='1'/>
+                       	<field name="state" select="1"/>
                    </group>
                </search>
             </field>
@@ -510,19 +510,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                <search string="Task Edition">
-                    <group col="4" colspan="1">
-                       <filter domain="[('user_id','=',uid)]" help="Tasks Related to Current User" icon="gtk-execute" string="My Task"/>
-                        <filter domain="[('user_id', 'child_of', [uid])]" help="Tasks Related to Department" icon="gtk-execute" separator="1" string="My Departments Task"/>
-                        <filter domain="[('user_id','=',uid),('parent_id','!=',False)]" help="Delegated Tasks Related to Current User" icon="gtk-execute" separator="1" string="My Delegated Task"/>
-                    </group>
-                    <group col="6" colspan="4">
-                        <field name="state" select="1">
-                             <filter domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
-                             <filter domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
-                        </field>
+                    <group col="8" colspan="4">
+                    	<filter string="Draft" domain="[('state','=','draft')]" help="Draft Tasks" icon="terp-project"/>
+                        <filter string="Open" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
+                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
+                        <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="user_id" select="1" widget="selection"/>
-                        <field name="project_id" select="1" widget="selection"/>
+                        <field name="project_id" select="1" widget="selection">
+                        	 <filter domain="[('parent_id','=',False)]" help="Unassigned Tasks" icon="terp-project"/>
+                        </field>
+                    </group>
+                    <group col="4" colspan="1">
+	                    <field name="user_id" select="1" widget="selection">
+	                        <filter domain="[('user_id','=',uid)]" help="Tasks Related to Current User" icon="gtk-execute"/>
+	                        <filter domain="[('user_id', 'child_of', [uid])]" help="Tasks Related to Department" icon="gtk-execute" separator="1"/>
+	                        <filter domain="[('user_id','=',uid),('parent_id','!=',False)]" help="Delegated Tasks Related to Current User" icon="gtk-execute" separator="1"/>
+	                    </field>
                     </group>
                 </search>
             </field>
@@ -657,7 +660,17 @@
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <menuitem action="action_view_task5_departments_prog_draft" id="menu_tasks_yours_departments_prog_draft" groups="base.group_extended_menu" parent="menu_tasks_yours_departments_prog"/>
-
+		
+		<record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
+            <field name="name">Overpassed Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
+        </record>
+	
         <record id="action_view_task_new" model="ir.actions.act_window">
             <field name="name">New Task</field>
             <field name="res_model">project.task</field>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index b84356684a9..7ce0ede6a20 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -180,6 +180,24 @@
             id="menu_open_time_allinbox" 
             parent="menu_open_time" 
             action="open_gtd_timebox_all"/>
+		
+		<record id="view_task_search_form" model="ir.ui.view">
+            <field name="name">project.task.search.form</field>
+            <field name="model">project.task</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="project.view_task_search_form"/>
+            <field name="arch" type="xml">
+               <search string="Task Edition">
+                    <group col="6" colspan="4">
+                    	<field name="timebox_id" select="1" widget="selection">
+                           <filter string="Daily Timebox" domain="[('timebox_id.type','=','daily')]" help="Daily Timebox"/>
+                           <filter string="Inbox" domain="[('user_id','=',uid)]" help="Inbox"/>
+                       	</field>
+                    	<field name="context_id" select="1" widget="selection"/>
+                    </group>
+                </search>
+            </field>
+     	</record>
 
     <record model="ir.ui.view" id="project_task">
         <field name="name">project.task.form.timebox</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d1a8199428a..3c3cb0aef86 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -114,15 +114,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                 <group col='6' colspan='4'>
-                   <filter icon="gtk-execute" string="Exception Purchases" domain="[('state','in',('except_picking','except_invoice'))]" separator="1" help="Purchases Related to Exception"/>
-                   <field name="state">
-                       <filter icon="terp-purchase" domain="[('state','=','wait')]" help="Waiting Purchases"/>
-                       <filter icon="terp-purchase" domain="[('state','=','confirmed')]" help="Confirmed Purchases"/>
-                       <filter icon="terp-purchase" domain="[('state','=','approved')]" help="Approved Purchases"/>
-                    </field>
-                   <separator orientation="vertical"/>
-                   <field name="name" select="1"/>
+                 <group col='8' colspan='4'>
+                    <filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
+                	<filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+					<separator orientation="vertical"/>
+					<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
+					<separator orientation="vertical"/>
+					<field name="name" select="1"/>
+					<field name="partner_id" select="1"/>
                 </group>
               </search>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c6e617ae623..2ec9db07170 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -227,14 +227,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='6' colspan='4'>
-                        <filter icon="gtk-execute" string="Exception sales" domain="[('state','in',('shipping_except','invoice_except'))]" separator="1" help="Sales Related to Exception"/>
-                        <field name="state">
-                           <filter icon="terp-sale" domain="[('state','in',('shipping_except','invoice_except'))]" help="Exception Sales"/>
-                           <filter icon="terp-sale" domain="[('state','=','manual')]" help="In progress Sales"/>
-                        </field>
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-sale" string="Quatation" domain="[('state','=','draft')]"/>
+                        <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="date_order" select="1"/>
                    </group>
                </search>
             </field>
@@ -259,7 +259,6 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
-
         </record>
         <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
 
@@ -381,6 +380,17 @@
         </record>
         <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_extended_menu"/>
 
+		<record id="action_order_tree" model="ir.actions.act_window">
+            <field name="name">Old Quotations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','draft'),('date_order','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
+        </record>
+
         <record id="view_order_line_graph" model="ir.ui.view">
             <field name="name">sale.order.line.graph</field>
             <field name="model">sale.order.line</field>
@@ -461,6 +471,22 @@
             </field>
         </record>
 
+		<record id="view_sales_order_line_filter" model="ir.ui.view">
+            <field name="name">sale.order.line.select</field>
+            <field name="model">sale.order.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Sales Order">
+                    <group col='8' colspan='4'>
+						<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
+						<separator orientation="vertical"/>
+						<field name="order_id" select="1"/>
+                        <field name="order_partner_id" select="1"/>
+                        <field name="product_id" select="1"/>
+					</group>
+				</search>
+			</field>
+		</record>
 
         <record id="action_order_line_tree1" model="ir.actions.act_window">
             <field name="name">Sales Order Lines</field>
@@ -468,6 +494,7 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_sales_order_line_filter"/>
         </record>
         <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root"
             groups="base.group_extended"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 464f7249c8f..d7962d700a4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -697,14 +697,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
-                    <group col='6' colspan='4'>
-                        <field name="state">
-                           <filter icon="terp-stock" domain="[('state','=','auto')]" help="Waiting Orders"/>
-                           <filter icon="terp-stock" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
-                           <filter icon="terp-stock" domain="[('state','=','assigned')]" help="Assigned Orders"/>
-                        </field>
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders"/>
+                        <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <separator orientation="vertical"/>
+                        <field name="address_id" select="1"/>
                         <field name="name" select="1"/>
+                        <field name="origin" select="1"/>
                    </group>
               </search>
             </field>

From 799020e13cd170b740bf2cb1c3d71f0bff036250 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 23 Oct 2009 16:29:37 +0530
Subject: [PATCH 2/7] [REF]: Modified some search views

bzr revid: uco@tinyerp.co.in-20091023105937-zm9umhhpcrw88qo8
---
 addons/account/project/project_view.xml       | 27 +++++++++++++++++++
 addons/crm_configuration/crm_bugs_view.xml    |  5 +++-
 addons/crm_configuration/crm_jobs_view.xml    |  5 +++-
 addons/crm_configuration/crm_lead_view.xml    |  5 +++-
 addons/crm_configuration/crm_meeting_view.xml |  5 +++-
 .../crm_opportunity_view.xml                  |  5 +++-
 addons/mrp/mrp_view.xml                       |  1 +
 addons/sale/sale_view.xml                     |  5 +++-
 8 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 2916a9f1a28..134a41d9eea 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -80,6 +80,16 @@
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
         <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/>
+	
+		<record id="act_account_renew_view" model="ir.actions.act_window">
+            <field name="name">Accounts to Renew</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
+            <field name="filter" eval="True"/>            
+        </record>
 
         <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
             <field name="name">Analytic Chart of Accounts</field>
@@ -150,6 +160,22 @@
                 </tree>
             </field>
         </record>
+        <record id="view_account_analytic_line_filter" model="ir.ui.view">
+            <field name="name">account.analytic.line.select</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="Search Analytic Lines">
+            		<group col='6' colspan='4'>
+            			<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Analytic Entries"/>
+            			<field name="name"/>
+            			<field name="account_id"/>
+            			<field name="journal_id"/>
+            			<field name="date"/>
+            		</group>
+            	</search>
+            </field>
+        </record>
         <record id="action_account_analytic_line_form" model="ir.actions.act_window">
             <field name="name">Analytic Entries</field>
             <field name="type">ir.actions.act_window</field>
@@ -169,6 +195,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('account_id','child_of',[active_id])]</field>
             <field name="context">{'account_id':active_id}</field>
+            <field name="search_view_id" ref="view_account_analytic_line_filter"/>
         </record>
         <record id="ir_open_account_analytic_account" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 09dbe583538..7bc40746f45 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -142,7 +142,10 @@
                		<field name="id" select='1' widget="char" size="16"/>
                		<field name="section_id" select='1'/>
                		<field name="category2_id" string="Version" select='1'/>
-               		<field name="user_id" select='1'/>
+               		<field name="user_id" select="1" widget="selection">
+                       	<filter icon="terp-crm" domain="[('user_id','=',uid)]" help="Bugs assigned to me"/>
+                       	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="Bugs assigned to my department"/>
+                    </field>
                	</group>
             </search>
          </field>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 8268c9cbbce..041e38da5fe 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -166,7 +166,10 @@
 	               		<field name="section_id" select='1'/>
 	               		<field name="partner_id" string="Candidate Name" select='1'/>
 	               		<field name="email_from" select='1'/>
-	               		<field name="user_id" select='1'/>
+	               		<field name="user_id" select="1" widget="selection">
+                        	<filter icon="terp-crm" domain="[('user_id','=',uid)]" help="My Jobs"/>
+                        	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My Departments Jobs"/>
+                        </field>
 	               		<field name="categ_id" string="Applied Job" select="1"/>
 					</group>
                </search>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 61c85bf97a4..fdb91674de0 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -178,7 +178,10 @@
                		<field name="section_id" select='1'/>
                		<field name="partner_id" select='1'/>
                		<field name="email_from" select='1'/>
-               		<field name="user_id" select='1'/>
+               		<field name="user_id" select="1" widget="selection">
+                       	<filter icon="terp-crm" domain="[('user_id','=',uid)]" help="My Prospects"/>
+                       	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My Departments Prospects"/>
+                    </field>
                </group>
            </search>
         </field>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 1e0985577cf..33b77931280 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -161,7 +161,10 @@
 	               		<separator orientation="vertical"/>
 	               		<field name="section_id" select='1'/>
 	               		<field name="partner_id" select='1'/>
-	               		<field name="user_id" select='1'/>
+	               		<field name="user_id" select="1" widget="selection">
+                        	<filter icon="terp-crm" domain="[('user_id','=',uid)]" help="My Meetings"/>
+                        	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My Departments Meetings"/>
+                        </field>
 	               	</group>
                 </search>
         	</field>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 50b724796e6..13f089f8d55 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -159,7 +159,10 @@
                		<field name="section_id" select='1'/>
                		<field name="partner_id" select='1'/>
                		<field name="email_from" select='1'/>
-               		<field name="user_id" select='1'/>
+               		<field name="user_id" select="1" widget="selection">
+                      	<filter icon="terp-crm" domain="[('user_id','=',uid)]" help="My Opportunities"/>
+                      	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My Departments Opportunities"/>
+                    </field>
                	</group>
            </search>
         </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 492f1c1ea34..7fd13872a95 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -802,6 +802,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
+            <field name="filter" eval="True"/>
         </record>
         <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended_menu"/>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2ec9db07170..74caba61a6a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -233,7 +233,10 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="partner_id" select="1"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1" widget="selection">
+                        	<filter icon="terp-sale" domain="[('user_id','=',uid)]" help="My Sale Orders"/>
+                        	<filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
+                        </field>
                         <field name="date_order" select="1"/>
                    </group>
                </search>

From b88c9002b9e637bb2171e4de30e3293548471fd3 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 23 Oct 2009 18:15:01 +0530
Subject: [PATCH 3/7] [REF]: Modified the views of project and tasks as in
 stable

bzr revid: uco@tinyerp.co.in-20091023124501-3m9u5m5u3aab0bl0
---
 addons/project/project_view.xml         | 18 ++++-----------
 addons/project_gtd/project_gtd_view.xml | 29 ++++++++++++++++++-------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3a4ca9e46dd..f347bbc93da 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -12,13 +12,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project">
-                    <group colspan="4" col="2">
+                    <group colspan="6" col="6">
                         <field name="name" select="1"/>
                         <field name="parent_id"/>
-                    </group>
-                    <group colspan="4" col="4">
-                        <field name="date_start"/>                        
                         <field name="manager" select="1"/>
+                        <field name="date_start"/>                        
                         <field name="date_end"/>
                         <field name="progress_rate" widget="progressbar"/>
                     </group>
@@ -304,14 +302,12 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Task edition">
-                    <group colspan="4" col="2">
+                    <group colspan="6" col="6">
                         <field name="name" select="1"/>
                         <field name="project_id" required="1" select="1"/>
-                    </group>
-                    <group colspan="4" col="4">
+						<field name="total_hours" widget="float_time"/>
                         <field name="date_deadline" select="2"/>
                         <field name="user_id" select="1"/>
-                        <field name="total_hours" widget="float_time"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -406,10 +402,7 @@
                     <field name="progress" widget="progressbar"/>
                     <field name="priority"/>
                     <field name="state"/>
-                    <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent" help="For changing to draft state"/>
                     <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state"/>
-                    <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks"/>
-                    <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause" help="For changing to pending state"/>
                     <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
                     <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
@@ -433,10 +426,7 @@
                     <field name="progress" widget="progressbar"/>
                     <field name="priority"/>
                     <field name="state"/>
-                    <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent" help="For changing to draft state"/>
                     <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state"/>
-                    <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks"/>
-                    <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause" help="For changing to pending state"/>
                     <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
                     <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 7ce0ede6a20..704dada01fa 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -199,20 +199,33 @@
             </field>
      	</record>
 
+	<record model="ir.ui.view" id="project_task_tree">
+        <field name="name">project.task.tree.timebox</field>
+        <field name="model">project.task</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="project.view_task_tree2" />
+        <field name="arch" type="xml">
+        	<field name="project_id" position="after">
+        		<field name="timebox_id"/>
+        		<button name="next_timebox" string="Next Timebox" type="object" icon="gtk-indent" attrs="{'invisible':[('timebox_id.type','=','other')]}"/>
+                <button name="prev_timebox" string="Previous Timebox" type="object" icon="gtk-indent" attrs="{'invisible':[('timebox_id.type','=','daily')]}"/>
+        	</field>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="project_task">
         <field name="name">project.task.form.timebox</field>
         <field name="model">project.task</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
-            <field name="progress" position="after">
-                <newline/>
-                <separator string="Getting Things Done" colspan="6"/>
-                <newline/>
-                <field name="context_id" select="2" />
-                <field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
-                <newline/>
-            </field>
+            <notebook>
+                <page string="TimeBox Configuration" position="inside">
+                	<separator string="Getting Things Done" colspan="4"/>
+                	<field name="context_id" select="2"/>
+               	 	<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
+                </page>
+             </notebook>
         </field>
     </record>
 

From 19c6bf3cbf9c418ef8f4c3664582e8a20fbf6749 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 27 Oct 2009 11:53:53 +0530
Subject: [PATCH 4/7] [FIX] osv_memory object search method: now it will accept
 id as domain with its action

bzr revid: mra@tinyerp.com-20091027062353-jf4yzdsdnit1rvsw
---
 bin/osv/orm.py | 169 +++++++++++++++++++++++++------------------------
 1 file changed, 85 insertions(+), 84 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 1767de14101..d717caf2bbc 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -196,8 +196,8 @@ class browse_record(object):
                 if not lang_obj_ids:
                     raise Exception(_('Language with code "%s" is not defined in your system !\nDefine it through the Administration menu.') % (lang,))
                 lang_obj = self.pool.get('res.lang').browse(self._cr, self._uid,lang_obj_ids[0])
-                                
-                for n, f in ffields:    
+
+                for n, f in ffields:
                     if f._type in self._fields_process:
                         for d in datas:
                             d[n] = self._fields_process[f._type](d[n])
@@ -444,28 +444,28 @@ class orm_template(object):
             return browse_null()
 
     def __export_row(self, cr, uid, row, fields, context=None):
-        
+
         def check_type(field_type):
             if field_type == 'float':
                 return 0.0
             elif field_type == 'integer':
                 return 0
-            elif field_type == 'boolean':   
-                return False                                
+            elif field_type == 'boolean':
+                return False
             return ''
-        
+
         lines = []
         data = map(lambda x: '', range(len(fields)))
         done = []
         for fpos in range(len(fields)):
-            f = fields[fpos]            
+            f = fields[fpos]
             if f:
                 r = row
                 i = 0
                 while i < len(f):
                     if f[i] == 'db_id':
-                        r = r['id']                        
-                    elif f[i] == 'id':                        
+                        r = r['id']
+                    elif f[i] == 'id':
                         model_data = self.pool.get('ir.model.data')
                         data_ids = model_data.search(cr, uid, [('model','=',r._table_name),('res_id','=',r['id'])])
                         if len(data_ids):
@@ -477,13 +477,13 @@ class orm_template(object):
                         else:
                             break
                     else:
-                        r = r[f[i]]                   
+                        r = r[f[i]]
                     if not r:
-                        if f[i] in self._columns: 
+                        if f[i] in self._columns:
                             r = check_type(self._columns[f[i]]._type)
                         elif f[i] in self._inherit_fields:
-                            r = check_type(self._inherit_fields[f[i]][2]._type)                        
-                        data[fpos] = r                        
+                            r = check_type(self._inherit_fields[f[i]][2]._type)
+                        data[fpos] = r
                         break
                     if isinstance(r, (browse_record_list, list)):
                         first = True
@@ -491,10 +491,10 @@ class orm_template(object):
                                 or [], fields)
                         if fields2 in done:
                             break
-                        done.append(fields2)                        
+                        done.append(fields2)
                         for row2 in r:
                             lines2 = self.__export_row(cr, uid, row2, fields2,
-                                    context)                            
+                                    context)
                             if first:
                                 for fpos2 in range(len(fields)):
                                     if lines2 and lines2[0][fpos2]:
@@ -510,7 +510,7 @@ class orm_template(object):
                                 lines += lines2[1:]
                                 first = False
                             else:
-                                lines += lines2                            
+                                lines += lines2
                         break
                     i += 1
                 if i == len(f):
@@ -522,14 +522,14 @@ class orm_template(object):
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
         if not context:
             context = {}
-        imp_comp = context.get('import_comp',False)        
+        imp_comp = context.get('import_comp',False)
         cols = self._columns.copy()
         for f in self._inherit_fields:
-            cols.update({f: self._inherit_fields[f][2]})        
+            cols.update({f: self._inherit_fields[f][2]})
         fields_to_export = map(lambda x: x.split('/'), fields_to_export)
-        fields_export = fields_to_export+[]        
-        warning = ''  
-        warning_fields = []      
+        fields_export = fields_to_export+[]
+        warning = ''
+        warning_fields = []
         for field in fields_export:
             if imp_comp and len(field)>1:
                 warning_fields.append('/'.join(map(lambda x:x in cols and cols[x].string or x,field)))
@@ -537,11 +537,11 @@ class orm_template(object):
                 if imp_comp and cols.get(field and field[0],False):
                     if ((isinstance(cols[field[0]], fields.function) and not cols[field[0]].store) \
                                      or isinstance(cols[field[0]], fields.related)\
-                                     or isinstance(cols[field[0]], fields.one2many)):                        
+                                     or isinstance(cols[field[0]], fields.one2many)):
                         warning_fields.append('/'.join(map(lambda x:x in cols and cols[x].string or x,field)))
         datas = []
         if imp_comp and len(warning_fields):
-            warning = 'Following columns cannot be exported since you select to be import compatible.\n%s' %('\n'.join(warning_fields))        
+            warning = 'Following columns cannot be exported since you select to be import compatible.\n%s' %('\n'.join(warning_fields))
             cr.rollback()
             return {'warning' : warning}
         for row in self.browse(cr, uid, ids, context):
@@ -554,14 +554,14 @@ class orm_template(object):
         fields = map(lambda x: x.split('/'), fields)
         logger = netsvc.Logger()
         ir_model_data_obj = self.pool.get('ir.model.data')
-        
+
         def _check_db_id(self, model_name, db_id):
             obj_model = self.pool.get(model_name)
             ids = obj_model.search(cr, uid, [('id','=',int(db_id))])
             if not len(ids):
                 raise Exception(_("Database ID doesn't exist: %s : %s") %(model_name, db_id))
             return True
-            
+
         def process_liness(self, datas, prefix, current_module, model_name, fields_def, position=0):
             line = datas[position]
             row = {}
@@ -581,25 +581,25 @@ class orm_template(object):
                     raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
                 if not line[i]:
                     continue
-                    
+
                 field = fields[i]
                 if prefix and not prefix[0] in field:
                     continue
-                
+
                 if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':db_id'):
                         # Database ID
                         res = False
                         if line[i]:
                             field_name = field[0].split(':')[0]
-                            model_rel =  fields_def[field_name]['relation']                            
-                            
+                            model_rel =  fields_def[field_name]['relation']
+
                             if fields_def[field[len(prefix)][:-6]]['type']=='many2many':
                                 res_id = []
                                 for db_id in line[i].split(config.get('csv_internal_sep')):
                                     try:
                                         _check_db_id(self, model_rel, db_id)
                                         res_id.append(db_id)
-                                    except Exception,e:                                    
+                                    except Exception,e:
                                         warning += [tools.exception_to_unicode(e)]
                                         logger.notifyChannel("import", netsvc.LOG_ERROR,
                                                   tools.exception_to_unicode(e))
@@ -609,10 +609,10 @@ class orm_template(object):
                                 try:
                                     _check_db_id(self, model_rel, line[i])
                                     res = line[i]
-                                except Exception,e:                                    
+                                except Exception,e:
                                     warning += [tools.exception_to_unicode(e)]
                                     logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                              tools.exception_to_unicode(e))                        
+                                              tools.exception_to_unicode(e))
                         row[field_name] = res or False
                         continue
 
@@ -625,7 +625,7 @@ class orm_template(object):
                                 if '.' in word:
                                     module, xml_id = word.rsplit('.', 1)
                                 else:
-                                    module, xml_id = current_module, word                                
+                                    module, xml_id = current_module, word
                                 id = ir_model_data_obj._get_id(cr, uid, module,
                                         xml_id)
                                 res_id2 = ir_model_data_obj.read(cr, uid, [id],
@@ -638,7 +638,7 @@ class orm_template(object):
                             if '.' in line[i]:
                                 module, xml_id = line[i].rsplit('.', 1)
                             else:
-                                module, xml_id = current_module, line[i]                            
+                                module, xml_id = current_module, line[i]
                             id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
                             res_id = ir_model_data_obj.read(cr, uid, [id],
                                     ['res_id'])[0]['res_id']
@@ -651,31 +651,31 @@ class orm_template(object):
                     continue
                 if (len(field) == len(prefix)+1) and \
                         (prefix == field[0:len(prefix)]):
-                    if field[len(prefix)] == "id":  
-                        # XML ID                         
-                        db_id = False                 
-                        is_xml_id = data_id = line[i] 
+                    if field[len(prefix)] == "id":
+                        # XML ID
+                        db_id = False
+                        is_xml_id = data_id = line[i]
                         d =  data_id.split('.')
                         module = len(d)>1 and d[0] or ''
-                        name = len(d)>1 and d[1] or d[0] 
-                        data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('name','=',name)])                    
+                        name = len(d)>1 and d[1] or d[0]
+                        data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('name','=',name)])
                         if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['res_id'])[0]                                                
-                            db_id = d['res_id']                       
+                            d = ir_model_data_obj.read(cr, uid, data_ids, ['res_id'])[0]
+                            db_id = d['res_id']
                         if is_db_id and not db_id:
-                           data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('res_id','=',is_db_id)])                     
+                           data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('res_id','=',is_db_id)])
                            if not len(data_ids):
-                               ir_model_data_obj.create(cr, uid, {'module':module, 'model':model_name, 'name':name, 'res_id':is_db_id}) 
-                               db_id = is_db_id 
-                        if is_db_id and int(db_id) != int(is_db_id):                        
+                               ir_model_data_obj.create(cr, uid, {'module':module, 'model':model_name, 'name':name, 'res_id':is_db_id})
+                               db_id = is_db_id
+                        if is_db_id and int(db_id) != int(is_db_id):
                             warning += [_("Id is not the same than existing one: %s")%(is_db_id)]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
                                     _("Id is not the same than existing one: %s")%(is_db_id))
                         continue
 
                     if field[len(prefix)] == "db_id":
-                        # Database ID                        
-                        try:                            
+                        # Database ID
+                        try:
                             _check_db_id(self, model_name, line[i])
                             data_res_id = is_db_id = int(line[i])
                         except Exception,e:
@@ -685,19 +685,19 @@ class orm_template(object):
                             continue
                         data_ids = ir_model_data_obj.search(cr, uid, [('model','=',model_name),('res_id','=',line[i])])
                         if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name','module'])[0]                                                
-                            data_id = d['name']       
+                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name','module'])[0]
+                            data_id = d['name']
                             if d['module']:
                                 data_id = '%s.%s'%(d['module'],d['name'])
                             else:
                                 data_id = d['name']
                         if is_xml_id and not data_id:
-                            data_id = is_xml_id                                     
-                        if is_xml_id and is_xml_id!=data_id:  
+                            data_id = is_xml_id
+                        if is_xml_id and is_xml_id!=data_id:
                             warning += [_("Id is not the same than existing one: %s")%(line[i])]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
                                     _("Id is not the same than existing one: %s")%(line[i]))
-                                                           
+
                         continue
                     if fields_def[field[len(prefix)]]['type'] == 'integer':
                         res = line[i] and int(line[i])
@@ -721,9 +721,9 @@ class orm_template(object):
                             logger.notifyChannel("import", netsvc.LOG_WARNING,
                                     _("key '%s' not found in selection field '%s'") % \
                                             (line[i], field[len(prefix)]))
-                            
+
                             warning += [_("Key/value '%s' not found in selection field '%s'")%(line[i],field[len(prefix)])]
-                            
+
                     elif fields_def[field[len(prefix)]]['type']=='many2one':
                         res = False
                         if line[i]:
@@ -766,13 +766,13 @@ class orm_template(object):
                 relation_obj = self.pool.get(fields_def[field]['relation'])
                 newfd = relation_obj.fields_get(
                         cr, uid, context=context)
-                res = process_liness(self, datas, prefix + [field], current_module, relation_obj._name, newfd, position)                              
-                (newrow, max2, w2, translate2, data_id2, data_res_id2) = res                  
+                res = process_liness(self, datas, prefix + [field], current_module, relation_obj._name, newfd, position)
+                (newrow, max2, w2, translate2, data_id2, data_res_id2) = res
                 nbrmax = max(nbrmax, max2)
-                warning = warning + w2         
-                reduce(lambda x, y: x and y, newrow)       
+                warning = warning + w2
+                reduce(lambda x, y: x and y, newrow)
                 row[field] = (reduce(lambda x, y: x or y, newrow.values()) and \
-                        [(0, 0, newrow)]) or []                
+                        [(0, 0, newrow)]) or []
                 i = max2
                 while (position+i)<len(datas):
                     ok = True
@@ -787,7 +787,7 @@ class orm_template(object):
                             self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
                     warning = warning+w2
                     if reduce(lambda x, y: x or y, newrow.values()):
-                        row[field].append((0, 0, newrow))                    
+                        row[field].append((0, 0, newrow))
                     i += max2
                     nbrmax = max(nbrmax, i)
 
@@ -812,10 +812,10 @@ class orm_template(object):
             #try:
             (res, other, warning, translate, data_id, res_id) = \
                     process_liness(self, datas, [], current_module, self._name, fields_def)
-            if len(warning):                        
+            if len(warning):
                 cr.rollback()
                 return (-1, res, 'Line ' + str(counter) +' : ' + '!\n'.join(warning), '')
-            
+
             try:
                 id = ir_model_data_obj._update(cr, uid, self._name,
                      current_module, res, xml_id=data_id, mode=mode,
@@ -829,7 +829,7 @@ class orm_template(object):
                             msg = self.pool._sql_error[key]
                             break
                     return (-1, res,'Line ' + str(counter) +' : ' + msg,'' )
-                
+
             for lang in translate:
                 context2 = context.copy()
                 context2['lang'] = lang
@@ -1011,7 +1011,7 @@ class orm_template(object):
                         dom = []
                         if column._domain and not isinstance(column._domain, (str, unicode)):
                             dom = column._domain
-                        
+
                         attrs['selection'] = self.pool.get(relation).name_search(cr, user, '', dom, context=context)
                         if (node.get('required') and not int(node.get('required'))) or not column.required:
                             attrs['selection'].append((False,''))
@@ -1069,15 +1069,15 @@ class orm_template(object):
             if user != 1:   # admin user has all roles
                 user_roles = usersobj.read(cr, user, [user], ['roles_id'])[0]['roles_id']
                 # TODO handle the case of more than one workflow for a model
-                cr.execute("""SELECT DISTINCT t.role_id 
-                                FROM wkf 
-                          INNER JOIN wkf_activity a ON a.wkf_id = wkf.id 
+                cr.execute("""SELECT DISTINCT t.role_id
+                                FROM wkf
+                          INNER JOIN wkf_activity a ON a.wkf_id = wkf.id
                           INNER JOIN wkf_transition t ON (t.act_to = a.id)
                                WHERE wkf.osv = %s
                                  AND t.signal = %s
                            """, (self._name, button.get('name'),))
                 roles = cr.fetchall()
-                
+
                 # draft -> valid = signal_next (role X)
                 # draft -> cancel = signal_cancel (no role)
                 #
@@ -1086,15 +1086,15 @@ class orm_template(object):
                 #
                 # running -> done = signal_next (role Z)
                 # running -> cancel = signal_cancel (role Z)
-                
 
-                # As we don't know the object state, in this scenario, 
+
+                # As we don't know the object state, in this scenario,
                 #   the button "signal_cancel" will be always shown as there is no restriction to cancel in draft
                 #   the button "signal_next" will be show if the user has any of the roles (X Y or Z)
                 # The verification will be made later in workflow process...
                 if roles:
                     can_click = any((not role) or rolesobj.check(cr, user, user_roles, role) for (role,) in roles)
-            
+
             button.set('readonly', str(int(not can_click)))
 
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
@@ -1350,7 +1350,7 @@ class orm_template(object):
                     act_id = int(data_menu.split(',')[1])
                     if act_id:
                         data_action = self.pool.get('ir.actions.act_window').browse(cr, user, [act_id], context)[0]
-                        result['submenu'] = hasattr(data_action,'menus') and data_action.menus or False        
+                        result['submenu'] = hasattr(data_action,'menus') and data_action.menus or False
         if toolbar:
             def clean(x):
                 x = x[2]
@@ -1484,7 +1484,7 @@ class orm_memory(orm_template):
             self.unlink(cr, uid, ids)
         return True
 
-    def read(self, cr, user, ids, fields_to_read=None, context=None, load='_classic_read'):        
+    def read(self, cr, user, ids, fields_to_read=None, context=None, load='_classic_read'):
         if not context:
             context = {}
         if not fields_to_read:
@@ -1652,6 +1652,7 @@ class orm_memory(orm_template):
         if result:
             for id, data in self.datas.items():
                 counter=counter+1
+                data['id']  = id
                 if limit and (counter >int(limit)):
                     break
                 f = True
@@ -1699,7 +1700,7 @@ class orm_memory(orm_template):
     def _check_removed_columns(self, cr, log=False):
         # nothing to check in memory...
         pass
-    
+
     def exists(self, cr, uid, id, context=None):
         return id in self.datas
 
@@ -2437,8 +2438,8 @@ class orm(orm_template):
         self.pool.get('ir.model.access').check(cr, uid, self._name, 'unlink', context=context)
 
         properties = self.pool.get('ir.property')
-        domain = [('res_id', '=', False), 
-                  ('value', 'in', ['%s,%s' % (self._name, i) for i in ids]), 
+        domain = [('res_id', '=', False),
+                  ('value', 'in', ['%s,%s' % (self._name, i) for i in ids]),
                  ]
         if properties.search(cr, uid, domain, context=context):
             raise except_orm(_('Error'), _('Unable to delete this document because it is used as a default property'))
@@ -2599,7 +2600,7 @@ class orm(orm_template):
                 else:
                     cr.execute('update "'+self._table+'" set '+string.join(upd0, ',')+' ' \
                             'where id in ('+ids_str+')', upd1)
-            
+
             if totranslate:
                 for f in direct:
                     if self._columns[f].translate:
@@ -2760,9 +2761,9 @@ class orm(orm_template):
             upd1 += ',%s'
             upd2.append(id)
 
-        #Start : Set bool fields to be False if they are not touched(to make search more powerful) 
+        #Start : Set bool fields to be False if they are not touched(to make search more powerful)
         bool_fields = [x for x in self._columns.keys() if self._columns[x]._type=='boolean']
-        
+
         for bool_field in bool_fields:
             if bool_field not in vals:
                 vals[bool_field] = False
@@ -2849,7 +2850,7 @@ class orm(orm_template):
                 cr.execute('update '+self._table+' set parent_left=parent_left+2 where parent_left>%s', (pleft,))
                 cr.execute('update '+self._table+' set parent_right=parent_right+2 where parent_right>%s', (pleft,))
                 cr.execute('update '+self._table+' set parent_left=%s,parent_right=%s where id=%s', (pleft+1,pleft+2,id_new))
-                
+
         # default element in context must be remove when call a one2many or many2many
         rel_context = context.copy()
         for c in context.items():
@@ -2928,7 +2929,7 @@ class orm(orm_template):
                                 if i[1] in fields:
                                     field_dict[r[0]].append(i[1])
                                     if not field_flag:
-                                        field_flag = True        
+                                        field_flag = True
         todo = {}
         keys = []
         for f in fields:
@@ -2944,7 +2945,7 @@ class orm(orm_template):
                     if field_flag:
                         for f in value.keys():
                             if f in field_dict[id]:
-                                value.pop(f)                    
+                                value.pop(f)
                     upd0 = []
                     upd1 = []
                     for v in value:
@@ -2968,7 +2969,7 @@ class orm(orm_template):
                         if field_flag:
                             if r in field_dict.keys():
                                 if f in field_dict[r]:
-                                    result.pop(r)                    
+                                    result.pop(r)
                     for id,value in result.items():
                         if self._columns[f]._type in ('many2one', 'one2one'):
                             try:

From b69f95fa60840cd004fae628899aff7abc2c7530 Mon Sep 17 00:00:00 2001
From: "RPA(OpenERP)" <>
Date: Wed, 28 Oct 2009 11:52:20 +0530
Subject: [PATCH 5/7] Added functionality to prevent database list while server
 hase list_db=False

bzr revid: hda@tinyerp.com-20091028062220-11i2s85pqrfjs4c2
---
 bin/service/web_services.py | 3 +++
 bin/tools/config.py         | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 95d080c40af..b89fa829266 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -298,6 +298,9 @@ class db(netsvc.Service):
         db = sql_db.db_connect('template1')
         cr = db.cursor()
         try:
+            list_db = tools.config["list_db"]
+            if list_db == 'False':
+                return []
             try:
                 db_user = tools.config["db_user"]
                 if not db_user and os.name == 'posix':
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 7085353607f..f9d381a5b72 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -79,6 +79,7 @@ class configmanager(object):
             'assert_exit_level': logging.WARNING, # level above which a failed assert will be raise
             'cache_timeout': 100000,
             'login_message': False,
+            'list_db' : True,
         }
 
         hasSSL = check_ssl()
@@ -156,6 +157,7 @@ class configmanager(object):
         group.add_option("--db_port", dest="db_port", help="specify the database port", type="int")
         group.add_option("--db_maxconn", dest="db_maxconn", default='64',
                          help="specify the the maximum number of physical connections to posgresql")
+        group.add_option("--list_db", dest="list_db", default=False, help="This option hides Database list for security purpose:\n \'False\' value disables listing of Databases")
         group.add_option("-P", "--import-partial", dest="import_partial",
                          help="Use this for big data importation, if it crashes you will be able to continue at the current state. Provide a filename to store intermediate importation states.", default=False)
         parser.add_option_group(group)
@@ -216,7 +218,7 @@ class configmanager(object):
             self.options['pidfile'] = False
 
         keys = ['interface', 'port', 'db_name', 'db_user', 'db_password', 'db_host',
-                'db_port', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout',
+                'db_port', 'list_db', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout',
                 'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 'price_accuracy',
                 'netinterface', 'netport', 'db_maxconn', 'import_partial', 'addons_path']
 

From f0b5bc678c374076b8d286fa9479bd4160dae0df Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 28 Oct 2009 15:43:32 +0530
Subject: [PATCH 6/7] [REF]: Small Modifications

bzr revid: uco@tinyerp.co.in-20091028101332-2h2vz1a02pk1s4ph
---
 addons/account/account_move_line.py       | 13 ++++++++++++-
 addons/account/account_view.xml           |  4 ++--
 addons/base_contact/base_contact_view.xml |  8 +++-----
 addons/product/product_view.xml           |  3 +--
 addons/sale/sale.py                       |  3 ++-
 addons/sale/sale_view.xml                 | 12 ++++--------
 addons/stock/product_view.xml             |  3 ++-
 7 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index edb7ad6a5e7..74a17873af6 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -283,6 +283,17 @@ class account_move_line(osv.osv):
                 result.append((line.id, line.name))
         return result
 
+    def _balance_search(self, cursor, user, obj, name, args):
+        if not len(args):
+            return []
+        where = ' and '.join(map(lambda x: '(sum(debit-credit)'+x[1]+str(x[2])+')',args))
+        cursor.execute('select id, sum(debit-credit) from account_move_line \
+                     group by id,debit,credit having '+where)
+        res = cursor.fetchall()
+        if not len(res):
+            return [('id', '=', '0')]
+        return [('id', 'in', [x[0] for x in res])]
+    
     def _invoice_search(self, cursor, user, obj, name, args):
         if not len(args):
             return []
@@ -366,7 +377,7 @@ class account_move_line(osv.osv):
         'date_created': fields.date('Creation date'),
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
-        'balance': fields.function(_balance, method=True, string='Balance'),
+        'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
         'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 21806398e29..12171ab3191 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -800,10 +800,10 @@
                         <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
 						<separator orientation="vertical"/>
 						<field name="date" select='1'/>
+						<field name="invoice" select='1'/>
 						<field name="account_id" select='1'/>
 						<field name="partner_id" select='1'/>
-						<field name="debit" select='1'/>
-						<field name="credit" select='1'/>
+						<field name="balance" string="Debit/Credit" select='1'/>
                 	</group>
                 </search>
             </field>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index da7f70b57e3..75c14f88a4d 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -176,11 +176,9 @@
 	    <field name="inherit_id" ref="base.view_res_partner_filter"/>
 	    <field name="arch" type="xml">
 	        <search string="Search Partner">
-	        	<group col='6' colspan='4'>
-		        	<field name="address" mode="tree,form" select="1">
-		                <field name="job_ids" select="1"/>
-			        </field>
-			    </group>
+	        	<field name="address" mode="tree,form" select="1" colspan="4">
+	                <field name="job_ids" select="1" colspan="4"/>
+		        </field>
 	       </search>
 	    </field>
     </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 040b015768f..9987c9898b6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -21,11 +21,10 @@
 		               	<filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
 	                  	<field name="name" select="1"/>
 	                  	<field name="default_code" select="1"/>
+	                  	<field name="categ_id" select="1" widget="selection"/>
 	               </group>
 	               <newline/>
 	               <group col='8' colspan='4'>
-	               		<field name="categ_id" select="1" widget="selection"/>
-	                  	<separator orientation="vertical"/>
 	                  	<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
 	                </group>
                 </search>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 803d080faa5..c17c4b3d8e4 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -765,7 +765,8 @@ class sale_order_line(osv.osv):
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight'),
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'Status', required=True, readonly=True),
-        'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer')
+        'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
+        'salesman_id':fields.related('order_id','user_id',type='many2one',relation='res.users',string='Salesman'),
     }
     _order = 'sequence, id'
     _defaults = {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 74caba61a6a..94edd758de1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -260,7 +260,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
@@ -271,7 +270,6 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
@@ -317,7 +315,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2" groups="base.group_extended_menu"/>
@@ -330,7 +327,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1" groups="base.group_extended_menu"/>
@@ -342,7 +338,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree" groups="base.group_extended_menu"/>
@@ -354,7 +349,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree" groups="base.group_extended_menu"/>
@@ -366,7 +360,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2" groups="base.group_extended_menu"/>
@@ -378,7 +371,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_extended_menu"/>
@@ -486,6 +478,10 @@
 						<field name="order_id" select="1"/>
                         <field name="order_partner_id" select="1"/>
                         <field name="product_id" select="1"/>
+                        <field name="salesman_id" select="1" widget="selection">
+                        	<filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        	<filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                        </field>
 					</group>
 				</search>
 			</field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 92fe8d54ea6..caac7a748a0 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,8 +8,9 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-               	<field name="categ_id" select="1" widget="selection" position="after">
+               	<field name="pricelist_id" select="1" widget="selection" position="before">
                		<field name="warehouse_id" select="1" widget="selection" context="{'warehouse': self}" />
+               		<separator orientation="vertical"/>
                	</field>
             </field>
         </record>

From d6e310d7871b23ad8a715b96e051fe44e33357ec Mon Sep 17 00:00:00 2001
From: "Ferdinand(ChriCar)" <>
Date: Wed, 28 Oct 2009 18:18:10 +0530
Subject: [PATCH 7/7] Better Error message on service denial

lp bug: https://launchpad.net/bugs/462080 fixed

bzr revid: hda@tinyerp.com-20091028124810-l2n6uqg1laqmc0er
---
 bin/netsvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index 387541ad55c..d10484e0435 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -235,7 +235,7 @@ class OpenERPDispatcher:
 
     def dispatch(self, service_name, method, params):
         if service_name not in GROUPS['web-services']:
-            raise Exception('AccessDenied')
+            raise Exception('Access Denied for Service :'+service_name)
         try:
             self.log('service', service_name)
             self.log('method', method)