diff options
3 files changed, 20 insertions, 2 deletions
diff --git a/addons/mrp_subcontracting_account/models/__init__.py b/addons/mrp_subcontracting_account/models/__init__.py index ac9517445ae..36be4423668 100644 --- a/addons/mrp_subcontracting_account/models/__init__.py +++ b/addons/mrp_subcontracting_account/models/__init__.py @@ -2,3 +2,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import stock_picking +from . import stock_location diff --git a/addons/mrp_subcontracting_account/models/stock_location.py b/addons/mrp_subcontracting_account/models/stock_location.py new file mode 100644 index 00000000000..33bed7e6995 --- /dev/null +++ b/addons/mrp_subcontracting_account/models/stock_location.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + + +from odoo import models + + +class StockLocation(models.Model): + _inherit = "stock.location" + + def _should_be_valued(self): + res = super()._should_be_valued() + if self.company_id.subcontracting_location_id: + res &= self != self.company_id.subcontracting_location_id + return res diff --git a/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py b/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py index fb27445d0f7..fe5b6b8011c 100644 --- a/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py +++ b/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py @@ -54,5 +54,7 @@ class TestAccountSubcontractingFlows(TestMrpSubcontractingCommon): picking_receipt._action_done() mo = picking_receipt._get_subcontracted_productions() - self.assertEqual(mo.move_finished_ids.stock_valuation_layer_ids.value, 60) - self.assertEqual(mo.move_finished_ids.product_id.value_svl, 60) + self.assertEqual(mo.move_finished_ids.stock_valuation_layer_ids.value, 0) + self.assertEqual(mo.move_finished_ids.product_id.value_svl, 30) + self.assertEqual(picking_receipt.move_lines.stock_valuation_layer_ids.value, 30) + self.assertEqual(picking_receipt.move_lines.product_id.value_svl, 30) |