lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quand on ferme un service, la date propos par defaut est la date du jour si date de fin prvu dans le future.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-07-08 15:34:38 +00:00
parent 61ad458e18
commit b408429fed
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/contrat/ligne.php
View File

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