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

Fix bad parameters of function select_date

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-12 12:50:24 +02:00
parent 39a9b41c42
commit 1fb40565f4
26 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/card_subscriptions.php
View File

@ -944,7 +944,7 @@ if ($rowid > 0)
$datefrom=$object->datevalid; $datefrom=$object->datevalid;
} }
} }
$form->select_date($datefrom,'','','','',"cotisation",1,1); print $form->select_date($datefrom,'','','','',"cotisation",1,1,1);
print "</td></tr>"; print "</td></tr>";
// Date end subscription // Date end subscription
@ -957,7 +957,7 @@ if ($rowid > 0)
$dateto=-1; // By default, no date is suggested $dateto=-1; // By default, no date is suggested
} }
print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>'; print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
$form->select_date($dateto,'end','','','',"cotisation"); print $form->select_date($dateto,'end','','','',"cotisation",1,0,1);
print "</td></tr>"; print "</td></tr>";
if ($adht->cotisation) if ($adht->cotisation)
@ -1058,7 +1058,7 @@ if ($rowid > 0)
// Date of payment // Date of payment
print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>'; print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
$form->select_date(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1); print $form->select_date(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1,1);
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero'); print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');

4
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -206,8 +206,8 @@ $langs->load("cashdesk");
<td> <td>
<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" /> <input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
<?php <?php
echo $langs->trans("DateEcheance").' :'; print $langs->trans("DateEcheance").' :';
print $form->select_date(-1,'txtDatePaiement'); print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1);
?> ?>
</td> </td>
</tr> </tr>

1
htdocs/commande/card.php
View File

@ -1372,7 +1372,6 @@ if ($action == 'create' && $user->rights->commande->creer)
} }
// Date // Date
print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">'; print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
//$form->select_date($dateorder, 're', '', '', '', "crea_commande", 1, 1);
$form->select_date('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date $form->select_date('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
print '</td></tr>'; print '</td></tr>';

4
htdocs/compta/deplacement/card.php
View File

@ -262,7 +262,7 @@ if ($action == 'create')
print "<tr>"; print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
print $form->select_date($datec?$datec:-1,'','','','','add',1,1); print $form->select_date($datec?$datec:-1,'','','','','add',1,1,1);
print '</td></tr>'; print '</td></tr>';
// Km // Km
@ -358,7 +358,7 @@ else if ($id)
// Date // Date
print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
print $form->select_date($object->date,'','','','','update'); print $form->select_date($object->date,'',0,0,0,'update',1,0,1);
print '</td></tr>'; print '</td></tr>';
// Km // Km

6
htdocs/compta/facture.php
View File

@ -2273,7 +2273,7 @@ if ($action == 'create')
// Date invoice // Date invoice
print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">'; print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$form->select_date($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1); print $form->select_date($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1, 1);
print '</td></tr>'; print '</td></tr>';
// Payment term // Payment term
@ -2457,12 +2457,12 @@ if ($action == 'create')
print '<td class="nobordernopadding nowrap">'; print '<td class="nobordernopadding nowrap">';
print $langs->trans('From') . ' '; print $langs->trans('From') . ' ';
print '</td><td class="nobordernopadding nowrap">'; print '</td><td class="nobordernopadding nowrap">';
print $form->select_date('', 'date_start' . $i, $usehm, $usehm, 1, "add"); print $form->select_date('', 'date_start' . $i, $usehm, $usehm, 1, "add", 1, 0, 1);
print '</td></tr>'; print '</td></tr>';
print '<td class="nobordernopadding nowrap">'; print '<td class="nobordernopadding nowrap">';
print $langs->trans('to') . ' '; print $langs->trans('to') . ' ';
print '</td><td class="nobordernopadding nowrap">'; print '</td><td class="nobordernopadding nowrap">';
print $form->select_date('', 'date_end' . $i, $usehm, $usehm, 1, "add"); print $form->select_date('', 'date_end' . $i, $usehm, $usehm, 1, "add", 1, 0, 1);
print '</td></tr></table>'; print '</td></tr></table>';
print '</td>'; print '</td>';
} }

2
htdocs/compta/paiement/cheque/card.php
View File

@ -386,7 +386,7 @@ if ($action == 'new')
//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>'; //print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
// Filter // Filter
print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>'; print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>';
print $form->select_date($filterdate,'fd',0,0,1,'',1,1); print $form->select_date($filterdate,'fd',0,0,1,'',1,1,1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("BankAccount").'</td><td>'; print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
$form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1); $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);

4
htdocs/contact/card.php
View File

@ -635,11 +635,11 @@ else
$form=new Form($db); $form=new Form($db);
if ($object->birthday) if ($object->birthday)
{ {
print $form->select_date($object->birthday,'birthday',0,0,0,"perso"); print $form->select_date($object->birthday,'birthday',0,0,0,"perso", 1, 0, 1);
} }
else else
{ {
print $form->select_date('','birthday',0,0,1,"perso"); print $form->select_date('','birthday',0,0,1,"perso", 1, 0, 1);
} }
print '</td>'; print '</td>';

2
htdocs/contact/perso.php
View File

@ -129,7 +129,7 @@ if ($action == 'edit')
// Date To Birth // Date To Birth
print '<tr><td>'.$langs->trans("DateToBirth").'</td><td>'; print '<tr><td>'.$langs->trans("DateToBirth").'</td><td>';
$form=new Form($db); $form=new Form($db);
print $form->select_date($object->birthday,'birthday',0,0,1,"perso"); print $form->select_date($object->birthday,'birthday',0,0,1,"perso", 1,0,1);
print '</td>'; print '</td>';
print '<td colspan="2">'.$langs->trans("Alert").': '; print '<td colspan="2">'.$langs->trans("Alert").': ';

6
htdocs/contrat/card.php
View File

@ -1687,11 +1687,11 @@ else
} }
print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active"); print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1);
print '</td>'; print '</td>';
print '<td>'.$langs->trans("DateEndPlanned").'</td><td>'; print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active"); print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active",1,0,1);
print '</td>'; print '</td>';
print '<td align="center" rowspan="2" valign="middle">'; print '<td align="center" rowspan="2" valign="middle">';
@ -1744,7 +1744,7 @@ else
if ($objp->statut == 4) if ($objp->statut == 4)
{ {
print $langs->trans("DateEndReal").' '; print $langs->trans("DateEndReal").' ';
$form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1); print $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1,1);
} }
} }
print '</td>'; print '</td>';

4
htdocs/contrat/services.php
View File

@ -191,14 +191,14 @@ if ($resql)
print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1); print $form->selectarray('filter_op1',$arrayofoperators,$filter_op1,1);
print ' '; print ' ';
$filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year); $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
print $form->select_date($filter_date1,'op1',0,0,1); print $form->select_date($filter_date1,'op1',0,0,1,'',1,0,1);
print '</td>'; print '</td>';
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre" align="center">';
$arrayofoperators=array('<'=>'<','>'=>'>'); $arrayofoperators=array('<'=>'<','>'=>'>');
print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1); print $form->selectarray('filter_op2',$arrayofoperators,$filter_op2,1);
print ' '; print ' ';
$filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year); $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
print $form->select_date($filter_date2,'op2',0,0,1); print $form->select_date($filter_date2,'op2',0,0,1,'',1,0,1);
print '</td>'; print '</td>';
print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'; print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'; print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

4
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -347,9 +347,9 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
else else
{ {
echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
echo $form->select_date($date_start,'date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct"); echo $form->select_date($date_start,'date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct",1,0,1);
echo ' '.$langs->trans('to').' '; echo ' '.$langs->trans('to').' ';
echo $form->select_date($date_end,'date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct"); echo $form->select_date($date_end,'date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct",1,0,1);
} }
?> ?>
</td> </td>

4
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -222,9 +222,9 @@ $coldisplay=-1; // We remove first td
<td colspan="11"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> <td colspan="11"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
<?php <?php
$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:''); $hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
echo $form->select_date($line->date_start,'date_start',$hourmin,$hourmin,$line->date_start?0:1,"updateligne"); echo $form->select_date($line->date_start,'date_start',$hourmin,$hourmin,$line->date_start?0:1,"updateligne",1,0,1);
echo ' '.$langs->trans('to').' '; echo ' '.$langs->trans('to').' ';
echo $form->select_date($line->date_end,'date_end',$hourmin,$hourmin,$line->date_end?0:1,"updateligne"); echo $form->select_date($line->date_end,'date_end',$hourmin,$hourmin,$line->date_end?0:1,"updateligne",1,0,1);
?> ?>
</td> </td>
</tr> </tr>

4
htdocs/expedition/card.php
View File

@ -542,7 +542,7 @@ if ($action == 'create')
print '<td colspan="3">'; print '<td colspan="3">';
//print dol_print_date($object->date_livraison,"day"); // date_livraison come from order and will be stored into date_delivery planed. //print dol_print_date($object->date_livraison,"day"); // date_livraison come from order and will be stored into date_delivery planed.
$date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST $date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST
print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1); print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1,1);
print "</td>\n"; print "</td>\n";
print '</tr>'; print '</tr>';
@ -1059,7 +1059,7 @@ else if ($id || $ref)
print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">'; print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">'; print '<input type="hidden" name="action" value="setdate_livraison">';
$form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison"); print $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison",1,0,1);
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">'; print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>'; print '</form>';
} }

8
htdocs/fourn/commande/card.php
View File

@ -2216,9 +2216,9 @@ elseif (! empty($object->id))
print '<br>'; print '<br>';
print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
print $form->select_date($date_start,'date_start'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,''); print $form->select_date($date_start,'date_start'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'',1,0,1);
print ' '.$langs->trans('to').' '; print ' '.$langs->trans('to').' ';
print $form->select_date($date_end,'date_end'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,''); print $form->select_date($date_end,'date_end'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'',1,0,1);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
@ -2790,7 +2790,7 @@ elseif (! empty($object->id))
//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>'; //print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
print '<tr><td>'.$langs->trans("OrderDate").'</td><td>'; print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
print $form->select_date($date_com,'',1,1,'',"commande"); print $form->select_date($date_com,'',1,1,'',"commande",1,0,1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("OrderMode").'</td><td>'; print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
@ -2817,7 +2817,7 @@ elseif (! empty($object->id))
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>'; //print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>'; print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
print $form->select_date('','',1,1,'',"commande"); print $form->select_date('','',1,1,'',"commande",1,0,1);
print "</td></tr>\n"; print "</td></tr>\n";
print "<tr><td>".$langs->trans("Delivery")."</td><td>\n"; print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";

8
htdocs/loan/card.php
View File

@ -218,13 +218,13 @@ if ($action == 'create')
// Date Start // Date Start
print "<tr>"; print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1); print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1,1);
print '</td></tr>'; print '</td></tr>';
// Date End // Date End
print "<tr>"; print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>'; print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1); print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1,1);
print '</td></tr>'; print '</td></tr>';
// Number of terms // Number of terms
@ -356,7 +356,7 @@ if ($id > 0)
print "<td>"; print "<td>";
if ($action == 'edit') if ($action == 'edit')
{ {
print $form->select_date($object->datestart, 'start', 0, 0, 0, 'update', 1); print $form->select_date($object->datestart, 'start', 0, 0, 0, 'update', 1, 0, 1);
} }
else else
{ {
@ -369,7 +369,7 @@ if ($id > 0)
print "<td>"; print "<td>";
if ($action == 'edit') if ($action == 'edit')
{ {
print $form->select_date($object->dateend, 'end', 0, 0, 0, 'update', 1); print $form->select_date($object->dateend, 'end', 0, 0, 0, 'update', 1, 0, 1);
} }
else else
{ {

4
htdocs/loan/document.php
View File

@ -123,7 +123,7 @@ if ($object->id)
print "<td>"; print "<td>";
if ($action == 'edit') if ($action == 'edit')
{ {
print $form->select_date($object->datestart, 'start', 0, 0, 0, 'loan', 1); print $form->select_date($object->datestart, 'start', 0, 0, 0, 'loan', 1, 0, 1);
} }
else else
{ {
@ -137,7 +137,7 @@ if ($object->id)
print "<td>"; print "<td>";
if ($action == 'edit') if ($action == 'edit')
{ {
print $form->select_date($object->dateend, 'end', 0, 0, 0, 'loan', 1); print $form->select_date($object->dateend, 'end', 0, 0, 0, 'loan', 1, 0, 1);
} }
else else
{ {

2
htdocs/opensurvey/card.php
View File

@ -287,7 +287,7 @@ print '</td></tr>';
// Expire date // Expire date
print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire'); if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
else print dol_print_date($object->date_fin,'day'); else print dol_print_date($object->date_fin,'day');
print '</td></tr>'; print '</td></tr>';

2
htdocs/opensurvey/results.php
View File

@ -458,7 +458,7 @@ print '</td></tr>';
// Expire date // Expire date
print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire'); if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
else print dol_print_date($object->date_fin,'day'); else print dol_print_date($object->date_fin,'day');
print '</td></tr>'; print '</td></tr>';

2
htdocs/opensurvey/wizard/create_survey.php
View File

@ -156,7 +156,7 @@ print '</tr>'."\n";
print '<tr><td class="fieldrequired">'. $langs->trans("ExpireDate") .'</td><td>'; print '<tr><td class="fieldrequired">'. $langs->trans("ExpireDate") .'</td><td>';
print $form->select_date($champdatefin?$champdatefin:-1,'champdatefin','','','',"add",1,0); print $form->select_date($champdatefin?$champdatefin:-1,'champdatefin','','','',"add",1,0,1);
print '</tr>'."\n"; print '</tr>'."\n";
print '</table>'."\n"; print '</table>'."\n";

4
htdocs/product/stock/product.php
View File

@ -747,10 +747,10 @@ if ($resql)
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>';
print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>'; print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
print '<td align="center" width="10%">'; print '<td align="center" width="10%">';
$form->select_date($pdluo->eatby,'eatby','','',1,""); $form->select_date($pdluo->eatby,'eatby','','',1,'',1,0,1);
print '</td>'; print '</td>';
print '<td align="center" width="10%">'; print '<td align="center" width="10%">';
$form->select_date($pdluo->sellby,'sellby','','',1,""); $form->select_date($pdluo->sellby,'sellby','','',1,'',1,0,1);
print '</td>'; print '</td>';
print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>'; print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">'; print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';

8
htdocs/projet/card.php
View File

@ -478,12 +478,12 @@ if ($action == 'create' && $user->rights->projet->creer)
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->select_date(($date_start?$date_start:''),'projectstart'); print $form->select_date(($date_start?$date_start:''),'projectstart',0,0,0,'',1,0,1);
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date(($date_end?$date_end:-1),'projectend'); print $form->select_date(($date_end?$date_end:-1),'projectend',0,0,0,'',1,0,1);
print '</td></tr>'; print '</td></tr>';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@ -636,7 +636,7 @@ else
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->select_date($object->date_start?$object->date_start:-1,'projectstart'); print $form->select_date($object->date_start?$object->date_start:-1,'projectstart',0,0,0,'',1,0,1);
print ' &nbsp; &nbsp; <input type="checkbox" name="reportdate" value="yes" '; print ' &nbsp; &nbsp; <input type="checkbox" name="reportdate" value="yes" ';
if ($comefromclone){print ' checked ';} if ($comefromclone){print ' checked ';}
print '/> '. $langs->trans("ProjectReportDate"); print '/> '. $langs->trans("ProjectReportDate");
@ -644,7 +644,7 @@ else
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date($object->date_end?$object->date_end:-1,'projectend'); print $form->select_date($object->date_end?$object->date_end:-1,'projectend',0,0,0,'',1,0,1);
print '</td></tr>'; print '</td></tr>';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))

4
htdocs/projet/element.php
View File

@ -320,10 +320,10 @@ if (! $showdatefilter)
print '<input type="hidden" name="action" value="view">'; print '<input type="hidden" name="action" value="view">';
print '<table><tr>'; print '<table><tr>';
print '<td>'.$langs->trans("From").' '; print '<td>'.$langs->trans("From").' ';
print $form->select_date($dates,'dates',0,0,1); print $form->select_date($dates,'dates',0,0,1,'',1,0,1);
print '</td>'; print '</td>';
print '<td>'.$langs->trans("to").' '; print '<td>'.$langs->trans("to").' ';
print $form->select_date($datee,'datee',0,0,1); print $form->select_date($datee,'datee',0,0,1,'',1,0,1);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">'; print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';

4
htdocs/projet/tasks.php
View File

@ -310,12 +310,12 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1); print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1,1);
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1); print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1,1);
print '</td></tr>'; print '</td></tr>';
// planned workload // planned workload

4
htdocs/projet/tasks/task.php
View File

@ -336,12 +336,12 @@ if ($id > 0 || ! empty($ref))
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->select_date($object->date_start,'dateo',1,1); print $form->select_date($object->date_start,'dateo',1,1,0,'',1,0,1);
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1); print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1,0,'',1,0,1);
print '</td></tr>'; print '</td></tr>';
// Planned workload // Planned workload

4
htdocs/projet/tasks/time.php
View File

@ -385,7 +385,7 @@ if ($id > 0 || ! empty($ref))
print '<td class="nowrap">'; print '<td class="nowrap">';
//$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]); //$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
$newdate=''; $newdate='';
print $form->select_date($newdate,'time',1,1,2,"timespent_date"); print $form->select_date($newdate,'time',1,1,2,"timespent_date",1,0,1);
print '</td>'; print '</td>';
// Contributor // Contributor
@ -486,7 +486,7 @@ if ($id > 0 || ! empty($ref))
print '<td class="nowrap">'; print '<td class="nowrap">';
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid) if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
{ {
print $form->select_date($db->jdate($date2?$date2:$date1),'timeline',1,1,2,"timespent_date"); print $form->select_date($db->jdate($date2?$date2:$date1),'timeline',1,1,2,"timespent_date",1,0,1);
} }
else else
{ {

2
htdocs/public/members/new.php
View File

@ -504,7 +504,7 @@ if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
} }
// Birthday // Birthday
print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>'; print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>';
print $form->select_date($birthday,'birth',0,0,1,"newmember"); print $form->select_date($birthday,'birth',0,0,1,"newmember",1,0,1);
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Photo // Photo
print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n"; print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";