audrius/manufacture
1
0
Fork 0
mirror of https://github.com/OCA/manufacture.git synced 2025-01-28 16:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] mrp_subcontracting_partner_management: Define the correct picking_type (out) in the subcontracting_resupply rule

Browse Source 
Before this change the picking_type_id used to create the subcontracting_resupply rule
was "fixed”, which is incorrect if you do not use the main company or multi-company.
This commit is contained in:
Víctor Martínez
2024-08-27 16:47:13 +02:00
parent ff699f89d8
commit 8054c364d2
3 changed files with 75 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mrp_subcontracting_partner_management/models/res_partner.py
View File

@@ -222,7 +222,11 @@ class ResPartner(models.Model):
prop = self.env["ir.property"]._get( prop = self.env["ir.property"]._get(
"property_stock_production", "product.template" "property_stock_production", "product.template"
) )
picking_type = self.env.ref("stock.picking_type_out", raise_if_not_found=False) company = self.company_id or self.env.company
warehouse = self.env["stock.warehouse"].search(
[("company_id", "=", company.id)], limit=1
)
picking_type = warehouse.out_type_id
route = self.env.ref( route = self.env.ref(
"mrp_subcontracting.route_resupply_subcontractor_mto", "mrp_subcontracting.route_resupply_subcontractor_mto",
raise_if_not_found=False, raise_if_not_found=False,

139
mrp_subcontracting_partner_management/tests/test_create_subcontractor_partner_location.py
View File

@@ -1,4 +1,5 @@
from odoo.tests import common, tagged from odoo.tests import common, tagged
from odoo.tools import mute_logger
@tagged("post_install", "-at_install") @tagged("post_install", "-at_install")
@@ -6,149 +7,95 @@ class TestSubcontractedPartner(common.SavepointCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super().setUpClass() super().setUpClass()
cls.partner_id = cls.env.ref("base.res_partner_12")
cls.partner_obj = cls.env["res.partner"] cls.partner_obj = cls.env["res.partner"]
cls.partner = cls.partner_obj.create({"name": "Test partner"})
def test_is_subcontractor_partner_first_time(self): def test_is_subcontractor_partner_first_time(self):
self.partner_id.update( self.partner.update({"is_subcontractor_partner": True})
{ location = self.partner.subcontracted_created_location_id
"is_subcontractor_partner": True,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertTrue(location, "Location is not created") self.assertTrue(location, "Location is not created")
self.assertTrue(location.active, "Location must be active") self.assertTrue(location.active, "Location must be active")
partner_picking_type = self.partner.partner_picking_type_id
partner_picking_type = self.partner_id.partner_picking_type_id
self.assertTrue(partner_picking_type, "Picking type is not created") self.assertTrue(partner_picking_type, "Picking type is not created")
self.assertTrue(partner_picking_type.active, "Picking type must be active") self.assertTrue(partner_picking_type.active, "Picking type must be active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertTrue(partner_buy_rule, "Partner Buy rule is not created") self.assertTrue(partner_buy_rule, "Partner Buy rule is not created")
self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active") self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertTrue(partner_resupply_rule, "Partner Resupply rule is not created") self.assertTrue(partner_resupply_rule, "Partner Resupply rule is not created")
self.assertTrue( self.assertTrue(
partner_resupply_rule.active, "Partner Resupply rule must be active" partner_resupply_rule.active, "Partner Resupply rule must be active"
) )
def test_is_subcontractor_partner_switch_off(self): def test_is_subcontractor_partner_switch_off(self):
self.partner_id.write( self.partner.write({"is_subcontractor_partner": True})
{ self.partner.update({"is_subcontractor_partner": False})
"is_subcontractor_partner": True, location = self.partner.subcontracted_created_location_id
}
)
self.partner_id.update(
{
"is_subcontractor_partner": False,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertFalse(location.active, "Location must be not active") self.assertFalse(location.active, "Location must be not active")
partner_picking_type = self.partner.partner_picking_type_id
partner_picking_type = self.partner_id.partner_picking_type_id
self.assertFalse(partner_picking_type.active, "Picking type must be not active") self.assertFalse(partner_picking_type.active, "Picking type must be not active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active") self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertFalse( self.assertFalse(
partner_resupply_rule.active, "Partner Resupply rule must be not active" partner_resupply_rule.active, "Partner Resupply rule must be not active"
) )
def test_is_subcontractor_partner_switch_on(self): def test_is_subcontractor_partner_switch_on(self):
self.partner_id.update( self.partner.update({"is_subcontractor_partner": True})
{ location = self.partner.subcontracted_created_location_id
"is_subcontractor_partner": True,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertTrue(location.active, "Location must be active") self.assertTrue(location.active, "Location must be active")
partner_picking_type = self.partner.partner_picking_type_id
partner_picking_type = self.partner_id.partner_picking_type_id
self.assertTrue(partner_picking_type.active, "Picking type must be active") self.assertTrue(partner_picking_type.active, "Picking type must be active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active") self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertTrue( self.assertTrue(
partner_resupply_rule.active, "Partner Resupply rule must be active" partner_resupply_rule.active, "Partner Resupply rule must be active"
) )
def test_is_subcontractor_partner_aсtive_switch_off(self): def test_is_subcontractor_partner_aсtive_switch_off(self):
self.partner_id.write( self.partner.write({"is_subcontractor_partner": True})
{ self.partner.update({"active": False})
"is_subcontractor_partner": True, location = self.partner.subcontracted_created_location_id
}
)
self.partner_id.update(
{
"active": False,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertFalse(location.active, "Location must be not active") self.assertFalse(location.active, "Location must be not active")
partner_picking_type = self.partner.partner_picking_type_id
partner_picking_type = self.partner_id.partner_picking_type_id
self.assertFalse(partner_picking_type.active, "Picking type must be not active") self.assertFalse(partner_picking_type.active, "Picking type must be not active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active") self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertFalse( self.assertFalse(
partner_resupply_rule.active, "Partner Resupply rule must be not active" partner_resupply_rule.active, "Partner Resupply rule must be not active"
) )
def test_is_subcontractor_partner_aсtive_switch_on(self): def test_is_subcontractor_partner_aсtive_switch_on(self):
self.partner_id.write( self.partner.write({"is_subcontractor_partner": True})
{ self.partner.write({"active": True})
"is_subcontractor_partner": True, location = self.partner.subcontracted_created_location_id
}
)
self.partner_id.write(
{
"active": True,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertTrue(location.active, "Location must be active") self.assertTrue(location.active, "Location must be active")
partner_picking_type = self.partner.partner_picking_type_id
partner_picking_type = self.partner_id.partner_picking_type_id
self.assertTrue(partner_picking_type.active, "Picking type must be active") self.assertTrue(partner_picking_type.active, "Picking type must be active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active") self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertTrue( self.assertTrue(
partner_resupply_rule.active, "Partner Resupply rule must be active" partner_resupply_rule.active, "Partner Resupply rule must be active"
) )
@mute_logger("odoo.models.unlink")
def test_is_subcontractor_partner_delete(self): def test_is_subcontractor_partner_delete(self):
partner_id = self.partner_obj.create( partner = self.partner_obj.create(
{ {
"name": "Test partner", "name": "Test partner",
"is_company": True, "is_company": True,
"is_subcontractor_partner": True, "is_subcontractor_partner": True,
} }
) )
location = partner.subcontracted_created_location_id
location = partner_id.subcontracted_created_location_id partner_picking_type = partner.partner_picking_type_id
partner_picking_type = partner_id.partner_picking_type_id partner_buy_rule = partner.partner_buy_rule_id
partner_buy_rule = partner_id.partner_buy_rule_id partner_resupply_rule = partner.partner_resupply_rule_id
partner_resupply_rule = partner_id.partner_resupply_rule_id partner.unlink()
partner_id.unlink()
self.assertFalse(location.active, "Location must be not active") self.assertFalse(location.active, "Location must be not active")
self.assertFalse(partner_picking_type.active, "Picking type must be not active") self.assertFalse(partner_picking_type.active, "Picking type must be not active")
self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active") self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active")
@@ -157,7 +104,7 @@ class TestSubcontractedPartner(common.SavepointCase):
) )
def test_check_countof_rules(self): def test_check_countof_rules(self):
partner_id = self.partner_obj.create( partner = self.partner_obj.create(
{ {
"name": "Test partner", "name": "Test partner",
"is_company": True, "is_company": True,
@@ -165,7 +112,7 @@ class TestSubcontractedPartner(common.SavepointCase):
} }
) )
rules = self.env["stock.rule"].search( rules = self.env["stock.rule"].search(
[("name", "=", partner_id.partner_buy_rule_id.name)] [("name", "=", partner.partner_buy_rule_id.name)]
) )
self.assertTrue(len(rules) == 2, "There are must be 2 subcontractor rules") self.assertTrue(len(rules) == 2, "There are must be 2 subcontractor rules")
@@ -184,7 +131,6 @@ class TestSubcontractedPartner(common.SavepointCase):
expected_text, expected_text,
msg="Location name must be equal to {}".format(expected_text), msg="Location name must be equal to {}".format(expected_text),
) )
fields = [ fields = [
"subcontracted_created_location_id", "subcontracted_created_location_id",
"partner_buy_rule_id", "partner_buy_rule_id",
@@ -200,7 +146,6 @@ class TestSubcontractedPartner(common.SavepointCase):
expected_text, expected_text,
msg="Record name must be equal to {}".format(expected_text), msg="Record name must be equal to {}".format(expected_text),
) )
picking = partner.partner_picking_type_id picking = partner.partner_picking_type_id
expected_text = "%s: IN" % expected_text expected_text = "%s: IN" % expected_text
self.assertEqual( self.assertEqual(
@@ -213,15 +158,15 @@ class TestSubcontractedPartner(common.SavepointCase):
) )
def test_action_subcontractor_location_stock(self): def test_action_subcontractor_location_stock(self):
self.partner_id.update({"is_subcontractor_partner": True}) self.partner.update({"is_subcontractor_partner": True})
action = self.partner_id.action_subcontractor_location_stock() action = self.partner.action_subcontractor_location_stock()
self.assertEqual( self.assertEqual(
action.get("domain"), action.get("domain"),
[ [
( (
"location_id", "location_id",
"child_of", "child_of",
self.partner_id.property_stock_subcontractor.ids, self.partner.property_stock_subcontractor.ids,
) )
], ],
msg="Domains must be the same", msg="Domains must be the same",

106
mrp_subcontracting_purchase_partner_management/tests/test_create_subcontractor_partner_location.py
View File

@@ -16,128 +16,78 @@ class TestSubcontractedPartnerPatch(TestSubcontractedPartner):
) )
def test_is_subcontractor_partner_first_time(self): def test_is_subcontractor_partner_first_time(self):
self.partner_id.update( self.partner.update({"is_subcontractor_partner": True})
{ location = self.partner.subcontracted_created_location_id
"is_subcontractor_partner": True,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertTrue(location, "Location is not created") self.assertTrue(location, "Location is not created")
self.assertTrue(location.active, "Location must be active") self.assertTrue(location.active, "Location must be active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertTrue(partner_buy_rule, "Partner Buy rule is not created") self.assertTrue(partner_buy_rule, "Partner Buy rule is not created")
self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active") self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertTrue(partner_resupply_rule, "Partner Resupply rule is not created") self.assertTrue(partner_resupply_rule, "Partner Resupply rule is not created")
self.assertTrue( self.assertTrue(
partner_resupply_rule.active, "Partner Resupply rule must be active" partner_resupply_rule.active, "Partner Resupply rule must be active"
) )
def test_is_subcontractor_partner_switch_off(self): def test_is_subcontractor_partner_switch_off(self):
self.partner_id.write( self.partner.write({"is_subcontractor_partner": True})
{ self.partner.update({"is_subcontractor_partner": False})
"is_subcontractor_partner": True, location = self.partner.subcontracted_created_location_id
}
)
self.partner_id.update(
{
"is_subcontractor_partner": False,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertFalse(location.active, "Location must be not active") self.assertFalse(location.active, "Location must be not active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active") self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertFalse( self.assertFalse(
partner_resupply_rule.active, "Partner Resupply rule must be not active" partner_resupply_rule.active, "Partner Resupply rule must be not active"
) )
def test_is_subcontractor_partner_switch_on(self): def test_is_subcontractor_partner_switch_on(self):
self.partner_id.update( self.partner.update({"is_subcontractor_partner": True})
{ location = self.partner.subcontracted_created_location_id
"is_subcontractor_partner": True,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertTrue(location.active, "Location must be active") self.assertTrue(location.active, "Location must be active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active") self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertTrue( self.assertTrue(
partner_resupply_rule.active, "Partner Resupply rule must be active" partner_resupply_rule.active, "Partner Resupply rule must be active"
) )
def test_is_subcontractor_partner_active_switch_off(self): def test_is_subcontractor_partner_active_switch_off(self):
self.partner_id.write( self.partner.write({"is_subcontractor_partner": True})
{ self.partner.update({"active": False})
"is_subcontractor_partner": True, location = self.partner.subcontracted_created_location_id
}
)
self.partner_id.update(
{
"active": False,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertFalse(location.active, "Location must be not active") self.assertFalse(location.active, "Location must be not active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active") self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertFalse( self.assertFalse(
partner_resupply_rule.active, "Partner Resupply rule must be not active" partner_resupply_rule.active, "Partner Resupply rule must be not active"
) )
def test_is_subcontractor_partner_aсtive_switch_on(self): def test_is_subcontractor_partner_aсtive_switch_on(self):
self.partner_id.write( self.partner.write({"is_subcontractor_partner": True})
{ self.partner.write({"active": True})
"is_subcontractor_partner": True, location = self.partner.subcontracted_created_location_id
}
)
self.partner_id.write(
{
"active": True,
}
)
location = self.partner_id.subcontracted_created_location_id
self.assertTrue(location.active, "Location must be active") self.assertTrue(location.active, "Location must be active")
partner_buy_rule = self.partner.partner_buy_rule_id
partner_buy_rule = self.partner_id.partner_buy_rule_id
self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active") self.assertTrue(partner_buy_rule.active, "Partner Buy rule must be active")
partner_resupply_rule = self.partner.partner_resupply_rule_id
partner_resupply_rule = self.partner_id.partner_resupply_rule_id
self.assertTrue( self.assertTrue(
partner_resupply_rule.active, "Partner Resupply rule must be active" partner_resupply_rule.active, "Partner Resupply rule must be active"
) )
def test_is_subcontractor_partner_delete(self): def test_is_subcontractor_partner_delete(self):
partner_id = self.partner_obj.create( partner = self.partner_obj.create(
{ {
"name": "Test partner", "name": "Test partner",
"is_company": True, "is_company": True,
"is_subcontractor_partner": True, "is_subcontractor_partner": True,
} }
) )
location = partner.subcontracted_created_location_id
location = partner_id.subcontracted_created_location_id partner_buy_rule = partner.partner_buy_rule_id
partner_buy_rule = partner_id.partner_buy_rule_id partner_resupply_rule = partner.partner_resupply_rule_id
partner_resupply_rule = partner_id.partner_resupply_rule_id partner.unlink()
partner_id.unlink()
self.assertFalse(location.active, "Location must be not active") self.assertFalse(location.active, "Location must be not active")
self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active") self.assertFalse(partner_buy_rule.active, "Partner Buy rule must be not active")
self.assertFalse( self.assertFalse(