diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 3c4c3cf1524..cf95c602e3e 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1330,7 +1330,7 @@ else if (GETPOST("action") == 'delete') { $html = new Form($db); - $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,2); + $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,1); if ($ret == 'html') print '
'; } @@ -1689,36 +1689,31 @@ else /* * Actions */ - if ($_GET["action"] == '') + print '
'; + + if ($user->rights->societe->creer) { - print '
'; - - if ($user->rights->societe->creer) - { - print ''.$langs->trans("Modify").''; - } - - if ($user->rights->societe->contact->creer) - { - print ''.$langs->trans("AddContact").''; - } - - if ($conf->projet->enabled && $user->rights->projet->creer) - { - print ''.$langs->trans("AddProject").''; - } - - if ($user->rights->societe->supprimer) - { - print ''.$langs->trans('Delete').''; - } - - print '
'; - print '
'; + print ''.$langs->trans("Modify").''; } - - + if ($user->rights->societe->contact->creer) + { + print ''.$langs->trans("AddContact").''; + } + + if ($conf->projet->enabled && $user->rights->projet->creer) + { + print ''.$langs->trans("AddProject").''; + } + + if ($user->rights->societe->supprimer) + { + print ''.$langs->trans('Delete').''; + } + + print '
'; + print '
'; + print '
'; print ''; // ancre