diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index d7060124ee4..f7eda940268 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -980,7 +980,7 @@ else
// Birthday
print "
".$langs->trans("Birthday")." \n";
- $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
+ print $form->selectDate(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
print " \n";
// Public profil
@@ -1218,7 +1218,7 @@ else
// Birthday
print "".$langs->trans("Birthday")." \n";
- $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
+ print $form->selectDate(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
print " \n";
// Public profil
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 6312bc8494b..17aa56f521b 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -895,7 +895,7 @@ if ($rowid > 0)
$datefrom=dol_time_plus_duree($object->datefin,1,'d');
}
}
- print $form->select_date($datefrom,'','','','',"subscription",1,1,1);
+ print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
print "";
// Date end subscription
@@ -908,7 +908,7 @@ if ($rowid > 0)
$dateto=-1; // By default, no date is suggested
}
print ''.$langs->trans("DateEndSubscription").' ';
- print $form->select_date($dateto,'end','','','',"subscription",1,0,1);
+ print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
print " ";
if ($adht->subscription)
@@ -1009,7 +1009,7 @@ if ($rowid > 0)
// Date of payment
print ''.$langs->trans("DatePayment").' ';
- print $form->select_date(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'subscription',1,1,1);
+ print $form->selectDate(isset($paymentdate)?$paymentdate:-1, 'payment', 0, 0, 1, 'subscription', 1, 1);
print " \n";
print ''.$langs->trans('Numero');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 75285bf35cf..bd165d71566 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1335,7 +1335,7 @@ if ($action == 'create')
print ' ';
print ''.$langs->trans("DateStart").' ';
print '';
- $form->select_date($date_start?$date_start:-1,'date_debut',0,0,0,'',1,1);
+ print $form->selectDate($date_start?$date_start:-1, 'date_debut', 0, 0, 0, '', 1, 1);
print ' ';
print ' ';
@@ -1343,7 +1343,7 @@ if ($action == 'create')
print '';
print ''.$langs->trans("DateEnd").' ';
print '';
- $form->select_date($date_end?$date_end:-1,'date_fin',0,0,0,'',1,1);
+ print $form->selectDate($date_end?$date_end:-1, 'date_fin', 0, 0, 0, '', 1, 1);
print ' ';
print ' ';
@@ -1500,13 +1500,13 @@ else
print '';
print ''.$langs->trans("DateStart").' ';
print '';
- $form->select_date($object->date_debut,'date_debut');
+ print $form->selectDate($object->date_debut, 'date_debut');
print ' ';
print ' ';
print '';
print ''.$langs->trans("DateEnd").' ';
print '';
- $form->select_date($object->date_fin,'date_fin');
+ print $form->selectDate($object->date_fin, 'date_fin');
print ' ';
print ' ';
@@ -2078,7 +2078,7 @@ else
// Select date
print '';
- $form->select_date($line->date,'date');
+ print $form->selectDate($line->date,'date');
print ' ';
// Select project
@@ -2161,7 +2161,7 @@ else
// Select date
print '';
- $form->select_date($date?$date:-1,'date');
+ print $form->selectDate($date?$date:-1, 'date');
print ' ';
// Select project
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
index 8ea72191b1d..e57702ba4c9 100644
--- a/htdocs/expensereport/export_csv.php
+++ b/htdocs/expensereport/export_csv.php
@@ -114,7 +114,7 @@ if (isset($_POST['action']))
{
if($_POST['action'] == 'export')
{
- $select_date = $_POST['annee'].'-'.$_POST['mois'];
+ $dateselected = $_POST['annee'].'-'.$_POST['mois'];
//var_dump($conf->expensereport->dir_output.'/export/');
if (!file_exists($conf->expensereport->dir_output.'/export/'))
@@ -122,7 +122,7 @@ if (isset($_POST['action']))
dol_mkdir($conf->expensereport->dir_output.'/export/');
}
- $dir = $conf->expensereport->dir_output.'/export/expensereport-'.$select_date.'.csv';
+ $dir = $conf->expensereport->dir_output.'/export/expensereport-'.$dateselected.'.csv';
$outputlangs = $langs;
$outputlangs->charset_output = 'UTF-8';
@@ -183,7 +183,7 @@ if (isset($_POST['action']))
fwrite($open,$ligne);
fclose($open);
- print 'Télécharger le fichier expensereport-'.$select_date.'.csv ';
+ print 'Télécharger le fichier expensereport-'.$dateselected.'.csv ';
} else {
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index d084f9be546..cdc3db64d47 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -357,7 +357,7 @@ if ($action == 'create') {
$date_next_execution = (GETPOST('remonth') ? dol_mktime(
12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')
) : -1);
- print $form->select_date($date_next_execution, '', 1, 1, '', "add", 1, 1, 1);
+ print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
print "";
// Number max of generation
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index fd050c4f772..eb89f1db232 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -909,10 +909,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
print '';
// Si la demande ne vient pas de l'agenda
if (! GETPOST('date_debut_')) {
- $form->select_date(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
+ print $form->selectDate(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
} else {
$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month','int'), GETPOST('date_debut_day','int'), GETPOST('date_debut_year','int'));
- $form->select_date($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
+ print $form->selectDate($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
}
print ' ';
print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday','alpha')?GETPOST('starthalfday','alpha'):'morning'));
@@ -928,10 +928,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
print ' ';
// Si la demande ne vient pas de l'agenda
if (! GETPOST('date_fin_')) {
- $form->select_date(-1,'date_fin_', 0, 0, 0, '', 1, 1);
+ print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
} else {
$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month','int'), GETPOST('date_fin_day','int'), GETPOST('date_fin_year','int'));
- $form->select_date($tmpdate,'date_fin_', 0, 0, 0, '', 1, 1);
+ print $form->selectDate($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
}
print ' ';
print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday','alpha')?GETPOST('endhalfday','alpha'):'afternoon'));
@@ -1104,9 +1104,9 @@ else
print ' ';
print ''.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").') ';
print '';
- $form->select_date($object->date_debut,'date_debut_');
- print ' ';
- print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
+ print $form->selectDate($object->date_debut, 'date_debut_');
+ print ' ';
+ print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
print ' ';
print ' ';
}
@@ -1126,9 +1126,9 @@ else
print '';
print ''.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").') ';
print '';
- $form->select_date($object->date_fin,'date_fin_');
- print ' ';
- print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
+ print $form->selectDate($object->date_fin, 'date_fin_');
+ print ' ';
+ print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
print ' ';
print ' ';
}
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index c452ac27ff0..68eddf44655 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -152,7 +152,7 @@ if ($object->id)
print '';
print ''.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").') ';
print '';
- $form->select_date($object->date_debut,'date_debut_');
+ print $form->selectDate($object->date_debut, 'date_debut_');
print ' ';
print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
print ' ';
@@ -174,9 +174,9 @@ if ($object->id)
print ' ';
print ''.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").') ';
print '';
- $form->select_date($object->date_fin,'date_fin_');
+ print $form->selectDate($object->date_fin, 'date_fin_');
print ' ';
- print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
+ print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
print ' ';
print ' ';
}
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 003d6450de7..44eb12299d9 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -506,7 +506,7 @@ else
print '';
}
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index dc546a7f9b4..5c808051a06 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -110,11 +110,11 @@ print '';
// Start date
print ''.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").') ';
print '';
-$form->select_date($startdate,'startdate','','',1,"sel",1,1);
+print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
print ' ';
print ''.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").') ';
print '';
-$form->select_date($enddate,'enddate','','',1,"sel",1,1);
+print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
print ' ';
print '';
print ' ';
@@ -271,4 +271,3 @@ $(document).ready(function() {
// End of page
llxFooter();
$db->close();
-
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 7160a13ed59..06527f42b91 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -165,11 +165,11 @@ print '';
print '' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ') ';
print '';
-$form->select_date($startdate, 'startdate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
print ' ';
print '' . $langs->trans('DateEnd') . ' (' . $langs->trans("DateValidation") . ') ';
print '';
-$form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
print ' ';
print '';
print ' ';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 7b33517556e..675fe527a47 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -159,11 +159,11 @@ print ' ';
// Start date
print ''.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").') ';
print '';
-$form->select_date($startdate,'startdate','','',1,"sel",1,1);
+print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
print ' ';
print ''.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").') ';
print '';
-$form->select_date($enddate,'enddate','','',1,"sel",1,1);
+print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
print ' ';
print '';
print ' ';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 55fef4e5c35..cb8bd53f790 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -134,11 +134,11 @@ print '';
print ' ';
print ''.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").') ';
print '';
-$form->select_date($startdate,'startdate','','',1,"sel",1,1);
+print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
print ' ';
print ''.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").') ';
print '';
-$form->select_date($enddate,'enddate','','',1,"sel",1,1);
+print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
print ' ';
print '';
print ' ';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 7210044ae35..83ebdc47507 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -529,10 +529,10 @@ if (! $showdatefilter)
print ' ';
print '';
print ''.$langs->trans("From").' ';
- print $form->select_date($dates,'dates',0,0,1,'',1,0,1);
+ print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0);
print ' ';
print ''.$langs->trans("to").' ';
- print $form->select_date($datee,'datee',0,0,1,'',1,0,1);
+ print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0);
print ' ';
print '';
print ' ';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index c10dc2b9c42..bffe5f4a373 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -480,12 +480,12 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
// Date start
print ' '.$langs->trans("DateStart").' ';
- print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1,1);
+ print $form->selectDate(($date_start?$date_start:''), 'dateo', 1, 1, 0, '', 1, 1);
print ' ';
// Date end
print ''.$langs->trans("DateEnd").' ';
- print $form->select_date(($date_end?$date_end:-1),'datee',-1,1,0,'',1,1,1);
+ print $form->selectDate(($date_end?$date_end:-1),'datee', -1, 1, 0, '', 1, 1);
print ' ';
// Planned workload
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 02f5786632c..e3a5f33cbeb 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -174,9 +174,9 @@ if ($showbirthday) $nav.=' ';
if ($pid) $nav.=' ';
if ($type) $nav.=' ';
if ($usergroup) $nav.=' ';
-$nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
-$nav.=' ';
-$nav.='';
+$nav.= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
+$nav.= ' ';
+$nav.= '';
$limit=10;
print_barre_liste('Title of my list', 12, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 500, '', 0, $nav, '', $limit);
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 614b10c976a..343acab9a4a 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -27,29 +27,29 @@ This page is a sample of page using Dolibarr HTML widget methods. It is designed
select_date using tzuser date
+// Test1: form->selectDate using tzuser date
print "Test 1a: We must have here current date and hour for user (must match hour on browser). Note: Check your are logged so user TZ and DST are known.";
$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
print " (dol_tz=".$offsettz." dol_dst=".$dol_dst.") \n";
-$form->select_date(dol_now(), 'test1a', 1, 1, 0);
+print $form->selectDate(dol_now(), 'test1a', 1, 1, 0);
print ' '."\n";
print "Test 1b: We must have here current date with hours to 00:00. ";
-$form->select_date('', 'test1b', 1, 1, 0);
+print $form->selectDate('', 'test1b', 1, 1, 0);
print ' '."\n";
-// Test2: form->select_date using tzuser date
+// Test2: form->selectDate using tzuser date
print "Test 2: We must have here 1970-01-01 00:00:00 selected (fields can be empty) \n";
-$form->select_date(dol_get_first_day(1970,1,false), 'test2', 1, 1, 1);
+print $form->selectDate(dol_get_first_day(1970,1,false), 'test2', 1, 1, 1);
print ' '."\n";
-// Test3: form->select_date for 1970-01-01 00:00:00
+// Test3: form->selectDate for 1970-01-01 00:00:00
print "Test 3: We must have here 1970-01-01 00:00:00 selected (fields are mandatory) \n";
-$form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
+print $form->selectDate(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
print ' '."\n";
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c7d734b4427..c208a8a719f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1158,21 +1158,21 @@ if ($action == 'create' || $action == 'adduserldap')
// Date employment
print ''.$langs->trans("DateEmployment").' ';
print '';
- echo $form->select_date(GETPOST('dateemployment'),'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
+ print $form->selectDate(GETPOST('dateemployment'), 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0);
print ' ';
print " \n";
// Date employment END
print ''.$langs->trans("DateEmploymentEnd").' ';
print '';
- echo $form->select_date(GETPOST('dateemploymentend'),'dateemploymentend',0,0,1,'form'.'dateemploymentend',1,0,1);
+ print $form->selectDate(GETPOST('dateemploymentend'), 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
print ' ';
print " \n";
// Date birth
print ''.$langs->trans("DateToBirth").' ';
print '';
- echo $form->select_date(GETPOST('birth'),'birth',0,0,1,'createuser',1,0,1);
+ print $form->selectDate(GETPOST('birth'), 'birth', 0, 0, 1, 'createuser', 1, 0);
print ' ';
print " \n";
@@ -2454,14 +2454,14 @@ else
// Date employment
print ''.$langs->trans("DateEmployment").' ';
print '';
- echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
+ print $form->selectDate(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0);
print ' ';
print " \n";
// Date employmentEnd
print ''.$langs->trans("DateEmploymentEnd").' ';
print '';
- echo $form->select_date(GETPOST('dateemploymentend')?GETPOST('dateemploymentend'):$object->dateemploymentend,'dateemploymentend',0,0,1,'form'.'dateemploymentend',1,0,1);
+ print $form->selectDate(GETPOST('dateemploymentend')?GETPOST('dateemploymentend'):$object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
print ' ';
print " \n";
@@ -2469,7 +2469,7 @@ else
// Date birth
print ''.$langs->trans("DateToBirth").' ';
print '';
- echo $form->select_date(GETPOST('birth')?GETPOST('birth'):$object->birth,'birth',0,0,1,'updateuser',1,0,1);
+ print $form->selectDate(GETPOST('birth')?GETPOST('birth'):$object->birth, 'birth', 0, 0, 1, 'updateuser', 1, 0);
print ' ';
print " \n";
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index 53136bf67b2..ccbad021b61 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -102,7 +102,7 @@ $periodlink = '';
$exportlink = '';
$nom = $langs->trans("ReportThirdParty");
-$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0) . ' - ' . $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$description = $langs->trans("DescThirdPartyReport");
$builddate=dol_now();