[IMP] fieldservice_stock: Remove unused procurement field fsm_order_id

Author: ppyczko

fieldservice_sale/models/sale_order.py

@@ -46,19 +46,18 @@ def _compute_fsm_location_id(self):
         the partner_shipping_id or the partner_id.commercial_partner_id if
         they are FS locations.
         """
-        res = super().onchange_partner_id()
-        domain = [
-            "|",
-            "|",
-            ("partner_id", "=", self.partner_id.id),
-            ("partner_id", "=", self.partner_shipping_id.id),
-            ("partner_id", "=", self.partner_id.commercial_partner_id.id),
-        ]
-        if self.partner_id.fsm_location:
-            domain = [("partner_id", "=", self.partner_id.id)]
-        location_ids = self.env["fsm.location"].search(domain)
-        self.fsm_location_id = location_ids and location_ids[0] or False
-        return res
+        for so in self:
+            if so.partner_id.fsm_location:
+                domain = [("partner_id", "=", so.partner_id.id)]
+            else:
+                domain = [
+                    "|",
+                    "|",
+                    ("partner_id", "=", so.partner_id.id),
+                    ("partner_id", "=", so.partner_shipping_id.id),
+                    ("partner_id", "=", so.partner_id.commercial_partner_id.id),
+                ]
+            so.fsm_location_id = self.env["fsm.location"].search(domain, limit=1)
 
     def _prepare_line_fsm_values(self, line):
         """
@@ -154,15 +153,15 @@ def _field_service_generate(self):
 
         # Process lines set to FSM Sale
         new_fsm_sale_sol = self.order_line.filtered(
-            lambda l: l.product_id.field_service_tracking == "sale"
-            and (not l.fsm_order_id or l.fsm_order_id.is_closed)
+            lambda x: x.product_id.field_service_tracking == "sale"
+            and (not x.fsm_order_id or x.fsm_order_id.is_closed)
         )
         new_fsm_orders |= self._field_service_generate_sale_fsm_orders(new_fsm_sale_sol)
 
         # Create new FSM Order for lines set to FSM Line
         new_fsm_line_sol = self.order_line.filtered(
-            lambda l: l.product_id.field_service_tracking == "line"
-            and (not l.fsm_order_id or l.fsm_order_id.is_closed)
+            lambda x: x.product_id.field_service_tracking == "line"
+            and (not x.fsm_order_id or x.fsm_order_id.is_closed)
         )
 
         new_fsm_orders |= self._field_service_generate_line_fsm_orders(new_fsm_line_sol)

fieldservice_sale/tests/test_fsm_sale_order.py

@@ -550,7 +550,9 @@ def test_sale_order_cancel(self):
         fsm_order = self.sale_order_1.fsm_order_ids[0]
 
         # Cancel the Sale Order
-        self.sale_order_1.action_cancel()
+        self.sale_order_1.with_context(
+            disable_cancel_warning="disable_cancel_warning"
+        ).action_cancel()
         self.assertEqual(
             self.sale_order_1.state,
             "cancel",

fieldservice_stock/models/fsm_order.py

@@ -54,6 +54,7 @@ def _compute_picking_ids(self):
                 lambda p: p.picking_type_id.code == "incoming"
             )
             order.return_count = len(incoming_pickings.ids)
+            order.move_ids = order.picking_ids.mapped("move_lines")
 
     def action_view_delivery(self):
         """

fieldservice_stock/models/stock_picking.py

@@ -7,5 +7,5 @@ class StockPicking(models.Model):
     _inherit = "stock.picking"
 
     fsm_order_id = fields.Many2one(
-        related="group_id.fsm_order_id", string="Field Service Order", store=True
+        "fsm.order", string="Field Service Order", store=True
     )