From 15a5e4376705ceebef0184955720943af05017c1 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 5 Sep 2019 09:06:59 +0000 Subject: [PATCH] [REF] stock_account, mrp_account: display valuation layers of scrap closes odoo/odoo#36423 Signed-off-by: Simon Lejeune (sle) --- addons/mrp_account/models/mrp_production.py | 2 +- addons/stock_account/models/stock_picking.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mrp_account/models/mrp_production.py b/addons/mrp_account/models/mrp_production.py index c0631356b4e..d89c916c1fa 100644 --- a/addons/mrp_account/models/mrp_production.py +++ b/addons/mrp_account/models/mrp_production.py @@ -70,7 +70,7 @@ class MrpProduction(models.Model): def action_view_stock_valuation_layers(self): self.ensure_one() - domain = [('id', 'in', (self.move_raw_ids + self.move_finished_ids).stock_valuation_layer_ids.ids)] + domain = [('id', 'in', (self.move_raw_ids + self.move_finished_ids + self.scrap_ids.move_id).stock_valuation_layer_ids.ids)] action = self.env.ref('stock_account.stock_valuation_layer_action').read()[0] return dict(action, domain=domain) diff --git a/addons/stock_account/models/stock_picking.py b/addons/stock_account/models/stock_picking.py index 5ba9b53ffc4..a1646e484fb 100644 --- a/addons/stock_account/models/stock_picking.py +++ b/addons/stock_account/models/stock_picking.py @@ -11,7 +11,8 @@ class StockPicking(models.Model): def action_view_stock_valuation_layers(self): self.ensure_one() - domain = [('id', 'in', self.move_lines.stock_valuation_layer_ids.ids)] + scraps = self.env['stock.scrap'].search([('picking_id', '=', self.id)]) + domain = [('id', 'in', (self.move_lines + scraps.move_id).stock_valuation_layer_ids.ids)] action = self.env.ref('stock_account.stock_valuation_layer_action').read()[0] context = literal_eval(action['context']) context.update(self.env.context)