diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py index 0f704957045..5aa25fc05ad 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -66,7 +66,9 @@ 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', 'Apply procurement rules again')], 'Procurement 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 apply the procurement rules again. """), 'route_sequence': fields.related('route_id', 'sequence', string='Route Sequence', store={ 'stock.location.route': (_get_rules, ['sequence'], 10), diff --git a/addons/stock/stock.py b/addons/stock/stock.py index de70e21bb23..2110c65a3c9 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1596,7 +1596,10 @@ class stock_move(osv.osv): 'split_from': fields.many2one('stock.move', string="Move Split From", help="Technical field used to track the origin of a split move, which can be useful in case of debug"), 'backorder_id': fields.related('picking_id', 'backorder_id', type='many2one', relation="stock.picking", string="Back Order of", select=True), 'origin': fields.char("Source"), - 'procure_method': fields.selection([('make_to_stock', 'Make to Stock'), ('make_to_order', 'Make to Order')], 'Procurement Method', required=True, help="Make to Stock: When needed, the product is taken from the stock or we wait for replenishment. \nMake to Order: When needed, the product is purchased or produced."), + 'procure_method': fields.selection([('make_to_stock', 'Default: Take from stock'), ('make_to_order', 'Advanced: Apply procurement rules')], 'Procurement Method', required=True, + help="""By default, the system will take from the available stock in the source location. + If we want to have chained moves, it can not take from the available stock, but has to apply the procurement rules + and wait for the moves generated by them. """), # used for colors in tree views: 'scrapped': fields.related('location_dest_id', 'scrap_location', type='boolean', relation='stock.location', string='Scrapped', readonly=True), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3a7e91ea28f..46f87a8cf7f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1109,12 +1109,12 @@ - + - + @@ -1140,7 +1140,7 @@ - +