diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 3da1ccbcc8d..9a87f91129a 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/procurement.py b/addons/stock/procurement.py index c904a3d42bf..d2e797093c3 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -67,7 +67,8 @@ class procurement_rule(osv.osv): help="Source location is action=move"), 'route_id': fields.many2one('stock.location.route', 'Route', help="If route_id is False, the rule is global"), - 'procure_method': fields.selection([('make_to_stock', 'Make to Stock'), ('make_to_order', 'Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."), + 'procure_method': fields.selection([('make_to_stock', 'Take From Stock'), ('make_to_order', 'Create Procurement')], 'Move Supply Method', required=True, + help="""Determines the procurement method of the stock move that will be generated: whether it will need to 'take from the available stock' in its source location or needs to ignore its stock and create a procurement over there."""), 'route_sequence': fields.related('route_id', 'sequence', string='Route Sequence', store={ 'stock.location.route': (_get_rules, ['sequence'], 10), diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index 162de1ff5b7..d9ad9ea1001 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -73,18 +73,17 @@ This installs the module product_expiry."""), 'group_stock_tracking_lot': fields.boolean("Use packages: pallets, boxes, ...", implied_group='stock.group_tracking_lot', help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the traceability of that product."""), - 'group_stock_tracking_owner': fields.boolean("Manage owner on stock", - implied_group='stock.group_tracking_owner', - help="""This way you can receive products attributed to a certain owner. """), + 'group_stock_tracking_owner': fields.boolean("Manage owner on stock", + implied_group='stock.group_tracking_owner', + help="""This way you can receive products attributed to a certain owner. """), 'module_stock_account': fields.boolean("Generate accounting entries per stock movement", help="""Allows to configure inventory valuations on products and product categories."""), 'group_stock_multiple_locations': fields.boolean("Manage multiple locations and warehouses", implied_group='stock.group_locations', - help="""This allows to configure and use multiple stock locations and warehouses, - instead of having a single default one."""), - 'group_stock_adv_location': fields.boolean("Active Push and Pull inventory flows", + help="""This will show you the locations and allows you to define multiple picking types and warehouses."""), + 'group_stock_adv_location': fields.boolean("Manage advanced routes for your warehouse", implied_group='stock.group_adv_location', - help="""This option supplements the warehouse application by effectively implementing Push and Pull inventory flows. """), + help="""This option supplements the warehouse application by effectively implementing Push and Pull inventory flows through Routes."""), 'decimal_precision': fields.integer('Decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like: 0.0231 kg."), 'propagation_minimum_delta': fields.related('company_id', 'propagation_minimum_delta', type='integer', string="Minimum days to trigger a propagation of date change in pushed/pull flows."), 'module_stock_dropshipping': fields.boolean("Manage dropshipping", @@ -93,6 +92,11 @@ This installs the module product_expiry."""), 'module_stock_picking_wave': fields.boolean('Manage picking wave', help='Install the picking wave module which will help you grouping your pickings and processing them in batch'), } + def onchange_adv_location(self, cr, uid, ids, group_stock_adv_location, context=None): + if group_stock_adv_location: + return {'value': {'group_stock_multiple_locations': True}} + return {} + def _default_company(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) return user.company_id.id diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index b783caff41e..6817c2a6477 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -71,25 +71,13 @@