diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5e20c715342..07f7bf1c49e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -324,18 +324,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                   <group col='6' colspan='4'>
-                       <field name="type">
-                           <filter icon="terp-account" domain="[('type','=','out_invoice')]" help="Customer Invoices"/>
-                           <filter icon="terp-account" domain="[('type','=','in_invoice')]" help="Supplier Invoices"/>
-                       </field>
-                       <separator orientation="vertical"/>
-                       <field name="state">
-                           <filter icon="terp-account" domain="[('state','=','open')]" help="Open Invoices"/>
-                           <filter icon="terp-account" domain="[('state','=','paid')]" help="Paid Invoices"/>
-                       </field>
-                       <separator orientation="vertical"/>
-                       <field name="name" select='1'/>
+                   <group col="10" colspan="4">
+                   		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Invoices"/>
+                        <filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
+						<separator orientation="vertical"/>
+						<field name="number" select='1'/>
+						<field name="partner_id" select='1'/>
+						<field name="amount_total" string="Price" select='1'/>
+						<field name="origin" select='1'/>
                    </group>
                </search>
             </field>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index f2df6dc139e..df2196585b2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -282,6 +282,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: '(abs(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 []
@@ -365,7 +376,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 7dcfcc95475..d79ac0fd8ca 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -788,6 +788,25 @@
                 </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="balance" string="Debit/Credit" select='1'/>
+                	</group>
+                </search>
+            </field>
+        </record>
 
         <record id="action_move_line_select" model="ir.actions.act_window">
             <field name="name">Entry Lines</field>
@@ -795,6 +814,18 @@
             <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_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>
 
         <!--
@@ -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"/>
@@ -910,6 +961,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>            
         </record>
 
         <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
@@ -921,6 +973,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 ef557688d99..3f28086f54b 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"/>
@@ -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" select="1"/>
+                        <field name="journal_id" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <field name="date" select="1"/>
+            		</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/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
index e868e6bbd9c..09a90955220 100644
--- a/addons/account/project/wizard/wizard_account_analytic_line.py
+++ b/addons/account/project/wizard/wizard_account_analytic_line.py
@@ -34,13 +34,18 @@ def _action_open_window(self, cr, uid, data, context):
         domain = [('date','>=',from_date)]
     elif to_date:
         domain = [('date','<=',to_date)]
+    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
+    result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
+    id = mod_obj.read(cr, uid, result, ['res_id'])        
+
     return {
         'name': _('Analytic Entries'),
         'view_type': 'form',
         "view_mode": 'tree,form',
         'res_model': 'account.analytic.line',
         'type': 'ir.actions.act_window',
-        'domain': domain}
+        'domain': domain,
+        'search_view_id': id['res_id'],}
 
 
 class account_analytic_line(wizard.interface):
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
index 7a59a1188bc..b6a598416bd 100644
--- a/addons/account/wizard/wizard_journal.py
+++ b/addons/account/wizard/wizard_journal.py
@@ -64,6 +64,10 @@ def _action_open_window(self, cr, uid, data, context):
     ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
     jp = jp.browse(cr, uid, ids, context=context)[0]
     name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
+
+    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
+    result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
+    id = mod_obj.read(cr, uid, result, ['res_id'])    
     return {
         'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (form['journal_id'],form['period_id']),
         'name': name,
@@ -72,7 +76,8 @@ def _action_open_window(self, cr, uid, data, context):
         'res_model': 'account.move.line',
         'view_id': view_res,
         'context': "{'journal_id':%d, 'period_id':%d}" % (form['journal_id'],form['period_id']),
-        'type': 'ir.actions.act_window'
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']        
     }
 
 class wiz_journal(wizard.interface):
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 58650e3eed7..9fb957258be 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -33,14 +33,14 @@
                         <newline/>
                         <separator string="General Information" colspan="4"/>
                        <group string="Partner" colspan="2" col="2">
-                           <field name="partner_id" invisible="1" select="2"/>
-                           <field name="title" select="1" />
+                           <field name="partner_id" invisible="1" select="1"/>
+                           <field name="title" select="1"/>
                            <field name="function_id" invisible="1" select="2"/>
                            <field name="lang_id"/>
                            <field name="active"/>
                        </group>
                        <group string="Communication" colspan="2" col="2">
-                           <field name="mobile" select="2"/>
+                           <field name="mobile"/>
                            <field name="email"  widget="email"/>
                            <field name="website"/>
                        </group>
@@ -79,7 +79,7 @@
                     </page>
                     <page string="Extra Information">
                         <field name="country_id"/>
-                        <field name="birthdate" select="1" />
+                        <field name="birthdate"/>
                     </page>
                     <page string="Notes">
                         <field name="comment" nolabel="1"/>
@@ -92,12 +92,26 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="view_partner_contact_search">
+        <field name="name">res.partner.contact.search</field>
+        <field name="model">res.partner.contact</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Partner Contact">
+                <field name="name" select="1"/>
+                <field name="first_name" select="1"/>
+                <field name="partner_id" select="1" string="Partner"/>
+            </search>
+        </field>
+    </record>
+    
     <record model="ir.actions.act_window" id="action_partner_contact_form">
         <field name="name">Contacts</field>
         <field name="res_model">res.partner.contact</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_partner_contact_tree"/>
+        <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
     <menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/>
     <menuitem name="Partners/Addresses"  id="base.menu_partner_address_form"/>
@@ -168,6 +182,20 @@
             </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">
+	        	<field name="address" mode="tree,form" select="1">
+	                <field name="job_ids" select="1" string="Contacts" />
+		        </field>
+	       </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 +347,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_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
index 441cb45a0fc..086222c9f25 100644
--- a/addons/crm_configuration/crm_meeting_data.xml
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -5,6 +5,7 @@
     <record model="crm.case.section" id="section_support1">
         <field name="name">Meetings</field>
         <field name="code">Mtngs</field>
+        <field name="calendar">True</field>
     </record>
         <!--    CASE CATEGORY(categ_id)        -->
 
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 6a9bfb93848..c5d8f30a911 100755
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -113,9 +113,6 @@
     </record>
     <menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
 
-    
-
-
     <!-- 
         ALL MEETINGS 
     -->
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index f3795aacdaa..67ed305e864 100755
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -99,21 +99,20 @@
         <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="terp-partner" string="My Meetings" default="1" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
-               </group>
-               <group col="4" colspan="4">
-                   <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Meetings"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Meetings"/>
-                       <filter icon="gtk-media-pause" 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="name" select="1" string="Subject"/>
+	               		<field name="partner_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>
+    	</record>
+	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 2e45b0e8cee..1a70b69ccf7 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -34,8 +34,8 @@
                 <group colspan="4" col="7">
                     <field name="name" string="Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/>
-                    <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                    
+                    <field name="user_id" string="Assigned to" select="2"/> 
+                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>                   
                     <newline/>
                     <field name="date" string="Planned Date"/>
                     <field name="duration"/>
@@ -46,8 +46,6 @@
                                'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
                     </group>
-                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
-                    <label string='' colspan='6' />
                     <button string="Schedule a Phone Call"
                         name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                 </group>
@@ -55,11 +53,14 @@
                 <page string="General">
                     <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1"/>
                     <field name="active" string="Reminder"/>
-                    <field name="partner_id" string="Partner"/>
-                    <field name="partner_address_id" string="Contact"/>
-                    <newline/>
+                    <label string="Partner:" align="1.0"/>
+                    <group colspan="1">
+                        <field name="partner_id" string="Partner" nolabel="1"/>
+                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                        
+                    </group>                        
+                    <field name="partner_address_id" string="Contact"/>                                     
                     <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
+                    <field name="partner_mobile"/>                    
                     <newline/>
                     <field name="som"/>
                     <field name="priority" string="Relevant"/>
@@ -126,8 +127,8 @@
                <group col="4" colspan="2">
              		<field name="name" select='1' string="Subject"/>
                		<field name="user_id" select="1" widget="selection">
-	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Prospects" default="1"/>
-	                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Prospects"/>
+	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
+	                   	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My department's Phonecalls"/>
                    </field>
                    <field name="state" select="1">
                        <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 7e9ff90607d..7c54db176b1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -176,14 +176,15 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                    <group col='6' colspan='4'>
-                       <filter icon="gtk-execute" string="My Timesheet" domain="[('user_id','=',uid)]" separator="1" help="Timesheets Related to Current User"/>
-                        <filter icon="gtk-execute" string="My Departments Timesheet" domain="[('user_id', 'child_of', [uid])]" help="Timesheets Related to Department"/>
                        <field name="state">
                            <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
                            <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                        </field>
                        <field name="name" select='1'/>
-                       <field name="user_id" select="1" widget="selection" />
+                       <field name="user_id" select="1" widget="selection">
+                           <filter icon="gtk-execute" domain="[('user_id','=',uid)]" help="My Timesheet"/>
+                           <filter icon="gtk-execute" domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
+                       </field>                       
                    </group>
                </search>
             </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e5d54196622..b180dbcb076 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" />
 
@@ -784,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/product/product_view.xml b/addons/product/product_view.xml
index 7b55f92dcf8..0e8f53e97f8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -16,10 +16,17 @@
             <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"/>
+	                  	<field name="categ_id" select="1" widget="selection"/>
+	               </group>
+	               <newline/>
+	               <group col='8' colspan='4'>
+	                  	<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+	                </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project/project.py b/addons/project/project.py
index b9488a86cb9..96e86b4153c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -300,6 +300,7 @@ class task(osv.osv):
         'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
+        'manager_id': fields.related('project_id','manager', type='many2one', relation='res.users', string='Project Manager')
     }
     _defaults = {
         'user_id': lambda obj,cr,uid,context: uid,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 48ad064a7d5..792871a6606 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>
@@ -114,13 +112,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>
@@ -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">
@@ -404,12 +400,8 @@
                     <field name="date_deadline"/>
                     <field name="remaining_hours" widget="float_time"/>
                     <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"/>
@@ -431,12 +423,8 @@
                     <field name="date_deadline"/>
                     <field name="remaining_hours" widget="float_time"/>
                     <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"/>
@@ -510,19 +498,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="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
+                        </field>
+                    </group>
+                    <group col="4" colspan="1">
+	                    <field name="user_id" select="1" widget="selection">
+	                        <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute"/>
+	                        <filter domain="[('user_id', 'child_of', [uid])]" help="My Department tasks" icon="gtk-execute" separator="1"/>
+	                        <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
+	                    </field>
                     </group>
                 </search>
             </field>
@@ -657,7 +648,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 d96e70d8460..a58a1d73407 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -1,73 +1,87 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_gtd_context_tree">
-            <field name="name">project.gtd.context.tree</field>
-            <field name="model">project.gtd.context</field>
-            <field name="type">tree</field>            
-            <field name="arch" type="xml">
-                <tree string="Context">
-                    <field name="name"/>
-                    <field name="project_default_id"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_gtd_context_form">
-            <field name="name">project.gtd.context.form</field>
-            <field name="model">project.gtd.context</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Context">
-                    <field name="name"/>
-                    <field name="sequence"/>
-                    <field name="project_default_id"/>
-                </form>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="open_gtd_context_tree">
-            <field name="name">Contexts</field>
-            <field name="res_model">project.gtd.context</field>
-        </record>
+    <record model="ir.ui.view" id="view_gtd_context_tree">
+        <field name="name">project.gtd.context.tree</field>
+        <field name="model">project.gtd.context</field>
+        <field name="type">tree</field>            
+        <field name="arch" type="xml">
+            <tree string="Context">
+                <field name="name"/>
+                <field name="project_default_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_gtd_context_form">
+        <field name="name">project.gtd.context.form</field>
+        <field name="model">project.gtd.context</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Context">
+                <field name="name"/>
+                <field name="sequence"/>
+                <field name="project_default_id"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="open_gtd_context_tree">
+        <field name="name">Contexts</field>
+        <field name="res_model">project.gtd.context</field>
+    </record>
 
-        <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>
-        <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>        
+    <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>        
 
-        <record model="ir.ui.view" id="view_gtd_timebox_tree">
-            <field name="name">project.gtd.timebox.tree</field>
-            <field name="model">project.gtd.timebox</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Timebox">
-                    <field name="sequence"/>
-                    <field name="name"/>                    
-                    <field name="icon"/>
-                </tree>
-            </field>
-        </record>
+    <record model="ir.ui.view" id="view_gtd_timebox_tree">
+        <field name="name">project.gtd.timebox.tree</field>
+        <field name="model">project.gtd.timebox</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Timebox">
+                <field name="sequence"/>
+                <field name="name"/>                    
+                <field name="icon"/>
+            </tree>
+        </field>
+    </record>
 
-        <record model="ir.ui.view" id="view_gtd_timebox_form">
-            <field name="name">project.gtd.timebox.form</field>
-            <field name="model">project.gtd.timebox</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Timeboxes">
-                    <separator string="Timebox Definition" colspan="4"/>
-                    <field name="name"/>
-                    <field name="sequence"/>
-                    <field name="icon"/>
-                </form>
-            </field>
-        </record>
+    <record model="ir.ui.view" id="view_gtd_timebox_form">
+        <field name="name">project.gtd.timebox.form</field>
+        <field name="model">project.gtd.timebox</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Timeboxes">
+                <separator string="Timebox Definition" colspan="4"/>
+                <field name="name"/>
+                <field name="sequence"/>
+                <field name="icon"/>
+            </form>
+        </field>
+    </record>
 
-        <record model="ir.actions.act_window" id="open_gtd_timebox_tree">
-            <field name="name">Timeboxes</field>
-            <field name="res_model">project.gtd.timebox</field>
-            <field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_gtd_timebox_tree"/>
-        </record>
-       
-        <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree" groups="group_project_getting"/>        
+    <record model="ir.actions.act_window" id="open_gtd_timebox_tree">
+        <field name="name">Timeboxes</field>
+        <field name="res_model">project.gtd.timebox</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_gtd_timebox_tree"/>
+    </record>        
+
+    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree"/>        
+		
+	<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>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a5052ab11b8..99c9bd26d3e 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.py b/addons/sale/sale.py
index ff27dc5012e..bdfb107b73a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -764,7 +764,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 8fb380643e5..7f68020c434 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -227,14 +227,17 @@
             <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">
+                        	<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>
             </field>
@@ -257,9 +260,7 @@
             <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"/>
 
@@ -269,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"/>
@@ -315,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"/>
@@ -328,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"/>
@@ -340,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"/>
@@ -352,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"/>
@@ -364,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"/>
@@ -376,11 +371,21 @@
             <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"/>
 
+		<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 +466,26 @@
             </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','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+						<separator orientation="vertical"/>
+						<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>
+		</record>
 
         <record id="action_order_line_tree1" model="ir.actions.act_window">
             <field name="name">Sales Order Lines</field>
@@ -468,6 +493,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/product.py b/addons/stock/product.py
index f229ed236a6..242f7519a5e 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -169,7 +169,7 @@ class product_product(osv.osv):
         'track_production': fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
         'track_incoming': fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing': fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
-        'warehouse_id': fields.dummy(string='Warehouse',relation='stock.warehouse',type='many2one'),
+        'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one', domain=[('usage','=','internal')]),
     }
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index cc807731241..9f9dd4b6ec2 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="warehouse_id" select="1" widget="selection" context="{'warehouse': self}" />
+               	<field name="pricelist_id" select="1" widget="selection" position="before">
+               		<field name="location_id" select="1" widget="selection" context="{'location': self}" />
+               		<separator orientation="vertical"/>
                	</field>
             </field>
         </record>
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>