From 2af15aa1057dc6a04d99b347dde2daf28beb7476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jp@naralabs.com>
Date: Sat, 2 Nov 2024 17:52:45 +0100
Subject: [PATCH] Cleanup

---
 CHANGES.rst                              | 2 +-
 src/senaite/core/upgrade/v02_06_000.py   | 2 +-
 src/senaite/core/upgrade/v02_06_000.zcml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 43c64335cf..6758951bbd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
 2.6.0 (unreleased)
 ------------------
 
+- #2569 Fix samples are indicated as late when Turnaround Time is zero
 - #2636 Fix JS Error in WS Template edit form
 - #2635 Remove reindexing of Analyses and Analysis Services on Category change
 - #2599 Migrate WorksheetTemplates to Dexterity
@@ -18,7 +19,6 @@ Changelog
 - #2625 Fix sizing of listing widgets
 - #2621 Fix UnicodeDecodeError when render non-latin email template
 - #2623 Fix inactive services are added via profile on sample creation/edition
-- #2569 Fix samples are indicated as late when Turnaround Time is zero
 - #2620 Support IAddSampleObjectInfo adapter for sample's Template field
 - #2619 Fix analysis categories are not sorted by sort key
 - #2618 Fix UnicodeDecodeError when user linked to a contact with special chars
diff --git a/src/senaite/core/upgrade/v02_06_000.py b/src/senaite/core/upgrade/v02_06_000.py
index 956a694461..4544de81a4 100644
--- a/src/senaite/core/upgrade/v02_06_000.py
+++ b/src/senaite/core/upgrade/v02_06_000.py
@@ -24,6 +24,7 @@
 from bika.lims import api
 from bika.lims.api import UID_CATALOG
 from bika.lims.api.snapshot import disable_snapshots
+from bika.lims.interfaces.analysis import IRequestAnalysis
 from bika.lims.utils import tmpID
 from plone.dexterity.fti import DexterityFTI
 from plone.dexterity.utils import createContent
@@ -60,7 +61,6 @@
 from senaite.core.schema.addressfield import PHYSICAL_ADDRESS
 from senaite.core.schema.addressfield import POSTAL_ADDRESS
 from zope.component import getMultiAdapter
-from bika.lims.interfaces.analysis import IRequestAnalysis
 
 version = "2.6.0"  # Remember version number in metadata.xml and setup.py
 profile = "profile-{0}:default".format(product)
diff --git a/src/senaite/core/upgrade/v02_06_000.zcml b/src/senaite/core/upgrade/v02_06_000.zcml
index 72e0930973..b84adfd7c0 100644
--- a/src/senaite/core/upgrade/v02_06_000.zcml
+++ b/src/senaite/core/upgrade/v02_06_000.zcml
@@ -4,8 +4,8 @@
     i18n_domain="senaite.core">
 
    <genericsetup:upgradeStep
-      title="SENAITE.CORE 2.6.0: Reindex getDueDate index from analyses and setup catalog"
-      description="Reindex getDuedate in analyses and sample catalog"
+      title="SENAITE.CORE 2.6.0: Reindex getDueDate"
+      description="Reindex getDueDate from analyses and sample catalogs"
       source="2653"
       destination="2654"
       handler=".v02_06_000.reindex_getDueDate"