Skip to content

Commit

Permalink
[FIX] refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergiocorato
sergiocorato committed Nov 11, 2024
1 parent 32f3634 commit 96e212d
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 37 deletions.
32 changes: 23 additions & 9 deletions mrp_manual_procurement_subcontractor/models/mrp_production.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,36 @@ class MrpProduction(models.Model):
)
def _compute_is_subcontractable(self):
# stop procurement for all production order which product has a
# purchase route and at least 2 subcontractor
# nel caso il prodotto non abbia bom di produzione ma solo una di subappalto?
# purchase route and at least 2 subcontractor or 1 subcontractor and at least
# 2 bom, 1 of type normal and 1 or type subcontractor
buy_route = self.env.ref("purchase_stock.route_warehouse0_buy")
for production in self:
# produce route is obviously already present
is_subcontractable = bool(
len(
production.mapped("product_id.seller_ids").filtered(
lambda x: x.is_subcontractor
)
)
>= 2
and buy_route in production.product_id.route_ids
buy_route in production.product_id.route_ids
and not production.purchase_order_id
and not production.proceed_to_production
and production.state == "confirmed"
and (
len(
production.mapped("product_id.seller_ids").filtered(
lambda x: x.is_subcontractor
)
)
>= 2
or (
production.mapped("product_id.seller_ids").filtered(
lambda x: x.is_subcontractor
)
and len(
set(
production.product_id.bom_ids.filtered(
lambda x: x.type in ["normal", "subcontract"]
).mapped("type")
)
) >= 2
)
)
)
production.is_subcontractable = is_subcontractable

Expand Down
88 changes: 60 additions & 28 deletions mrp_manual_procurement_subcontractor/tests/test_mrp_manual_procurement_subcontractor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def setUpClass(cls):
"name": cls.subcontractor_partner3.id,
}
)
# ADD to top_product buy route
# ADD to top_product buy route and two subcontractor
cls.top_product.write(
{
"purchase_ok": True,
Expand All @@ -97,6 +97,7 @@ def setUpClass(cls):
"seller_ids": [(6, 0, [supplierinfo_1.id, supplierinfo_2.id])],
}
)
# Create subcontracted component with one subcontractor
cls.subproduct3 = cls.env["product.product"].create(
{
"name": "Subcontracted component",
Expand All @@ -115,6 +116,7 @@ def setUpClass(cls):
"categ_id": cls.product_categ_order_grouping.id,
}
)
# Create bom of type subcontract for subcontracted component
cls.sub_bom3 = cls.env["mrp.bom"].create(
{
"product_tmpl_id": cls.subproduct3.product_tmpl_id.id,
Expand Down Expand Up @@ -155,6 +157,7 @@ def setUpClass(cls):
],
}
)
# add to main bom subcontracted the subcontracted component
cls.main_bom_subcontracted.write(
{
"bom_line_ids": [
Expand All @@ -169,6 +172,21 @@ def setUpClass(cls):
]
}
)
# add to main bom the subcontracted component
cls.main_bom.write(
{
"bom_line_ids": [
(
0,
0,
{
"product_id": cls.subproduct3.id,
"product_qty": 2,
},
)
]
}
)

def _create_sale_order_line(self, order, product, qty):
vals = {
Expand Down Expand Up @@ -236,14 +254,14 @@ def test_01_mo_from_sale_with_subcontracting_and_mto(self):
self.assertEqual(len(new_po_ids.mapped("order_line")), 1)
self.assertEqual(new_po_ids.state, "purchase")
self.assertTrue(new_po_ids.subcontract_production_ids)
# subproduct3_po_ids = self.env["purchase.order"].search(
# [
# ("order_line.product_id", "=", self.subproduct3.id),
# ]
# )
# self.assertEqual(len(subproduct3_po_ids), 1)
subproduct3_po_ids = self.env["purchase.order"].search(
[
("order_line.product_id", "=", self.subproduct3.id),
]
)
self.assertEqual(len(subproduct3_po_ids), 1)
# self.assertEqual(subproduct3_po_ids.state, "purchase")
# self.assertEqual(subproduct3_po_ids.origin, self.production.name)
self.assertEqual(subproduct3_po_ids.origin, production.name)

def test_02_normal_mo_from_sale_with_mto(self):
product_qty = 3
Expand Down Expand Up @@ -281,14 +299,14 @@ def test_02_normal_mo_from_sale_with_mto(self):
]
)
self.assertFalse(new_po_ids)
# subproduct3_po_ids = self.env["purchase.order"].search(
# [
# ("order_line.product_id", "in", self.subproduct3.ids),
# ]
# )
# self.assertEqual(len(subproduct3_po_ids), 1)
# self.assertEqual(subproduct3_po_ids.state, "purchase")
# self.assertEqual(subproduct3_po_ids.origin, self.production.name)
subproduct3_po_ids = self.env["purchase.order"].search(
[
("order_line.product_id", "in", self.subproduct3.ids),
]
)
self.assertEqual(len(subproduct3_po_ids), 1)
self.assertEqual(subproduct3_po_ids.state, "purchase")
self.assertEqual(subproduct3_po_ids.origin, production.name)

def _remove_mto_and_create_orderpoint(self):
for product in [self.top_product, self.subproduct3]:
Expand Down Expand Up @@ -317,8 +335,8 @@ def test_03_mo_from_sale_with_subcontracting_and_orderpoint(self):
)
self._create_sale_order_line(sale_order, self.top_product, 3)
sale_order.action_confirm()
# check procurement has not created RDP, even launching scheduler
# (which will do nothing anyway)
# check procurement has not created RDP, even launching scheduler (which will
# do nothing anyway)
with mute_logger("odoo.addons.stock.models.procurement"):
self.procurement_model.run_scheduler()
production = self.env["mrp.production"].search(
Expand All @@ -333,6 +351,12 @@ def test_03_mo_from_sale_with_subcontracting_and_orderpoint(self):
]
)
self.assertFalse(po_ids)
# subproduct3_po_ids = self.env["purchase.order"].search(
# [
# ("order_line.product_id", "in", self.subproduct3.ids),
# ]
# )
# self.assertFalse(subproduct3_po_ids) FIXME questo viene già creato qui
# continue production with subcontrator
procure_form = Form(
self.env["mrp.production.procure.subcontractor"].with_context(
Expand All @@ -343,6 +367,11 @@ def test_03_mo_from_sale_with_subcontracting_and_orderpoint(self):
procure_form.subcontractor_id = self.subcontractor_partner2
wizard = procure_form.save()
wizard.action_done()
self.assertEqual(production.state, "cancel")
new_production = self.env["mrp.production"].search(
[("product_id", "=", self.top_product.id), ("state", "!=", "cancel")]
)
self.assertTrue(new_production)
new_po_ids = self.env["purchase.order"].search(
[
("order_line.product_id", "in", self.top_product.ids),
Expand All @@ -359,7 +388,7 @@ def test_03_mo_from_sale_with_subcontracting_and_orderpoint(self):
# check purchase order for manufactured product is in purchase state
subproduct3_po_ids = self.env["purchase.order"].search(
[
("order_line.product_id", "in", self.subproduct3.ids),
("order_line.product_id", "=", self.subproduct3.id),
]
)
self.assertEqual(len(subproduct3_po_ids), 1)
Expand Down Expand Up @@ -411,13 +440,16 @@ def test_04_normal_mo_from_sale_with_orderpoint(self):
with mute_logger("odoo.addons.stock.models.procurement"):
self.procurement_model.run_scheduler()
# check purchase order for manufactured product is in purchase state
# subproduct3_po_ids = self.env["purchase.order"].search(
# [
# ("order_line.product_id", "in", self.subproduct3.ids),
# ]
# )
# self.assertEqual(len(subproduct3_po_ids), 1)
# self.assertEqual(subproduct3_po_ids.state, "purchase")
# self.assertEqual(
# subproduct3_po_ids.origin, self.subproduct3.orderpoint_ids.name
subproduct3_po_ids = self.env["purchase.order"].search(
[
("order_line.product_id", "in", self.subproduct3.ids),
]
)
self.assertEqual(len(subproduct3_po_ids), 1)
self.assertEqual(subproduct3_po_ids.state, "purchase")
self.assertIn(
self.subproduct3.orderpoint_ids.name, subproduct3_po_ids.origin
)
# self.assertIn(
# new_po_ids.picking_ids.name, subproduct3_po_ids.origin
# )

0 comments on commit 96e212d

Please sign in to comment.