From d3a6ac994dbefc52d99aa4b3b04835c77d376aa5 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Fri, 27 Feb 2026 13:01:14 +0100
Subject: [PATCH] [IMP] automation_oca: Rename "Rejected" to "Skipped"

It's an ambiguous terminology, specially when the action is to send an
email, thinking that the recipient has rejected somehow the content.

Thus, let's rename it to "Skipped" to be clearer, both in the technical
and the label part.

All the references, translations and tests has been adapted accordingly.
It also includes a migration script for switching to the new DB value.

TT61258
---
 automation_oca/__manifest__.py                |   2 +-
 automation_oca/i18n/automation_oca.pot        |  16 +-
 automation_oca/i18n/es.po                     | 176 ++++++++++++++----
 automation_oca/i18n/es_VE.po                  |  14 +-
 automation_oca/i18n/fr.po                     |  14 +-
 automation_oca/i18n/it.po                     |  14 +-
 .../migrations/17.0.1.1.0/pre-migration.py    |   8 +
 .../models/automation_configuration_step.py   |   2 +-
 .../models/automation_record_step.py          |  18 +-
 .../tests/test_automation_action.py           |   4 +-
 .../tests/test_automation_activity.py         |   8 +-
 automation_oca/tests/test_automation_mail.py  |  16 +-
 automation_oca/views/automation_record.xml    |   8 +-
 .../views/automation_record_step.xml          |   6 +-
 14 files changed, 214 insertions(+), 92 deletions(-)
 create mode 100644 automation_oca/migrations/17.0.1.1.0/pre-migration.py

diff --git a/automation_oca/__manifest__.py b/automation_oca/__manifest__.py
index 7cdf71e5..2de7fb1b 100644
--- a/automation_oca/__manifest__.py
+++ b/automation_oca/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Automation Oca",
     "summary": """
         Automate actions in threaded models""",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.1.0",
     "license": "AGPL-3",
     "category": "Automation",
     "author": "Dixmit,Odoo Community Association (OCA)",
diff --git a/automation_oca/i18n/automation_oca.pot b/automation_oca/i18n/automation_oca.pot
index 643989d6..4bd47114 100644
--- a/automation_oca/i18n/automation_oca.pot
+++ b/automation_oca/i18n/automation_oca.pot
@@ -1144,13 +1144,6 @@ msgstr ""
 msgid "Records"
 msgstr ""
 
-#. module: automation_oca
-#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__rejected
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
-msgid "Rejected"
-msgstr ""
-
 #. module: automation_oca
 #. odoo-python
 #: code:addons/automation_oca/models/automation_record_step.py:0
@@ -1256,6 +1249,13 @@ msgid ""
 "        finish."
 msgstr ""
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__skipped
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
+msgid "Skipped"
+msgstr ""
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "Specific Domain"
@@ -1495,7 +1495,7 @@ msgstr ""
 #: code:addons/automation_oca/models/automation_record_step.py:0
 #, python-format
 msgid ""
-"You can only retry a record step in a rejected, expired, cancelled or error "
+"You can only retry a record step in a skipped, expired, cancelled or error "
 "state."
 msgstr ""
 
diff --git a/automation_oca/i18n/es.po b/automation_oca/i18n/es.po
index 4a7ea964..156aa147 100644
--- a/automation_oca/i18n/es.po
+++ b/automation_oca/i18n/es.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2025-06-02 22:26+0000\n"
-"Last-Translator: \"Leonardo J. Caballero G.\" <leonardocaballero@gmail.com>\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2026-02-27 14:57+0100\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@tecnativa.com>\n"
 "Language-Team: none\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.4\n"
+"X-Generator: Poedit 3.8\n"
 
 #. module: automation_oca
 #: model:ir.model.fields,help:automation_oca.field_automation_configuration__domain
@@ -44,6 +45,14 @@ msgstr ""
 msgid "%s configurations needs a parent"
 msgstr "%s configuraciones necesitan un padre"
 
+#. module: automation_oca
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
+msgid ""
+"<i class=\"fa fa-calendar pe-1\" role=\"img\" aria-label=\"At\" title=\"At\"/"
+">"
+msgstr ""
+"<i class=\"fa fa-calendar pe-1\" role=\"img\" aria-label=\"A\" title=\"A\"/>"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
 msgid ""
@@ -98,6 +107,19 @@ msgstr ""
 "            <p>Saludos cordiales,</p>\n"
 "        "
 
+#. module: automation_oca
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
+msgid ""
+"<span class=\"col-2\" invisible=\"trigger_date_kind != 'offset'\">after</"
+"span>\n"
+"                                    <span class=\"col-2\" "
+"invisible=\"trigger_date_kind == 'offset'\">when</span>"
+msgstr ""
+"<span class=\"col-2\" invisible=\"trigger_date_kind != 'offset'\">después</"
+"span>\n"
+"                                    <span class=\"col-2\" "
+"invisible=\"trigger_date_kind == 'offset'\">cuando</span>"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "<span class=\"col-2\">after</span>"
@@ -180,6 +202,16 @@ msgstr "Número de correos de actividad"
 msgid "Activity User Type"
 msgstr "Actividad tipo de usuario"
 
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__activity_verification_domain
+msgid "Activity Verification Domain"
+msgstr "Dominio de verificación de la actividad"
+
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__activity_verification_domain_error
+msgid "Activity Verification Domain Error"
+msgstr "Error de dominio de verificación de actividad"
+
 #. module: automation_oca
 #. odoo-python
 #: code:addons/automation_oca/models/automation_configuration_step.py:0
@@ -307,13 +339,11 @@ msgstr "Configuración de automatización"
 
 #. module: automation_oca
 #: model:ir.actions.server,name:automation_oca.cron_configuration_run_ir_actions_server
-#: model:ir.cron,cron_name:automation_oca.cron_configuration_run
 msgid "Automation: Create records"
 msgstr "Automatización: Crear registros"
 
 #. module: automation_oca
 #: model:ir.actions.server,name:automation_oca.cron_step_execute_ir_actions_server
-#: model:ir.cron,cron_name:automation_oca.cron_step_execute
 msgid "Automation: Execute scheduled activities"
 msgstr "Automatización: Ejecutar actividades programadas"
 
@@ -587,6 +617,11 @@ msgstr "Tipo de intervalo de expiración"
 msgid "Field"
 msgstr "Campo"
 
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__trigger_date_field
+msgid "Field Label"
+msgstr "Etiqueta de campo"
+
 #. module: automation_oca
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__filter_id
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
@@ -627,6 +662,11 @@ msgstr ""
 msgid "Filter to apply specifically"
 msgstr "Filtro a aplicar específicamente"
 
+#. module: automation_oca
+#: model:ir.model.fields,help:automation_oca.field_automation_configuration_step__activity_verification_domain
+msgid "Filter to verify when the activity is done"
+msgstr "Filtro para verificar cuando la actividad está realizada"
+
 #. module: automation_oca
 #: model:ir.actions.act_window,name:automation_oca.automation_filter_act_window
 #: model:ir.ui.menu,name:automation_oca.automation_filter_menu
@@ -648,6 +688,11 @@ msgstr "Seguidores"
 msgid "Followers (Partners)"
 msgstr "Seguidores (Contactos)"
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_configuration_step__trigger_date_kind__date
+msgid "Force on Record Date"
+msgstr "Forzar en la fecha del registro"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
 msgid "Generate new records"
@@ -739,17 +784,6 @@ msgstr "Es periódico"
 msgid "Is Test"
 msgstr "Es prueba"
 
-#. module: automation_oca
-#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration____last_update
-#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step____last_update
-#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_test____last_update
-#: model:ir.model.fields,field_description:automation_oca.field_automation_filter____last_update
-#: model:ir.model.fields,field_description:automation_oca.field_automation_record____last_update
-#: model:ir.model.fields,field_description:automation_oca.field_automation_record_step____last_update
-#: model:ir.model.fields,field_description:automation_oca.field_automation_tag____last_update
-msgid "Last Modified on"
-msgstr "Última modificación en"
-
 #. module: automation_oca
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__write_uid
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__write_uid
@@ -861,11 +895,6 @@ msgstr "Correo abierto"
 msgid "Mail replied"
 msgstr "Correo respondido"
 
-#. module: automation_oca
-#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Adjunto principal"
-
 #. module: automation_oca
 #: model:res.groups,name:automation_oca.group_automation_manager
 msgid "Manager"
@@ -891,6 +920,11 @@ msgstr "Mensaje"
 msgid "Message Delivery error"
 msgstr "Error de entrega de mensaje"
 
+#. module: automation_oca
+#: model:ir.model.fields,help:automation_oca.field_automation_configuration_step__activity_verification_domain_error
+msgid "Message to show when the activity domain is not as expected"
+msgstr "Mensaje a mostrar cuando el dominio de la actividad no es el esperado"
+
 #. module: automation_oca
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__message_ids
 msgid "Messages"
@@ -898,16 +932,20 @@ msgstr "Mensajes"
 
 #. module: automation_oca
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__model
-#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__model_id
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__model
-#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__model_id
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_test__model
 #: model:ir.model.fields,field_description:automation_oca.field_automation_filter__model
-#: model:ir.model.fields,field_description:automation_oca.field_automation_filter__model_id
 #: model:ir.model.fields,field_description:automation_oca.field_automation_record__model
 msgid "Model"
 msgstr "Modelo"
 
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration__model_id
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__model_id
+#: model:ir.model.fields,field_description:automation_oca.field_automation_filter__model_id
+msgid "Model ID"
+msgstr "ID de modelo"
+
 #. module: automation_oca
 #: model:ir.model.fields,help:automation_oca.field_automation_configuration__model_id
 #: model:ir.model.fields,help:automation_oca.field_automation_configuration_step__model_id
@@ -1016,6 +1054,11 @@ msgstr "Número de mensajes que requieren acción"
 msgid "Number of messages with delivery error"
 msgstr "Número de mensajes con error de entrega"
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_configuration_step__trigger_date_kind__offset
+msgid "Offset"
+msgstr "Desplazamiento"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
 msgid ""
@@ -1153,13 +1196,6 @@ msgstr "Número de registros de prueba"
 msgid "Records"
 msgstr "Registros"
 
-#. module: automation_oca
-#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__rejected
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
-msgid "Rejected"
-msgstr "Rechazado"
-
 #. module: automation_oca
 #. odoo-python
 #: code:addons/automation_oca/models/automation_record_step.py:0
@@ -1191,6 +1227,11 @@ msgstr "Referencia de recurso"
 msgid "Responsible"
 msgstr "Responsable"
 
+#. module: automation_oca
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
+msgid "Retry"
+msgstr "Reintentar"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_search_view
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
@@ -1236,9 +1277,22 @@ msgstr "Enviado"
 #. module: automation_oca
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__server_action_id
 #: model:ir.model.fields.selection,name:automation_oca.selection__automation_configuration_step__step_type__action
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "Server Action"
 msgstr "Acción de servidor"
 
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__server_context
+msgid "Server Context"
+msgstr "Contexto de servidor"
+
+#. module: automation_oca
+#. odoo-python
+#: code:addons/automation_oca/models/automation_configuration_step.py:0
+#, python-format
+msgid "Server Context is not wellformed"
+msgstr "El contexto de servidor no está correctamente formado"
+
 #. module: automation_oca
 #: model:ir.model.fields,help:automation_oca.field_automation_configuration_step__trigger_interval
 msgid ""
@@ -1251,6 +1305,13 @@ msgstr ""
 "        inmediatamente, en paralelo, sin esperar que acabe el \n"
 "        anterior."
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__skipped
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
+msgid "Skipped"
+msgstr "Saltado"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "Specific Domain"
@@ -1351,6 +1412,30 @@ msgstr "Configuración de prueba"
 msgid "Tests"
 msgstr "Pruebas"
 
+#. module: automation_oca
+#. odoo-python
+#: code:addons/automation_oca/models/automation_record_step.py:0
+#, python-format
+msgid ""
+"The record does not fulfill the expected domain:\n"
+"%(domain)s"
+msgstr ""
+"El registro no cumple con el dominio esperado:\n"
+"%(domain)s"
+
+#. module: automation_oca
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
+msgid ""
+"The scheduled date will be the date of the record at the moment we generate "
+"the new record.\n"
+"                                Later changes of the field will not affect "
+"the scheduled date."
+msgstr ""
+"La fecha de publicación será la fecha en la que se genera el nuevo "
+"registro.\n"
+"                                Cambios posteriores de los campos no "
+"afectarán a la fecha planificada."
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
 msgid ""
@@ -1400,6 +1485,16 @@ msgstr "Disparador"
 msgid "Trigger Child Types"
 msgstr "Tipos de hijos de disparador"
 
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__trigger_date_field_id
+msgid "Trigger Date Field"
+msgstr "Campo de fecha disparadora"
+
+#. module: automation_oca
+#: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__trigger_date_kind
+msgid "Trigger Date Kind"
+msgstr "Tipo de fecha disparadora"
+
 #. module: automation_oca
 #: model:ir.model.fields,field_description:automation_oca.field_automation_configuration_step__trigger_interval
 msgid "Trigger Interval"
@@ -1476,6 +1571,17 @@ msgstr "Bienvenido"
 msgid "Welcome! Thanks for being part of our database"
 msgstr "¡Bienvenido! Gracias por ser parte de nuestra base de datos"
 
+#. module: automation_oca
+#. odoo-python
+#: code:addons/automation_oca/models/automation_record_step.py:0
+#, python-format
+msgid ""
+"You can only retry a record step in a skipped, expired, cancelled or error "
+"state."
+msgstr ""
+"Solo puede reintentar un paso que esté en estado saltado, expirado,cancelado "
+"o error."
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_form_view
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
@@ -1496,6 +1602,12 @@ msgstr "ejecución de otro paso"
 msgid "start of workflow"
 msgstr "inicio de flujo de trabajo"
 
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificación en"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Adjunto principal"
+
 #~ msgid "Days"
 #~ msgstr "Días"
 
diff --git a/automation_oca/i18n/es_VE.po b/automation_oca/i18n/es_VE.po
index 1d5f4ef5..854cd872 100644
--- a/automation_oca/i18n/es_VE.po
+++ b/automation_oca/i18n/es_VE.po
@@ -1189,13 +1189,6 @@ msgstr "Número de registros de prueba"
 msgid "Records"
 msgstr "Registros"
 
-#. module: automation_oca
-#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__rejected
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
-msgid "Rejected"
-msgstr "Rechazado"
-
 #. module: automation_oca
 #. odoo-python
 #: code:addons/automation_oca/models/automation_record_step.py:0
@@ -1304,6 +1297,13 @@ msgstr ""
 "        inmediatamente, en paralelo, sin esperar que acabe el \n"
 "        anterior."
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__skipped
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
+msgid "Skipped"
+msgstr "Saltado"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "Specific Domain"
diff --git a/automation_oca/i18n/fr.po b/automation_oca/i18n/fr.po
index 36f50799..014fb6b0 100644
--- a/automation_oca/i18n/fr.po
+++ b/automation_oca/i18n/fr.po
@@ -1133,13 +1133,6 @@ msgstr ""
 msgid "Records"
 msgstr ""
 
-#. module: automation_oca
-#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__rejected
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
-msgid "Rejected"
-msgstr "Rejeté"
-
 #. module: automation_oca
 #. odoo-python
 #: code:addons/automation_oca/models/automation_record_step.py:0
@@ -1228,6 +1221,13 @@ msgid ""
 "        finish."
 msgstr ""
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__skipped
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
+msgid "Skipped"
+msgstr "Sauté"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "Specific Domain"
diff --git a/automation_oca/i18n/it.po b/automation_oca/i18n/it.po
index 6ae91ae1..6cfe42dd 100644
--- a/automation_oca/i18n/it.po
+++ b/automation_oca/i18n/it.po
@@ -1156,13 +1156,6 @@ msgstr "Conteggio test record"
 msgid "Records"
 msgstr "Record"
 
-#. module: automation_oca
-#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__rejected
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
-#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
-msgid "Rejected"
-msgstr "Respinta"
-
 #. module: automation_oca
 #. odoo-python
 #: code:addons/automation_oca/models/automation_record_step.py:0
@@ -1255,6 +1248,13 @@ msgstr ""
 "precedente,\n"
 "        senza attendere che termini."
 
+#. module: automation_oca
+#: model:ir.model.fields.selection,name:automation_oca.selection__automation_record_step__state__skipped
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_form_view
+#: model_terms:ir.ui.view,arch_db:automation_oca.automation_record_step_search_view
+msgid "Skipped"
+msgstr "Saltato"
+
 #. module: automation_oca
 #: model_terms:ir.ui.view,arch_db:automation_oca.automation_configuration_step_form_view
 msgid "Specific Domain"
diff --git a/automation_oca/migrations/17.0.1.1.0/pre-migration.py b/automation_oca/migrations/17.0.1.1.0/pre-migration.py
new file mode 100644
index 00000000..d2eb3adb
--- /dev/null
+++ b/automation_oca/migrations/17.0.1.1.0/pre-migration.py
@@ -0,0 +1,8 @@
+# Copyright 2026 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+
+def migrate(cr, version):
+    cr.execute(
+        "UPDATE automation_record_step SET state='skipped' WHERE state='rejected'"
+    )
diff --git a/automation_oca/models/automation_configuration_step.py b/automation_oca/models/automation_configuration_step.py
index ab9f5f80..b8d0a501 100644
--- a/automation_oca/models/automation_configuration_step.py
+++ b/automation_oca/models/automation_configuration_step.py
@@ -257,7 +257,7 @@ def _compute_total_graph_data(self):
             record.graph_error = self.env["automation.record.step"].search_count(
                 [
                     ("configuration_step_id", "=", record.id),
-                    ("state", "in", ["expired", "rejected", "error", "cancel"]),
+                    ("state", "in", ["expired", "skipped", "error", "cancel"]),
                     ("is_test", "=", False),
                 ]
             )
diff --git a/automation_oca/models/automation_record_step.py b/automation_oca/models/automation_record_step.py
index 8d9aa085..0275995b 100644
--- a/automation_oca/models/automation_record_step.py
+++ b/automation_oca/models/automation_record_step.py
@@ -54,7 +54,7 @@ class AutomationRecordStep(models.Model):
             ("scheduled", "Scheduled"),
             ("done", "Done"),
             ("expired", "Expired"),
-            ("rejected", "Rejected"),
+            ("skipped", "Skipped"),
             ("error", "Error"),
             ("cancel", "Cancelled"),
         ],
@@ -154,7 +154,7 @@ def run(self, trigger_activity=True):
             )
             or not self._check_to_execute()
         ):
-            self._reject()
+            self._skip()
             return self.browse()
         try:
             result = getattr(self, f"_run_{self.configuration_step_id.step_type}")()
@@ -177,8 +177,12 @@ def run(self, trigger_activity=True):
             )
         return self.browse()
 
+    def _skip(self):
+        self.write({"state": "skipped", "processed_on": fields.Datetime.now()})
+
     def _reject(self):
-        self.write({"state": "rejected", "processed_on": fields.Datetime.now()})
+        # FIXME: Kept for retro-compatibility
+        self._skip()
 
     def _fill_childs(self, **kwargs):
         return self.create(
@@ -344,7 +348,7 @@ def _set_activity_done(self):
             lambda r: r.trigger_type == "activity_cancel"
             and not r.scheduled_date
             and r.state == "scheduled"
-        )._reject()
+        )._skip()
 
     def _set_activity_cancel(self):
         self.write({"activity_cancel_on": fields.Datetime.now()})
@@ -357,7 +361,7 @@ def _set_activity_cancel(self):
             lambda r: r.trigger_type == "activity_done"
             and not r.scheduled_date
             and r.state == "scheduled"
-        )._reject()
+        )._skip()
 
     def _set_mail_bounced(self):
         self.write({"mail_status": "bounce"})
@@ -461,10 +465,10 @@ def retry(self):
         """
         Retry the record step
         """
-        if self.state not in ["error", "rejected", "expired", "cancel"]:
+        if self.state not in ["error", "skipped", "expired", "cancel"]:
             raise ValidationError(
                 _(
-                    "You can only retry a record step in a rejected, "
+                    "You can only retry a record step in a skipped, "
                     "expired, cancelled or error state."
                 )
             )
diff --git a/automation_oca/tests/test_automation_action.py b/automation_oca/tests/test_automation_action.py
index 57a83279..7fa9f12e 100644
--- a/automation_oca/tests/test_automation_action.py
+++ b/automation_oca/tests/test_automation_action.py
@@ -158,7 +158,7 @@ def test_child_execution_filters(self):
                 [
                     ("configuration_step_id", "=", activity_1_2.id),
                     ("record_id.res_id", "=", self.partner_01.id),
-                    ("state", "=", "rejected"),
+                    ("state", "=", "skipped"),
                 ]
             ),
         )
@@ -168,7 +168,7 @@ def test_child_execution_filters(self):
                 [
                     ("configuration_step_id", "=", activity_1_1.id),
                     ("record_id.res_id", "=", self.partner_02.id),
-                    ("state", "=", "rejected"),
+                    ("state", "=", "skipped"),
                 ]
             ),
         )
diff --git a/automation_oca/tests/test_automation_activity.py b/automation_oca/tests/test_automation_activity.py
index 33d3b439..6f0ea290 100644
--- a/automation_oca/tests/test_automation_activity.py
+++ b/automation_oca/tests/test_automation_activity.py
@@ -182,7 +182,7 @@ def test_activity_execution_on_cancel(self):
         self.partner_01.activity_ids.unlink()
         self.assertFalse(record_activity.activity_done_on)
         self.assertFalse(record_child_activity.scheduled_date)
-        self.assertEqual(record_child_activity.state, "rejected")
+        self.assertEqual(record_child_activity.state, "skipped")
 
     def test_activity_execution_on_cancel_permission(self):
         """
@@ -211,7 +211,7 @@ def test_activity_execution_on_cancel_permission(self):
         self.partner_01.activity_ids.with_user(self.user.id).unlink()
         self.assertFalse(record_activity.activity_done_on)
         self.assertFalse(record_child_activity.scheduled_date)
-        self.assertEqual(record_child_activity.state, "rejected")
+        self.assertEqual(record_child_activity.state, "skipped")
 
     def test_activity_execution_cancel_child(self):
         """
@@ -268,7 +268,7 @@ def test_activity_execution_cancel_child_on_done(self):
         self.partner_01.activity_ids.action_feedback()
         self.assertFalse(record_activity.activity_cancel_on)
         self.assertFalse(record_child_activity.scheduled_date)
-        self.assertEqual(record_child_activity.state, "rejected")
+        self.assertEqual(record_child_activity.state, "skipped")
 
     def test_activity_execution_not_done_child_done(self):
         """
@@ -299,7 +299,7 @@ def test_activity_execution_not_done_child_done(self):
         self.assertTrue(record_child_activity.scheduled_date)
         self.assertEqual("scheduled", record_child_activity.state)
         record_child_activity.run()
-        self.assertEqual("rejected", record_child_activity.state)
+        self.assertEqual("skipped", record_child_activity.state)
 
     def test_activity_execution_not_done_child_not_done(self):
         """
diff --git a/automation_oca/tests/test_automation_mail.py b/automation_oca/tests/test_automation_mail.py
index 8e1474ec..aa312088 100644
--- a/automation_oca/tests/test_automation_mail.py
+++ b/automation_oca/tests/test_automation_mail.py
@@ -200,7 +200,7 @@ def test_no_reply(self):
         )
         self.assertEqual("reply", record_activity.mail_status)
         self.env["automation.record.step"]._cron_automation_steps()
-        self.assertEqual("rejected", record_child_activity.state)
+        self.assertEqual("skipped", record_child_activity.state)
 
     def test_open(self):
         """
@@ -300,9 +300,9 @@ def test_no_open(self):
         self.env["automation.record.step"]._cron_automation_steps()
         self.assertEqual("done", record_child_activity.state)
 
-    def test_no_open_rejected(self):
+    def test_no_open_skipped(self):
         """
-        Now we will check the not open validation when it was already opened (rejection)
+        Now we will check the not open validation when it was already opened (skipped)
         """
         activity = self.create_mail_activity()
         child_activity = self.create_mail_activity(
@@ -326,7 +326,7 @@ def test_no_open_rejected(self):
         self.url_open(record_activity._get_mail_tracking_url())
         self.assertEqual("open", record_activity.mail_status)
         self.env["automation.record.step"]._cron_automation_steps()
-        self.assertEqual("rejected", record_child_activity.state)
+        self.assertEqual("skipped", record_child_activity.state)
 
     def test_click(self):
         """
@@ -487,10 +487,8 @@ def test_no_click(self):
         self.env["automation.record.step"]._cron_automation_steps()
         self.assertEqual("done", record_child_activity.state)
 
-    def test_no_click_rejected(self):
-        """
-        Checking the not clicked validation when it was already clicked
-        """
+    def test_no_click_skipped(self):
+        """Checking the not clicked validation when it was already clicked."""
         activity = self.create_mail_activity()
         child_activity = self.create_mail_activity(
             parent_id=activity.id, trigger_type="mail_not_clicked"
@@ -521,7 +519,7 @@ def test_no_click_rejected(self):
             allow_redirects=False,
         )
         self.env["automation.record.step"]._cron_automation_steps()
-        self.assertEqual("rejected", record_child_activity.state)
+        self.assertEqual("skipped", record_child_activity.state)
 
     def test_is_test_behavior(self):
         """
diff --git a/automation_oca/views/automation_record.xml b/automation_oca/views/automation_record.xml
index a886927a..7438f579 100644
--- a/automation_oca/views/automation_record.xml
+++ b/automation_oca/views/automation_record.xml
@@ -103,9 +103,9 @@
                                                 </span>
                                                 <span
                                                     class="text-info"
-                                                    t-elif="record.state.raw_value == 'rejected'"
+                                                    t-elif="record.state.raw_value == 'skipped'"
                                                 >
-                                                    Rejected <field
+                                                    Skipped <field
                                                         name="processed_on"
                                                     />
                                                 </span>
@@ -143,7 +143,7 @@
                                     <div class="o_automation_kanban_card">
                                         <div class="o_automation_kanban_header">
                                             <div
-                                                t-attf-class="o_automation_kanban_header_icon {{record.state.raw_value === 'done' ? 'btn-success': (record.state.raw_value === 'scheduled' ? 'btn-primary': (record.state.raw_value === 'error' ? 'btn-danger': (record.state.raw_value === 'rejected' ? 'btn-info': 'btn-warning')))}}"
+                                                t-attf-class="o_automation_kanban_header_icon {{record.state.raw_value === 'done' ? 'btn-success': (record.state.raw_value === 'scheduled' ? 'btn-primary': (record.state.raw_value === 'error' ? 'btn-danger': (record.state.raw_value === 'skipped' ? 'btn-info': 'btn-warning')))}}"
                                             >
                                                 <span
                                                     t-att-class="record.step_icon.raw_value"
@@ -188,7 +188,7 @@
                                                     name="retry"
                                                     class="fa fa-refresh btn-warning o_automation_kanban_header_icon"
                                                     title="Retry"
-                                                    t-if="record.state.raw_value  == 'cancel' || record.state.raw_value  == 'rejected' || record.state.raw_value  ==  'error' || record.state.raw_value  ==  'expired'"
+                                                    t-if="record.state.raw_value  == 'cancel' || record.state.raw_value  == 'skipped' || record.state.raw_value  ==  'error' || record.state.raw_value  ==  'expired'"
                                                 />
                                             </div>
                                         </div>
diff --git a/automation_oca/views/automation_record_step.xml b/automation_oca/views/automation_record_step.xml
index df9b9439..895b395e 100644
--- a/automation_oca/views/automation_record_step.xml
+++ b/automation_oca/views/automation_record_step.xml
@@ -63,9 +63,9 @@
                     domain="[('state', '=', 'expired')]"
                 />
                 <filter
-                    string="Rejected"
-                    name="rejected"
-                    domain="[('state', '=', 'rejected')]"
+                    string="Skipped"
+                    name="skipped"
+                    domain="[('state', '=', 'skipped')]"
                 />
                 <filter
                     string="Error"