diff --git a/order_point.py b/order_point.py index f2a27e2afa..e5db1a5923 100644 --- a/order_point.py +++ b/order_point.py @@ -16,7 +16,7 @@ class OrderPoint(ModelSQL, ModelView): _description = "Order Point" product = fields.Many2One('product.product', 'Product', required=True, - select=1, + select=True, domain=[ ('type', '=', 'stockable'), ('purchasable', 'in', If(Equal(Eval('type'), 'purchase'), @@ -25,7 +25,7 @@ class OrderPoint(ModelSQL, ModelView): depends=['type'], on_change=['product']) warehouse_location = fields.Many2One('stock.location', - 'Warehouse Location', select=1, + 'Warehouse Location', select=True, domain=[('type', '=', 'warehouse')], states={ 'invisible': Not(Equal(Eval('type'), 'purchase')), @@ -33,7 +33,7 @@ class OrderPoint(ModelSQL, ModelView): }, depends=['type']) storage_location = fields.Many2One('stock.location', 'Storage Location', - select=1, + select=True, domain=[('type', '=', 'storage')], states={ 'invisible': Not(Equal(Eval('type'), 'internal')), @@ -53,7 +53,7 @@ class OrderPoint(ModelSQL, ModelView): type = fields.Selection( [('internal', 'Internal'), ('purchase', 'Purchase')], - 'Type', select=1, required=True) + 'Type', select=True, required=True) min_quantity = fields.Float('Minimal Quantity', required=True, digits=(16, Eval('unit_digits', 2)), depends=['unit_digits']) max_quantity = fields.Float('Maximal Quantity', required=True, diff --git a/purchase_request.py b/purchase_request.py index fa8641a63d..7df5fd40f2 100644 --- a/purchase_request.py +++ b/purchase_request.py @@ -19,11 +19,11 @@ class PurchaseRequest(ModelSQL, ModelView): _description = __doc__ product = fields.Many2One( - 'product.product', 'Product', required=True, select=1, readonly=True, + 'product.product', 'Product', required=True, select=True, readonly=True, domain=[('purchasable', '=', True)]) - party = fields.Many2One('party.party', 'Party', select=1) + party = fields.Many2One('party.party', 'Party', select=True) quantity = fields.Float('Quantity', required=True) - uom = fields.Many2One('product.uom', 'UOM', required=True, select=1) + uom = fields.Many2One('product.uom', 'UOM', required=True, select=True) computed_quantity = fields.Float('Computed Quantity', readonly=True) computed_uom = fields.Many2One('product.uom', 'Computed UOM', readonly=True) purchase_date = fields.Date('Best Purchase Date', readonly=True)