[IMP] stock_valuation_fifo_lot: Allow revaluation for specific lot_id

Author: AungKoKoLin1997

stock_valuation_fifo_lot/README.rst

@@ -119,6 +119,10 @@ that still exists in terms of FIFO costing, but not in reality, due to the incon
 carried over from the past) in the 'Force FIFO Lot/Serial' field so that this lot/serial
 is used for FIFO costing instead.
 
+To revalue a product with lot_ids displayed in the Stock Valuation Layer list view,
+use the standard revaluation wizard. Set a lot_id in the wizard to revalue a specific
+lot only. Only lots with a remaining quantity will appear in the dropdown list.
+
 Known issues / Roadmap
 ======================
 

stock_valuation_fifo_lot/__init__.py

@@ -1,4 +1,5 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html)
 
 from . import models
+from . import wizard
 from .hooks import post_init_hook

stock_valuation_fifo_lot/__manifest__.py

@@ -16,6 +16,7 @@
         "views/stock_move_line_views.xml",
         "views/stock_package_level_views.xml",
         "views/stock_valuation_layer_views.xml",
+        "wizard/stock_valuation_layer_revaluation_views.xml",
     ],
     "installable": True,
     "post_init_hook": "post_init_hook",

stock_valuation_fifo_lot/models/product.py

@@ -53,14 +53,20 @@ def sorting_key(candidate):
             all_candidates = self._sort_by_all_candidates(all_candidates, sort_by)
         return all_candidates
 
-    # Depends on https://github.com/odoo/odoo/pull/180245
     def _get_qty_taken_on_candidate(self, qty_to_take_on_candidates, candidate):
         fifo_lot = self.env.context.get("fifo_lot")
         if fifo_lot:
             candidate_ml = candidate._get_unconsumed_in_move_line(fifo_lot)
             qty_to_take_on_candidates = min(
                 qty_to_take_on_candidates, candidate_ml.qty_remaining
             )
+            lot_revaluation_value = candidate._get_lot_revaluation_value(
+                fifo_lot, qty_to_take_on_candidates
+            )
+            self.env["stock.valuation.layer"]._adjust_lot_revaluation_remaining_value(
+                fifo_lot, qty_to_take_on_candidates
+            )
+            candidate_ml.value_consumed += lot_revaluation_value
             candidate_ml.qty_consumed += qty_to_take_on_candidates
             candidate_ml.value_consumed += qty_to_take_on_candidates * (
                 candidate.remaining_value / candidate.remaining_qty
@@ -86,13 +92,18 @@ def _run_fifo(self, quantity, company):
                     ml.qty_done, self.uom_id
                 )
             fifo_qty = min(remaining_qty, moved_qty)
+            lot_revaluation_value = self.env[
+                "stock.valuation.layer"
+            ]._get_lot_revaluation_value(fifo_lot, fifo_qty)
             self = self.with_context(fifo_lot=fifo_lot, fifo_qty=fifo_qty)
             ml_fifo_vals = super()._run_fifo(fifo_qty, company)
             for key, value in ml_fifo_vals.items():
                 if key in ("remaining_qty", "value"):
                     vals[key] += value
                     continue
-                vals[key] = value  # unit_cost
+                vals[key] = value
+            vals["value"] -= lot_revaluation_value
+            vals["unit_cost"] = vals["value"] / fifo_qty
             remaining_qty -= fifo_qty
             if float_is_zero(remaining_qty, precision_rounding=self.uom_id.rounding):
                 break

stock_valuation_fifo_lot/models/stock_move_line.py

@@ -71,6 +71,12 @@ def _compute_remaining_value(self):
                 * rec.qty_remaining
                 / remaining_qty
             )
+            if not rec.qty_remaining:
+                continue
+            lot_revaluation_value = self.env[
+                "stock.valuation.layer"
+            ]._get_lot_revaluation_value(rec.lot_id, rec.qty_remaining)
+            rec.value_remaining += lot_revaluation_value
 
     def _create_correction_svl(self, move, diff):
         # Pass the move line as a context value in case qty_done is overridden in a done

stock_valuation_fifo_lot/models/stock_valuation_layer.py

@@ -11,9 +11,42 @@ class StockValuationLayer(models.Model):
         comodel_name="stock.lot",
         string="Lots/Serials",
     )
+    is_lot_revaluation = fields.Boolean(
+        help="Technical field to indicate that this SVL was generated "
+        "from a FIFO lot revaluation."
+    )
 
     def _get_unconsumed_in_move_line(self, lot):
         self.ensure_one()
         return self.stock_move_id.move_line_ids.filtered(
             lambda x: x.lot_id == lot and x.qty_remaining
         )
+
+    def _get_lot_revaluation_data(self, lot, qty):
+        lot_revaluation_layers = self.env["stock.valuation.layer"].search(
+            [("lot_ids", "in", lot.ids), ("is_lot_revaluation", "=", True)]
+        )
+        move_lines = self.env["stock.move.line"].search(
+            [("lot_id", "=", lot.id), ("qty_remaining", ">", 0.0)]
+        )
+        return lot_revaluation_layers, move_lines
+
+    def _get_lot_revaluation_value(self, lot, qty):
+        lot_revaluation_layers, move_lines = self._get_lot_revaluation_data(lot, qty)
+        if not lot_revaluation_layers or not move_lines:
+            return 0.0
+        lot_remaining_qty = sum(move_lines.mapped("qty_remaining"))
+        lot_revaluation_value = (
+            sum(lot_revaluation_layers.mapped("remaining_value"))
+            * qty
+            / lot_remaining_qty
+        )
+        return lot_revaluation_value
+
+    def _adjust_lot_revaluation_remaining_value(self, lot, qty):
+        lot_revaluation_layers, move_lines = self._get_lot_revaluation_data(lot, qty)
+        if not lot_revaluation_layers or not move_lines:
+            return
+        lot_remaining_qty = sum(move_lines.mapped("qty_remaining"))
+        for layer in lot_revaluation_layers:
+            layer.remaining_value -= layer.remaining_value * qty / lot_remaining_qty

stock_valuation_fifo_lot/readme/USAGE.rst

@@ -9,3 +9,7 @@ been strictly FIFO). In such situations, you should select a "rogue" lot/serial
 that still exists in terms of FIFO costing, but not in reality, due to the inconsistency
 carried over from the past) in the 'Force FIFO Lot/Serial' field so that this lot/serial
 is used for FIFO costing instead.
+
+To revalue a product with lot_ids displayed in the Stock Valuation Layer list view,
+use the standard revaluation wizard. Set a lot_id in the wizard to revalue a specific
+lot only. Only lots with a remaining quantity will appear in the dropdown list.

stock_valuation_fifo_lot/static/description/index.html

@@ -472,6 +472,9 @@ <h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
 that still exists in terms of FIFO costing, but not in reality, due to the inconsistency
 carried over from the past) in the ‘Force FIFO Lot/Serial’ field so that this lot/serial
 is used for FIFO costing instead.</p>
+<p>To revalue a product with lot_ids displayed in the Stock Valuation Layer list view,
+use the standard revaluation wizard. Set a lot_id in the wizard to revalue a specific
+lot only. Only lots with a remaining quantity will appear in the dropdown list.</p>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h2><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h2>

stock_valuation_fifo_lot/tests/test_stock_valuation_fifo_lot.py

@@ -288,3 +288,57 @@ def test_avco_product_receipt(self):
             move_in.stock_valuation_layer_ids.lot_ids,
             "Lot IDs should be empty for AVCO product.",
         )
+
+    def test_fifo_revaluation_lot(self):
+        receipt_picking, move_in = self.create_picking(
+            self.supplier_location,
+            self.stock_location,
+            self.picking_type_in,
+            ["001", "002", "003"],
+            100.0,
+        )
+        self.assertEqual(len(receipt_picking.move_line_ids), 3)
+        svls = move_in.stock_valuation_layer_ids
+        self.assertEqual(svls.remaining_value, 1500.0)
+        self.assertEqual(svls.remaining_qty, 15.0)
+        lot_001 = self.env["stock.lot"].search(
+            [("product_id", "=", self.product.id), ("name", "=", "001")], limit=1
+        )
+        self.assertTrue(lot_001, "Lot 001 should exist")
+        stock_valuation_account = self.env["account.account"].create(
+            {
+                "name": "Stock Valuation",
+                "code": "StockValuation",
+                "account_type": "asset_current",
+                "reconcile": True,
+            }
+        )
+        revaluation = self.env["stock.valuation.layer.revaluation"].create(
+            {
+                "product_id": self.product.id,
+                "company_id": self.env.company.id,
+                "added_value": 10.0,
+                "lot_id": lot_001.id,
+                "reason": "Test Revaluation Lot 001",
+                "account_id": stock_valuation_account.id,
+            }
+        )
+        revaluation.action_validate_revaluation()
+        svl_revaluation = self.env["stock.valuation.layer"].search(
+            [
+                ("product_id", "=", self.product.id),
+                ("lot_ids", "in", lot_001.ids),
+            ],
+            limit=1,
+            order="id desc",
+        )
+        self.assertTrue(svl_revaluation, "Revaluation SVL should be created")
+        self.assertIn(
+            lot_001, svl_revaluation.lot_ids, "Revaluation SVL should have correct lot"
+        )
+        self.assertEqual(svl_revaluation.value, 10.0)
+        self.assertEqual(
+            svl_revaluation.remaining_value,
+            10.0,
+            "Remaining value should be added in revaluation SVL",
+        )

stock_valuation_fifo_lot/wizard/__init__.py

@@ -0,0 +1 @@
+from . import stock_valuation_layer_revaluation