diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index dbdfcbc4fbd..353228df599 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -245,7 +245,7 @@ class sale_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
-        'note': fields.text('Notes'),
+        'note': fields.text('Terms and conditions'),
 
         'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
             store = {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b83cd8b8d06..12463fe1b74 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -228,8 +228,12 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <separator string="Notes" class="oe_clear"/>
-                            <field name="note" placeholder="Add a global note on the sale order..."/>
+                            <div class="oe_clear">
+                                <label for="note"/>
+                            </div>
+                            <div>
+                                <field name="note" class="oe_inline"/>
+                            </div>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>