diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index b3fe345308a..5b611b1cfdb 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
+
     <!--Resource: purchase.order-->
-        
+
         <record id="order_purchase1" model="purchase.order">
             <field model="stock.location" name="location_id" search="[]"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field model="res.partner" name="partner_id" search="[]"/>
+            <field model="res.partner" name="partner_id" search="[('supplier','=','True')]" />
             <field model="res.partner.address" name="partner_address_id" search="[]"/>
         </record>
-        
+
         <record id="order_purchase2" model="purchase.order">
             <field model="stock.location" name="location_id" search="[]"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field model="res.partner" name="partner_id" search="[]"/>
+            <field model="res.partner" name="partner_id" search="[('supplier','=','True')]" />
             <field model="res.partner.address" name="partner_address_id" search="[]"/>
         </record>
-        
+
         <!--Resource: purchase.order.line-->
-        
+
         <record id="line1_purchase" model="purchase.order.line">
             <field name="order_id" ref="order_purchase1"/>
             <field name="date_planned">2010/09/15</field>
@@ -29,7 +29,7 @@
             <field name="price_unit">150</field>
             <field name="product_qty">5</field>
         </record>
-        
+
         <record id="line2_purchase" model="purchase.order.line">
             <field name="order_id" ref="order_purchase1"/>
             <field name="date_planned">2010/09/15</field>
@@ -39,7 +39,7 @@
             <field name="price_unit">450</field>
             <field name="product_qty">2</field>
         </record>
-        
+
         <record id="line3_purchase" model="purchase.order.line">
             <field name="order_id" ref="order_purchase2"/>
             <field name="date_planned">2010/09/15</field>
@@ -49,9 +49,9 @@
             <field name="price_unit">900</field>
             <field name="product_qty">1</field>
         </record>
-        
+
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
-        
+
     </data>
 </openerp>
-    
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f825a11cac5..e9e20c952b2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -41,7 +41,7 @@
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
             name="Incoming Shipments" sequence="9"
-	    groups="base.group_extended"/>
+      groups="base.group_extended"/>
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
             parent="menu_procurement_management_inventory" sequence="11"/>
 
@@ -115,7 +115,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=',True)]" context="{'search_default_supplier':1}" />
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
@@ -147,7 +147,7 @@
                                 <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
-				<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+        <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
 
                             </group>
                         </page>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3431c911a97..d6b1fd18449 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -113,7 +113,7 @@
                     </group>
                     <notebook colspan="5">
                         <page string="Sales Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended"/>