Fix: Confirm validate must be set on yes by default.

This commit is contained in:
Laurent Destailleur 2014-10-20 23:37:28 +02:00
parent 9278d21048
commit 8e63f09764

View File

@ -1165,13 +1165,13 @@ else if ($id > 0 || ! empty($ref))
$formconfirm=''; $formconfirm='';
// Confirmation de la suppression de la fiche d'intervention // Confirm deletion of intervention
if ($action == 'delete') if ($action == 'delete')
{ {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1);
} }
// Confirmation validation // Confirm validation
if ($action == 'validate') if ($action == 'validate')
{ {
// on verifie si l'objet est en numerotation provisoire // on verifie si l'objet est en numerotation provisoire
@ -1191,16 +1191,16 @@ else if ($id > 0 || ! empty($ref))
} }
$text=$langs->trans('ConfirmValidateIntervention',$numref); $text=$langs->trans('ConfirmValidateIntervention',$numref);
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',1,1);
} }
// Confirmation de la validation de la fiche d'intervention // Confirm back to draft
if ($action == 'modify') if ($action == 'modify')
{ {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1);
} }
// Confirmation de la suppression d'une ligne d'intervention // Confirm deletion of line
if ($action == 'ask_deleteline') if ($action == 'ask_deleteline')
{ {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1);
@ -1599,7 +1599,7 @@ else if ($id > 0 || ! empty($ref))
if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS))) if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS)))
{ {
print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"'; print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
print '>'.$langs->trans("Valid").'</a></div>'; print '>'.$langs->trans("Validate").'</a></div>';
} }
// Modify // Modify