From 89bd173c2f6224818b74bec6fc5b75dd12e2d940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 21 Mar 2016 21:51:29 +0100 Subject: [PATCH] NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate --- ChangeLog | 4 +-- htdocs/accountancy/admin/fiscalyear_card.php | 8 +++--- htdocs/accountancy/bookkeeping/balance.php | 4 +-- htdocs/accountancy/bookkeeping/card.php | 2 +- htdocs/accountancy/bookkeeping/list.php | 4 +-- htdocs/accountancy/bookkeeping/listbyyear.php | 6 ++-- htdocs/accountancy/journal/bankjournal.php | 2 +- .../accountancy/journal/purchasesjournal.php | 2 +- htdocs/accountancy/journal/sellsjournal.php | 2 +- htdocs/adherents/card.php | 4 +-- htdocs/adherents/card_subscriptions.php | 6 ++-- htdocs/adherents/fiche_subscription.php | 4 +-- htdocs/admin/tools/listevents.php | 2 +- htdocs/cashdesk/tpl/facturation1.tpl.php | 28 +++++++++---------- htdocs/comm/action/card.php | 26 ++++++++--------- htdocs/comm/action/listactions.php | 6 ++-- htdocs/comm/action/pertype.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/comm/propal.php | 10 +++---- htdocs/commande/card.php | 8 +++--- htdocs/commande/orderstoinvoice.php | 6 ++-- htdocs/compta/bank/account.php | 6 ++-- htdocs/compta/bank/card.php | 2 +- htdocs/compta/bank/ligne.php | 4 +-- htdocs/compta/bank/search.php | 4 +-- htdocs/compta/bank/virement.php | 2 +- htdocs/compta/deplacement/card.php | 4 +-- htdocs/compta/facture.php | 10 +++---- htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/compta/facture/prelevement.php | 4 +-- htdocs/compta/journal/purchasesjournal.php | 2 +- htdocs/compta/journal/sellsjournal.php | 2 +- htdocs/compta/localtax/card.php | 4 +-- htdocs/compta/localtax/clients.php | 4 +-- htdocs/compta/localtax/quadri_detail.php | 4 +-- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/cheque/card.php | 4 +-- htdocs/compta/paiement_charge.php | 2 +- htdocs/compta/prelevement/card.php | 4 +-- htdocs/compta/prelevement/ligne.php | 2 +- htdocs/compta/resultat/clientfourn.php | 6 ++-- htdocs/compta/salaries/card.php | 8 +++--- htdocs/compta/sociales/charges.php | 8 +++--- htdocs/compta/sociales/document.php | 4 +-- htdocs/compta/stats/cabyprodserv.php | 4 +-- htdocs/compta/stats/cabyuser.php | 4 +-- htdocs/compta/stats/casoc.php | 4 +-- htdocs/compta/tva/card.php | 4 +-- htdocs/compta/tva/clients.php | 4 +-- htdocs/compta/tva/quadri_detail.php | 4 +-- htdocs/compta/tva/quarter_report.php | 4 +-- htdocs/contact/card.php | 4 +-- htdocs/contact/perso.php | 2 +- htdocs/contrat/card.php | 12 ++++---- htdocs/contrat/services.php | 4 +-- htdocs/core/class/extrafields.class.php | 4 +-- htdocs/core/class/html.form.class.php | 18 ++++++------ htdocs/core/lib/project.lib.php | 2 +- .../core/modules/mailings/fraise.modules.php | 4 +-- htdocs/core/tpl/objectline_create.tpl.php | 8 +++--- htdocs/core/tpl/objectline_edit.tpl.php | 4 +-- htdocs/cron/card.php | 12 ++++---- htdocs/don/card.php | 4 +-- htdocs/don/payment/payment.php | 2 +- htdocs/expedition/card.php | 4 +-- htdocs/expedition/shipment.php | 2 +- htdocs/expensereport/card.php | 12 ++++---- htdocs/expensereport/payment/payment.php | 2 +- htdocs/fichinter/card.php | 4 +-- htdocs/fourn/commande/card.php | 12 ++++---- htdocs/fourn/commande/dispatch.php | 4 +-- htdocs/fourn/commande/orderstoinvoice.php | 6 ++-- htdocs/fourn/facture/card.php | 4 +-- htdocs/fourn/facture/paiement.php | 2 +- htdocs/holiday/card.php | 12 ++++---- htdocs/holiday/document.php | 4 +-- htdocs/livraison/card.php | 2 +- htdocs/loan/card.php | 8 +++--- htdocs/loan/document.php | 4 +-- htdocs/loan/payment/payment.php | 2 +- htdocs/margin/agentMargins.php | 4 +-- htdocs/margin/checkMargins.php | 4 +-- htdocs/margin/customerMargins.php | 4 +-- htdocs/margin/productMargins.php | 4 +-- htdocs/opensurvey/card.php | 2 +- htdocs/opensurvey/results.php | 2 +- htdocs/opensurvey/wizard/create_survey.php | 2 +- htdocs/product/stock/product.php | 4 +-- htdocs/product/stock/replenishorders.php | 2 +- .../product/stock/tpl/stockcorrection.tpl.php | 4 +-- .../product/stock/tpl/stocktransfer.tpl.php | 4 +-- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/activity/perweek.php | 2 +- htdocs/projet/card.php | 8 +++--- htdocs/projet/element.php | 4 +-- htdocs/projet/tasks.php | 4 +-- htdocs/projet/tasks/task.php | 4 +-- htdocs/projet/tasks/time.php | 4 +-- htdocs/public/members/new.php | 2 +- htdocs/public/test/test_arrays.php | 2 +- htdocs/public/test/test_forms.php | 12 ++++---- htdocs/supplier_proposal/card.php | 6 ++-- .../accountancy/export-thirdpartyaccount.php | 2 +- 103 files changed, 256 insertions(+), 256 deletions(-) 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("DateStart") . ''; - print Form::select_date(($date_start ? $date_start : ''), 'fiscalyear'); + print Form::selectDate(($date_start ? $date_start : ''), 'fiscalyear'); print ''; // Date end print '' . $langs->trans("DateEnd") . ''; - print Form::select_date(($date_end ? $date_end : - 1), 'fiscalyearend'); + print Form::selectDate(($date_end ? $date_end : - 1), 'fiscalyearend'); print ''; // Statut @@ -216,12 +216,12 @@ if ($action == 'create') { // Date start print '' . $langs->trans("DateStart") . ''; - print Form::select_date($object->date_start ? $object->date_start : - 1, 'fiscalyear'); + print Form::selectDate($object->date_start ? $object->date_start : - 1, 'fiscalyear'); print ''; // Date end print '' . $langs->trans("DateEnd") . ''; - print Form::select_date($object->date_end ? $object->date_end : - 1, 'fiscalyearend'); + print Form::selectDate($object->date_end ? $object->date_end : - 1, 'fiscalyearend'); print ''; // Statut diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 3de3e9849e9..f44f9620d8e 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -161,9 +161,9 @@ else { print '
'; print $langs->trans('DateStart') . ': '; - print Form::select_date($search_date_start, 'date_start', 0, 0, 1); + print Form::selectDate($search_date_start, 'date_start', 0, 0, 1); print $langs->trans('DateEnd') . ': '; - 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 ''; diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 3629a8453df..0af4f745e3d 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -248,7 +248,7 @@ if ($action == 'create') { print ''; print ''; print ''; print ''; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 01e14273461..f2ada190468 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -394,10 +394,10 @@ else { print ''; print ''; print ''; print ''; print '\n"; // Public profil @@ -1154,7 +1154,7 @@ else // Birthday print "\n"; // Public profil diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 2e39e43bc66..77361c7e732 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -974,7 +974,7 @@ if ($rowid > 0) $datefrom=$object->datevalid; } } - print Form::select_date($datefrom,'','','','',"cotisation",1,1,1); + print Form::selectDate($datefrom,'','','','',"cotisation",1,1,1); print ""; // Date end subscription @@ -987,7 +987,7 @@ if ($rowid > 0) $dateto=-1; // By default, no date is suggested } print '"; if ($adht->cotisation) @@ -1088,7 +1088,7 @@ if ($rowid > 0) // Date of payment print '\n"; print ''; print ''; // Date end subscription print ''; print ''; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 6b22ce0dc3f..21ccb1efd6c 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -198,7 +198,7 @@ if ($result) // Lignes des champs de filtres print ''; - print ''; + print ''; print '
' . $langs->trans("Docdate") . ''; - print Form::select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1); + print Form::selectDate('', 'doc_date', '', '', '', "create_mvt", 1, 1); 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 '		'; 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 '
'; print $langs->trans('DateStart') . ': '; -print Form::select_date($search_date_start, 'date_start'); +print Form::selectDate($search_date_start, 'date_start'); print $langs->trans('DateEnd') . ': '; -print Form::select_date($search_date_end, 'date_end'); +print Form::selectDate($search_date_end, 'date_end'); print '
'; print '
'; print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': '; @@ -220,7 +220,7 @@ print ''; -print Form::select_date($search_doc_date, 'doc_date', 0, 0, 1); +print Form::selectDate($search_doc_date, 'doc_date', 0, 0, 1); 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 '
'.$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 '
'.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).''.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 ''; 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"); */ ?> - '.$top_liste_produits.''."\n"; @@ -93,7 +93,7 @@ $langs->load("cashdesk");
-
+ @@ -106,7 +106,7 @@ $langs->load("cashdesk"); - @@ -115,10 +115,10 @@ $langs->load("cashdesk"); - + - @@ -126,7 +126,7 @@ $langs->load("cashdesk"); - @@ -201,10 +201,10 @@ $langs->load("cashdesk"); print '
'; print '
'; ?> - " onclick="javascript: verifClic('DIF');" /> + " onclick="verifClic('DIF');" /> trans("DateEcheance").' :'; - print Form::select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1); + print Form::selectDate(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1); print '
'; ?>
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 2b7d7bea153..e1422b077a9 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -665,9 +665,9 @@ if ($action == 'create') $datep=($datep?$datep:$object->datep); if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0); print ''; // Date end @@ -678,9 +678,9 @@ if ($action == 'create') $datef=dol_time_plus_duree($datep, $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS, 'h'); } print ''; // Status @@ -955,16 +955,16 @@ if ($id > 0) // Date start print ''; // Date end print ''; $userepeatevent=0; // Dev in progress diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 145ff7331dd..1ad1374da6a 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -142,7 +142,7 @@ $form=new Form($db); $userstatic=new User($db); $nav=''; -$nav.=Form::select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); +$nav.=Form::selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); $nav.=' '; $now=dol_now(); @@ -320,10 +320,10 @@ if ($resql) //print ''; } print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php index a3242b8bb3d..f0b5df726fe 100644 --- a/htdocs/comm/action/pertype.php +++ b/htdocs/comm/action/pertype.php @@ -261,7 +261,7 @@ $nav.=''; $nav.=''; $nav.=''; -$nav.=Form::select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); +$nav.=Form::selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); $nav.=' '; $nav.=''; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 35df5053c15..aa588d7a837 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -264,7 +264,7 @@ $nav.=''; $nav.=''; $nav.=''; -$nav.=Form::select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); +$nav.=Form::selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1); $nav.=' '; $nav.=''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 11e5cddfbad..68bcfe55b62 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1368,7 +1368,7 @@ if ($action == 'create') // Date print ''; // Validaty duration @@ -1416,9 +1416,9 @@ if ($action == 'create') $syear = date("Y", $tmpdte); $smonth = date("m", $tmpdte); $sday = date("d", $tmpdte); - Form::select_date($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop"); + Form::selectDate($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop"); } else { - Form::select_date(-1, 'date_livraison', '', '', '', "addprop", 1, 1); + Form::selectDate(-1, 'date_livraison', '', '', '', "addprop", 1, 1); } print ''; @@ -1804,7 +1804,7 @@ if ($action == 'create') print ''; print ''; print ''; - Form::select_date($object->date, 're', '', '', 0, "editdate"); + Form::selectDate($object->date, 're', '', '', 0, "editdate"); print ''; print ''; } else { @@ -1830,7 +1830,7 @@ if ($action == 'create') print ''; print ''; print ''; - Form::select_date($object->fin_validite, 'ech', '', '', '', "editecheance"); + Form::selectDate($object->fin_validite, 'ech', '', '', '', "editecheance"); print ''; print ''; } else { diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 058a68d3803..69bcbad33c1 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1505,7 +1505,7 @@ if ($action == 'create' && $user->rights->commande->creer) } // Date print ''; // Delivery date planed @@ -1515,7 +1515,7 @@ if ($action == 'create' && $user->rights->commande->creer) if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60); else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE_DELIVERY)?-1:''; } - Form::select_date($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1); + Form::selectDate($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1); print ""; // Conditions de reglement @@ -2047,7 +2047,7 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print ''; print ''; - Form::select_date($object->date, 'order_', '', '', '', "setdate"); + Form::selectDate($object->date, 'order_', '', '', '', "setdate"); print ''; print ''; } else { @@ -2072,7 +2072,7 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print ''; print ''; - Form::select_date($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison"); + Form::selectDate($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison"); print ''; print ''; } else { diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 07fe4af6015..e4879d14c05 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -427,7 +427,7 @@ if ($action == 'create' && !$error) // Date invoice print ''; // Payment term print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index d69db934899..df40028bae8 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -365,7 +365,7 @@ if ($action == 'create') print ''; print ''; print ''; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 7722713fce1..502fdf7d36c 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -451,7 +451,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; } else @@ -467,7 +467,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print '\n"; print "\n"; print ''; print ''; diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 94bb70ca9a2..930684a2e69 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -262,7 +262,7 @@ if ($action == 'create') print ""; print ''; // Km @@ -358,7 +358,7 @@ else if ($id) // Date print ''; // Km diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 2c4442aa595..b6469da3168 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2354,7 +2354,7 @@ if ($action == 'create') // Date invoice print ''; // Payment term @@ -2548,12 +2548,12 @@ if ($action == 'create') print ''; print '
trans("Qty"); ?>trans("VATRate"); ?>
+ + - tva(); // Try to get a previously entered VAT rowid. First time, this will return empty. @@ -151,7 +151,7 @@ $langs->load("cashdesk"); - +
trans("Amount"); ?> @@ -161,7 +161,7 @@ $langs->load("cashdesk");
+
'.$langs->trans("DateActionStart").''; - if (GETPOST("afaire") == 1) Form::select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend'); - else if (GETPOST("afaire") == 2) Form::select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend'); - else Form::select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); + if (GETPOST("afaire") == 1) Form::selectDate($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend'); + else if (GETPOST("afaire") == 2) Form::selectDate($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend'); + else Form::selectDate($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); print '
'.$langs->trans("DateActionEnd").''; - if (GETPOST("afaire") == 1) Form::select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); - else if (GETPOST("afaire") == 2) Form::select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); - else Form::select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); + if (GETPOST("afaire") == 1) Form::selectDate($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); + else if (GETPOST("afaire") == 2) Form::selectDate($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); + else Form::selectDate($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); print '
'.$langs->trans("DateActionStart").''; - if (GETPOST("afaire") == 1) Form::select_date($datep?$datep:$object->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart'); - else if (GETPOST("afaire") == 2) Form::select_date($datep?$datep:$object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); - else Form::select_date($datep?$datep:$object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); + if (GETPOST("afaire") == 1) Form::selectDate($datep?$datep:$object->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart'); + else if (GETPOST("afaire") == 2) Form::selectDate($datep?$datep:$object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); + else Form::selectDate($datep?$datep:$object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); print '
'.$langs->trans("DateActionEnd").''; - if (GETPOST("afaire") == 1) Form::select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); - else if (GETPOST("afaire") == 2) Form::select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); - //else Form::select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend','ap'); - else Form::select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); + if (GETPOST("afaire") == 1) Form::selectDate($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); + else if (GETPOST("afaire") == 2) Form::selectDate($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); + //else Form::selectDate($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend','ap'); + else Form::selectDate($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend'); print '
'; - print Form::select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1); + print Form::selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1); print ''; - print Form::select_date($dateend, 'dateend', 0, 0, 1, '', 1, 0, 1); + print Form::selectDate($dateend, 'dateend', 0, 0, 1, '', 1, 0, 1); print '
' . $langs->trans('Date') . ''; - Form::select_date('', '', '', '', '', "addprop", 1, 1); + Form::selectDate('', '', '', '', '', "addprop", 1, 1); print '
' . $langs->trans('Date') . ''; - Form::select_date('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date + Form::selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date print '
'.$langs->trans('Date').''; - Form::select_date('','','','','',"add",1,1); + Form::selectDate('','','','','',"add",1,1); print '
'.$langs->trans('PaymentConditionsShort').''; @@ -575,8 +575,8 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) $num = $db->num_rows($resql); print load_fiche_titre($title); $i = 0; - $period=Form::select_date($date_start,'date_start',0,0,1,'',1,0,1).' - '.Form::select_date($date_end,'date_end',0,0,1,'',1,0,1); - $periodely=Form::select_date($date_starty,'date_start_dely',0,0,1,'',1,0,1).' - '.Form::select_date($date_endy,'date_end_dely',0,0,1,'',1,0,1); + $period=Form::selectDate($date_start,'date_start',0,0,1,'',1,0,1).' - '.Form::selectDate($date_end,'date_end',0,0,1,'',1,0,1); + $periodely=Form::selectDate($date_starty,'date_start_dely',0,0,1,'',1,0,1).' - '.Form::selectDate($date_endy,'date_end_dely',0,0,1,'',1,0,1); if (! empty($socid)) { diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 847795df1a4..7919f074d41 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -466,7 +466,7 @@ if ($id > 0 || ! empty($ref)) print '
'; - Form::select_date($dateop,'op',0,0,0,'transaction'); + Form::selectDate($dateop,'op',0,0,0,'transaction'); print ''; $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1); @@ -521,9 +521,9 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - $period_filter .= $langs->trans('From').' '.Form::select_date($req_stdt,'req_stdt',0,0,1,null,1,1,1); + $period_filter .= $langs->trans('From').' '.Form::selectDate($req_stdt,'req_stdt',0,0,1,null,1,1,1); $period_filter .= ' '; - $period_filter .= $langs->trans('to').' '.Form::select_date($req_enddt,'req_enddt',0,0,1,null,1,1,1); + $period_filter .= $langs->trans('to').' '.Form::selectDate($req_enddt,'req_enddt',0,0,1,null,1,1,1); print '
'.$period_filter.'
'.$langs->trans("Date").''; - Form::select_date('', 're', 0, 0, 0, 'formsoc'); + Form::selectDate('', 're', 0, 0, 0, 'formsoc'); print '
'.$langs->trans("BalanceMinimalAllowed").''; - print Form::select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro); + print Form::selectDate($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro); print ''; - print Form::select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro); + print Form::selectDate($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro); if (! $objp->rappro) { print '   '; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index e56f776578e..47a24e91666 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -191,9 +191,9 @@ if ($resql) $moreforfilter = ''; $moreforfilter.='
'; $moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' '; - $moreforfilter .= Form::select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1); + $moreforfilter .= Form::selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1); $moreforfilter .= ' - '; - $moreforfilter .= $langs->trans('EndDate') . ' ' . Form::select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1); + $moreforfilter .= $langs->trans('EndDate') . ' ' . Form::selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1); $moreforfilter .= '
'; if ($moreforfilter) diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index ca13059a0e4..403574b04d0 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -177,7 +177,7 @@ $form->select_comptes($account_to,'account_to',0,'',1); print "		"; -Form::select_date((! empty($dateo)?$dateo:''),'','','','','add'); +Form::selectDate((! empty($dateo)?$dateo:''),'','','','','add'); print "
'.$langs->trans("Date").''; - print Form::select_date($datec?$datec:-1,'','','','','add',1,1,1); + print Form::selectDate($datec?$datec:-1,'','','','','add',1,1,1); print '
'.$langs->trans("Date").''; - print Form::select_date($object->date,'',0,0,0,'update',1,0,1); + print Form::selectDate($object->date,'',0,0,0,'update',1,0,1); print '
' . $langs->trans('Date') . ''; $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); - print Form::select_date($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1, 1); + print Form::selectDate($datefacture?$datefacture:$dateinvoice, '', '', '', '', "add", 1, 1, 1); print '
'; print $langs->trans('From') . ' '; print ''; - print Form::select_date('', 'date_start' . $i, $usehm, $usehm, 1, "add", 1, 0, 1); + print Form::selectDate('', 'date_start' . $i, $usehm, $usehm, 1, "add", 1, 0, 1); print '
'; print $langs->trans('to') . ' '; print ''; - print Form::select_date('', 'date_end' . $i, $usehm, $usehm, 1, "add", 1, 0, 1); + print Form::selectDate('', 'date_end' . $i, $usehm, $usehm, 1, "add", 1, 0, 1); print '
'; print ''; } @@ -3091,7 +3091,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->type != Facture::TYPE_CREDIT_NOTE) { if ($action == 'editinvoicedate') { - Form::form_date($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->date, 'invoicedate'); + Form::formDate($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->date, 'invoicedate'); } else { print dol_print_date($object->date, 'daytext'); } @@ -3454,7 +3454,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->type != Facture::TYPE_CREDIT_NOTE) { if ($action == 'editpaymentterm') { - Form::form_date($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->date_lim_reglement, 'paymentterm'); + Form::formDate($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->date_lim_reglement, 'paymentterm'); } else { print dol_print_date($object->date_lim_reglement, 'daytext'); if ($object->hasDelay()) { diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 81fcd4e24a2..b11f395a25f 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -349,7 +349,7 @@ if ($action == 'create') // First date of execution for cron print "".$langs->trans('NextDateToExecution').""; $date_next_execution = isset($date_next_execution) ? $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, 1); print ""; // Number max of generation diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 8dbb1106869..bf08a1cc299 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -300,7 +300,7 @@ if ($object->id > 0) { if ($action == 'editinvoicedate') { - Form::form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$object->date,'invoicedate'); + Form::formDate($_SERVER['PHP_SELF'].'?id='.$object->id,$object->date,'invoicedate'); } else { @@ -351,7 +351,7 @@ if ($object->id > 0) { if ($action == 'editpaymentterm') { - Form::form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$object->date_lim_reglement,'paymentterm'); + Form::formDate($_SERVER['PHP_SELF'].'?id='.$object->id,$object->date_lim_reglement,'paymentterm'); } else { diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index fc99b8e747f..bd219b171a7 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -92,7 +92,7 @@ $builddate=time(); $description=$langs->trans("DescPurchasesJournal").'
'; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $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); $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 30e0aa69a75..68df0cd964e 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -96,7 +96,7 @@ $builddate=time(); $description=$langs->trans("DescSellsJournal").'
'; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $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); $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY); diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 11f7e154f0a..04d05d670ed 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -164,11 +164,11 @@ if ($_GET["action"] == 'create') print ""; print ''.$langs->trans("DatePayment").''; - print Form::select_date($datep,"datep",'','','','add'); + print Form::selectDate($datep,"datep",'','','','add'); print ''; print ''.$langs->trans("DateValue").''; - print Form::select_date($datev,"datev",'','','','add'); + print Form::selectDate($datev,"datev",'','','','add'); print ''; // Label diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index f2836dcb1ce..2e39dc6058e 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -111,7 +111,7 @@ if ($conf->global->$calc==0 || $conf->global->$calc==1) // Calculate on invoice $nom=$langs->transcountry($local==1?"LT1ReportByCustomersInInputOutputMode":"LT2ReportByCustomersInInputOutputMode",$mysoc->country_code); $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')'; - $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); if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='
'.$langs->trans("WarningDepositsNotIncluded"); $description.=$fsearch; $description.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')'; @@ -129,7 +129,7 @@ if ($conf->global->$calc==2) // Invoice for goods, payment for services $nom=$langs->transcountry($local==1?"LT1ReportByCustomersInInputOutputMode":"LT2ReportByCustomersInInputOutputMode",$mysoc->country_code); $calcmode=$langs->trans("CalcModeLT2Debt"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')'; - $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); if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='
'.$langs->trans("WarningDepositsNotIncluded"); $description.=$fsearch; $description.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')'; diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php index 6cdc56baef5..5fea79227f5 100644 --- a/htdocs/compta/localtax/quadri_detail.php +++ b/htdocs/compta/localtax/quadri_detail.php @@ -131,7 +131,7 @@ if ($conf->global->$calc==0 || $conf->global->$calc==1) // Calculate on invoice $nom=$langs->trans($local==1?"LT1ReportByQuartersInDueDebtMode":"LT2ReportByQuartersInDueDebtMode"); $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')'; - $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); $prevyear=$year_start; $prevquarter=$q; if ($prevquarter > 1) $prevquarter--; else { $prevquarter=4; $prevyear--; } @@ -163,7 +163,7 @@ if ($conf->global->$calc==2) // Invoice for goods, payment for services $nom=$langs->trans($local==1?"LT1ReportByQuartersInInputOutputMode":"LT2ReportByQuartersInInputOutputMode"); $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT".$local."Rec"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')'; - $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); $prevyear=$year_start; $prevquarter=$q; if ($prevquarter > 1) $prevquarter--; else { $prevquarter=4; $prevyear--; } diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index b1abf17fe73..5715d3c711b 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -462,7 +462,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); + Form::selectDate($datepayment,'','','',0,"add_paiement",1,1,0,0,'','',$facture->date); print ''; print ''.$langs->trans('Comments').''; diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 8c4b478abd2..a785094807f 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -387,7 +387,7 @@ if ($action == 'new') //print ''.$langs->trans('Date').''.dol_print_date($now,'day').''; // Filter print ''.$langs->trans("DateChequeReceived").''; - print Form::select_date($filterdate,'fd',0,0,1,'',1,1,1); + print Form::selectDate($filterdate,'fd',0,0,1,'',1,1,1); print ''; print ''.$langs->trans("BankAccount").''; $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1); @@ -601,7 +601,7 @@ else print '
'; print ''; print ''; - Form::select_date($object->date_bordereau,'datecreate_','','','',"setdate"); + Form::selectDate($object->date_bordereau,'datecreate_','','','',"setdate"); print ''; print '
'; } diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 04926879739..83c86cb528e 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -209,7 +209,7 @@ if ($_GET["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); + Form::selectDate($datepayment,'','','','',"add_payment",1,1); print ""; print ''; diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index f9d35b00937..e9b99050350 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -214,7 +214,7 @@ if ($id > 0) print ''; print ''.$langs->trans("NotifyTransmision").''; print ''.$langs->trans("TransData").''; - print Form::select_date('','','','','',"userfile",1,1); + print Form::selectDate('','','','','',"userfile",1,1); print ''; print ''.$langs->trans("TransMetod").''; print Form::selectarray("methode",$bon->methodes_trans); @@ -237,7 +237,7 @@ if ($id > 0) print ''; print ''.$langs->trans("NotifyCredit").''; print ''.$langs->trans('CreditDate').''; - print Form::select_date('','','','','',"infocredit",1,1); + print Form::selectDate('','','','','',"infocredit",1,1); print ''; print ''; print '
'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice"); diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 13e54e0e2d3..96c81bdad53 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -199,7 +199,7 @@ if ($id) //Date print ''.$langs->trans("RefusedData").''; print ''; - print Form::select_date('','','','','',"confirm_rejet"); + print Form::selectDate('','','','','',"confirm_rejet"); print ''; //Reason diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 8d7364af048..dd69ee71d6e 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -125,7 +125,7 @@ if ($modecompta=="CREANCES-DETTES") $name=$langs->trans("AnnualByCompaniesDueDebtMode"); $calcmode=$langs->trans("CalcModeDebt"); $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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); //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultDue"); if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded"); @@ -137,8 +137,8 @@ else { $name=$langs->trans("AnnualByCompaniesInputOutputMode"); $calcmode=$langs->trans("CalcModeEngagement"); $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - //$period=Form::select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.Form::select_date($date_end,'date_end',1,1,0,'',1,0,1); - $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',1,1,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); //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultInOut"); $builddate=time(); diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index e2bb44c31d8..eea7746dbeb 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -239,13 +239,13 @@ if ($action == 'create') // Date payment print ''; print fieldLabel('DatePayment','datep',1).''; - print Form::select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1); + print Form::selectDate((empty($datep)?-1:$datep),"datep",'','','','add',1,1); print ''; // Date value for bank print ''; print fieldLabel('DateValue','datev',0).''; - print Form::select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1); + print Form::selectDate((empty($datev)?-1:$datev),"datev",'','','','add',1,1); print ''; // Employee @@ -263,13 +263,13 @@ if ($action == 'create') // Date start period print ''; print fieldLabel('DateStartPeriod','datesp',1).''; - print Form::select_date($datesp,"datesp",'','','','add'); + print Form::selectDate($datesp,"datesp",'','','','add'); print ''; // Date end period print ''; print fieldLabel('DateEndPeriod','dateep',1).''; - print Form::select_date($dateep,"dateep",'','','','add'); + print Form::selectDate($dateep,"dateep",'','','','add'); print ''; // Amount diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 53d12229f97..ba1e97f0db9 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -270,7 +270,7 @@ if ($action == 'create') print $langs->trans("PeriodEndDate"); print ''; print ''; - print Form::select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1); + print Form::selectDate(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1); print ''; print ''; // Amount @@ -286,7 +286,7 @@ if ($action == 'create') print $langs->trans("DateDue"); print ''; print ''; - print Form::select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1); + print Form::selectDate(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1); print ''; print "\n"; @@ -443,7 +443,7 @@ if ($id > 0) print ""; if ($action == 'edit') { - print Form::select_date($object->periode, 'period', 0, 0, 0, 'charge', 1); + print Form::selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1); } else { @@ -455,7 +455,7 @@ if ($id > 0) if ($action == 'edit') { print ''.$langs->trans("DateDue").""; - print Form::select_date($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); + print Form::selectDate($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); print ""; } else { diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 6bc9fe14f9d..81bc7e53382 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -130,7 +130,7 @@ if ($object->id) print ""; if ($action == 'edit') { - print Form::select_date($object->periode, 'period', 0, 0, 0, 'charge', 1); + print Form::selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1); } else { @@ -143,7 +143,7 @@ if ($object->id) if ($action == 'edit') { print ''.$langs->trans("DateDue").""; - print Form::select_date($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); + print Form::selectDate($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); print ""; } else { diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index 910bc6e16e6..5ff08743dcf 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -150,7 +150,7 @@ if ($modecompta=="CREANCES-DETTES") { $calcmode=$langs->trans("CalcModeDebt"); $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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); $description=$langs->trans("RulesCADue"); if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { @@ -164,7 +164,7 @@ if ($modecompta=="CREANCES-DETTES") { $calcmode=$langs->trans("CalcModeEngagement"); $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - $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); $description=$langs->trans("RulesCAIn"); $description.= $langs->trans("DepositsAreIncluded"); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index cbcbb4d860d..54a59926f5b 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -139,7 +139,7 @@ if ($modecompta=="CREANCES-DETTES") { $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice"); $calcmode=$langs->trans("CalcModeDebt"); $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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); //$periodlink="".img_previous()." ".img_next().""; $description=$langs->trans("RulesCADue"); if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded"); @@ -150,7 +150,7 @@ if ($modecompta=="CREANCES-DETTES") { $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice"); $calcmode=$langs->trans("CalcModeEngagement"); $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - $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); //$periodlink="".img_previous()." ".img_next().""; $description=$langs->trans("RulesCAIn"); $description.= $langs->trans("DepositsAreIncluded"); diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 41da09ed290..d6b40e44389 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -155,7 +155,7 @@ if ($modecompta=="CREANCES-DETTES") $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties"); $calcmode=$langs->trans("CalcModeDebt"); $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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); //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesCADue"); if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded"); @@ -166,7 +166,7 @@ if ($modecompta=="CREANCES-DETTES") $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties"); $calcmode=$langs->trans("CalcModeEngagement"); $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - $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); //$periodlink=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesCAIn"); $description.= $langs->trans("DepositsAreIncluded"); diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 6c6d22be491..10130dfd9ad 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -234,11 +234,11 @@ if ($action == 'create') print ""; print ''.$langs->trans("DatePayment").''; - print Form::select_date($datep,"datep",'','','','add',1,1); + print Form::selectDate($datep,"datep",'','','','add',1,1); print ''; print ''.$langs->trans("DateValue").''; - print Form::select_date($datev,"datev",'','','','add',1,1); + print Form::selectDate($datev,"datev",'','','','add',1,1); print ''; // Label diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index dcf6d284490..6e59b44514a 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -140,7 +140,7 @@ if ($modetax==1) { // Calculate on invoice for goods and services $calcmode=$langs->trans("CalcModeVATDebt"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; //$name.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; - $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); //$periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATDueServices"); $description.='
'; @@ -183,7 +183,7 @@ if ($modetax==0) { // Invoice for goods, payment for services $calcmode=$langs->trans("CalcModeVATEngagement"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; //$name.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; - $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); //$periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATInServices"); $description.=' '.$langs->trans("DepositsAreIncluded"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 500739c18fb..8fbf0d89093 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -130,7 +130,7 @@ if ($modetax==1) // Calculate on invoice for goods and services $nom=$langs->trans("VATReportByQuartersInDueDebtMode"); $calcmode=$langs->trans("CalcModeVATDebt"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - $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); $prevyear=$year_start; $prevquarter=$q; if ($prevquarter > 1) $prevquarter--; else { $prevquarter=4; $prevyear--; } @@ -165,7 +165,7 @@ if ($modetax==0) // Invoice for goods, payment for services $nom=$langs->trans("VATReportByQuartersInInputOutputMode"); $calcmode=$langs->trans("CalcModeVATEngagement"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - $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); $prevyear=$year_start; $prevquarter=$q; if ($prevquarter > 1) $prevquarter--; else { $prevquarter=4; $prevyear--; } diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php index a4cfedca663..7f4157fceea 100644 --- a/htdocs/compta/tva/quarter_report.php +++ b/htdocs/compta/tva/quarter_report.php @@ -149,7 +149,7 @@ if ($modetax==1) { // Calculate on invoice for goods and services $nom=$langs->trans("VATReportByQuartersInDueDebtMode"); $calcmode=$langs->trans("CalcModeVATDebt"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - $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); $prevyear=$year_start; $prevquarter=$q; if ($prevquarter > 1) { $prevquarter--; @@ -198,7 +198,7 @@ if ($modetax==0) { // Invoice for goods, payment for services $nom=$langs->trans("VATReportByQuartersInInputOutputMode"); $calcmode=$langs->trans("CalcModeVATEngagement"); $calcmode.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; - $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); $prevyear=$year_start; $prevquarter=$q; if ($prevquarter > 1) { $prevquarter--; diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 0e3653c2293..a90ed4db0eb 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -688,11 +688,11 @@ else $form=new Form($db); if ($object->birthday) { - print Form::select_date($object->birthday,'birthday',0,0,0,"perso", 1, 0, 1); + print Form::selectDate($object->birthday,'birthday',0,0,0,"perso", 1, 0, 1); } else { - print Form::select_date('','birthday',0,0,1,"perso", 1, 0, 1); + print Form::selectDate('','birthday',0,0,1,"perso", 1, 0, 1); } print ''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 121dbba32bb..c9ca56cdbb1 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -130,7 +130,7 @@ if ($action == 'edit') // Date To Birth print ''.$langs->trans("DateToBirth").''; $form=new Form($db); - print Form::select_date($object->birthday,'birthday',0,0,1,"perso", 1,0,1); + print Form::selectDate($object->birthday,'birthday',0,0,1,"perso", 1,0,1); print ''; print ''.$langs->trans("Alert").': '; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 6343461e9a7..2d0de53b783 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1148,7 +1148,7 @@ if ($action == 'create') print ''; print ''.$langs->trans("Date").''; - Form::select_date($datecontrat,'',0,0,'',"contrat"); + Form::selectDate($datecontrat,'',0,0,'',"contrat"); print ""; // Project @@ -1651,9 +1651,9 @@ else print ""; print ''; print $langs->trans("DateStartPlanned").' '; - Form::select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update"); + Form::selectDate($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update"); print '   '.$langs->trans("DateEndPlanned").' '; - Form::select_date($db->jdate($objp->date_fin),"date_end_update",$usehm,$usehm,($db->jdate($objp->date_fin)>0?0:1),"update"); + Form::selectDate($db->jdate($objp->date_fin),"date_end_update",$usehm,$usehm,($db->jdate($objp->date_fin)>0?0:1),"update"); print ''; if (is_array($extralabelslines) && count($extralabelslines)>0) { @@ -1824,11 +1824,11 @@ else print ''; print ''.$langs->trans("DateServiceActivate").''; - print Form::select_date($dateactstart,'',$usehm,$usehm,'',"active",1,0,1); + print Form::selectDate($dateactstart,'',$usehm,$usehm,'',"active",1,0,1); print ''; print ''.$langs->trans("DateEndPlanned").''; - print Form::select_date($dateactend,"end",$usehm,$usehm,'',"active",1,0,1); + print Form::selectDate($dateactend,"end",$usehm,$usehm,'',"active",1,0,1); print ''; print ''; @@ -1881,7 +1881,7 @@ else if ($objp->statut == 4) { print $langs->trans("DateEndReal").' '; - print Form::select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1,1); + print Form::selectDate($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1,1); } } print ''; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 3cf3a922b59..a5b951c0d6e 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -219,14 +219,14 @@ if ($resql) print Form::selectarray('filter_op1',$arrayofoperators,$filter_op1,1); print ' '; $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year); - print Form::select_date($filter_date1,'op1',0,0,1,'',1,0,1); + print Form::selectDate($filter_date1,'op1',0,0,1,'',1,0,1); print ''; print ''; $arrayofoperators=array('<'=>'<','>'=>'>'); print Form::selectarray('filter_op2',$arrayofoperators,$filter_op2,1); print ' '; $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year); - print Form::select_date($filter_date2,'op2',0,0,1,'',1,0,1); + print Form::selectDate($filter_date2,'op2',0,0,1,'',1,0,1); print ''; print ''; $arrayofstatus=array( diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 166b6d6b41f..2de07969918 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -694,7 +694,7 @@ class ExtraFields $showtime = in_array($type,array('datetime')) ? 1 : 0; - // Do not show current date when field not required (see select_date() method) + // Do not show current date when field not required (see selectDate() method) if (!$required && $value == '') $value = '-1'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; @@ -702,7 +702,7 @@ class ExtraFields if (! is_object($form)) $form=new Form($this->db); // TODO Must also support $moreparam - $out = Form::select_date($value, $keysuffix.'options_'.$key.$keyprefix, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1); + $out = Form::selectDate($value, $keysuffix.'options_'.$key.$keyprefix, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1); } elseif (in_array($type,array('int'))) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e17bd17861d..2c8026ae435 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -171,11 +171,11 @@ class Form } else if ($typeofdata == 'day' || $typeofdata == 'datepicker') { - $ret.=self::select_date($value,$htmlname,0,0,1,'form'.$htmlname,1,0,1); + $ret.=self::selectDate($value,$htmlname,0,0,1,'form'.$htmlname,1,0,1); } else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') { - $ret.=self::select_date($value,$htmlname,1,1,1,'form'.$htmlname,1,0,1); + $ret.=self::selectDate($value,$htmlname,1,1,1,'form'.$htmlname,1,0,1); } else if (preg_match('/^select;/',$typeofdata)) { @@ -3264,7 +3264,7 @@ class Form { $more.=''.$input['label'].''; $more.=''; - $more.=self::select_date($input['value'],$input['name'],0,0,0,'',1,0,1); + $more.=self::selectDate($input['value'],$input['name'],0,0,0,'',1,0,1); $more.=''."\n"; $formquestion[] = array('name'=>$input['name'].'day'); $formquestion[] = array('name'=>$input['name'].'month'); @@ -3614,9 +3614,9 @@ class Form * @param int $displaymin Display minutes selector * @param int $nooutput 1=No print output, return string * @return void - * @see select_date + * @see selectDate */ - public static function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $nooutput=0) + public static function formDate($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $nooutput=0) { global $langs; @@ -3629,7 +3629,7 @@ class Form $ret.=''; $ret.=''; $ret.=''; $ret.=''; $ret.='
'; - $ret.=self::select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0,1); + $ret.=self::selectDate($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0,1); $ret.='
'; @@ -4252,12 +4252,12 @@ class Form * @param int $nooutput Do not output html string but return it * @param int $disabled Disable input fields * @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59 - * @param string $addplusone Add a link "+1 hour". Value must be name of another select_date field. + * @param string $addplusone Add a link "+1 hour". Value must be name of another selectDate field. * @param datetime $adddateof Add a link "Date of invoice" using the following date. * @return mixed Nothing or string if nooutput is 1 - * @see form_date + * @see formDate */ - public static function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='') + public static function selectDate($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='') { global $conf,$langs; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 217030bd1e9..5239c06346f 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -636,7 +636,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t // Form to add new time print ''; - $tableCell=Form::select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask); + $tableCell=Form::selectDate($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask); print $tableCell; print ''; diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index 8dbe5d924fd..cf4985f3038 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -154,9 +154,9 @@ class mailing_fraise extends MailingTargets $s.=''; $s.='
'; $s.=$langs->trans("DateEndSubscription").':  '; - $s.=$langs->trans("After").' > '.Form::select_date(-1,'subscriptionafter',0,0,1,'fraise',1,0,1,0); + $s.=$langs->trans("After").' > '.Form::selectDate(-1,'subscriptionafter',0,0,1,'fraise',1,0,1,0); $s.='   '; - $s.=$langs->trans("Before").' < '.Form::select_date(-1,'subscriptionbefore',0,0,1,'fraise',1,0,1,0); + $s.=$langs->trans("Before").' < '.Form::selectDate(-1,'subscriptionbefore',0,0,1,'fraise',1,0,1,0); return $s; } diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 7d17930cdc0..98c028b5735 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -382,16 +382,16 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da if (! empty($object->element) && $object->element == 'contrat') { print $langs->trans("DateStartPlanned").' '; - Form::select_date($date_start,"date_start",$usehm,$usehm,1,"addproduct"); + Form::selectDate($date_start,"date_start",$usehm,$usehm,1,"addproduct"); print '   '.$langs->trans("DateEndPlanned").' '; - Form::select_date($date_end,"date_end",$usehm,$usehm,1,"addproduct"); + Form::selectDate($date_end,"date_end",$usehm,$usehm,1,"addproduct"); } else { 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",1,0,1); + echo Form::selectDate($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 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); + echo Form::selectDate($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); }; print '