diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 620d677a5bf..50b280d2c32 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -14,6 +14,7 @@ pads (by default, http://ietherpad.com/).
     'website': 'http://openerp.com',
     'depends': ['base'],
     'data': ['res_company.xml'],
+    'demo': ['pad_demo.xml'],
     'installable': True,
     'auto_install': False,
     'web': True,
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
new file mode 100644
index 00000000000..407f90e8242
--- /dev/null
+++ b/addons/pad/pad_demo.xml
@@ -0,0 +1,9 @@
+<openerp>
+  <data noupdate="1">
+
+    <record id="base.main_company" model="res.company">
+      <field name="pad_server">pad.openerp.com</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 5a9164db2f4..1e2184c61a3 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -7,11 +7,12 @@
       <field name="arch" type="xml">
         <xpath expr="//group[@name='account_grp']" position="after">
             <group string="Pads">
-                <field name="pad_server" placeholder="e.g. beta.primarypad.org"/>
+                <field name="pad_server" placeholder="e.g. beta.primarypad.com"/>
                 <field name="pad_key"/>
             </group>
         </xpath>
       </field>
     </record>
+
   </data>
 </openerp>
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index e84414dd4e8..ce79df52684 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -11,7 +11,6 @@
     </div>
 </t>
 <t t-name="FieldPad.unconfigured">
-    Please configure your etherpad server.<br/>
-    OpenERP Entreprise customers may safely use pad.openerp.com<br/>
+    You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.<br/>
 </t>
 </templates>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2f59709657b..2c2acff227e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -269,18 +269,18 @@
                                         groups="base.group_user" 
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                     <field name="name"/>
-                                    <field name="type"/>
+                                    <field name="type" invisible="1"/>
                                     <field name="product_uom_qty"
                                         context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
                                         groups="product.group_uom" options='{"no_open": true}'/>
-                                    <field name="product_uos_qty" groups="product.group_uos"/>
-                                    <field name="product_uos" string="UoS" groups="product.group_uos"/>
-                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                    <field name="price_unit"/>
+                                    <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
+                                    <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
                                     <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                    <field name="price_unit"/>
+                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>