diff --git a/ChangeLog b/ChangeLog index a83fc453a65..45f46132825 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1463,10 +1463,10 @@ Fix: Dump using php not not include lock on tables that are deleted. Fix: Fixed a problem with bank accounts sharing across entities. Fix: fields into group by of sql requests for module margins must be same than fields into select. -Fix: When select_date is called with '' as preselected date, +Fix: When selectDate is called with '' as preselected date, automatic user date was not correctly et (We must set a date into PHP server timezone area) -Fix: First param of select_date must always be forged with a dolibarr +Fix: First param of selectDate must always be forged with a dolibarr date function and not time(). Fix: fix can't add line with product in supplier order Fix: [bug #1309] diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 5a875cbba2a..041d1322038 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -162,12 +162,12 @@ if ($action == 'create') { // Date start print '
| ' . $langs->trans("Docdate") . ' | '; print ''; - print Form::select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1); + print Form::selectDate('', 'doc_date', '', '', '', "create_mvt", 1, 1); print ' | '; print ''; print ' | ';
print $langs->trans('From') . ': ';
- print Form::select_date($search_date_start, 'date_start', 0, 0, 1);
+ print Form::selectDate($search_date_start, 'date_start', 0, 0, 1);
print ' '; print $langs->trans('To') . ': '; - print Form::select_date($search_date_end, 'date_end', 0, 0, 1); + print Form::selectDate($search_date_end, 'date_end', 0, 0, 1); print ' | ';
print ''; print ' | '; diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php index 7e2aec72f1e..f9f86002376 100644 --- a/htdocs/accountancy/bookkeeping/listbyyear.php +++ b/htdocs/accountancy/bookkeeping/listbyyear.php @@ -176,9 +176,9 @@ print_barre_liste($langs->trans("Bookkeeping") . ' ' . dol_print_date($search_da print ' | '; print '';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index aec871ac33f..f09a8960933 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -541,7 +541,7 @@ else {
$nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
$builddate = time();
$description = $langs->trans("DescFinanceJournal") . ' '; - $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, 1) . ' - ' . Form::selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1); $varlink = 'id_account=' . $id_bank_account; report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array ( diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index f9c7f54308b..6f8642a4c47 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -403,7 +403,7 @@ if ($action == 'export_csv') { $description .= $langs->trans("DepositsAreIncluded"); } - $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, 1) . ' - ' . Form::selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1); report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array ( 'action' => '' )); diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index f70a7b261a0..65e383dce88 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -418,7 +418,7 @@ if ($action == 'export_csv') { $description .= $langs->trans("DepositsAreNotIncluded"); else $description .= $langs->trans("DepositsAreIncluded"); - $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, 1) . ' - ' . Form::selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1); report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array ( 'action' => '' )); diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index a926d96b2fe..c4125c1f482 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -900,7 +900,7 @@ else // Birthday print " |
| ".$langs->trans("Birthday")." | \n"; - Form::select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); + Form::selectDate(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); print " | |
| ".$langs->trans("Birthday")." | \n"; - Form::select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); + Form::selectDate(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); print " | |
| '.$langs->trans("DateEndSubscription").' | '; - print Form::select_date($dateto,'end','','','',"cotisation",1,0,1); + print Form::selectDate($dateto,'end','','','',"cotisation",1,0,1); print " | |
| '.$langs->trans("DatePayment").' | '; - print Form::select_date(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1,1); + print Form::selectDate(isset($paymentdate)?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1,1); print " | |
| '.$langs->trans('Numero'); diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 4fbf65d6128..3ecc840c1bb 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -207,13 +207,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') // Date start subscription print ' | ||
| '.$langs->trans("DateSubscription").' | '; - Form::select_date($subscription->dateh,'datesub',1,1,0,'update',1); + Form::selectDate($subscription->dateh,'datesub',1,1,0,'update',1); print ' | '; print '|
| '.$langs->trans("DateEndSubscription").' | '; - Form::select_date($subscription->datef,'datesubend',0,0,0,'update',1); + Form::selectDate($subscription->datef,'datesubend',0,0,0,'update',1); print ' | '; print '|
| '.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).' | '; + print ''.Form::selectDate($date_start,'date_start',0,0,0,'',1,0,1).Form::selectDate($date_end,'date_end',0,0,0,'',1,0,1).' | '; print ''; print ''; diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 7c44898717f..92db0df15fb 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -43,10 +43,10 @@ $langs->load("cashdesk"); |
| + onchange="setSource('REF');" + onkeyup="verifResultat('resultats_dhtml', this.value, global->BARCODE_USE_SEARCH_TO_SELECT) ? (int) $conf->global->BARCODE_USE_SEARCH_TO_SELECT : 1) ?>);" + onfocus="this.select(); verifResultat('resultats_dhtml', this.value, global->BARCODE_USE_SEARCH_TO_SELECT) ? (int) $conf->global->BARCODE_USE_SEARCH_TO_SELECT : 1) ?>);" + onBlur="document.getElementById('resultats_dhtml').innerHTML = '';"/> | load("cashdesk"); */ ?> - | |