diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 074d00443bd..3396cd6270b 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -638,12 +638,10 @@ if ($resql)
{
print '
';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -652,12 +650,10 @@ if ($resql)
{
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1);
+ print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1);
+ print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -666,12 +662,10 @@ if ($resql)
{
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
+ print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
+ print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print ' ';
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 898c581407f..875b72a8dd2 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -632,31 +632,31 @@ if ($resql)
if (!empty($arrayfields['c.ref']['checked']))
{
print '';
- print ' ';
+ print ' ';
print ' ';
}
// Ref customer
if (!empty($arrayfields['c.ref_client']['checked']))
{
print '';
- print ' ';
+ print ' ';
print ' ';
}
// Project ref
if (!empty($arrayfields['p.ref']['checked']))
{
- print ' ';
+ print ' ';
}
// Project title
if (!empty($arrayfields['p.title']['checked']))
{
- print ' ';
+ print ' ';
}
// Thirpdarty
if (!empty($arrayfields['s.nom']['checked']))
{
print '';
- print ' ';
+ print ' ';
print ' ';
}
// Town
@@ -689,12 +689,10 @@ if ($resql)
{
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1);
+ print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1);
+ print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -702,12 +700,10 @@ if ($resql)
{
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
+ print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
+ print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -715,14 +711,14 @@ if ($resql)
{
// Amount
print '';
- print ' ';
+ print ' ';
print ' ';
}
if (!empty($arrayfields['c.total_vat']['checked']))
{
// Amount
print '';
- print ' ';
+ print ' ';
print ' ';
}
if (!empty($arrayfields['c.total_ttc']['checked']))
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 1573a226521..950d0c7d3c6 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -811,19 +811,19 @@ if ($resql)
$moreforfilter .= '';
$moreforfilter .= $langs->trans('DateOperationShort').' :';
$moreforfilter .= ($conf->browser->layout == 'phone' ? '
' : ' ');
- $moreforfilter .= '
'.$langs->trans('From').' ';
- $moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0).'
';
+ $moreforfilter .= '
';
+ $moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'
';
//$moreforfilter .= ' - ';
- $moreforfilter .= '
'.$langs->trans('to').' '.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0).'
';
+ $moreforfilter .= '
'.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'
';
$moreforfilter .= '
';
$moreforfilter .= '';
$moreforfilter .= $langs->trans('DateValueShort').' : ';
$moreforfilter .= ($conf->browser->layout == 'phone' ? '
' : ' ');
- $moreforfilter .= '
'.$langs->trans('From').' ';
- $moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0).'
';
+ $moreforfilter .= '
';
+ $moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'
';
//$moreforfilter .= ' - ';
- $moreforfilter .= '
'.$langs->trans('to').' '.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0).'
';
+ $moreforfilter .= '
'.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'
';
$moreforfilter .= '
';
if (!empty($conf->categorie->enabled))
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index cfecfecffa5..89a9899e197 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -240,8 +240,10 @@ if ($result)
if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
if ($search_label) $param .= '&search_label='.urlencode($search_label);
- if ($search_date_start) $param .= '&search_date_start='.urlencode($search_date_start);
- if ($search_date_end) $param .= '&search_date_end='.urlencode($search_date_end);
+ if ($search_datep_start) $param .= '&search_datep_start='.urlencode($search_datep_start);
+ if ($search_datep_end) $param .= '&search_datep_end='.urlencode($search_datep_end);
+ if ($search_datev_start) $param .= '&search_datev_start='.urlencode($search_datev_start);
+ if ($search_datev_end) $param .= '&search_datev_end='.urlencode($search_datev_end);
if ($typeid > 0) $param .= '&typeid='.urlencode($typeid);
if ($search_amount_deb) $param .= '&search_amount_deb='.urlencode($search_amount_deb);
if ($search_amount_cred) $param .= '&search_amount_cred='.urlencode($search_amount_cred);
@@ -306,12 +308,10 @@ if ($result)
if ($arrayfields['datep']['checked']) {
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_datep_start ? $search_datep_start : -1, 'search_date_start', 0, 0, 1);
+ print $form->selectDate($search_datep_start ? $search_datep_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_datep_end ? $search_datep_end : -1, 'search_date_end', 0, 0, 1);
+ print $form->selectDate($search_datep_end ? $search_datep_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -320,12 +320,10 @@ if ($result)
if ($arrayfields['datev']['checked']) {
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_datev_start ? $search_datev_start : -1, 'search_date_value_start', 0, 0, 1);
+ print $form->selectDate($search_datev_start ? $search_datev_start : -1, 'search_date_value_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_datev_end ? $search_datev_end : -1, 'search_date_value_end', 0, 0, 1);
+ print $form->selectDate($search_datev_end ? $search_datev_end : -1, 'search_date_value_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -333,7 +331,7 @@ if ($result)
// Payment type
if ($arrayfields['type']['checked']) {
print '';
- $form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
+ $form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16, 1, 'maxwidth100');
print ' ';
}
@@ -347,14 +345,14 @@ if ($result)
// Bank account
if ($arrayfields['bank']['checked']) {
print '';
- $form->select_comptes($search_bank_account, 'search_account', 0, '', 1);
+ $form->select_comptes($search_bank_account, 'search_account', 0, '', 1, '', 0, 'maxwidth100');
print ' ';
}
// Bank entry
if ($arrayfields['entry']['checked']) {
- print '';
- print ' ';
+ print ' ';
+ print ' ';
print ' ';
}
@@ -379,14 +377,14 @@ if ($result)
// Debit
if ($arrayfields['debit']['checked']) {
print '';
- print ' ';
+ print ' ';
print ' ';
}
// Credit
if ($arrayfields['credit']['checked']) {
print '';
- print ' ';
+ print ' ';
print ' ';
}
@@ -471,7 +469,7 @@ if ($result)
// Project
if ($arrayfields['project']['checked']) {
$proj->fetch($obj->fk_project);
- print ''.$proj->getNomUrl(1).' ';
+ print ''.$proj->getNomUrl(1).' ';
if (!$i) $totalarray['nbfield']++;
}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6df16367015..b4bfa70a287 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -804,12 +804,10 @@ if ($resql)
{
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -818,12 +816,10 @@ if ($resql)
{
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1);
+ print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1);
+ print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 5b09da5305c..ea0d7fe637b 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -172,22 +172,18 @@ if ($result)
// Date end period
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1);
+ print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1);
+ print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
// Date payment
print ' ';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1);
+ print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1);
+ print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
// Type
print ' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 27e7029c254..5acb5d7de85 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5280,10 +5280,11 @@ class Form
* @param string $openinghours Specify hour start and hour end for the select ex 8,20
* @param int $stepminutes Specify step for minutes between 1 and 30
* @param string $labeladddateof Label to use for the $adddateof parameter.
+ * @param string $placeholder Placeholder
* @return string Html for selectDate
* @see form_date(), select_month(), select_year(), select_dayofweek()
*/
- public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '')
+ public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '', $placeholder = '')
{
global $conf, $langs;
@@ -5420,6 +5421,7 @@ class Form
$retstring .= '';
$retstring .= '
trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
$retstring .= '>';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index db9f326dfdc..2e06837563e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1252,7 +1252,7 @@ class FormFile
} else {
print '
';
}
- print ' ';
+ print ' ';
print ' ';
} else print ' ';
print '
';
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 4c1c58edf6f..e26a97521f3 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -186,12 +186,10 @@ if ($result)
// Date
print '';
print '';
- print $langs->trans('From').' ';
- print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $langs->trans('to').' ';
- print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
// Type