[FIX] fieldservice: Fix location partner type

Service locations `fsm.location` create a partner `res.partner` through
inheritance.

Before this change, partners could be explicitely typed "fsm_location"
when adding them within children of an existing partner, which in turn
would automatically create service locations on top of them.

But creating a service location by hand would not set that type on the
partner created through inheritance. After this change, all partners
built from service locations are typed the same.

Fixes #1128.

Author: houzefa-abba

fieldservice/models/fsm_location.py

@@ -70,10 +70,12 @@ class FSMLocation(models.Model):
     )
 
     @api.model_create_multi
-    def create(self, vals):
-        res = super().create(vals)
-        res.write({"fsm_location": True})
-        return res
+    def create(self, vals_list):
+        for vals in vals_list:
+            vals.update({"fsm_location": True, "type": "fsm_location"})
+        return super(FSMLocation, self.with_context(creating_fsm_location=True)).create(
+            vals_list
+        )
 
     @api.depends("partner_id.name", "fsm_parent_id.complete_name", "ref")
     def _compute_complete_name(self):

fieldservice/models/res_partner.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ResPartner(models.Model):
@@ -52,21 +52,22 @@ def action_open_owned_locations(self):
             return action
 
     def _convert_fsm_location(self):
-        wiz = self.env["fsm.wizard"]
-        partners_with_loc_ids = (
-            self.env["fsm.location"]
-            .sudo()
-            .search([("active", "in", [False, True]), ("partner_id", "in", self.ids)])
-            .mapped("partner_id")
-        ).ids
+        """Build service location when adding child partner with type=fsm_location."""
+        if self.env.context.get("creating_fsm_location"):
+            return  # partner created by inheritance from fsm.location
+        for partner in self:
+            if partner.type == "fsm_location" and not partner.fsm_location_id:
+                self.env["fsm.wizard"].action_convert_location(partner)
 
-        partners_to_convert = self.filtered(
-            lambda p: p.type == "fsm_location" and p.id not in partners_with_loc_ids
-        )
-        for partner_to_convert in partners_to_convert:
-            wiz.action_convert_location(partner_to_convert)
+    @api.model_create_multi
+    def create(self, vals_list):
+        partners = super().create(vals_list)
+        if any(vals.get("type") == "fsm_location" for vals in vals_list):
+            partners._convert_fsm_location()
+        return partners
 
-    def write(self, value):
-        res = super().write(value)
-        self._convert_fsm_location()
+    def write(self, vals):
+        res = super().write(vals)
+        if vals.get("type") == "fsm_location":
+            self._convert_fsm_location()
         return res

fieldservice/tests/test_fsm_location.py

@@ -50,6 +50,12 @@ def test_fsm_location(self):
         ]:
             self.assertEqual(location[x], self.test_location[x])
 
+        # Check partner defaults.
+        self.assertTrue(location.fsm_location)
+        self.assertFalse(location.fsm_person)
+        self.assertFalse(location.is_company)
+        self.assertEqual(location.type, "fsm_location")
+
         # Test initial stage
         self.assertEqual(
             location.stage_id, self.env.ref("fieldservice.location_stage_1")

fieldservice/tests/test_fsm_wizard.py

@@ -60,14 +60,15 @@ def test_convert_location(self):
         # convert test_partner to FSM Location
         self.Wizard.action_convert_location(self.test_partner)
 
-        # check if there is a new FSM Location with name 'Test Partner'
-        self.wiz_location = self.env["fsm.location"].search(
-            [("name", "=", "Test Partner")]
-        )
-
-        # check if 'Test Partner' creation successful and fields copied over
-        self.assertEqual(self.test_location.phone, self.wiz_location.phone)
-        self.assertEqual(self.test_location.email, self.wiz_location.email)
+        # Check new service location.
+        new_location = self.env["fsm.location"].search([("name", "=", "Test Partner")])
+        self.assertNotEqual(new_location, self.test_location)
+        self.assertTrue(new_location.fsm_location)
+        self.assertFalse(new_location.fsm_person)
+        self.assertFalse(new_location.is_company)
+        self.assertEqual(new_location.type, "fsm_location")
+        self.assertEqual(self.test_location.phone, new_location.phone)
+        self.assertEqual(self.test_location.email, new_location.email)
 
     def test_convert_person(self):
         # convert test_partner to FSM Person

fieldservice/wizard/fsm_wizard.py

@@ -34,7 +34,7 @@ def action_convert_location(self, partner):
         fl_model = self.env["fsm.location"]
         if fl_model.search_count([("partner_id", "=", partner.id)]) == 0:
             fl_model.create(self._prepare_fsm_location(partner))
-            partner.write({"fsm_location": True})
+            partner.write({"fsm_location": True, "type": "fsm_location"})
             self.action_other_address(partner)
         else:
             raise UserError(