diff --git a/addons/delivery/models/stock_move.py b/addons/delivery/models/stock_move.py index 2cf30338dc0..0087445e567 100644 --- a/addons/delivery/models/stock_move.py +++ b/addons/delivery/models/stock_move.py @@ -31,6 +31,8 @@ class StockMoveLine(models.Model): _inherit = 'stock.move.line' sale_price = fields.Float(compute='_compute_sale_price') + destination_country_code = fields.Char(related='picking_id.destination_country_code') + carrier_id = fields.Many2one(related='picking_id.carrier_id') @api.depends('qty_done', 'product_uom_id', 'product_id', 'move_id.sale_line_id', 'move_id.sale_line_id.price_reduce_taxinc', 'move_id.sale_line_id.product_uom') def _compute_sale_price(self): diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index d940c343cfe..16a6181ca0e 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -259,6 +259,18 @@ + + stock.move.line.tree.detailed + stock.move.line + + + + + + + + + stock.quant.package.weight.form stock.quant.package diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py index b8a5e0c2a8f..d67b5085fdf 100644 --- a/addons/stock/__manifest__.py +++ b/addons/stock/__manifest__.py @@ -70,12 +70,12 @@ 'views/product_strategy_views.xml', 'views/product_views.xml', 'views/stock_production_lot_views.xml', - 'views/stock_picking_views.xml', 'views/stock_scrap_views.xml', 'views/stock_quant_views.xml', 'views/stock_location_views.xml', 'views/stock_warehouse_views.xml', 'views/stock_move_line_views.xml', + 'views/stock_picking_views.xml', 'views/stock_move_views.xml', 'views/stock_orderpoint_views.xml', 'views/stock_storage_category_views.xml', diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py index f0f481133c6..1ecd487bc1b 100644 --- a/addons/stock/models/stock_move_line.py +++ b/addons/stock/models/stock_move_line.py @@ -57,6 +57,8 @@ class StockMoveLine(models.Model): location_id = fields.Many2one('stock.location', 'From', domain="[('usage', '!=', 'view')]", check_company=True, required=True) location_dest_id = fields.Many2one('stock.location', 'To', domain="[('usage', '!=', 'view')]", check_company=True, required=True) lots_visible = fields.Boolean(compute='_compute_lots_visible') + picking_type_id = fields.Many2one(related='picking_id.picking_type_id', readonly=True) + picking_partner_id = fields.Many2one(related='picking_id.partner_id', readonly=True) picking_code = fields.Selection(related='picking_id.picking_type_id.code', readonly=True) picking_type_id = fields.Many2one( 'stock.picking.type', 'Operation type', compute='_compute_picking_type_id') diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml index daac2291689..6b971fcaa18 100644 --- a/addons/stock/views/stock_move_line_views.xml +++ b/addons/stock/views/stock_move_line_views.xml @@ -19,6 +19,28 @@ + + stock.move.line.tree.detailed + stock.move.line + 25 + + + + + + + + + + + + + + + + + + stock.move.line.form stock.move.line @@ -97,6 +119,8 @@ + + @@ -147,8 +171,8 @@ - diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index 4eb69fa10f4..1bbad0eee06 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -646,6 +646,27 @@ + + Operations + stock.move.line + ir.actions.act_window + + [('picking_type_id', '=', active_id), ('picking_id', '!=', False)] + { + 'search_default_todo': '1', + } + + + + No operations found. Let's create a tranfer ! + + + Transfers allow you to move products from one location to another. + + + + New Transfer stock.picking @@ -764,6 +785,9 @@ Waiting + + Operations +
+ No operations found. Let's create a tranfer ! +
+ Transfers allow you to move products from one location to another. +