From d9a9cd4550f26013f447b37521299910b59cf703 Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <je@bcim.be>
Date: Thu, 4 Jan 2024 15:53:29 +0100
Subject: [PATCH] [FIX] shopfloor: inventory. Set qty & date

---
 shopfloor/actions/inventory.py | 44 +++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/shopfloor/actions/inventory.py b/shopfloor/actions/inventory.py
index 67c79856e4..588ed3e78f 100644
--- a/shopfloor/actions/inventory.py
+++ b/shopfloor/actions/inventory.py
@@ -1,6 +1,6 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import _
+from odoo import _, fields
 
 from odoo.addons.component.core import Component
 
@@ -39,7 +39,7 @@ def _inventory_exists(self, location, product, package=None, lot=None):
             domain.append(("lot_id", "=", lot.id))
         return self.inventory_model.search_count(domain)
 
-    def _get_existing_quant(self, location, product, package=None, lot=None):
+    def _get_existing_quant(self, location, product, package=None, lot=None, limit=1):
         domain = [("location_id", "=", location.id), ("product_id", "=", product.id)]
         if package is not None:
             domain.append(("package_id", "=", package.id))
@@ -49,21 +49,43 @@ def _get_existing_quant(self, location, product, package=None, lot=None):
             domain.append(("lot_id", "=", lot.id))
         else:
             domain.append(("lot_id", "=", False))
-        return self.inventory_model.search(domain, limit=1)
-
-    def _create_draft_inventory(self, location, product):
-        return self.inventory_model.sudo().create(
-            {"location_id": location.id, "product_id": product.id}
-        )
+        return self.inventory_model.search(domain, limit=limit)
+
+    def _create_draft_inventory(self, location, product, lot=None):
+        quants = self._get_existing_quant(location, product, lot=lot, limit=None)
+        if quants:
+            for quant in quants:
+                if quant.inventory_quantity_set:
+                    continue
+                quants.write(
+                    {
+                        # Set an inventory quantity to prevent the zero quant cleanup
+                        "inventory_quantity": quant.inventory_quantity + 1,
+                        "inventory_date": fields.Date.today(),
+                    }
+                )
+            return quants
+        else:
+            return self.inventory_model.sudo().create(
+                {
+                    "location_id": location.id,
+                    "product_id": product.id,
+                    "lot_id": lot.id,
+                    "inventory_quantity": 1,
+                    "inventory_date": fields.Date.today(),
+                }
+            )
 
-    def create_control_stock(self, location, product, package, lot, name=None):
+    def create_control_stock(
+        self, location, product, package=None, lot=None, name=None
+    ):
         """Create a draft inventory so a user has to check a location
 
         If a draft or in progress inventory already exists for the same
         combination of product/package/lot, no inventory is created.
         """
-        if not self._inventory_exists(location, product):
-            self._create_draft_inventory(location, product)
+        if not self._inventory_exists(location, product, lot=lot):
+            self._create_draft_inventory(location, product, lot=lot)
 
     def create_stock_issue(self, move, location, package, lot):
         """Create an inventory for a stock issue