diff --git a/addons/stock/data/stock_demo.yml b/addons/stock/data/stock_demo.yml index ac8ac582632..697bd8a2cad 100644 --- a/addons/stock/data/stock_demo.yml +++ b/addons/stock/data/stock_demo.yml @@ -131,7 +131,6 @@ - !record {model: stock.picking, id: incomming_shipment}: picking_type_id: stock.picking_type_in - origin: 'incoming_shipment for test' location_id: stock_location_suppliers location_dest_id: stock_location_stock - @@ -146,7 +145,6 @@ - !record {model: stock.picking, id: incomming_shipment1}: picking_type_id: stock.picking_type_in - origin: 'incoming_shipment' partner_id: base.res_partner_1 location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_stock @@ -160,7 +158,6 @@ - !record {model: stock.picking, id: incomming_shipment2}: picking_type_id: stock.picking_type_in - origin: 'incoming_shipment main_warehouse' partner_id: base.res_partner_1 location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_stock @@ -174,7 +171,6 @@ - !record {model: stock.picking, id: incomming_shipment3}: picking_type_id: stock.picking_type_in - origin: 'incoming_shipment your_company warehouse' partner_id: base.res_partner_1 location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_stock @@ -188,7 +184,6 @@ - !record {model: stock.picking, id: incomming_shipment4}: picking_type_id: stock.picking_type_in - origin: 'incoming_shipment_main_warehouse' partner_id: base.res_partner_1 location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_stock @@ -219,7 +214,6 @@ - !record {model: stock.picking, id: incomming_chicago_warehouse1}: picking_type_id: chi_picking_type_in - origin: 'incoming_shipment_chicago_warehouse' partner_id: base.res_partner_1 location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_shop0 @@ -240,7 +234,6 @@ - !record {model: stock.picking, id: incomming_chicago_warehouse2}: picking_type_id: chi_picking_type_in - origin: 'incoming_shipment chicago_warehouse' partner_id: base.res_partner_1 location_id: stock.stock_location_suppliers location_dest_id: stock.stock_location_shop0 diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index 38a0586d248..258c452bdeb 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -240,7 +240,7 @@ class Picking(models.Model): readonly=True, required=True, states={'draft': [('readonly', False)]}) location_dest_id = fields.Many2one( - 'stock.location', "Destination Location Zone", + 'stock.location', "Destination Location", default=lambda self: self.env['stock.picking.type'].browse(self._context.get('default_picking_type_id')).default_location_dest_id, readonly=True, required=True, states={'draft': [('readonly', False)]}) diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index 66c4bd8a8d1..6a9e83c7a4b 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -181,7 +181,7 @@ - +