diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index c2ce95dd827..9397a1fa1ee 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -467,7 +467,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '
| '.$langs->trans('Date').' | ';
$datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'') : $datepayment);
- $form->select_date($datepayment,'','','',0,"add_paiement",1,1,0,0,'','',$facture->date);
+ print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
print ' |
';
// Payment mode
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index fba8723d818..a20620f8a12 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -226,7 +226,7 @@ if ($action == 'create')
print '| '.$langs->trans("Date").' | ';
$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0;
- $form->select_date($datepayment,'','','','',"add_payment",1,1);
+ print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
print " | ";
print '
';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 5a9e439a9c7..f8b8b97182c 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -328,7 +328,7 @@ if ($action == 'create')
// Date
print '| '.$langs->trans("Date").' | ';
- $form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
+ print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
print ' | ';
// Amount
@@ -455,7 +455,7 @@ if (! empty($id) && $action == 'edit')
// Date
print '
| '.$langs->trans("Date").' | ';
- $form->select_date($object->date,'','','','',"update");
+ print $form->selectDate($object->date,'','','','',"update");
print ' | ';
// Amount
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index c5ff6d18ddc..75866d586f6 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1490,8 +1490,11 @@ else if ($id > 0 || ! empty($ref))
// Date d'intervention
print '';
- if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) $form->select_date($db->jdate($objp->date_intervention),'di',0,0,0,"date_intervention");
- else $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
+ if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+ print $form->selectDate($db->jdate($objp->date_intervention),'di',0,0,0,"date_intervention");
+ } else {
+ print $form->selectDate($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
+ }
print ' | ';
// Duration
@@ -1556,18 +1559,25 @@ else if ($id > 0 || ! empty($ref))
print '';
$now=dol_now();
$timearray=dol_getdate($now);
- if (! GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
- else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
- if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) $form->select_date($timewithnohour,'di',0,0,0,"addinter");
- else $form->select_date($timewithnohour,'di',1,1,0,"addinter");
+ if (! GETPOST('diday','int')) {
+ $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
+ } else {
+ $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
+ }
+ if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+ print $form->selectDate($timewithnohour,'di',0,0,0,"addinter");
+ } else {
+ print $form->selectDate($timewithnohour,'di',1,1,0,"addinter");
+ }
print ' | ';
// Duration
print '';
if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
$selectmode = 'select';
- if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
+ if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
$selectmode = 'text';
+ }
$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
}
print ' | ';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 42b604f03d5..7a59f9c1ba2 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -286,13 +286,13 @@ if ($action == 'create')
// Date Start
print "
";
print '| '.$langs->trans("DateStart").' | ';
- print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1,1);
+ print $form->selectDate($datestart?$datestart:-1,'start','','','','add',1,1);
print ' |
';
// Date End
print "";
print '| '.$langs->trans("DateEnd").' | ';
- print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1,1);
+ print $form->selectDate($dateend?$dateend:-1,'end','','','','add',1,1);
print ' |
';
// Number of terms
@@ -501,7 +501,7 @@ if ($id > 0)
print "";
if ($action == 'edit')
{
- print $form->select_date($object->datestart, 'start', 0, 0, 0, 'update', 1, 0, 1);
+ print $form->selectDate($object->datestart, 'start', 0, 0, 0, 'update', 1, 0);
}
else
{
@@ -514,7 +514,7 @@ if ($id > 0)
print " | ";
if ($action == 'edit')
{
- print $form->select_date($object->dateend, 'end', 0, 0, 0, 'update', 1, 0, 1);
+ print $form->selectDate($object->dateend, 'end', 0, 0, 0, 'update', 1, 0);
}
else
{
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index bc674b2ba95..dfc0b753559 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -569,12 +569,12 @@ if ($action == 'create' && $user->rights->projet->creer)
// Date start
print ' | | '.$langs->trans("DateStart").' | ';
- print $form->select_date(($date_start?$date_start:''),'projectstart',0,0,0,'',1,0,1);
+ print $form->selectDate(($date_start?$date_start:''), 'projectstart', 0, 0, 0, '', 1, 0);
print ' |
';
// Date end
print '| '.$langs->trans("DateEnd").' | ';
- print $form->select_date(($date_end?$date_end:-1),'projectend',0,0,0,'',1,0,1);
+ print $form->selectDate(($date_end?$date_end:-1), 'projectend', 0, 0, 0, '', 1, 0);
print ' |
';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -822,7 +822,7 @@ elseif ($object->id > 0)
// Date start
print '| '.$langs->trans("DateStart").' | ';
- print $form->select_date($object->date_start?$object->date_start:-1,'projectstart',0,0,0,'',1,0,1);
+ print $form->selectDate($object->date_start?$object->date_start:-1, 'projectstart', 0, 0, 0, '', 1, 0);
print ' '. $langs->trans("ProjectReportDate");
@@ -830,7 +830,7 @@ elseif ($object->id > 0)
// Date end
print ' |
| '.$langs->trans("DateEnd").' | ';
- print $form->select_date($object->date_end?$object->date_end:-1,'projectend',0,0,0,'',1,0,1);
+ print $form->selectDate($object->date_end?$object->date_end:-1, 'projectend', 0, 0, 0, '', 1, 0);
print ' |
';
// Budget