[IMP] display quant button even if there wasn't any to allow creating…

… new quants during the inventory
OCA · Jul 17, 2024 · 037988e · 037988e
1 parent 9e22ce7
commit 037988e
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 18 deletions.
diff --git a/stock_inventory/i18n/fr.po b/stock_inventory/i18n/fr.po
@@ -97,6 +97,11 @@ msgstr "Société"
 msgid "Config Settings"
 msgstr ""
 
+#. module: stock_inventory
+#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__auto_create_missing_quants
+msgid "Create missing quants"
+msgstr "Créer les quants manquants"
+
 #. module: stock_inventory
 #: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__create_uid
 msgid "Created by"

diff --git a/stock_inventory/i18n/stock_inventory.pot b/stock_inventory/i18n/stock_inventory.pot
@@ -92,6 +92,11 @@ msgstr ""
 msgid "Config Settings"
 msgstr ""
 
+#. module: stock_inventory
+#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__auto_create_missing_quants
+msgid "Create missing quants"
+msgstr ""
+
 #. module: stock_inventory
 #: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__create_uid
 msgid "Created by"

diff --git a/stock_inventory/models/res_company.py b/stock_inventory/models/res_company.py
@@ -11,9 +11,7 @@ class ResCompany(models.Model):
     stock_inventory_auto_complete = fields.Boolean(
         help="If enabled, when all the quants prepared for the adjustment "
         "are done, the adjustment is automatically set to done.",
-        default=False,
     )
     stock_inventory_auto_create_missing_quants = fields.Boolean(
         help="If enabled, missing quants will be created on the inventory confirmation",
-        default=False,
     )
diff --git a/stock_inventory/models/stock_inventory.py b/stock_inventory/models/stock_inventory.py
@@ -151,7 +151,6 @@ class InventoryAdjustmentsGroup(models.Model):
         string="Create missing quants",
         readonly=True,
         states=READONLY_STATES,
-        default=False,
     )
 
     @api.depends("stock_quant_ids")
@@ -413,6 +412,7 @@ def action_view_inventory_adjustment(self):
             {
                 "search_default_to_do": 1,
                 "inventory_id": self.id,
+                "default_stock_inventory_ids": [(4, self.id)],
                 "default_to_do": True,
                 "default_user_id": self.env.user.id,
             }
@@ -567,7 +567,7 @@ def _get_new_quant_base_values(self, product, **kwargs):
         self.ensure_one()
         values = {
             "product_id": product.id,
-            "user_id": self.env.user.id,
+            "user_id": self.responsible_id.id or self.env.user.id,
             "stock_inventory_ids": [(4, self.id)],
         }
         values.update(kwargs)

diff --git a/stock_inventory/models/stock_quant.py b/stock_inventory/models/stock_quant.py
@@ -1,9 +1,10 @@
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class StockQuant(models.Model):
     _inherit = "stock.quant"
 
+    to_do = fields.Boolean(default=False)
     virtual_in_progress_inventory_id = fields.Many2one(
         comodel_name="stock.inventory",
         compute="_compute_virtual_in_progress_inventory_id",
@@ -15,20 +16,17 @@ class StockQuant(models.Model):
     )
 
     def _compute_virtual_in_progress_inventory_id(self):
-        Inventory = self.env["stock.inventory"]
+        locations = self.mapped("location_id")
+        inventories = self.env["stock.inventory"].search(
+            self._get_virtual_in_progress_inventory_domain(locations),
+            limit=1,
+        )
         for rec in self:
-            rec.virtual_in_progress_inventory_id = Inventory.search(
-                [
-                    ("state", "=", "in_progress"),
-                    "|",
-                    "&",
-                    ("exclude_sublocation", "=", False),
-                    ("location_ids", "parent_of", rec.location_id.ids),
-                    "&",
-                    ("exclude_sublocation", "=", True),
-                    ("location_ids", "in", rec.location_id.ids),
-                ],
-                limit=1,
+            filtered_inventories = inventories.filtered_domain(
+                self._get_virtual_in_progress_inventory_domain(rec.location_id)
+            )
+            rec.virtual_in_progress_inventory_id = (
+                filtered_inventories[0] if filtered_inventories else False
             )
 
     def _apply_inventory(self):
@@ -87,3 +85,16 @@ def _get_inventory_move_values(self, qty, location_id, location_dest_id, out=Fal
 
     def _get_inventory_fields_write(self):
         return super()._get_inventory_fields_write() + ["to_do"]
+
+    @api.model
+    def _get_virtual_in_progress_inventory_domain(self, locations):
+        return [
+            ("state", "=", "in_progress"),
+            "|",
+            "&",
+            ("exclude_sublocation", "=", False),
+            ("location_ids", "parent_of", locations.ids),
+            "&",
+            ("exclude_sublocation", "=", True),
+            ("location_ids", "in", locations.ids),
+        ]
diff --git a/stock_inventory/views/stock_quant.xml b/stock_inventory/views/stock_quant.xml
@@ -1,4 +1,15 @@
 <odoo>
+    <record model="ir.ui.view" id="view_stock_quant_tree_inventory_editable">
+        <field name="name">stock.quant.tree stock inventory</field>
+        <field name="model">stock.quant</field>
+        <field name="inherit_id" ref="stock.view_stock_quant_tree_inventory_editable" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="to_do" invisible="1" />
+                <field name="stock_inventory_ids" invisible="1" />
+            </xpath>
+        </field>
+    </record>
     <record id="view_stock_quant_search_not_done" model="ir.ui.view">
             <field name="name">stock.quant.search.not.done</field>
             <field name="model">stock.quant</field>