diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index df23aaae3b8..b0edacd7272 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -84,13 +84,12 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <filter name="others" position="after">
-                    <separator orientation="vertical"/>
+                <field name="date" position="before">
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
-                </filter>
+                    <separator orientation="vertical"/>
+                </field>
             </field>
         </record>
-	
 
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f5a67d2c356..05d08d86054 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -42,7 +42,6 @@
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="2" string="Miscelleanous"/>
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                                 <field name="warn_manager"/>
                             </group>
                             <newline/>
@@ -74,6 +73,7 @@
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
                             <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
+                            <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="2" string="Mail Header"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index b0a898dac3b..4f5e0ce5891 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -19,7 +19,7 @@
             </field>
         </record>
 
-	<record id="project_invoice_form_cutomer" model="ir.ui.view">
+        <record id="project_invoice_form_cutomer" model="ir.ui.view">
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
@@ -53,7 +53,7 @@
                     <field name="account_id" string="Project" />
                 </field>
             </field>
-         </record>        
+         </record>
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
             <field name="name">account.analytic.line.form.account_id</field>
             <field name="model">account.analytic.line</field>
@@ -76,42 +76,8 @@
                 </field>
             </field>
         </record>
-        <record id="view_account_analytic_line_filter_inherit_buttons" model="ir.ui.view">
-            <field name="name">account.analytic.line.inherit.select</field>
-            <field name="model">account.analytic.line</field>
-            <field name="type">search</field>
-			<field name="priority">10</field>
-            <field name="arch" type="xml">
-                <search string="Search Analytic Lines">
-                    <group col='6' colspan='4'>
-                        <field name="name"/>
-						<field name="date"/>
-                        <field name="account_id"/>
-                        <field name="user_id">
-                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        </field>
-                    </group>
-					<newline/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="journal_id" widget="selection"/>
-                        <field name="product_id" widget="selection"/>
-                        <field name="amount" select="1"/>
-                    </group>
-                    <newline/>
-                    <group string="Group By..." expand="0">
-                        <filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-green"/>
-                        <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
-                    </group>
-                </search>
-            </field>
-        </record>
 
- 		<!-- Menus -->
+        <!-- Menus -->
         <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
             <field name="name">Bill Tasks Works</field>
             <field name="res_model">account.analytic.line</field>
@@ -119,11 +85,10 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
-			<field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
-			<field name="search_view_id" ref="view_account_analytic_line_filter_inherit_buttons"/>
+            <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
             <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
         </record>
-  		<menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
+        <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
             id="menu_hr_timesheet_sign_in"
             groups="base.group_extended"
             parent="hr_attendance.menu_hr_attendance"
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index be39f082c41..80ac41d2ce8 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -8,10 +8,10 @@
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
-            <field ref="res_partner_agrolait" name="partner_id"/>
-            <field ref="res_partner_address_8" name="partner_invoice_id"/>
-            <field ref="res_partner_address_8" name="partner_shipping_id"/>
-            <field ref="res_partner_address_8" name="partner_order_id"/>
+            <field ref="base.res_partner_agrolait" name="partner_id"/>
+            <field ref="base.res_partner_address_8" name="partner_invoice_id"/>
+            <field ref="base.res_partner_address_8" name="partner_shipping_id"/>
+            <field ref="base.res_partner_address_8" name="partner_order_id"/>
         </record>
 
         <!--Resource: sale.order.line-->