diff --git a/addons/sale_stock_location/__openerp__.py b/addons/sale_stock_location/__openerp__.py index daa12d98328..2fd4fb20bc4 100644 --- a/addons/sale_stock_location/__openerp__.py +++ b/addons/sale_stock_location/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { - 'name': 'Sales and Warehouse Management', + 'name': 'Sales and Warehouse and Route Management', 'version': '1.0', 'category': 'Hidden', 'summary': 'Quotation, Sale Orders, Delivery & Invoicing Control', diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 69b20c02fda..8c7eac8d3ae 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1484,7 +1484,7 @@ - + diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml index 0ea659d8129..b2b2c2d6089 100644 --- a/addons/stock/test/shipment.yml +++ b/addons/stock/test/shipment.yml @@ -28,9 +28,8 @@ backorder = self.browse(cr, uid, backorder_id)[0] for move_line in backorder.move_lines: assert move_line.product_qty == 10, "Qty in backorder does not correspond." - assert move_line.state == 'draft', "Move line of backorder should be draft." + assert (move_line.state == 'assigned' or move_line.state == 'waiting' or move_line.state == 'confirmed'), "Move line of backorder should be assigned, confirmed or waiting." context.update({'active_model': 'stock.picking', 'active_id': backorder_id[0], 'active_ids': backorder_id}) - self.action_confirm(cr, uid, backorder_id, context=context) - I receive the remaining 10kgm Ice-cream from the backorder. -