diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py index 5d1a0a50bcb..1996136130d 100644 --- a/addons/mrp/tests/test_multicompany.py +++ b/addons/mrp/tests/test_multicompany.py @@ -35,7 +35,7 @@ class TestMrpMulticompany(common.TransactionCase): model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user') model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager') - model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2') + model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_1') self.multicompany_user_id = self.res_users.create(cr, uid, {'name': 'multicomp', 'login': 'multicomp', 'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])], diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index f10248d27a4..252e860aefa 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -188,53 +188,6 @@ Your Company, Chicago shop - - - Your Company, Birmingham shop - - - - 1 - 82-85 Academy Avenue - Birmingham - B46 3AG - - +44 121 690 4596 - birmingham@yourcompany.com - www.yourcompany.com - - - - Donald Thompson - - - - - - - - - Your Company, Birmingham shop - - - - - - - - internal - - Your Company, Chicago shop - - - - - - transit - Internal Shippings - - - Chicago Warehouse diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml index 24b17863949..3b90afe52b3 100644 --- a/addons/stock/stock_demo.yml +++ b/addons/stock/stock_demo.yml @@ -1,11 +1,12 @@ - !python {model: ir.model.data}: | - main_warehouse = self.pool.get('stock.warehouse').browse(cr, uid, ref('stock_warehouse_shop0'), context=context) + chicago_warehouse = self.pool.get('stock.warehouse').browse(cr, uid, ref('stock_warehouse_shop0'), context=context) #create xml ids for demo data that are widely used in tests or in other codes, for more convenience xml_references = [ - {'name':'chi_picking_type_in','module':'stock', 'model':'stock.picking.type','res_id':main_warehouse.in_type_id.id}, - {'name':'chi_picking_type_out','module':'stock', 'model':'stock.picking.type','res_id':main_warehouse.out_type_id.id}, + {'name':'chi_picking_type_in','module':'stock', 'model':'stock.picking.type','res_id': chicago_warehouse.in_type_id.id}, + {'name':'chi_picking_type_out','module':'stock', 'model':'stock.picking.type','res_id': chicago_warehouse.out_type_id.id}, + {'name':'stock_location_shop0','module':'stock', 'model':'stock.location','res_id': chicago_warehouse.lot_stock_id.id}, ] for xml_record in xml_references: xml_ids = self.search(cr, uid, [('module', '=', xml_record['module']), ('model', '=', xml_record['model']), ('name', '=', xml_record['name'])], context=context) @@ -18,14 +19,6 @@ name: Small Refrigerator usage: internal location_id: stock_location_14 -- - !record {model: stock.location, id: location_opening}: - name: opening - usage: inventory -- - !record {model: stock.location, id: location_convenience_shop}: - name: Convenient Store - usage: supplier - !record {model: product.product, id: product_icecream}: default_code: 001 @@ -36,7 +29,7 @@ standard_price: 70.0 uom_id: product.product_uom_kgm uom_po_id: product.product_uom_kgm - property_stock_inventory: location_opening + property_stock_inventory: location_inventory description: Ice cream can be mass-produced and thus is widely available in developed parts of the world. Ice cream can be purchased in large cartons (vats and squrounds) from supermarkets and grocery stores, in smaller quantities from ice cream shops, convenience stores, and milk bars, and in individual servings from small carts or vans at public events. - !record {model: stock.production.lot, id: lot_icecream_0}: @@ -135,7 +128,7 @@ product_uom: product.product_uom_kgm product_uom_qty: 50.0 picking_type_id: stock.picking_type_in - location_id: location_convenience_shop + location_id: stock_location_suppliers location_dest_id: stock_location_14 - !record {model: stock.picking, id: incomming_shipment1}: @@ -198,7 +191,7 @@ product_uom_qty: 25.0 picking_type_id: chi_picking_type_in location_id: stock.stock_location_suppliers - location_dest_id: stock.stock_location_stock + location_dest_id: stock.stock_location_shop0 - !record {model: stock.picking, id: incomming_chicago_warehouse1}: picking_type_id: chi_picking_type_in @@ -210,7 +203,7 @@ product_uom_qty: 180.0 picking_type_id: chi_picking_type_in location_id: stock.stock_location_suppliers - location_dest_id: stock.stock_location_stock + location_dest_id: stock.stock_location_shop0 state: done pack_operation_ids: - product_id: product.product_product_48 @@ -227,7 +220,7 @@ product_uom_qty: 45.0 picking_type_id: chi_picking_type_in location_id: stock.stock_location_suppliers - location_dest_id: stock.stock_location_stock + location_dest_id: stock.stock_location_shop0 - !record {model: stock.picking, id: incomming_chicago_warehouse3}: picking_type_id: chi_picking_type_in @@ -240,7 +233,7 @@ product_uom_qty: 75.0 picking_type_id: chi_picking_type_in location_id: stock.stock_location_suppliers - location_dest_id: stock.stock_location_stock + location_dest_id: stock.stock_location_shop0 - Create STOCK_PICKING_OUT for Chicago Warehouse - @@ -253,7 +246,7 @@ product_uom: product.product_uom_unit product_uom_qty: 15.0 picking_type_id: chi_picking_type_out - location_id: stock.stock_location_stock + location_id: stock.stock_location_shop0 location_dest_id: stock.stock_location_customers - !record {model: stock.picking, id: outgoing_chicago_warehouse1}: @@ -265,7 +258,7 @@ product_uom: product.product_uom_unit product_uom_qty: 180.0 picking_type_id: chi_picking_type_out - location_id: stock.stock_location_stock + location_id: stock.stock_location_shop0 location_dest_id: stock.stock_location_customers pack_operation_ids: - product_id: product.product_product_6 @@ -281,7 +274,7 @@ product_uom: product.product_uom_unit product_uom_qty: 45.0 picking_type_id: chi_picking_type_out - location_id: stock.stock_location_stock + location_id: stock.stock_location_shop0 location_dest_id: stock.stock_location_customers - !record {model: stock.picking, id: outgoing_chicago_warehouse3}: @@ -293,7 +286,7 @@ product_uom: product.product_uom_unit product_uom_qty: 75.0 picking_type_id: chi_picking_type_out - location_id: stock.stock_location_stock + location_id: stock.stock_location_shop0 location_dest_id: stock.stock_location_customers - !python {model: stock.picking}: | @@ -303,4 +296,4 @@ record_chi_out = self.browse(cr, uid, ref('outgoing_chicago_warehouse1'), context=context) if record.state != 'done' and record_chi_in.state != 'done' and record_chi_out.state != 'done': self.force_assign(cr, uid, [ref('outgoing_shipment_main_warehouse'),ref('outgoing_chicago_warehouse3'),ref('outgoing_shipment_main_warehouse2')], context=context) - self.do_transfer(cr, uid, [ref('outgoing_shipment_main_warehouse1'),ref('incomming_chicago_warehouse1'),ref('outgoing_chicago_warehouse1')], context=context) \ No newline at end of file + self.do_transfer(cr, uid, [ref('outgoing_shipment_main_warehouse1'),ref('incomming_chicago_warehouse1'),ref('outgoing_chicago_warehouse1')], context=context)