Change select=1|2 to select=True
issue2305 review269003
This commit is contained in:
1 parent
46ae3ada54
commit
6cbeee4fa3
5 files changed
+32
-32
No files matched your search
+1
-1
@@ -46,7 +46,7 @@ class Inventory(ModelWorkflow, ModelSQL, ModelView):
|
||||
('draft', 'Draft'),
|
||||
('done', 'Done'),
|
||||
('cancel', 'Canceled'),
|
||||
], 'State', readonly=True, select=1)
|
||||
], 'State', readonly=True, select=True)
|
||||
|
||||
def __init__(self):
|
||||
super(Inventory, self).__init__()
|
||||
|
||||
+5
-5
@@ -22,8 +22,8 @@ class Location(ModelSQL, ModelView):
|
||||
name = fields.Char("Name", size=None, required=True, states=STATES,
|
||||
depends=DEPENDS, translate=True)
|
||||
code = fields.Char("Code", size=None, states=STATES, depends=DEPENDS,
|
||||
select=1)
|
||||
active = fields.Boolean('Active', select=1)
|
||||
select=True)
|
||||
active = fields.Boolean('Active', select=True)
|
||||
address = fields.Many2One("party.address", "Address",
|
||||
states={
|
||||
'invisible': Not(Equal(Eval('type'), 'warehouse')),
|
||||
@@ -39,10 +39,10 @@ class Location(ModelSQL, ModelView):
|
||||
('production', 'Production'),
|
||||
('view', 'View'),
|
||||
], 'Location type', states=STATES, depends=DEPENDS)
|
||||
parent = fields.Many2One("stock.location", "Parent", select=1,
|
||||
parent = fields.Many2One("stock.location", "Parent", select=True,
|
||||
left="left", right="right")
|
||||
left = fields.Integer('Left', required=True, select=1)
|
||||
right = fields.Integer('Right', required=True, select=1)
|
||||
left = fields.Integer('Left', required=True, select=True)
|
||||
right = fields.Integer('Right', required=True, select=True)
|
||||
childs = fields.One2Many("stock.location", "parent", "Children")
|
||||
input_location = fields.Many2One(
|
||||
"stock.location", "Input", states={
|
||||
|
||||
@@ -20,7 +20,7 @@ class Move(ModelSQL, ModelView):
|
||||
_description = __doc__
|
||||
_order_name = 'product'
|
||||
product = fields.Many2One("product.product", "Product", required=True,
|
||||
select=1, states=STATES,
|
||||
select=True, states=STATES,
|
||||
on_change=['product', 'currency', 'uom', 'company',
|
||||
'from_location', 'to_location'],
|
||||
domain=[('type', '!=', 'service')],
|
||||
@@ -43,28 +43,28 @@ class Move(ModelSQL, ModelView):
|
||||
depends=['state', 'unit_digits'])
|
||||
internal_quantity = fields.Float('Internal Quantity', readonly=True,
|
||||
required=True)
|
||||
from_location = fields.Many2One("stock.location", "From Location", select=1,
|
||||
required=True, states=STATES, depends=DEPENDS,
|
||||
from_location = fields.Many2One("stock.location", "From Location",
|
||||
select=True, required=True, states=STATES, depends=DEPENDS,
|
||||
domain=[('type', 'not in', ('warehouse', 'view'))])
|
||||
to_location = fields.Many2One("stock.location", "To Location", select=1,
|
||||
to_location = fields.Many2One("stock.location", "To Location", select=True,
|
||||
required=True, states=STATES, depends=DEPENDS,
|
||||
domain=[('type', 'not in', ('warehouse', 'view'))])
|
||||
shipment_in = fields.Many2One('stock.shipment.in', 'Supplier Shipment',
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'],
|
||||
readonly=True, select=1, ondelete='CASCADE')
|
||||
readonly=True, select=True, ondelete='CASCADE')
|
||||
shipment_out = fields.Many2One('stock.shipment.out', 'Customer Shipment',
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'],
|
||||
readonly=True, select=1, ondelete='CASCADE')
|
||||
readonly=True, select=True, ondelete='CASCADE')
|
||||
shipment_out_return = fields.Many2One('stock.shipment.out.return',
|
||||
'Customer Return Shipment', readonly=True, select=1,
|
||||
'Customer Return Shipment', readonly=True, select=True,
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'],
|
||||
ondelete='CASCADE')
|
||||
shipment_in_return = fields.Many2One('stock.shipment.in.return',
|
||||
'Supplier Return Shipment', readonly=True, select=1,
|
||||
'Supplier Return Shipment', readonly=True, select=True,
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'],
|
||||
ondelete='CASCADE')
|
||||
shipment_internal = fields.Many2One('stock.shipment.internal',
|
||||
'Internal Shipment', readonly=True, select=1, ondelete='CASCADE',
|
||||
'Internal Shipment', readonly=True, select=True, ondelete='CASCADE',
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'])
|
||||
planned_date = fields.Date("Planned Date", states={
|
||||
'readonly': (In(Eval('state'), ['cancel', 'assigned', 'done'])
|
||||
@@ -73,14 +73,14 @@ class Move(ModelSQL, ModelView):
|
||||
| Eval('shipment_internal'))
|
||||
}, depends=['state', 'shipment_in', 'shipment_out',
|
||||
'shipment_in_return', 'shipment_out_return', 'shipment_internal'],
|
||||
select=2)
|
||||
effective_date = fields.Date("Effective Date", readonly=True, select=2)
|
||||
select=True)
|
||||
effective_date = fields.Date("Effective Date", readonly=True, select=True)
|
||||
state = fields.Selection([
|
||||
('draft', 'Draft'),
|
||||
('assigned', 'Assigned'),
|
||||
('done', 'Done'),
|
||||
('cancel', 'Canceled'),
|
||||
], 'State', select=1, readonly=True)
|
||||
], 'State', select=True, readonly=True)
|
||||
company = fields.Many2One('company.company', 'Company', required=True,
|
||||
states={
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
|
||||
@@ -24,7 +24,7 @@ class Period(ModelSQL, ModelView):
|
||||
state = fields.Selection([
|
||||
('draft', 'Draft'),
|
||||
('closed', 'Closed'),
|
||||
], 'State', select=1, readonly=True)
|
||||
], 'State', select=True, readonly=True)
|
||||
|
||||
def __init__(self):
|
||||
super(Period, self).__init__()
|
||||
@@ -113,11 +113,11 @@ class Cache(ModelSQL, ModelView):
|
||||
_description = __doc__
|
||||
|
||||
period = fields.Many2One('stock.period', 'Period', required=True,
|
||||
readonly=True, select=1, ondelete='CASCADE')
|
||||
readonly=True, select=True, ondelete='CASCADE')
|
||||
location = fields.Many2One('stock.location', 'Location', required=True,
|
||||
readonly=True, select=1, ondelete='CASCADE')
|
||||
readonly=True, select=True, ondelete='CASCADE')
|
||||
product = fields.Many2One('product.product', 'Product', required=True,
|
||||
readonly=True, select=1, ondelete='CASCADE')
|
||||
readonly=True, select=True, ondelete='CASCADE')
|
||||
internal_quantity = fields.Float('Internal Quantity', readonly=True)
|
||||
|
||||
Cache()
|
||||
+10
-10
@@ -35,7 +35,7 @@ class ShipmentIn(ModelWorkflow, ModelSQL, ModelView):
|
||||
Get(Eval('context', {}), 'company', 0)),
|
||||
],
|
||||
depends=['state'])
|
||||
reference = fields.Char("Reference", size=None, select=1,
|
||||
reference = fields.Char("Reference", size=None, select=True,
|
||||
states={
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, depends=['state'])
|
||||
@@ -83,7 +83,7 @@ class ShipmentIn(ModelWorkflow, ModelSQL, ModelView):
|
||||
moves = fields.One2Many('stock.move', 'shipment_in', 'Moves',
|
||||
domain=[('company', '=', Eval('company'))], readonly=True,
|
||||
depends=['company'])
|
||||
code = fields.Char("Code", size=None, select=1, readonly=True)
|
||||
code = fields.Char("Code", size=None, select=True, readonly=True)
|
||||
state = fields.Selection([
|
||||
('draft', 'Draft'),
|
||||
('done', 'Done'),
|
||||
@@ -434,8 +434,8 @@ class ShipmentInReturn(ModelWorkflow, ModelSQL, ModelView):
|
||||
Get(Eval('context', {}), 'company', 0)),
|
||||
],
|
||||
depends=['state'])
|
||||
code = fields.Char("Code", size=None, select=1, readonly=True)
|
||||
reference = fields.Char("Reference", size=None, select=1,
|
||||
code = fields.Char("Code", size=None, select=True, readonly=True)
|
||||
reference = fields.Char("Reference", size=None, select=True,
|
||||
states={
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, depends=['state'])
|
||||
@@ -701,7 +701,7 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView):
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, domain=[('party', '=', Eval('customer'))],
|
||||
depends=['state', 'customer'])
|
||||
reference = fields.Char("Reference", size=None, select=1,
|
||||
reference = fields.Char("Reference", size=None, select=True,
|
||||
states={
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, depends=['state'])
|
||||
@@ -732,7 +732,7 @@ class ShipmentOut(ModelWorkflow, ModelSQL, ModelView):
|
||||
moves = fields.One2Many('stock.move', 'shipment_out', 'Moves',
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'],
|
||||
readonly=True)
|
||||
code = fields.Char("Code", size=None, select=1, readonly=True)
|
||||
code = fields.Char("Code", size=None, select=True, readonly=True)
|
||||
state = fields.Selection([
|
||||
('draft', 'Draft'),
|
||||
('done', 'Done'),
|
||||
@@ -1192,7 +1192,7 @@ class ShipmentOutReturn(ModelWorkflow, ModelSQL, ModelView):
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, domain=[('party', '=', Eval('customer'))],
|
||||
depends=['state', 'customer'])
|
||||
reference = fields.Char("Reference", size=None, select=1,
|
||||
reference = fields.Char("Reference", size=None, select=True,
|
||||
states={
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, depends=['state'])
|
||||
@@ -1222,7 +1222,7 @@ class ShipmentOutReturn(ModelWorkflow, ModelSQL, ModelView):
|
||||
moves = fields.One2Many('stock.move', 'shipment_out_return', 'Moves',
|
||||
domain=[('company', '=', Eval('company'))], depends=['company'],
|
||||
readonly=True)
|
||||
code = fields.Char("Code", size=None, select=1, readonly=True)
|
||||
code = fields.Char("Code", size=None, select=True, readonly=True)
|
||||
state = fields.Selection([
|
||||
('draft', 'Draft'),
|
||||
('done', 'Done'),
|
||||
@@ -1624,8 +1624,8 @@ class ShipmentInternal(ModelWorkflow, ModelSQL, ModelView):
|
||||
Get(Eval('context', {}), 'company', 0)),
|
||||
],
|
||||
depends=['state'])
|
||||
code = fields.Char("Code", size=None, select=1, readonly=True)
|
||||
reference = fields.Char("Reference", size=None, select=1,
|
||||
code = fields.Char("Code", size=None, select=True, readonly=True)
|
||||
reference = fields.Char("Reference", size=None, select=True,
|
||||
states={
|
||||
'readonly': Not(Equal(Eval('state'), 'draft')),
|
||||
}, depends=['state'])
|
||||
|
||||
Reference in new issue
Block a user