From eb6e46b5b6397e5f489945abe0378a676b85fdfc Mon Sep 17 00:00:00 2001
From: Marc Durepos <marc@bemade.org>
Date: Thu, 22 Aug 2024 20:38:07 -0400
Subject: [PATCH] fsm_equipment/bemade_fsm: fix migration script and move a
 relation to fsm_equipment

---
 bemade_fsm/migrations/17.0.0.4.0/pre-migrate.py | 16 ++++++++++------
 bemade_fsm/models/task.py                       |  9 ---------
 fsm_equipment/models/__init__.py                |  1 +
 fsm_equipment/models/task.py                    | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 fsm_equipment/models/task.py

diff --git a/bemade_fsm/migrations/17.0.0.4.0/pre-migrate.py b/bemade_fsm/migrations/17.0.0.4.0/pre-migrate.py
index 5dea508..2d7eba9 100644
--- a/bemade_fsm/migrations/17.0.0.4.0/pre-migrate.py
+++ b/bemade_fsm/migrations/17.0.0.4.0/pre-migrate.py
@@ -12,29 +12,33 @@ def migrate(cr, version):
     env = api.Environment(cr, SUPERUSER_ID, {})
     _logger.info("Moving FSM equipment...")
     # Move the old equipment over to the new table
-    sql = """
+    cr.execute(
+        """
     INSERT INTO fsm_equipment
         (id, code, name, description, partner_id, location_notes, active)
     SELECT id, pid_tag code, name, description, partner_location_id, location_notes,
            active
     FROM bemade_fsm_equipment
     """
-    cr.execute(sql)
+    )
 
     _logger.info("Moving FSM equipment tags...")
     # Move the tags
-    sql = """
+    cr.execute(
+        """
     INSERT INTO fsm_equipment_tag (id, name, color)
     SELECT id, name, color FROM bemade_fsm_equipment_tag
     """
-    cr.execute(sql)
+    )
 
     _logger.info("Re-creating equipment to tag relations.")
     # Add the relations
-    sql = """
+    cr.execute(
+        """
     INSERT INTO fsm_task_equipment_rel (equipment_id, task_id)
-    SELECT equipment_id, task_id from bemade_fsm_equipment_rel
+    SELECT equipment_id, task_id from bemade_fsm_task_equipment_rel
     """
+    )
 
     _logger.info("Deleting menu items.")
     cr.execute(
diff --git a/bemade_fsm/models/task.py b/bemade_fsm/models/task.py
index f673167..e705dfc 100644
--- a/bemade_fsm/models/task.py
+++ b/bemade_fsm/models/task.py
@@ -6,15 +6,6 @@ import re
 class Task(models.Model):
     _inherit = "project.task"
 
-    equipment_ids = fields.Many2many(
-        comodel_name="fsm.equipment",
-        relation="bemade_fsm_task_equipment_rel",
-        column1="task_id",
-        column2="equipment_id",
-        string="Equipment to Service",
-        tracking=True,
-    )
-
     work_order_contacts = fields.Many2many(
         comodel_name="res.partner",
         relation="task_work_order_contact_rel",
diff --git a/fsm_equipment/models/__init__.py b/fsm_equipment/models/__init__.py
index d19e9fa..79c07ad 100644
--- a/fsm_equipment/models/__init__.py
+++ b/fsm_equipment/models/__init__.py
@@ -2,3 +2,4 @@ from . import equipment_tag
 from . import equipment
 from . import res_partner
 from . import equipment_component
+from . import task
diff --git a/fsm_equipment/models/task.py b/fsm_equipment/models/task.py
new file mode 100644
index 0000000..194a5b9
--- /dev/null
+++ b/fsm_equipment/models/task.py
@@ -0,0 +1,14 @@
+from odoo import fields, models
+
+
+class Task(models.Model):
+    _inherit = "project.task"
+
+    equipment_ids = fields.Many2many(
+        comodel_name="fsm.equipment",
+        relation="fsm_task_equipment_rel",
+        column1="task_id",
+        column2="equipment_id",
+        string="Equipment to Service",
+        tracking=True,
+    )