diff --git a/addons/stock_account/__manifest__.py b/addons/stock_account/__manifest__.py index 2662210d0c1..62873c1c87c 100644 --- a/addons/stock_account/__manifest__.py +++ b/addons/stock_account/__manifest__.py @@ -32,6 +32,7 @@ Dashboard / Reports for Warehouse Management includes: 'views/product_views.xml', 'views/stock_quant_views.xml', 'views/stock_valuation_layer_views.xml', + 'wizard/stock_valuation_layer_revaluation_views.xml' ], 'test': [ ], diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py index 48f59d5f836..bea0dfacd87 100644 --- a/addons/stock_account/models/product.py +++ b/addons/stock_account/models/product.py @@ -97,6 +97,7 @@ class ProductProduct(models.Model): quantity_svl = fields.Float(compute='_compute_value_svl') stock_valuation_layer_ids = fields.One2many('stock.valuation.layer', 'product_id') valuation = fields.Selection(related="categ_id.property_valuation", readonly=True) + cost_method = fields.Selection(related="categ_id.property_cost_method", readonly=True) def write(self, vals): if 'standard_price' in vals and not self.env.context.get('disable_auto_svl'): @@ -126,6 +127,22 @@ class ProductProduct(models.Model): remaining.value_svl = 0 remaining.quantity_svl = 0 + # ------------------------------------------------------------------------- + # Actions + # ------------------------------------------------------------------------- + def action_revaluation(self): + self.ensure_one() + ctx = dict(self._context, default_product_id=self.id, default_company_id=self.env.company.id) + return { + 'name': _("Product Revaluation"), + 'view_mode': 'form', + 'res_model': 'stock.valuation.layer.revaluation', + 'view_id': self.env.ref('stock_account.stock_valuation_layer_revaluation_form_view').id, + 'type': 'ir.actions.act_window', + 'context': ctx, + 'target': 'new' + } + # ------------------------------------------------------------------------- # SVL creation helpers # ------------------------------------------------------------------------- diff --git a/addons/stock_account/security/ir.model.access.csv b/addons/stock_account/security/ir.model.access.csv index bd56cc16f9a..f1c43927394 100644 --- a/addons/stock_account/security/ir.model.access.csv +++ b/addons/stock_account/security/ir.model.access.csv @@ -6,3 +6,4 @@ access_stock_picking_invoicing_payments,stock.picking,stock.model_stock_picking, access_stock_move_invoicing_payments_readonly,stock.move,model_stock_move,account.group_account_readonly,1,0,0,0 access_stock_move_invoicing_payments,stock.move,model_stock_move,account.group_account_invoice,1,1,1,0 access_stock_valuation_layer,access_stock_valuation_layer,model_stock_valuation_layer,stock.group_stock_manager,1,1,1,0 +access_stock_valuation_layer_revaluation,access_stock_valuation_layer_revaluation,model_stock_valuation_layer_revaluation,stock.group_stock_manager,1,1,1,0 \ No newline at end of file diff --git a/addons/stock_account/tests/__init__.py b/addons/stock_account/tests/__init__.py index 78353eecb83..fe72444ecfd 100644 --- a/addons/stock_account/tests/__init__.py +++ b/addons/stock_account/tests/__init__.py @@ -1,3 +1,4 @@ from . import test_anglo_saxon_valuation_reconciliation_common from . import test_stockvaluation from . import test_stockvaluationlayer +from . import test_stock_valuation_layer_revaluation diff --git a/addons/stock_account/tests/test_stock_valuation_layer_revaluation.py b/addons/stock_account/tests/test_stock_valuation_layer_revaluation.py new file mode 100644 index 00000000000..d84f865229a --- /dev/null +++ b/addons/stock_account/tests/test_stock_valuation_layer_revaluation.py @@ -0,0 +1,173 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo.exceptions import UserError +from odoo.tests import Form +from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data +from odoo.addons.stock_account.tests.test_stockvaluationlayer import TestStockValuationCommon + + +class TestStockValuationLayerRevaluation(TestStockValuationCommon): + @classmethod + def setUpClass(cls): + super(TestStockValuationLayerRevaluation, cls).setUpClass() + cls.stock_input_account, cls.stock_output_account, cls.stock_valuation_account, cls.expense_account, cls.stock_journal = _create_accounting_data(cls.env) + cls.product1.write({ + 'property_account_expense_id': cls.expense_account.id, + }) + cls.product1.categ_id.write({ + 'property_stock_account_input_categ_id': cls.stock_input_account.id, + 'property_stock_account_output_categ_id': cls.stock_output_account.id, + 'property_stock_valuation_account_id': cls.stock_valuation_account.id, + 'property_stock_journal': cls.stock_journal.id, + }) + + cls.product1.categ_id.property_valuation = 'real_time' + + def test_stock_valuation_layer_revaluation_avco(self): + self.product1.categ_id.property_cost_method = 'average' + context = { + 'default_product_id': self.product1.id, + 'default_company_id': self.env.company.id, + 'default_added_value': 0.0 + } + # Quantity of product1 is zero, raise + with self.assertRaises(UserError): + Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save() + + self._make_in_move(self.product1, 10, unit_cost=2) + self._make_in_move(self.product1, 10, unit_cost=4) + + self.assertEqual(self.product1.standard_price, 3) + self.assertEqual(self.product1.quantity_svl, 20) + + old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc") + + self.assertEqual(len(old_layers), 2) + self.assertEqual(old_layers[0].remaining_value, 40) + + revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context)) + revaluation_wizard.added_value = 20 + revaluation_wizard.account_id = self.stock_valuation_account + revaluation_wizard.save().action_validate_revaluation() + + # Check standard price change + self.assertEqual(self.product1.standard_price, 4) + self.assertEqual(self.product1.quantity_svl, 20) + + # Check the creation of stock.valuation.layer + new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1) + self.assertEqual(new_layer.value, 20) + + # Check the remaing value of current layers + self.assertEqual(old_layers[0].remaining_value, 50) + self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80) + + # Check account move + self.assertTrue(bool(new_layer.account_move_id)) + self.assertEqual(len(new_layer.account_move_id.line_ids), 2) + + self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20) + self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20) + + credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0] + self.assertEqual(len(credit_lines), 1) + self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id) + + def test_stock_valuation_layer_revaluation_avco_rounding(self): + self.product1.categ_id.property_cost_method = 'average' + context = { + 'default_product_id': self.product1.id, + 'default_company_id': self.env.company.id, + 'default_added_value': 0.0 + } + # Quantity of product1 is zero, raise + with self.assertRaises(UserError): + Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save() + + self._make_in_move(self.product1, 1, unit_cost=1) + self._make_in_move(self.product1, 1, unit_cost=1) + self._make_in_move(self.product1, 1, unit_cost=1) + + self.assertEqual(self.product1.standard_price, 1) + self.assertEqual(self.product1.quantity_svl, 3) + + old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc") + + self.assertEqual(len(old_layers), 3) + self.assertEqual(old_layers[0].remaining_value, 1) + + revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context)) + revaluation_wizard.added_value = 1 + revaluation_wizard.account_id = self.stock_valuation_account + revaluation_wizard.save().action_validate_revaluation() + + # Check standard price change + self.assertEqual(self.product1.standard_price, 1.33) + self.assertEqual(self.product1.quantity_svl, 3) + + # Check the creation of stock.valuation.layer + new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1) + self.assertEqual(new_layer.value, 1) + + # Check the remaing value of current layers + self.assertEqual(sum(slv.remaining_value for slv in old_layers), 4) + self.assertTrue(1.34 in old_layers.mapped("remaining_value")) + + # Check account move + self.assertTrue(bool(new_layer.account_move_id)) + self.assertEqual(len(new_layer.account_move_id.line_ids), 2) + + self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 1) + self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 1) + + credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0] + self.assertEqual(len(credit_lines), 1) + self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id) + + def test_stock_valuation_layer_revaluation_fifo(self): + self.product1.categ_id.property_cost_method = 'fifo' + context = { + 'default_product_id': self.product1.id, + 'default_company_id': self.env.company.id, + 'default_added_value': 0.0 + } + # Quantity of product1 is zero, raise + with self.assertRaises(UserError): + Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save() + + self._make_in_move(self.product1, 10, unit_cost=2) + self._make_in_move(self.product1, 10, unit_cost=4) + + self.assertEqual(self.product1.standard_price, 2) + self.assertEqual(self.product1.quantity_svl, 20) + + old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc") + + self.assertEqual(len(old_layers), 2) + self.assertEqual(old_layers[0].remaining_value, 40) + + revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context)) + revaluation_wizard.added_value = 20 + revaluation_wizard.account_id = self.stock_valuation_account + revaluation_wizard.save().action_validate_revaluation() + + self.assertEqual(self.product1.standard_price, 2) + + # Check the creation of stock.valuation.layer + new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1) + self.assertEqual(new_layer.value, 20) + + # Check the remaing value of current layers + self.assertEqual(old_layers[0].remaining_value, 50) + self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80) + + # Check account move + self.assertTrue(bool(new_layer.account_move_id)) + self.assertTrue(len(new_layer.account_move_id.line_ids), 2) + + self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20) + self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20) + + credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0] + self.assertEqual(len(credit_lines), 1) diff --git a/addons/stock_account/views/stock_valuation_layer_views.xml b/addons/stock_account/views/stock_valuation_layer_views.xml index a89aac82267..fc76a676907 100644 --- a/addons/stock_account/views/stock_valuation_layer_views.xml +++ b/addons/stock_account/views/stock_valuation_layer_views.xml @@ -50,6 +50,11 @@ + + + +