diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 4dde02ce33deb892b006420e9dadf106a9635ff4..59a23bebd91bde3a39b795e399829ffbcac290ec 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -88,17 +88,24 @@ if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat-> else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer) { - $object->fetch($id); - $result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment'))); - - if ($result > 0) - { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; - } - else { - $mesg=$object->error; - } + if (! GETPOST('dateend')) + { + $error++; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),'errors'); + } + if (! $error) + { + $object->fetch($id); + $result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment'))); + if ($result > 0) + { + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); + exit; + } + else { + $mesg=$object->error; + } + } } // Si ajout champ produit predefini @@ -1514,7 +1521,7 @@ else if ($objp->statut == 4) { print $langs->trans("DateEndReal").' '; - $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline"); + $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1); } } print '</td>';