odoo-addon-stock-move-location 16.0.1.4.0.2__py3-none-any.whl → 18.0.1.0.0.3__py3-none-any.whl

odoo/addons/stock_move_location/tests/test_stock_fillwithstock.py

@@ -2,63 +2,58 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 
-import odoo.tests.common as common
+from odoo.addons.base.tests.common import BaseCommon
 
 
-class TestFillwithStock(common.TransactionCase):
-    def setUp(self):
-        super(TestFillwithStock, self).setUp()
-        self.env = self.env(
-            context=dict(
-                self.env.context,
-                tracking_disable=True,
-            )
-        )
+class TestFillwithStock(BaseCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
 
-        self.stock_location = self.env.ref("stock.stock_location_stock")
-        self.pack_location = self.env.ref("stock.location_pack_zone")
+        cls.stock_location = cls.env.ref("stock.stock_location_stock")
+        cls.pack_location = cls.env.ref("stock.location_pack_zone")
 
-        self.shelf1_location = self.env["stock.location"].create(
+        cls.shelf1_location = cls.env["stock.location"].create(
             {
                 "name": "Test location",
                 "usage": "internal",
-                "location_id": self.stock_location.id,
+                "location_id": cls.stock_location.id,
             }
         )
 
-        self.product1 = self.env["product.product"].create(
+        cls.product1 = cls.env["product.product"].create(
             {
                 "name": "Product A",
-                "type": "product",
+                "is_storable": True,
             }
         )
-        self.product2 = self.env["product.product"].create(
+        cls.product2 = cls.env["product.product"].create(
             {
                 "name": "Product B",
-                "type": "product",
+                "is_storable": True,
             }
         )
 
-        self.env["stock.quant"].create(
+        cls.env["stock.quant"].create(
             {
-                "product_id": self.product1.id,
-                "location_id": self.shelf1_location.id,
+                "product_id": cls.product1.id,
+                "location_id": cls.shelf1_location.id,
                 "quantity": 5.0,
                 "reserved_quantity": 0.0,
             }
         )
-        self.env["stock.quant"].create(
+        cls.env["stock.quant"].create(
             {
-                "product_id": self.product1.id,
-                "location_id": self.shelf1_location.id,
+                "product_id": cls.product1.id,
+                "location_id": cls.shelf1_location.id,
                 "quantity": 10.0,
                 "reserved_quantity": 5.0,
             }
         )
-        self.env["stock.quant"].create(
+        cls.env["stock.quant"].create(
             {
-                "product_id": self.product2.id,
-                "location_id": self.shelf1_location.id,
+                "product_id": cls.product2.id,
+                "location_id": cls.shelf1_location.id,
                 "quantity": 5.0,
                 "reserved_quantity": 0.0,
             }
@@ -80,7 +75,7 @@ class TestFillwithStock(common.TransactionCase):
             picking_stock_pack.move_ids.filtered(
                 lambda m: m.product_id == self.product1
             ).product_uom_qty,
-            10.0,
+            15.0,
         )
         self.assertEqual(
             picking_stock_pack.move_ids.filtered(

odoo/addons/stock_move_location/views/stock_picking.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <odoo>
-
     <record id="view_picking_form" model="ir.ui.view">
         <field name="name">stock.picking.form.fillwithstock</field>
         <field name="model">stock.picking</field>
@@ -9,7 +8,7 @@
             <button name="action_confirm" position="before">
                 <button
                     name="button_fillwithstock"
-                    states="draft"
+                    invisible="state != 'draft'"
                     string="Fill with stock"
                     type="object"
                     class="oe_highlight"
@@ -18,5 +17,4 @@
             </button>
         </field>
     </record>
-
 </odoo>

odoo/addons/stock_move_location/views/stock_picking_type_views.xml

@@ -5,11 +5,8 @@
         <field name="model">stock.picking.type</field>
         <field name="inherit_id" ref="stock.view_picking_type_form" />
         <field name="arch" type="xml">
-            <field name="show_operations" position="after">
-                <field
-                    name="show_move_onhand"
-                    attrs='{"invisible": [("code", "not in", ["internal", "outgoing"])]}'
-                />
+            <field name="create_backorder" position="after">
+                <field name="show_move_onhand" invisible="code != 'internal'" />
             </field>
         </field>
     </record>
@@ -20,7 +17,7 @@
             <field name="code" position="after">
                 <field name="show_move_onhand" />
             </field>
-            <xpath expr="//div[hasclass('o_kanban_primary_left')]" position="inside">
+            <button name="get_action_picking_tree_ready" position="after">
                 <div t-if="record.show_move_onhand.raw_value">
                     <button
                         name="action_move_location"
@@ -31,7 +28,7 @@
                         Move On Hand
                     </button>
                 </div>
-            </xpath>
+            </button>
         </field>
     </record>
 </odoo>

odoo/addons/stock_move_location/wizard/stock_move_location.py

@@ -3,9 +3,8 @@
 # Copyright 2019 Sergio Teruel - Tecnativa <sergio.teruel@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
-from itertools import groupby
 
-from odoo import api, fields, models
+from odoo import Command, api, fields, models
 from odoo.fields import first
 from odoo.osv import expression
 
@@ -39,17 +38,20 @@ class StockMoveLocationWizard(models.TransientModel):
         "move_location_wizard_id",
         string="Move Location lines",
     )
+    company_id = fields.Many2one("res.company", default=lambda self: self.env.company)
     picking_type_id = fields.Many2one(
         compute="_compute_picking_type_id",
         comodel_name="stock.picking.type",
         readonly=False,
         store=True,
+        domain="[('company_id', '=', company_id), ('code', '=', 'internal')]",
     )
     picking_id = fields.Many2one(
         string="Connected Picking", comodel_name="stock.picking"
     )
     edit_locations = fields.Boolean(default=True)
     apply_putaway_strategy = fields.Boolean()
+    exclude_reserved_qty = fields.Boolean(default=True)
 
     @api.depends("edit_locations")
     def _compute_readonly_locations(self):
@@ -67,15 +69,20 @@ class StockMoveLocationWizard(models.TransientModel):
     @api.depends_context("company")
     @api.depends("origin_location_id")
     def _compute_picking_type_id(self):
-        company_id = self.env.context.get("company_id") or self.env.company.id
         for rec in self:
             picking_type = self.env["stock.picking.type"]
             base_domain = [
-                ("code", "in", ("internal", "outgoing")),
-                ("warehouse_id.company_id", "=", company_id),
+                ("code", "=", "internal"),
+                ("warehouse_id.company_id", "=", self.company_id.id),
             ]
             if rec.origin_location_id:
                 location_id = rec.origin_location_id
+                if (
+                    location_id
+                    and rec.picking_type_id
+                    and rec.picking_type_id.default_location_src_id == location_id
+                ):
+                    continue
                 while location_id and not picking_type:
                     domain = [("default_location_src_id", "=", location_id.id)]
                     domain = expression.AND([base_domain, domain])
@@ -102,8 +109,7 @@ class StockMoveLocationWizard(models.TransientModel):
     @api.model
     def _prepare_wizard_move_lines(self, quants):
         res = []
-        exclude_reserved_qty = self.env.context.get("only_reserved_qty", False)
-        if not exclude_reserved_qty:
+        if not self.exclude_reserved_qty:
             res = [
                 (
                     0,
@@ -113,6 +119,7 @@ class StockMoveLocationWizard(models.TransientModel):
                         "move_quantity": quant.quantity,
                         "max_quantity": quant.quantity,
                         "reserved_quantity": quant.reserved_quantity,
+                        "total_quantity": quant.quantity,
                         "origin_location_id": quant.location_id.id,
                         "lot_id": quant.lot_id.id,
                         "package_id": quant.package_id.id,
@@ -125,12 +132,13 @@ class StockMoveLocationWizard(models.TransientModel):
             ]
         else:
             # if need move only available qty per product on location
-            for _product, quant in groupby(quants, lambda r: r.product_id):
-                # we need only one quant per product
-                quant = list(quant)[0]
+            for quant in quants:
                 qty = quant._get_available_quantity(
                     quant.product_id,
                     quant.location_id,
+                    quant.lot_id,
+                    quant.package_id,
+                    quant.owner_id,
                 )
                 if qty:
                     res.append(
@@ -142,6 +150,7 @@ class StockMoveLocationWizard(models.TransientModel):
                                 "move_quantity": qty,
                                 "max_quantity": qty,
                                 "reserved_quantity": quant.reserved_quantity,
+                                "total_quantity": quant.quantity,
                                 "origin_location_id": quant.location_id.id,
                                 "lot_id": quant.lot_id.id,
                                 "package_id": quant.package_id.id,
@@ -153,16 +162,6 @@ class StockMoveLocationWizard(models.TransientModel):
                     )
         return res
 
-    @api.onchange("origin_location_id")
-    def _onchange_origin_location_id(self):
-        if not self.env.context.get("origin_location_disable", False):
-            self._clear_lines()
-
-    @api.onchange("destination_location_id")
-    def _onchange_destination_location_id(self):
-        for line in self.stock_move_location_line_ids:
-            line.destination_location_id = self.destination_location_id
-
     def _clear_lines(self):
         self.stock_move_location_line_ids = False
 
@@ -196,8 +195,7 @@ class StockMoveLocationWizard(models.TransientModel):
         groups = self.group_lines()
         moves = self.env["stock.move"]
         for lines in groups.values():
-            move = self._create_move(picking, lines)
-            moves |= move
+            moves |= self._create_move(picking, lines)
         return moves
 
     def _get_move_values(self, picking, lines):
@@ -224,17 +222,8 @@ class StockMoveLocationWizard(models.TransientModel):
         lines.create_move_lines(picking, move)
         if self.env.context.get("planned"):
             for line in lines:
-                available_quantity = self.env["stock.quant"]._get_available_quantity(
-                    line.product_id,
-                    line.origin_location_id,
-                    lot_id=line.lot_id,
-                    package_id=line.package_id,
-                    owner_id=line.owner_id,
-                    strict=True,
-                )
                 move._update_reserved_quantity(
                     line.move_quantity,
-                    available_quantity,
                     line.origin_location_id,
                     lot_id=line.lot_id,
                     package_id=line.package_id,
@@ -244,10 +233,11 @@ class StockMoveLocationWizard(models.TransientModel):
             # Force the state to be assigned, instead of _action_assign,
             # to avoid discarding the selected move_location_line.
             move.state = "assigned"
+            move.move_line_ids.filtered(lambda ml: not ml.quantity).unlink()
             move.move_line_ids.write({"state": "assigned"})
         return move
 
-    def _unreserve_moves(self):
+    def _unreserve_moves(self, picking):
         """
         Try to unreserve moves that they has reserved quantity before user
         moves products from a location to other one and change move origin
@@ -256,9 +246,9 @@ class StockMoveLocationWizard(models.TransientModel):
         """
         moves_to_reassign = self.env["stock.move"]
         lines_to_ckeck_reverve = self.stock_move_location_line_ids.filtered(
-            lambda l: (
-                l.move_quantity > l.max_quantity - l.reserved_quantity
-                and not l.origin_location_id.should_bypass_reservation()
+            lambda line: (
+                line.move_quantity > line.max_quantity
+                and not line.origin_location_id.should_bypass_reservation()
             )
         )
         for line in lines_to_ckeck_reverve:
@@ -270,7 +260,8 @@ class StockMoveLocationWizard(models.TransientModel):
                     ("lot_id", "=", line.lot_id.id),
                     ("package_id", "=", line.package_id.id),
                     ("owner_id", "=", line.owner_id.id),
-                    ("qty_done", ">", 0.0),
+                    ("quantity", ">", 0.0),
+                    ("picking_id", "!=", picking.id),
                 ]
             )
             moves_to_unreserve = move_lines.mapped("move_id")
@@ -281,13 +272,10 @@ class StockMoveLocationWizard(models.TransientModel):
 
     def action_move_location(self):
         self.ensure_one()
-        if not self.picking_id:
-            picking = self._create_picking()
-        else:
-            picking = self.picking_id
+        picking = self.picking_id if self.picking_id else self._create_picking()
         self._create_moves(picking)
         if not self.env.context.get("planned"):
-            moves_to_reassign = self._unreserve_moves()
+            moves_to_reassign = self._unreserve_moves(picking)
             picking.button_validate()
             moves_to_reassign._action_assign()
         self.picking_id = picking
@@ -318,7 +306,7 @@ class StockMoveLocationWizard(models.TransientModel):
                 "quantity:sum",
                 "reserved_quantity:sum",
             ],
-            groupby=["product_id", "lot_id", "package_id", "owner_id"],
+            groupby=["id", "product_id", "lot_id", "package_id", "owner_id"],
             orderby="id",
             lazy=False,
         )
@@ -335,12 +323,18 @@ class StockMoveLocationWizard(models.TransientModel):
                 and self.destination_location_id._get_putaway_strategy(product).id
                 or self.destination_location_id.id
             )
+            res_qty = group.get("reserved_quantity", 0.0)
+            total_qty = group.get("quantity", 0.0)
+            max_qty = (
+                total_qty if not self.exclude_reserved_qty else total_qty - res_qty
+            )
             product_data.append(
                 {
                     "product_id": product.id,
-                    "move_quantity": group.get("quantity") or 0,
-                    "max_quantity": group.get("quantity") or 0,
-                    "reserved_quantity": group.get("reserved_quantity"),
+                    "move_quantity": max_qty,
+                    "max_quantity": max_qty,
+                    "reserved_quantity": res_qty,
+                    "total_quantity": total_qty,
                     "origin_location_id": self.origin_location_id.id,
                     "destination_location_id": location_dest_id,
                     # cursor returns None instead of False
@@ -357,21 +351,7 @@ class StockMoveLocationWizard(models.TransientModel):
             )
         return product_data
 
-    def _reset_stock_move_location_lines(self):
-        lines = []
-        line_model = self.env["wiz.stock.move.location.line"]
-        for line_val in self._get_stock_move_location_lines_values():
-            if line_val.get("max_quantity") <= 0:
-                continue
-            line = line_model.create(line_val)
-            line.max_quantity = line.get_max_quantity()
-            line.reserved_quantity = line.reserved_quantity
-            lines.append(line)
-        self.update(
-            {"stock_move_location_line_ids": [(6, 0, [line.id for line in lines])]}
-        )
-
-    @api.onchange("origin_location_id")
+    @api.onchange("origin_location_id", "exclude_reserved_qty")
     def onchange_origin_location(self):
         # Get origin_location_disable context key to prevent load all origin
         # location products when user opens the wizard from stock quants to
@@ -380,7 +360,12 @@ class StockMoveLocationWizard(models.TransientModel):
             not self.env.context.get("origin_location_disable")
             and self.origin_location_id
         ):
-            self._reset_stock_move_location_lines()
+            lines = [Command.clear()] + [
+                Command.create(line_vals)
+                for line_vals in self._get_stock_move_location_lines_values()
+                if line_vals.get("max_quantity", 0.0) > 0.0
+            ]
+            self.update({"stock_move_location_line_ids": lines})
 
     def clear_lines(self):
         self._clear_lines()

odoo/addons/stock_move_location/wizard/stock_move_location.xml

@@ -10,15 +10,24 @@
             <form>
                 <sheet>
                     <div class="oe_button_box" name="button_box" />
-                    <group name="options">
+                    <div>
+                        <label for="edit_locations">
+                            Edit Locations
+                        </label>
                         <field name="edit_locations" widget="boolean_toggle" />
-                        <field
-                            name="apply_putaway_strategy"
-                            string="Apply putaway strategy for moving products"
-                            widget="boolean_toggle"
-                            groups="stock.group_stock_multi_locations"
-                        />
-                    </group>
+                    </div>
+                    <div>
+                        <label for="exclude_reserved_qty">
+                            Exclude Reserved Quantities
+                        </label>
+                        <field name="exclude_reserved_qty" widget="boolean_toggle" />
+                    </div>
+                    <div groups="stock.group_stock_multi_locations">
+                        <label for="apply_putaway_strategy">
+                Apply putaway strategy for moving products
+            </label>
+                        <field name="apply_putaway_strategy" widget="boolean_toggle" />
+                    </div>
                     <group name="picking_type">
                         <field name="picking_type_id" />
                     </group>
@@ -26,24 +35,23 @@
                         <field name="origin_location_disable" invisible="True" />
                         <field
                             name="origin_location_id"
-                            attrs="{'readonly': [('origin_location_disable', '=', True)]}"
+                            readonly="origin_location_disable"
                         />
                         <field name="destination_location_disable" invisible="True" />
                         <field
                             name="destination_location_id"
-                            attrs="{'readonly': [('destination_location_disable', '=', True)]}"
+                            readonly="destination_location_disable"
                         />
-                    </group>
-                    <group name="filters">
+                        <field name="company_id" invisible="1" />
                     </group>
                     <group name="lines">
                         <field
                             name="stock_move_location_line_ids"
                             nolabel="1"
-                            mode="tree,kanban"
+                            mode="list,kanban"
                             colspan="2"
                         >
-                            <tree
+                            <list
                                 editable="bottom"
                                 decoration-info="move_quantity != max_quantity"
                                 decoration-danger="(move_quantity &lt; 0) or (move_quantity > max_quantity)"
@@ -58,6 +66,11 @@
                                     string="UoM"
                                     groups="uom.group_uom"
                                 />
+                                <field
+                                    name="product_uom_id"
+                                    string="UoM"
+                                    column_invisible="1"
+                                />
                                 <field
                                     name="origin_location_id"
                                     readonly="1"
@@ -85,7 +98,7 @@
                                 <field name="custom" invisible="1" />
                                 <field
                                     name="max_quantity"
-                                    attrs="{'readonly': [('custom', '!=', True)]}"
+                                    readonly="not custom"
                                     force_save="1"
                                 />
                                 <field
@@ -93,27 +106,42 @@
                                     readonly="1"
                                     force_save="1"
                                 />
-                            </tree>
+                                <field
+                                    name="total_quantity"
+                                    readonly="1"
+                                    force_save="1"
+                                />
+                            </list>
                             <kanban class="o_kanban_mobile">
                                 <templates>
-                                    <t t-name="kanban-box">
-                                        <div t-attf-class="oe_kanban_global_click">
-                                            <div class="o_kanban_record_body">
-                                                <field name="product_id" />
-                                                <field name="product_uom_id" />
+                                    <t t-name="card">
+                                        <field name="product_id" class="fw-bolder" />
+                                        <div
+                                            groups="stock.group_production_lot"
+                                            invisible="not lot_id"
+                                        >
+                                            Lot/SN:
+                                            <field
+                                            name="lot_id"
+                                            invisible="not lot_id"
+                                        />
+                                        </div>
+                                        <div groups="stock.group_stock_multi_locations">
+                                            <field name="origin_location_id" />
+                                            →
+                                            <field name="destination_location_id" />
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-6">
                                                 <field
-                                                    name="lot_id"
-                                                    groups="stock.group_production_lot"
+                                                    name="move_quantity"
+                                                    string="Quantity"
+                                                />
+                                                <field
+                                                    name="product_uom_id"
+                                                    string="Unit of Measure"
+                                                    groups="uom.group_uom"
                                                 />
-                                                <field name="origin_location_id" />
-                                                <field name="destination_location_id" />
-                                            </div>
-                                            <div class="o_kanban_record_bottom">
-                                                <div class="oe_kanban_bottom_right">
-                                                    <span>
-                                                        <field name="move_quantity" />
-                                                    </span>
-                                                </div>
                                             </div>
                                         </div>
                                     </t>

odoo/addons/stock_move_location/wizard/stock_move_location_line.py

@@ -22,7 +22,9 @@ class StockMoveLocationWizardLine(models.TransientModel):
         string="Origin Location", comodel_name="stock.location"
     )
     destination_location_id = fields.Many2one(
-        string="Destination Location", comodel_name="stock.location"
+        string="Destination Location",
+        comodel_name="stock.location",
+        compute="_compute_destination_location_id",
     )
     product_uom_id = fields.Many2one(
         string="Product Unit of Measure", comodel_name="uom.uom"
@@ -44,9 +46,19 @@ class StockMoveLocationWizardLine(models.TransientModel):
     max_quantity = fields.Float(
         string="Maximum available quantity", digits="Product Unit of Measure"
     )
+    total_quantity = fields.Float(
+        string="Total existence quantity", digits="Product Unit of Measure"
+    )
     reserved_quantity = fields.Float(digits="Product Unit of Measure")
     custom = fields.Boolean(string="Custom line", default=True)
 
+    @api.depends("move_location_wizard_id.destination_location_id")
+    def _compute_destination_location_id(self):
+        for record in self:
+            record.destination_location_id = (
+                record.move_location_wizard_id.destination_location_id
+            )
+
     @staticmethod
     def _compare(qty1, qty2, precision_rounding):
         return float_compare(qty1, qty2, precision_rounding=precision_rounding)
@@ -64,32 +76,10 @@ class StockMoveLocationWizardLine(models.TransientModel):
                     _("Move quantity can not exceed max quantity or be negative")
                 )
 
-    def get_max_quantity(self):
-        self.product_uom_id = self.product_id.uom_id
-        search_args = [
-            ("location_id", "=", self.origin_location_id.id),
-            ("product_id", "=", self.product_id.id),
-        ]
-        if self.lot_id:
-            search_args.append(("lot_id", "=", self.lot_id.id))
-        else:
-            search_args.append(("lot_id", "=", False))
-        if self.package_id:
-            search_args.append(("package_id", "=", self.package_id.id))
-        else:
-            search_args.append(("package_id", "=", False))
-        if self.owner_id:
-            search_args.append(("owner_id", "=", self.owner_id.id))
-        else:
-            search_args.append(("owner_id", "=", False))
-        res = self.env["stock.quant"].read_group(search_args, ["quantity"], [])
-        max_quantity = res[0]["quantity"]
-        return max_quantity
-
     def create_move_lines(self, picking, move):
         for line in self:
             values = line._get_move_line_values(picking, move)
-            if not self.env.context.get("planned") and values.get("qty_done") <= 0:
+            if not self.env.context.get("planned") and values.get("quantity") <= 0:
                 continue
             self.env["stock.move.line"].create(values)
         return True
@@ -101,7 +91,7 @@ class StockMoveLocationWizardLine(models.TransientModel):
             and self.destination_location_id._get_putaway_strategy(self.product_id).id
             or self.destination_location_id.id
         )
-        qty_todo, qty_done = self._get_available_quantity()
+        qty_done = self._get_available_quantity()
         return {
             "product_id": self.product_id.id,
             "lot_id": self.lot_id.id,
@@ -110,7 +100,7 @@ class StockMoveLocationWizardLine(models.TransientModel):
             "owner_id": self.owner_id.id,
             "location_id": self.origin_location_id.id,
             "location_dest_id": location_dest_id,
-            "qty_done": qty_done,
+            "quantity": qty_done,
             "product_uom_id": self.product_uom_id.id,
             "picking_id": picking.id,
             "move_id": move.id,
@@ -126,7 +116,7 @@ class StockMoveLocationWizardLine(models.TransientModel):
             return 0
         if self.env.context.get("planned"):
             # for planned transfer we don't care about the amounts at all
-            return self.move_quantity, 0
+            return 0.0
         search_args = [
             ("location_id", "=", self.origin_location_id.id),
             ("product_id", "=", self.product_id.id),
@@ -153,6 +143,4 @@ class StockMoveLocationWizardLine(models.TransientModel):
         available_qty_lt_move_qty = (
             self._compare(available_qty, self.move_quantity, rounding) == -1
         )
-        if available_qty_lt_move_qty:
-            return available_qty
-        return 0, self.move_quantity
+        return available_qty if available_qty_lt_move_qty else self.move_quantity