From b408429fed6b6948f5df867db43f28eb1dd18df9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 8 Jul 2007 15:34:38 +0000
Subject: [PATCH] =?UTF-8?q?Quand=20on=20ferme=20un=20service,=20la=20date?=
 =?UTF-8?q?=20propos=E9=20par=20defaut=20est=20la=20date=20du=20jour=20si?=
 =?UTF-8?q?=20date=20de=20fin=20pr=E9vu=20dans=20le=20future.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contrat/ligne.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php
index 3247206124f..8ef310a9fc3 100644
--- a/htdocs/contrat/ligne.php
+++ b/htdocs/contrat/ligne.php
@@ -135,8 +135,8 @@ if ($id > 0)
          */
         if ($_GET["action"] == 'active' && $user->rights->contrat->activer)
         {
-            $dateactstart = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-            $dateactend   = mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
+            $dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+            $dateactend   = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
             $html->form_confirm("ligne.php?id=".$contrat->id."&amp;ligne=".$_GET["ligne"]."&amp;date=".$dateactstart."&amp;dateend=".$dateactend,$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",strftime("%A %d %B %Y", $dateactstart)),"confirm_active");
             print '<br />';
         }
@@ -146,8 +146,8 @@ if ($id > 0)
          */
         if ($_GET["action"] == 'close' && $user->rights->contrat->activer)
         {
-            $dateactstart = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-            $dateactend   = mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
+			$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+            $dateactend   = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
             $html->form_confirm("ligne.php?id=".$contrat->id."&amp;ligne=".$_GET["ligne"]."&amp;date=".$dateactstart."&amp;dateend=".$dateactend,$langs->trans("CloseService"),$langs->trans("ConfirmCloseService",strftime("%A %d %B %Y", $dateactstart)),"confirm_close");
             print '<br />';
         }
@@ -426,10 +426,10 @@ if ($id > 0)
             print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("CloseService").'</td></tr>';
 
             // Definie date debut et fin par defaut
-            if ($_POST["remonth"]) $dateactstart = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+            if ($_POST["remonth"]) $dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
             elseif (! $dateactstart) $dateactstart = time();
 
-            if ($_POST["endmonth"]) $dateactend = mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
+            if ($_POST["endmonth"]) $dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
             elseif (! $dateactend)
             {
                 if ($objp->fk_product > 0)
@@ -439,7 +439,10 @@ if ($id > 0)
                     $dateactend = dolibarr_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
                 }
             }
+            $now=mktime();
+			if ($dateactend > $now) $dateactend=$now;
 
+			
             print '<tr '.$bc[$var].'><td>'.$langs->trans("DateEndReal").'</td><td>';
             print $form->select_date($dateactend,"end",'','','',"close");
             print '</td>';