From d9dc8de4e6a6aac427dd74ef4bce45a4c2e53a33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Mar 2014 15:58:02 +0100
Subject: [PATCH] Fix: Badd error message
---
htdocs/contrat/fiche.php | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 4dde02ce33d..59a23bebd91 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>';
--
GitLab