diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3a53a4c030a..4b3aa5d1667 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -636,7 +636,7 @@ class stock_picking(osv.osv):
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
-            ("none", "From Ordered Quantities")], "Invoice Control",
+            ("none", "Not Applicable")], "Invoice Control",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
     }
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 357e944b44e..01d3b906d29 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -38,7 +38,7 @@ class stock_location_path(osv.osv):
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
-            ("none", "From Ordered Quantities")], "Invoice Status",
+            ("none", "Not Applicable")], "Invoice Status",
             required=True,),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
         'auto': fields.selection(
@@ -77,7 +77,7 @@ class product_pulled_flow(osv.osv):
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
-            ("none", "From Ordered Quantities")], "Invoice Status",
+            ("none", "Not Applicable")], "Invoice Status",
             required=True,),
     }
     _defaults = {