diff --git a/addons/product/product.py b/addons/product/product.py
index 699fa66dd8f..6acf1ac526b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -294,7 +294,7 @@ class product_template(osv.osv):
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
             help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
-        'warranty': fields.float('Warranty (months)'),
+        'warranty': fields.float('Warranty'),
         'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'state': fields.selection([('',''),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index da10dcbb429..3ae82a07efd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -134,7 +134,7 @@
                                         <div>
                                             <field name="sale_delay"/> days
                                         </div>
-                                        <field name="warranty"/>
+                                        <field name="warranty"/> months
                                     </group>
                                     <group groups="product.group_uom">
                                         <field name="uos_id"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ea0d9b2ce5e..e5986318fbd 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,8 +60,6 @@
                     <group name="delay" string="Delays">
                         <field name="active"/>
                         <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="warranty"/>
                     </group>
                     <group name="store" string="Storage Localisation">
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>