From 8f0095a006d3d40057737d23baeca48aaef04c81 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 28 Oct 2010 12:50:11 +0530 Subject: [PATCH] [FIX] avoid negative wording lp bug: https://launchpad.net/bugs/666362 fixed bzr revid: ron@tinyerp.com-20101028072011-19v0gxf5dr3kqbpa --- addons/stock/stock.py | 2 +- addons/stock_location/stock_location.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 = {