From 8fc8c6ae269eebee4f493ecf9c2818d465b27de3 Mon Sep 17 00:00:00 2001
From: Marc Durepos <marc@bemade.org>
Date: Wed, 5 Jul 2023 16:16:29 -0400
Subject: [PATCH] Updated the naming of tasks for FSM. Fixes #54.

---
 bemade_fsm/models/sale_order.py                  | 7 ++++++-
 bemade_fsm/static/tests/tours/sale_order_tour.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bemade_fsm/models/sale_order.py b/bemade_fsm/models/sale_order.py
index ff287d1..164fee6 100644
--- a/bemade_fsm/models/sale_order.py
+++ b/bemade_fsm/models/sale_order.py
@@ -69,6 +69,10 @@ class SaleOrderLine(models.Model):
             task.child_ids.write({'sale_order_id': None, 'sale_line_id': None, })
             return task
 
+        def _generate_task_name(template = None):
+            template_name = template and template.name
+            return f"{self.order_id.name}: {self.order_id.partner_shipping_id.name} - {self.name} ({template_name})"
+
         def _timesheet_create_task_prepare_values_from_template(project, template, parent):
             """ Copies the values from a project.task.template over to the set of values used to create a project.task.
 
@@ -79,7 +83,7 @@ class SaleOrderLine(models.Model):
             :param parent: project.task to set as the parent to this task.
             """
             vals = self._timesheet_create_task_prepare_values(project)
-            vals['name'] = f"{vals['name']} ({template.name})" if not parent else template.name
+            vals['name'] = _generate_task_name(template) if not parent else template.name
             vals['description'] = template.description or vals['description']
             vals['parent_id'] = parent and parent.id
             vals['user_ids'] = template.assignees.ids
@@ -99,4 +103,5 @@ class SaleOrderLine(models.Model):
                            self.order_id.id, self.order_id.name, self.product_id.name)
             task.message_post(body=task_msg)
         task.equipment_id = self.order_id.equipment_id
+        task.name = _generate_task_name(tmpl)
         return task
diff --git a/bemade_fsm/static/tests/tours/sale_order_tour.js b/bemade_fsm/static/tests/tours/sale_order_tour.js
index d2ab49b..86b3849 100644
--- a/bemade_fsm/static/tests/tours/sale_order_tour.js
+++ b/bemade_fsm/static/tests/tours/sale_order_tour.js
@@ -35,6 +35,6 @@ tour.register('sale_order_tour', {
     }, {
         content: 'View the SO',
         trigger: 'button[name="action_view_so"]',
-        extra_trigger: 'button[title="Current state"]:contains(Done)',
+        // extra_trigger: 'button[title="Current state"]:contains(Done)',
     }
     ]);