diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 1c1fbede039..d01036a6616 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -183,11 +183,11 @@ if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user-> $result = $contrat->validate($user); } -if ($_POST["action"] == 'confirm_cancel' && $_POST["confirm"] == 'yes' && $user->rights->contrat->creer) +if ($_POST["action"] == 'confirm_close' && $_POST["confirm"] == 'yes' && $user->rights->contrat->creer) { $contrat = new Contrat($db); $contrat->fetch($_GET["id"]); - $result = $contrat->cancel($user); + $result = $contrat->cloture($user); } if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') @@ -488,11 +488,12 @@ else } /* - * Confirmation de l'annulation + * Confirmation de la fermeture */ - if ($_GET["action"] == 'annuler') + if ($_GET["action"] == 'close') { - $html->form_confirm("fiche.php?id=$id",$langs->trans("Cancel"),"Etes-vous sûr de vouloir annuler cette contrat ?","confirm_cancel"); + $html->form_confirm("fiche.php?id=$id",$langs->trans("CloseAContract"),$langs->trans("ConfirmCloseContract"),"confirm_close"); + print '
'; } /* @@ -633,7 +634,7 @@ else print ''; } else { - print ' '; + print ' '; } if ($contrat->statut == 0 && $user->rights->contrat->creer) { @@ -834,7 +835,14 @@ else print ''.$langs->trans("Valid").''; } - if ($user->rights->contrat->supprimer) + // \todo Mettre bouton cloturer que si tous les services sont clos + $numclos=$num; + if ($contrat->statut == 1 && $num == $numclos) + { + print ''.$langs->trans("Close").''; + } + + if ($contrat->statut == 0 && $user->rights->contrat->supprimer) { print ''.$langs->trans("Delete").''; } diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index bf5c1659ec9..0bd7be8e1e4 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -26,8 +26,10 @@ NewContract=New contract AddContract=Add contract SearchAContract=Search a contract DeleteAContract=Delete a contract +CloseAContract=Close a contract ConfirmDeleteAContract=Are you sure you want to delete this contract ? ConfirmValidateContract=Are you sure you want to validate this contract ? +ConfirmCloseContract=Are you sure you want to close this contract ? ConfirmCloseService=Are you sure you want to close this service ? ValidateAContract=Validate a contract ActivateService=Activate service diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index c14a037052e..b0541a36390 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -26,8 +26,10 @@ NewContract=Nouveau contrat AddContract=Créer contrat SearchAContract=Rechercher un contrat DeleteAContract=Supprimer un contract +CloseAContract=Cloturer un contract ConfirmDeleteAContract=Etes-vous sûr de vouloir supprimer ce contrat ? -ConfirmValidateContract=Etes-vous sûr de vouloir valider cet contrat ? +ConfirmValidateContract=Etes-vous sûr de vouloir valider ce contrat ? +ConfirmCloseContract=Etes-vous sûr de vouloir cloturer ce contrat ? ConfirmCloseService=Etes-vous sûr de vouloir fermer ce service ? ValidateAContract=Valider un contrat ActivateService=Activer le service