From 69b930451d22e915cf437291cb4b63413689a723 Mon Sep 17 00:00:00 2001
From: Nicolas Demonte <nicolas@affinitic.be>
Date: Mon, 8 Apr 2019 09:43:11 +0200
Subject: [PATCH] Add incoming mail transitions back to Processing #22007

---
 .../policy/locales/fr/LC_MESSAGES/plone.po    | 11 ++++++++
 .../incomingmail_workflow/definition.xml      | 26 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/pfwbged/policy/locales/fr/LC_MESSAGES/plone.po b/src/pfwbged/policy/locales/fr/LC_MESSAGES/plone.po
index 646d703..e87d2c9 100644
--- a/src/pfwbged/policy/locales/fr/LC_MESSAGES/plone.po
+++ b/src/pfwbged/policy/locales/fr/LC_MESSAGES/plone.po
@@ -64,6 +64,17 @@ msgstr "Retour à validé"
 #: ../profiles/default/workflows/outgoingmail_workflow/definition.xml
 msgid "Back to writing"
 msgstr "Retour à la rédaction"
+#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
+msgid "Cancel Answering"
+msgstr "Annuler la réponse"
+
+#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
+msgid "Cancel Considering"
+msgstr "Annuler la prise en compte"
+
+#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
+msgid "Cancel No action"
+msgstr "Annuler le classement sans suite"
 
 #: ../profiles/default/workflows/versionnote_workflow/definition.xml
 msgid "Cancel refusal"
diff --git a/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml b/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml
index fda7266..06e5a1b 100644
--- a/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml
+++ b/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml
@@ -12,6 +12,7 @@
  <permission>Modify portal content</permission>
  <permission>View</permission>
  <state state_id="answered" title="Answered" i18n:attributes="title">
+  <exit-transition transition_id="cancel_answered"/>
   <permission-map name="Access contents information" acquired="False">
    <permission-role>Editor</permission-role>
    <permission-role>Manager</permission-role>
@@ -70,6 +71,7 @@
  </state>
  <state state_id="noaction" title="No action" i18n:attributes="title">
   <exit-transition transition_id="back_to_assigning"/>
+  <exit-transition transition_id="cancel_noaction"/>
   <permission-map name="Access contents information" acquired="False">
    <permission-role>Editor</permission-role>
    <permission-role>Manager</permission-role>
@@ -97,6 +99,7 @@
  </state>
  <state state_id="considered" title="Considered" i18n:attributes="title">
   <exit-transition transition_id="back_to_assigning"/>
+  <exit-transition transition_id="cancel_considered"/>
   <permission-map name="Access contents information" acquired="False">
    <permission-role>Editor</permission-role>
    <permission-role>Manager</permission-role>
@@ -243,6 +246,29 @@
    <guard-expression>here/@@can_return_to_registering_or_process</guard-expression>
   </guard>
  </transition>
+
+ <transition transition_id="cancel_considered" title="" new_state="processing" trigger="USER" before_script="" after_script="">
+  <action url="%(content_url)s/content_status_modify?workflow_action=cancel_considered" category="workflow" icon="" i18n:translate="">Cancel Considering</action>
+  <guard>
+   <guard-role>Editor</guard-role>
+   <guard-role>Manager</guard-role>
+  </guard>
+ </transition>
+ <transition transition_id="cancel_noaction" title="" new_state="processing" trigger="USER" before_script="" after_script="">
+  <action url="%(content_url)s/content_status_modify?workflow_action=cancel_noaction" category="workflow" icon="" i18n:translate="">Cancel No action</action>
+  <guard>
+   <guard-role>Editor</guard-role>
+   <guard-role>Manager</guard-role>
+  </guard>
+ </transition>
+ <transition transition_id="cancel_answered" title="" new_state="processing" trigger="USER" before_script="" after_script="">
+  <action url="%(content_url)s/content_status_modify?workflow_action=cancel_answered" category="workflow" icon="" i18n:translate="">Cancel Answering</action>
+  <guard>
+   <guard-role>Editor</guard-role>
+   <guard-role>Manager</guard-role>
+  </guard>
+ </transition>
+
  <variable variable_id="action" for_catalog="False" for_status="True" update_always="True">
   <description>Previous transition</description>
   <default>