[14.0][IMP] stock_move_location: owner support

This commit is contained in:
Abraham Anes
2022-11-03 16:57:02 +01:00
committed by Ethan Hildick
parent 321c93e961
commit f651bac545
5 changed files with 72 additions and 14 deletions

View File

@@ -15,6 +15,7 @@ class TestsCommon(common.SavepointCase):
cls.wizard_obj = cls.env["wiz.stock.move.location"]
cls.quant_obj = cls.env["stock.quant"]
cls.company = cls.env.ref("base.main_company")
cls.partner = cls.env.ref("base.res_partner_category_0")
cls.internal_loc_1 = cls.location_obj.create(
{
@@ -79,7 +80,15 @@ class TestsCommon(common.SavepointCase):
"company_id": cls.company.id,
}
)
cls.package = cls.env["stock.quant.package"].create({})
cls.lot5 = cls.env["stock.production.lot"].create(
{
"name": "lot5",
"product_id": cls.product_package.id,
"company_id": cls.company.id,
}
)
cls.package1 = cls.env["stock.quant.package"].create({})
cls.package2 = cls.env["stock.quant.package"].create({})
def setup_product_amounts(self):
self.set_product_amount(self.product_no_lots, self.internal_loc_1, 123)
@@ -97,22 +106,39 @@ class TestsCommon(common.SavepointCase):
self.internal_loc_1,
1.0,
lot_id=self.lot4,
package_id=self.package,
package_id=self.package1,
)
self.set_product_amount(
self.product_package,
self.internal_loc_1,
1.0,
lot_id=self.lot5,
package_id=self.package2,
owner_id=self.partner,
)
def set_product_amount(
self, product, location, amount, lot_id=None, package_id=None
self, product, location, amount, lot_id=None, package_id=None, owner_id=None
):
self.env["stock.quant"]._update_available_quantity(
product, location, amount, lot_id=lot_id, package_id=package_id
product,
location,
amount,
lot_id=lot_id,
package_id=package_id,
owner_id=owner_id,
)
def check_product_amount(
self, product, location, amount, lot_id=None, package_id=None
self, product, location, amount, lot_id=None, package_id=None, owner_id=None
):
self.assertEqual(
self.env["stock.quant"]._get_available_quantity(
product, location, lot_id=lot_id, package_id=package_id
product,
location,
lot_id=lot_id,
package_id=package_id,
owner_id=owner_id,
),
amount,
)

View File

@@ -22,14 +22,30 @@ class TestMoveLocation(TestsCommon):
self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot2)
self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot3)
self.check_product_amount(
self.product_package, self.internal_loc_1, 0, self.lot4, self.package
self.product_package, self.internal_loc_1, 0, self.lot4, self.package1
)
self.check_product_amount(
self.product_package,
self.internal_loc_1,
0,
self.lot5,
self.package2,
self.partner,
)
self.check_product_amount(self.product_no_lots, self.internal_loc_2, 123)
self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot1)
self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot2)
self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot3)
self.check_product_amount(
self.product_package, self.internal_loc_2, 1, self.lot4, self.package
self.product_package, self.internal_loc_2, 1, self.lot4, self.package1
)
self.check_product_amount(
self.product_package,
self.internal_loc_2,
1,
self.lot5,
self.package2,
self.partner,
)
def test_move_location_wizard_amount(self):
@@ -60,9 +76,9 @@ class TestMoveLocation(TestsCommon):
"""Test lines getting cleared properly."""
wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2)
wizard.onchange_origin_location()
self.assertEqual(len(wizard.stock_move_location_line_ids), 5)
self.assertEqual(len(wizard.stock_move_location_line_ids), 6)
wizard._onchange_destination_location_id()
self.assertEqual(len(wizard.stock_move_location_line_ids), 5)
self.assertEqual(len(wizard.stock_move_location_line_ids), 6)
dest_location_line = wizard.stock_move_location_line_ids.mapped(
"destination_location_id"
)
@@ -78,9 +94,10 @@ class TestMoveLocation(TestsCommon):
wizard.action_move_location()
picking = wizard.picking_id
self.assertEqual(picking.state, "assigned")
self.assertEqual(len(picking.move_line_ids), 5)
self.assertEqual(len(picking.move_line_ids), 6)
self.assertEqual(
sorted(picking.move_line_ids.mapped("product_uom_qty")), [1, 1, 1, 1, 123]
sorted(picking.move_line_ids.mapped("product_uom_qty")),
[1, 1, 1, 1, 1, 123],
)
def test_quant_transfer(self):

View File

@@ -105,6 +105,7 @@ class StockMoveLocationWizard(models.TransientModel):
"origin_location_id": quant.location_id.id,
"lot_id": quant.lot_id.id,
"package_id": quant.package_id.id,
"owner_id": quant.owner_id.id,
"product_uom_id": quant.product_uom_id.id,
"custom": False,
},
@@ -133,6 +134,7 @@ class StockMoveLocationWizard(models.TransientModel):
"origin_location_id": quant.location_id.id,
"lot_id": quant.lot_id.id,
"package_id": quant.package_id.id,
"owner_id": quant.owner_id.id,
"product_uom_id": quant.product_uom_id.id,
"custom": False,
},
@@ -242,6 +244,7 @@ class StockMoveLocationWizard(models.TransientModel):
("location_id", "=", line.origin_location_id.id),
("lot_id", "=", line.lot_id.id),
("package_id", "=", line.package_id.id),
("owner_id", "=", line.owner_id.id),
("product_uom_qty", ">", 0.0),
]
)
@@ -283,11 +286,11 @@ class StockMoveLocationWizard(models.TransientModel):
# Using sql as search_group doesn't support aggregation functions
# leading to overhead in queries to DB
query = """
SELECT product_id, lot_id, package_id, SUM(quantity) AS quantity,
SELECT product_id, lot_id, package_id, owner_id, SUM(quantity) AS quantity,
SUM(reserved_quantity) AS reserved_quantity
FROM stock_quant
WHERE location_id = %s
GROUP BY product_id, lot_id, package_id
GROUP BY product_id, lot_id, package_id, owner_id
"""
self.env.cr.execute(query, (location_id.id,))
return self.env.cr.dictfetchall()
@@ -314,6 +317,7 @@ class StockMoveLocationWizard(models.TransientModel):
# cursor returns None instead of False
"lot_id": group.get("lot_id") or False,
"package_id": group.get("package_id") or False,
"owner_id": group.get("owner_id") or False,
"product_uom_id": product.uom_id.id,
"custom": False,
}

View File

@@ -82,6 +82,7 @@
domain="[('location_id', '=', origin_location_id)]"
options="{'no_create': True}"
/>
<field name="owner_id" options="{'no_create': True}" />
<field name="move_quantity" />
<field name="custom" invisible="1" />
<field

View File

@@ -40,6 +40,7 @@ class StockMoveLocationWizardLine(models.TransientModel):
comodel_name="stock.quant.package",
domain="[('location_id', '=', origin_location_id)]",
)
owner_id = fields.Many2one(comodel_name="res.partner", string="From Owner")
move_quantity = fields.Float(
string="Quantity to move", digits="Product Unit of Measure"
)
@@ -82,6 +83,10 @@ class StockMoveLocationWizardLine(models.TransientModel):
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
@@ -107,6 +112,7 @@ class StockMoveLocationWizardLine(models.TransientModel):
"lot_id": self.lot_id.id,
"package_id": self.package_id.id,
"result_package_id": self.package_id.id,
"owner_id": self.owner_id.id,
"location_id": self.origin_location_id.id,
"location_dest_id": location_dest_id,
"product_uom_qty": qty_todo,
@@ -139,6 +145,10 @@ class StockMoveLocationWizardLine(models.TransientModel):
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"], [])
available_qty = res[0]["quantity"]
if not available_qty: