From 1a042a720fd1ca0fb65e7c67cb1c09033aaba7a0 Mon Sep 17 00:00:00 2001
From: Marc Durepos <marc@bemade.org>
Date: Fri, 6 Sep 2024 08:27:31 -0400
Subject: [PATCH] bemade_fsm, fsm_equipment: fixes #109

Updated report template to use display_name and converted the
_compute_complete_name function to _compute_display_name in
fsm.equipment model.
---
 bemade_fsm/__manifest__.py                               | 2 +-
 bemade_fsm/reports/worksheet_custom_report_templates.xml | 2 +-
 bemade_fsm/views/task_views.xml                          | 3 ++-
 fsm_equipment/__manifest__.py                            | 2 +-
 fsm_equipment/models/equipment.py                        | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index 096e4fb..e981190 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     "name": "Improved Field Service Management",
-    "version": "17.0.0.4.0",
+    "version": "17.0.0.4.1",
     "summary": (
         "Adds functionality necessary for managing field service operations at Durpro."
     ),
diff --git a/bemade_fsm/reports/worksheet_custom_report_templates.xml b/bemade_fsm/reports/worksheet_custom_report_templates.xml
index cddad25..d461a2f 100644
--- a/bemade_fsm/reports/worksheet_custom_report_templates.xml
+++ b/bemade_fsm/reports/worksheet_custom_report_templates.xml
@@ -288,7 +288,7 @@
                 <h3 t-if="intervention.equipment_ids">Equipment:
                     <t t-foreach="intervention.equipment_ids" t-as="equipment_id">
                         <span
-              t-out="equipment_id.complete_name + (', ' if not equipment_id_last else '')"
+              t-out="equipment_id.display_name + (', ' if not equipment_id_last else '')"
             />
                     </t>
                 </h3>
diff --git a/bemade_fsm/views/task_views.xml b/bemade_fsm/views/task_views.xml
index 58ac808..6bce7cd 100644
--- a/bemade_fsm/views/task_views.xml
+++ b/bemade_fsm/views/task_views.xml
@@ -15,7 +15,8 @@
                 </h1>
             </xpath>
             <xpath expr="//page[@name='extra_info']" position="after">
-                <page string="Field Service" name="field_service" translate="True">
+                <page string="Equipment and Contacts" name="equipment_contacts"
+                      translate="True">
                     <group name="equipment_and_contacts">
                         <field
               name="equipment_ids"
diff --git a/fsm_equipment/__manifest__.py b/fsm_equipment/__manifest__.py
index b1491e0..69fbb42 100644
--- a/fsm_equipment/__manifest__.py
+++ b/fsm_equipment/__manifest__.py
@@ -19,7 +19,7 @@
 #
 {
     "name": "FSM Equipment",
-    "version": "17.0.0.1.1",
+    "version": "17.0.0.1.2",
     "summary": "Add the notion of client equipment for Field Service",
     "category": "Services/Field Service",
     "author": "Bemade Inc.",
diff --git a/fsm_equipment/models/equipment.py b/fsm_equipment/models/equipment.py
index 321dba7..8f3363d 100644
--- a/fsm_equipment/models/equipment.py
+++ b/fsm_equipment/models/equipment.py
@@ -84,8 +84,8 @@ class Equipment(models.Model):
         }
 
     @api.depends("code", "name")
-    def _compute_complete_name(self):
+    def _compute_display_name(self):
         for rec in self:
             tag_part = "[%s] " % rec.code if rec.code else ""
             name = rec.name or ""
-            rec.complete_name = tag_part + name
+            rec.display_name = tag_part + name