diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 8281b414b771827297508765557bbdb070722503..146d20e5e3a4bdf3844f98f204e7e7007f7eb0c7 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -294,8 +294,8 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes')
$actioncomm = new ActionComm($db);
$actioncomm->fetch($_GET["id"]);
- if ($user->rights->agenda->myactions->create
- || $user->rights->agenda->allactions->create)
+ if ($user->rights->agenda->myactions->delete
+ || $user->rights->agenda->allactions->delete)
{
$result=$actioncomm->delete();
@@ -885,7 +885,7 @@ if ($_GET["id"])
if ($_GET["action"] != 'edit')
{
- if ($user->rights->agenda->allactions->modify ||
+ if ($user->rights->agenda->allactions->modify ||
(($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->modify))
{
print '<a class="butAction" href="fiche.php?action=edit&id='.$act->id.'">'.$langs->trans("Modify").'</a>';
@@ -895,8 +895,8 @@ if ($_GET["id"])
print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a>';
}
- if ($user->rights->agenda->allactions->create ||
- (($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->create))
+ if ($user->rights->agenda->allactions->delete ||
+ (($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete))
{
print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$act->id.'">'.$langs->trans("Delete").'</a>';
}
diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php
index 27a72c57933a0a0cdd885a73cdac881c916b17c2..0c5bfd398933dec08ed798c7bb8179ca436fc3df 100644
--- a/htdocs/includes/modules/modAgenda.class.php
+++ b/htdocs/includes/modules/modAgenda.class.php
@@ -109,19 +109,19 @@ class modAgenda extends DolibarrModules
$r++;
$this->rights[$r][0] = 2402;
- $this->rights[$r][1] = 'Create/delete actions/tasks linked to his account';
+ $this->rights[$r][1] = 'Create/modify actions/tasks linked to his account';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'myactions';
$this->rights[$r][5] = 'create';
$r++;
-
+
$this->rights[$r][0] = 2403;
- $this->rights[$r][1] = 'Modify actions/tasks linked to his account';
+ $this->rights[$r][1] = 'Delete actions/tasks linked to his account';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'myactions';
- $this->rights[$r][5] = 'modify';
+ $this->rights[$r][5] = 'delete';
$r++;
$this->rights[$r][0] = 2411;
@@ -133,19 +133,19 @@ class modAgenda extends DolibarrModules
$r++;
$this->rights[$r][0] = 2412;
- $this->rights[$r][1] = 'Create/delete actions/tasks of others';
+ $this->rights[$r][1] = 'Create/modify actions/tasks of others';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'allactions';
$this->rights[$r][5] = 'create';
$r++;
-
+
$this->rights[$r][0] = 2413;
- $this->rights[$r][1] = 'Modify actions/tasks of others';
+ $this->rights[$r][1] = 'Delete actions/tasks of others';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'allactions';
- $this->rights[$r][5] = 'modify';
+ $this->rights[$r][5] = 'delete';
$r++;
// Main menu entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 348a5e34f504b6aa8610256b9d3515e3477c51e5..f95f8a29a2d82a98118dca9d3596fdf330afedfd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -548,11 +548,11 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1421=Export customer orders and attributes
Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/delete actions (events or tasks) linked to his account
-Permission2403=Modify actions (events or tasks) linked to his account
+Permission2402=Create/modify actions (events or tasks) linked to his account
+Permission2403=Delete actions (events or tasks) linked to his account
Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/delete actions (events or tasks) of others
-Permission2413=Modify actions (events or tasks) of others
+Permission2412=Create/modify actions (events or tasks) of others
+Permission2413=Delete actions (events or tasks) of others
Permission2500=Read documents
Permission2501=Submit or delete documents
Permission2515=Setup documents directories
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 839b30c5550f9f02986a6970c11d7ad9846c4bb5..a768374fda2e91e1984d062dc946e531a22b682e 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -548,11 +548,11 @@ Permission1251 = Lancer des imports de masse dans la base (chargement de donnée
Permission1321 = Exporter les factures clients, attributs et règlements
Permission1421 = Exporter les commandes clients et attributs
Permission2401 = Lire les actions (évènements ou tâches) liées à son compte
-Permission2402 = Creer/supprimer les actions (évènements ou tâches) liées à son compte
-Permission2403 = Modifier les actions (évènements ou tâches) liées à son compte
+Permission2402 = Creer/modifier les actions (évènements ou tâches) liées à son compte
+Permission2403 = Supprimer les actions (évènements ou tâches) liées à son compte
Permission2411 = Lire les actions (évènements ou tâches) des autres
-Permission2412 = Creer/supprimer les actions (évènements ou tâches) pour les autres
-Permission2413 = Modifier les actions (évènements ou tâches) pour les autres
+Permission2412 = Creer/modifier les actions (évènements ou tâches) pour les autres
+Permission2413 = Supprimer les actions (évènements ou tâches) pour les autres
Permission2500 = Consulter les documents
Permission2501 = Soumettre ou supprimer des documents
Permission2515 = Administrer les rubriques de documents