Fixes #767 - Applied 'merge' state changes

locale/admin-docs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zammad Admin Documentation pre-release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-20 12:50+0100\n"
+"POT-Creation-Date: 2025-02-25 11:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -408,7 +408,7 @@ msgstr ""
 
 #: ../channels/email/accounts/account-setup.rst:122
 #: ../misc/object-conditions/basics.rst:207
-#: ../system/objects.rst:152
+#: ../system/objects.rst:154
 #: ../system/objects/types.rst:157
 msgid "Type"
 msgstr ""
@@ -1048,8 +1048,8 @@ msgstr ""
 #: ../system/integrations/cti/includes/inbound-calls.include.rst:15
 #: ../system/integrations/cti/includes/inbound-calls.include.rst:15
 #: ../system/integrations/cti/includes/outbound-calls.include.rst:18
-#: ../system/objects.rst:160
-#: ../system/objects.rst:244
+#: ../system/objects.rst:162
+#: ../system/objects.rst:246
 msgid "Note"
 msgstr ""
 
@@ -2912,8 +2912,8 @@ msgstr ""
 #: ../manage/scheduler.rst:39
 #: ../manage/slas/how-do-they-work.rst:26
 #: ../manage/templates.rst:33
-#: ../system/objects.rst:128
-#: ../system/objects.rst:232
+#: ../system/objects.rst:131
+#: ../system/objects.rst:234
 msgid "Name"
 msgstr ""
 
@@ -2947,8 +2947,8 @@ msgstr ""
 #: ../manage/scheduler.rst:111
 #: ../manage/templates.rst:43
 #: ../manage/webhook/add.rst:123
-#: ../system/objects.rst:167
-#: ../system/objects.rst:246
+#: ../system/objects.rst:169
+#: ../system/objects.rst:248
 msgid "Active"
 msgstr ""
 
@@ -21755,7 +21755,7 @@ msgstr ""
 msgid "Screenshot showing highlighted ticket state attribute"
 msgstr ""
 
-#: ../system/objects.rst:120
+#: ../system/objects.rst:123
 msgid "Handling of states"
 msgstr ""
 
@@ -21768,178 +21768,178 @@ msgid "Screenshot showing table of default ticket states"
 msgstr ""
 
 #: ../system/objects.rst:108
+msgid "The `merged` state can't be changed because it is a required system state. Otherwise, the merging of tickets would lead to errors."
+msgstr ""
+
+#: ../system/objects.rst:111
 msgid "To add a new state, click on the \"New Ticket State\" button in the top right corner. To change an existing state, simply click on the affected state. This opens an edit dialog."
 msgstr ""
 
-#: ../system/objects.rst:112
+#: ../system/objects.rst:115
 msgid "You can also clone a state or set them to \"Default for new tickets\" or \"Default for follow-ups\" by clicking on the ⁝ action button and select the desired function."
 msgstr ""
 
-#: ../system/objects.rst:116
+#: ../system/objects.rst:119
 msgid "*Default for new tickets* means that this state is used for every newly created ticket."
 msgstr ""
 
-#: ../system/objects.rst:119
+#: ../system/objects.rst:122
 msgid "*Default for follow-ups* means that this state is used if the ticket is re-opened after it was closed."
 msgstr ""
 
-#: ../system/objects.rst:169
+#: ../system/objects.rst:171
 msgid "Ticket state in detail"
 msgstr ""
 
-#: ../system/objects.rst:123
+#: ../system/objects.rst:126
 msgid "Below you can find a description for each field and option. Please head over to the :ref:`example <example-state>` to see the edit dialog."
 msgstr ""
 
-#: ../system/objects.rst:127
+#: ../system/objects.rst:130
 msgid "This is the name of the state and what you and your agents are seeing when choosing a state somewhere (e.g. in tickets, trigger configuration)."
 msgstr ""
 
-#: ../system/objects.rst:135
+#: ../system/objects.rst:138
 msgid "There are different state types you can choose from. By default, Zammad comes with one state per state type."
 msgstr ""
 
-#: ../system/objects.rst:138
+#: ../system/objects.rst:141
 msgid "**new**: for states for tickets that are new and it hasn't been worked on them"
 msgstr ""
 
-#: ../system/objects.rst:140
+#: ../system/objects.rst:143
 msgid "**open**: for states for tickets that are in progress and agents are working on them"
 msgstr ""
 
-#: ../system/objects.rst:142
-msgid "**merged**: for states for tickets that are merged with other tickets"
-msgstr ""
-
-#: ../system/objects.rst:143
+#: ../system/objects.rst:145
 msgid "**pending reminder**: for states for tickets that are in progress and you want to set a reminder. (default example: *pending reminder*)"
 msgstr ""
 
-#: ../system/objects.rst:145
+#: ../system/objects.rst:147
 msgid "**pending action**: for states for tickets that are waiting for a specified time and then change their state (default example: *pending close*)"
 msgstr ""
 
-#: ../system/objects.rst:148
+#: ../system/objects.rst:150
 msgid "**closed**: for states for tickets that are finished and do not need to be processed further"
 msgstr ""
 
-#: ../system/objects.rst:151
+#: ../system/objects.rst:153
 msgid "⚠️ Choosing the correct state type is important! If you are in doubt, have a look on the default states and their types!"
 msgstr ""
 
-#: ../system/objects.rst:156
+#: ../system/objects.rst:158
 msgid "Ignore escalation"
 msgstr ""
 
-#: ../system/objects.rst:155
+#: ../system/objects.rst:157
 msgid "Here you can define whether tickets of this state will count to escalation time or not."
 msgstr ""
 
-#: ../system/objects.rst:159
+#: ../system/objects.rst:161
 msgid "You can create a note for the state to inform other admins about the state. This has no effect on tickets."
 msgstr ""
 
-#: ../system/objects.rst:163
+#: ../system/objects.rst:165
 msgid "Set the state to *active* or *inactive*."
 msgstr ""
 
-#: ../system/objects.rst:165
+#: ../system/objects.rst:167
 msgid "it is technically possible to set all states to inactive. To keep Zammad working in such a case, the inactive flag of one of the states is ignored."
 msgstr ""
 
-#: ../system/objects.rst:192
+#: ../system/objects.rst:194
 msgid "Ticket state example"
 msgstr ""
 
-#: ../system/objects.rst:172
+#: ../system/objects.rst:174
 msgid "Let's assume we want to create a new state which indicates that the ticket has to wait for a response of a third party (e.g. service contractor or manufacturer) and we want to to be able to set a reminder."
 msgstr ""
 
-#: ../system/objects.rst:176
+#: ../system/objects.rst:178
 msgid "First we give the new state a proper name. In this example we call it \"waiting for manufacturer\"."
 msgstr ""
 
-#: ../system/objects.rst:179
+#: ../system/objects.rst:181
 msgid "As state type we choose \"pending reminder\". This indicates that the ticket is still open and we can set a reminder. This reminder can be useful if our manufacturer sometimes isn't responding or we want to remind him to give us an answer."
 msgstr ""
 
-#: ../system/objects.rst:184
+#: ../system/objects.rst:186
 msgid "We choose \"no\" for \"ignore escalation\" because we want to escalate the tickets even if we are waiting on the manufacturer's feedback."
 msgstr ""
 
-#: ../system/objects.rst:187
+#: ../system/objects.rst:189
 msgid "The **result** in the creation dialog will look like this:"
 msgstr ""
 
 #: ../system/objects.rst:0
 msgid "Screenshot showing ticket state creation dialog with example"
 msgstr ""
 
-#: ../system/objects.rst:197
+#: ../system/objects.rst:199
 msgid "Ticket Priority"
 msgstr ""
 
-#: ../system/objects.rst:199
+#: ../system/objects.rst:201
 msgid "If the pre-configured priorities aren't enough for you or you want to change them, you can do so by clicking on the cogwheel icon in the priority row in the ticket tab:"
 msgstr ""
 
 #: ../system/objects.rst:None
 msgid "Screenshot showing highlighted ticket priority attribute"
 msgstr ""
 
-#: ../system/objects.rst:224
+#: ../system/objects.rst:226
 msgid "Handling of priorities"
 msgstr ""
 
-#: ../system/objects.rst:208
+#: ../system/objects.rst:210
 msgid "In the priority configuration screen, you can add new priorities, disable priorities or change priorities."
 msgstr ""
 
 #: ../system/objects.rst:0
 msgid "Screenshot showing table of default ticket priorities"
 msgstr ""
 
-#: ../system/objects.rst:216
+#: ../system/objects.rst:218
 msgid "To add a new priority, click on the \"New Priority\" button in the top right corner. To change an existing priority, simply click on the affected priority. This opens an edit dialog."
 msgstr ""
 
-#: ../system/objects.rst:220
+#: ../system/objects.rst:222
 msgid "You can also clone a priority or set them to \"Default for new tickets\" by clicking on the ⁝ action button and select the desired function."
 msgstr ""
 
-#: ../system/objects.rst:223
+#: ../system/objects.rst:225
 msgid "*Default for new tickets* means that this priority is used for every newly created ticket."
 msgstr ""
 
-#: ../system/objects.rst:246
+#: ../system/objects.rst:248
 msgid "Priorities in detail"
 msgstr ""
 
-#: ../system/objects.rst:227
+#: ../system/objects.rst:229
 msgid "Below you can find a description for each field and option."
 msgstr ""
 
-#: ../system/objects.rst:230
+#: ../system/objects.rst:232
 msgid "This is the name of the priority and what you and your agents are seeing when choosing a priority somewhere (e.g. in tickets, trigger configuration)."
 msgstr ""
 
-#: ../system/objects.rst:240
+#: ../system/objects.rst:242
 msgid "Highlight color"
 msgstr ""
 
-#: ../system/objects.rst:235
+#: ../system/objects.rst:237
 msgid "Switch between *Low priority* (light blue), *High priority* (red) and - (default). This affects the displayed color for ticket titles in overviews."
 msgstr ""
 
-#: ../system/objects.rst:239
+#: ../system/objects.rst:241
 msgid "The color options are currently limited to the mentioned options."
 msgstr ""
 
-#: ../system/objects.rst:243
+#: ../system/objects.rst:245
 msgid "You can create a note for the priority to inform other admins about the priority. This has no effect on tickets."
 msgstr ""
 
-#: ../system/objects.rst:247
+#: ../system/objects.rst:249
 msgid "Set the priority to *active* or *inactive*."
 msgstr ""
 

system/objects.rst

@@ -105,6 +105,9 @@ Handling of states
       :scale: 80%
       :alt: Screenshot showing table of default ticket states
 
+   .. note:: The `merged` state can't be changed because it is a required system
+      state. Otherwise, the merging of tickets would lead to errors.
+
    To add a new state, click on the "New Ticket State" button in the top right
    corner. To change an existing state, simply click on the affected state. This
    opens an edit dialog.
@@ -139,7 +142,6 @@ Ticket state in detail
           worked on them
         - **open**: for states for tickets that are in progress and agents are
           working on them
-        - **merged**: for states for tickets that are merged with other tickets
         - **pending reminder**: for states for tickets that are in progress and
           you want to set a reminder. (default example: *pending reminder*)
         - **pending action**: for states for tickets that are waiting for a