From 9c8cb32de3e52d710486225367dd1f2710d41006 Mon Sep 17 00:00:00 2001 From: BB2A Anthony Berton Date: Fri, 8 Apr 2022 10:25:19 +0200 Subject: [PATCH 1/2] FIX --- htdocs/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index b6e16a22a9e..3e2158ff2ae 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2628,7 +2628,7 @@ if ($action == 'create' && $usercancreate) { } // Cancel order - if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel))) { + if ($object->statut == Commande::STATUS_VALIDATED && !empty($usercancancel)) { print ''.$langs->trans("Cancel").''; } From 0d00c4b26d62a43af4a7f20a6ef5c58a03bbb739 Mon Sep 17 00:00:00 2001 From: BB2A Anthony Berton Date: Fri, 8 Apr 2022 10:25:19 +0200 Subject: [PATCH 2/2] FIX --- htdocs/commande/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index a3d1fa2da04..25b677d1887 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2799,8 +2799,8 @@ if ($action == 'create' && $usercancreate) { } // Cancel order - if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel))) { - print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id, ''); + if ($object->statut == Commande::STATUS_VALIDATED && !empty($usercancancel)) { + print ''.$langs->trans("Cancel").''; } // Delete order