From c48d2f08f357e12e0ca7c940ee7c28e943f862fb Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 27 Mar 2014 15:10:15 +0100 Subject: [PATCH] [IMP] Reordering rules of consumables should not be possible bzr revid: jco@openerp.com-20140327141015-m33u5r718dpczsiz --- addons/stock/__openerp__.py | 6 ++---- addons/stock/stock.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index cc4392b006d..41e24663cca 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -36,12 +36,10 @@ OpenERP has the capacity to manage lots and serial numbers ensuring compliance w Key Features ------------ * Moves history and planning, -* Stock valuation (standard or average price, ...) -* Robustness faced with Inventory differences -* Automatic reordering rules +* Minimum stock rules * Support for barcodes * Rapid detection of mistakes through double entry system -* Traceability (Upstream / Downstream, Serial numbers, ...) +* Traceability (Serial Numbers, Packages, ...) Dashboard / Reports for Warehouse Management will include: ---------------------------------------------------------- diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 2110c65a3c9..be1409510d9 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -3784,7 +3784,7 @@ class stock_warehouse_orderpoint(osv.osv): 'logic': fields.selection([('max', 'Order to Max'), ('price', 'Best price (not yet active!)')], 'Reordering Mode', required=True), 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"), 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"), - 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type', '!=', 'service')]), + 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type', '!=', 'service'), ('type', '!=', 'consu')]), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'product_min_qty': fields.float('Minimum Quantity', required=True, help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\