diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index b9c7e6c2f54..39d3df46583 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -729,12 +729,12 @@ if ($_GET["id"]) // Date planification print ''.$langs->trans("DateActionPlanned").''; - print dolibarr_print_date($act->datep,'%d %B %Y %H:%M'); + print dolibarr_print_date($act->datep,'dayhour'); if ($act->percent < 100 && $act->datep < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) print img_warning($langs->trans("Late")); print ''; // Date fin real - print ''.$langs->trans("DateActionDone").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').''; + print ''.$langs->trans("DateActionDone").''.dolibarr_print_date($act->date,'dayhour').''; // Statut print ''.$langs->trans("Status").' / '.$langs->trans("Percentage").''; diff --git a/htdocs/comm/action/rapport/rapport.pdf.php b/htdocs/comm/action/rapport/rapport.pdf.php index b12700f7588..4c8f6a31c4f 100644 --- a/htdocs/comm/action/rapport/rapport.pdf.php +++ b/htdocs/comm/action/rapport/rapport.pdf.php @@ -118,7 +118,7 @@ class CommActionRapport $pdf->SetFont('Arial','',30); $pdf->SetXY (10, 140); - $pdf->MultiCell(190, 20, $langs->trans("Date").': '.dolibarr_print_date($this->date_edition,"%d %B %Y"), 0, 'C', 0); + $pdf->MultiCell(190, 20, $langs->trans("Date").': '.dolibarr_print_date($this->date_edition,"day"), 0, 'C', 0); $pdf->SetXY (10, 170); $pdf->SetFont('Arial','B',18); @@ -171,7 +171,7 @@ class CommActionRapport $y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3) + 1; $pdf->SetXY(5, $y); - $pdf->MultiCell(22, 4, dolibarr_print_date($obj->da)."\n".dolibarr_print_date($obj->da,"%H:%m:%S"), 0, 'L', 0); + $pdf->MultiCell(22, 4, dolibarr_print_date($obj->da,"day")."\n".dolibarr_print_date($obj->da,"hour"), 0, 'L', 0); $y0 = $pdf->GetY(); $pdf->SetXY(26, $y); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index e0acbaca521..9bf39b2d3f3 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -336,7 +336,7 @@ else $uc->fetch(); print ''.$langs->trans("CreatedBy").''.$uc->getNomUrl(1).''; print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($mil->date_creat,"%d %b %Y %H:%M").''; + print ''.dolibarr_print_date($mil->date_creat,"dayhour").''; if ($mil->statut > 0) { @@ -344,14 +344,14 @@ else $uv->fetch(); print ''.$langs->trans("ValidatedBy").''.$uv->getNomUrl(1).''; print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($mil->date_valid,"%d %b %Y %H:%M").''; + print ''.dolibarr_print_date($mil->date_valid,"dayhour").''; } if ($mil->statut > 1) { print ''.$langs->trans("SentBy").''.$langs->trans("Unknown").''; print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($mil->date_envoi,"%d %b %Y %H:%M").''; + print ''.dolibarr_print_date($mil->date_envoi,"dayhour").''; } // Sujet diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index dc01e162da1..174037f88cc 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -152,7 +152,7 @@ if ($_socid > 0) $obj = $db->fetch_object($resql); $tag = !$tag; print ''; - print ''.dolibarr_print_date($obj->dc,"%d %B %Y %H:%M").''; + print ''.dolibarr_print_date($obj->dc,"dayhour").''; print ''.$obj->price_level.' '; print ''.$obj->login.''; print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index f008e5408eb..37b4758021b 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -846,7 +846,7 @@ if ($_GET['propalid'] > 0) // Dates print ''.$langs->trans('Date').''; - print dolibarr_print_date($propal->date,'%a %d %B %Y'); + print dolibarr_print_date($propal->date,'daytext'); print ''; if ($conf->projet->enabled) $rowspan++; @@ -881,7 +881,7 @@ if ($_GET['propalid'] > 0) { if ($propal->fin_validite) { - print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); + print dolibarr_print_date($propal->fin_validite,'daytext'); if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 13e66bdebe7..e5a8de58f6b 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -115,13 +115,13 @@ if ($_GET["propalid"] > 0) // ligne 2 // partie Gauche print ''.$langs->trans('Date').''; - print dolibarr_print_date($propal->date,'%a %e %B %Y'); + print dolibarr_print_date($propal->date,'daytext'); print ''; // partie Droite print ''.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { - print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); + print dolibarr_print_date($propal->fin_validite,'daytext'); } else { print $langs->trans("Unknown"); } diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 70cdf6844bd..81c126ccb97 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -134,7 +134,7 @@ if ($_GET['propalid']) // Date print ''.$langs->trans('Date').''; - print dolibarr_print_date($propal->date,'%a %d %B %Y'); + print dolibarr_print_date($propal->date,'daytext'); print ''; print ''; @@ -143,7 +143,7 @@ if ($_GET['propalid']) print ''.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { - print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); + print dolibarr_print_date($propal->fin_validite,'daytext'); if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 8f5dca2f3f4..3506a100165 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -196,7 +196,7 @@ if ($socid > 0) { print " ".img_warning(); } - print "".dolibarr_print_date($objp->dp,"%d %B %Y")."\n"; + print "".dolibarr_print_date($objp->dp,"day")."\n"; print "".price($objp->price)."\n"; print "".$propal_static->LibStatut($objp->fk_statut,5)."\n"; $i++; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 1190b845d8e..2a9aac3b3b1 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -159,7 +159,7 @@ if ($_socid > 0) $obj = $db->fetch_object($resql); $tag = !$tag; print ''; - print ''.dolibarr_print_date($obj->dc,"%d %B %Y %H:%M").''; + print ''.dolibarr_print_date($obj->dc,"dayhour").''; print ''.$obj->remise_client.' %'; print ''.$obj->note.''; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''; diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index dd60435bb22..796422c3b68 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -223,7 +223,7 @@ if ($_GET["id"] > 0) { // Date print ''.$langs->trans("Date").''; - print "".dolibarr_print_date($commande->date,"%A %d %B %Y")."\n"; + print "".dolibarr_print_date($commande->date,"daytext")."\n"; print ''; // ligne 6 diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 5c35ad1dfba..71407532be7 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1105,7 +1105,7 @@ else // Date print ''.$langs->trans('Date').''; - print ''.dolibarr_print_date($commande->date,'%A %d %B %Y').''; + print ''.dolibarr_print_date($commande->date,'daytext').''; print ''.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ; if ($commande->source == 0) { @@ -1138,7 +1138,7 @@ else } else { - print dolibarr_print_date($commande->date_livraison,'%A %d %B %Y'); + print dolibarr_print_date($commande->date_livraison,'daytext'); } print ''; print ''.$langs->trans('NotePublic').' :
'; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 2fd38bbc8b0..b759a6ac40d 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -418,8 +418,8 @@ if ($account > 0) } print ""; - print "".dolibarr_print_date($objp->do,"%d/%m/%y")."\n"; - print " ".dolibarr_print_date($objp->dv,"%d/%m/%y")."\n"; + print "".dolibarr_print_date($objp->do,"day")."\n"; + print " ".dolibarr_print_date($objp->dv,"day")."\n"; print " ".$objp->fk_type." ".($objp->num_chq?$objp->num_chq:"")."\n"; print ''; if (eregi('^\((.*)\)$',$objp->label,$reg)) diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 24fd84d048a..b0422743d0b 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -207,8 +207,8 @@ if ($resql) print ""; print "rowid."\">"; - print ''.dolibarr_print_date($objp->do,"%d/%m/%Y").''; - print ''.dolibarr_print_date($objp->dv,"%d/%m/%Y").''; + print ''.dolibarr_print_date($objp->do,"day").''; + print ''.dolibarr_print_date($objp->dv,"day").''; print ''.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').''; // Description diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 34ef2336347..18fb8df3100 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -236,13 +236,13 @@ else print ""; // Date operation - print ''.dolibarr_print_date($objp->do,"%d/%m/%Y").''; + print ''.dolibarr_print_date($objp->do,"day").''; // Date de valeur print ''; print ''; print img_previous().' '; - print dolibarr_print_date($objp->dv,"%d/%m/%Y") .' '; + print dolibarr_print_date($objp->dv,"day") .' '; print ''; print img_next().''; print "\n"; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 0d215d06415..1d3640b3c6c 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -166,7 +166,7 @@ if ($result) $var=!$var; print ""; - print ''.dolibarr_print_date($objp->do,"%d %b %y")."\n"; + print ''.dolibarr_print_date($objp->do,"day")."\n"; print "rowid&account=$objp->fk_account\">"; $reg=array(); diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index bf382f70f8e..3c56b4c5581 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -154,7 +154,7 @@ if ($_GET["id"] > 0) // Date print ''.$langs->trans('Date').''; - print ''.dolibarr_print_date($commande->date,'%A %d %B %Y').''; + print ''.dolibarr_print_date($commande->date,'daytext').''; print ''.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ; if ($commande->source == 0) { @@ -185,7 +185,7 @@ if ($_GET["id"] > 0) } else { - print dolibarr_print_date($commande->date_livraison,'%A %d %B %Y'); + print dolibarr_print_date($commande->date_livraison,'dayhourtext'); } print ''; print ''.$langs->trans('NotePublic').' :
'; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 3cf4072b4a5..ed65cf7099a 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -349,7 +349,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print ''; print ""; $nbrows=12; diff --git a/htdocs/compta/export/liste.php b/htdocs/compta/export/liste.php index e75a13f6b59..d873a9d4af3 100644 --- a/htdocs/compta/export/liste.php +++ b/htdocs/compta/export/liste.php @@ -89,7 +89,7 @@ if ($result) print ""; print ''; - print ''; + print ''; print ''; print "\n"; $i++; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 711d7c8996b..7ec2964831d 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1951,7 +1951,7 @@ else // Dates print ''; - print ''; + print ''; $nbrows=8; if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++; @@ -2064,7 +2064,7 @@ else print ''; - print ''; - print ''; + print '"; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 856169e3195..9dd0caefbc9 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -135,8 +135,8 @@ if ($_GET["facid"] > 0) // Dates print ''; - print ''; - print ''; + print '"; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 770c13091e3..29f3cf85711 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -331,7 +331,7 @@ if ($socid > 0) print ""; print ''; - print ""; + print ""; $i++; } $db->free(); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 8ce8b6e9cb2..a8b0047ccba 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -655,7 +655,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ""; $i++; } diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 9c6cea88bf8..8f7786f1512 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -147,7 +147,7 @@ if ($year) $relativepath = $year.'/'.$file; print "".''; print ''; - print ''; + print ''; } } print '
".$langs->trans("Date").""; - print dolibarr_print_date($don->date,"%d %B %Y"); + print dolibarr_print_date($don->date,"day"); print "
'.$obj->ref.''.dolibarr_print_date($obj->date_export,"%a %e %b %Y %H:%M:%S").''.dolibarr_print_date($obj->date_export,"dayhour").''.$langs->trans("ReBuild").'
'.$langs->trans('Date').''.dolibarr_print_date($fac->date,'%A %d %B %Y').''.dolibarr_print_date($fac->date,'daytext').''; if ($fac->type != 2) { - print dolibarr_print_date($fac->date_lim_reglement,'%A %d %B %Y'); + print dolibarr_print_date($fac->date_lim_reglement,'daytext'); if ($fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay) && ! $fac->paye && $fac->statut == 1 && ! $fac->am) print img_warning($langs->trans('Late')); } else diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index b26100b2cca..186b776fc0f 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -94,8 +94,8 @@ if ($_GET["facid"] > 0) // Dates print '
'.$langs->trans("Date").''.dolibarr_print_date($fac->date,"%A %d %B %Y").''.$langs->trans("DateMaxPayment").'' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y"); + print ''.dolibarr_print_date($fac->date,"daytext").''.$langs->trans("DateMaxPayment").'' . dolibarr_print_date($fac->date_lim_reglement,"daytext"); if ($fac->paye == 0 && $fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); print "
'.$langs->trans("Date").''.dolibarr_print_date($fac->date,"%A %d %B %Y").''.$langs->trans("DateMaxPayment").'' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y"); + print ''.dolibarr_print_date($fac->date,"daytext").''.$langs->trans("DateMaxPayment").'' . dolibarr_print_date($fac->date_lim_reglement,"daytext"); if ($fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay) && ! $fac->paye && $fac->statut == 1 && ! $fac->am) print img_warning($langs->trans("Late")); print "
'.img_object($langs->trans("ShowProject"),"project")." ".$obj->title.'".dolibarr_print_date($obj->do,"%d %b %Y") ."
".dolibarr_print_date($obj->do,"day") ."
".dolibarr_print_date($obj->da,"%d %b %Y")."
".dolibarr_print_date($obj->da,"day")."$obj->libelle $obj->label
'.img_pdf().' '.$file.''.filesize($tfile). ' '.$langs->trans("Bytes").''.dolibarr_print_date(filemtime($tfile),"%d %b %Y %H:%M:%S").'
'.dolibarr_print_date(filemtime($tfile),"dayhour").'
'; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 5005b53c3ec..6092e0d9ff4 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -109,7 +109,7 @@ if ($result) print ''.$obj->ref."\n"; - print ''.dolibarr_print_date($obj->datec,"%d/%m/%Y %H:%M")."\n"; + print ''.dolibarr_print_date($obj->datec,"dayhour")."\n"; print ''.price($obj->amount)."\n"; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index ac9c56a2a0b..0490af4b989 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -182,7 +182,7 @@ if ($_GET["propalid"] > 0) // Dates print ''.$langs->trans('Date').''; - print dolibarr_print_date($propal->date,'%a %d %B %Y'); + print dolibarr_print_date($propal->date,'daytext'); print ''; if ($conf->projet->enabled) $rowspan++; @@ -196,7 +196,7 @@ if ($_GET["propalid"] > 0) print ''.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { - print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); + print dolibarr_print_date($propal->fin_validite,'daytext'); if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index b32e698e2e5..693c640dfb6 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -709,7 +709,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit') print ""; // Date - print "". dolibarr_print_date($histo[$key]['date'],"%d %b %Y %H:%M") .""; + print "". dolibarr_print_date($histo[$key]['date'],"dayhour") .""; // Action print ''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 92f6c67b2f3..b4397f48049 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -198,7 +198,7 @@ else if ($contact->birthday) { - print ''.$langs->trans("Birthdate").''.dolibarr_print_date($contact->birthday); + print ''.$langs->trans("Birthdate").''.dolibarr_print_date($contact->birthday,'day"); if ($contact->birthday_alert) print ' (alerte anniversaire active)'; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index ffbac60c287..caabcbd2890 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -618,7 +618,7 @@ else // Date print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($contrat->date_contrat,"%A %d %B %Y")."\n"; + print ''.dolibarr_print_date($contrat->date_contrat,"dayhour")."\n"; // Factures associées /* diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php index 3e7bd96c0dd..3247206124f 100644 --- a/htdocs/contrat/ligne.php +++ b/htdocs/contrat/ligne.php @@ -185,7 +185,7 @@ if ($id > 0) // Date print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($contrat->date_contrat,"%A %d %B %Y")."\n"; + print ''.dolibarr_print_date($contrat->date_contrat,"dayhour")."\n"; // Factures associées /* diff --git a/htdocs/docsoc.php b/htdocs/docsoc.php index ab479438177..3ce8fff3422 100644 --- a/htdocs/docsoc.php +++ b/htdocs/docsoc.php @@ -173,7 +173,7 @@ if ($socid > 0) echo ''.$file.''; print "\n"; print ''.filesize($upload_dir."/".$file). ' '.$langs->trans("bytes").''; - print ''.dolibarr_print_date(filemtime($upload_dir."/".$file),"%d %b %Y %H:%M:%S").''; + print ''.dolibarr_print_date(filemtime($upload_dir."/".$file),"dayhour").''; print ''; echo ''.img_delete().''; print "\n"; @@ -218,7 +218,7 @@ if ($socid > 0) print "\n"; print ''.filesize($courrier_dir."/".$file). ' '.$langs->trans("bytes").''; - print ''.dolibarr_print_date(filemtime($courrier_dir."/".$file),"%d %b %Y %H:%M:%S").''; + print ''.dolibarr_print_date(filemtime($courrier_dir."/".$file),"dayhour").''; print "\n"; } } diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index 13572980765..a0deeb2510c 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -148,7 +148,7 @@ if ($_GET["id"] > 0) // Date print ''.$langs->trans('Date').''; - print ''.dolibarr_print_date($commande->date,'%A %d %B %Y').''; + print ''.dolibarr_print_date($commande->date,'day').''; print ''.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ; if ($commande->source == 0) { @@ -179,7 +179,7 @@ if ($_GET["id"] > 0) } else { - print dolibarr_print_date($commande->date_livraison,'%A %d %B %Y'); + print dolibarr_print_date($commande->date_livraison,'dayhour'); } print ''; print ''.$langs->trans('NotePublic').' :
'; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 643ddd7f327..702c8f1b5f1 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -248,7 +248,7 @@ if ($_GET["action"] == 'create') // Date print "".$langs->trans("Date").""; - print ''.dolibarr_print_date($commande->date,"%A %d %B %Y")."\n"; + print ''.dolibarr_print_date($commande->date,"dayhour")."\n"; // Entrepot (si forcé) if ($conf->stock->enabled && $_GET["entrepot_id"]) @@ -525,7 +525,7 @@ else // Date print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($expedition->date,"%A %d %B %Y")."\n"; + print ''.dolibarr_print_date($expedition->date,"dayhour")."\n"; print ''; // Poids Total diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 4afb9beb812..3bb43359ae5 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -429,7 +429,6 @@ class Facture extends CommonObject if ($this->db->num_rows($result)) { $obj = $this->db->fetch_object($result); - //print strftime('%Y%m%d%H%M%S',$obj->df).' '.$obj->df.' '.dolibarr_print_date($obj->df); $this->id = $rowid; $this->ref = $obj->facnumber; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 0c9629a7a91..f18cf89679d 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -368,7 +368,7 @@ elseif ($_GET["id"] > 0) print "".$langs->trans("Company")."".$fichinter->client->getNomUrl(1).""; // Date - print ''.$langs->trans("Date").''.dolibarr_print_date($fichinter->date,"%A %d %B %Y").''; + print ''.$langs->trans("Date").''.dolibarr_print_date($fichinter->date,"day").''; // Durée print ''.$langs->trans("Duration").''.$fichinter->duree.''; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 45f91ee8cd5..a26b54ecc13 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -161,7 +161,7 @@ if ($id > 0) if ($commande->date_commande) { - print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n"; + print dolibarr_print_date($commande->date_commande,"dayhourtext")."\n"; } print ''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 48e33b493a9..7147acf0e19 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -570,7 +570,7 @@ else if ($commande->date_commande) { - print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n"; + print dolibarr_print_date($commande->date_commande,"dayhour")."\n"; } print ''; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index ab9e26dec2c..bb033d7ce97 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -110,7 +110,7 @@ if ($_GET["id"] > 0) if ($commande->methode_commande_id > 0) { print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n"; + print ''.dolibarr_print_date($commande->date_commande,"dayhourtext")."\n"; print ' '; print ""; } @@ -149,7 +149,7 @@ if ($_GET["id"] > 0) $obj = $db->fetch_object($resql); print ""; - print ''.dolibarr_print_date($obj->dl,"%a %d %b %Y %H:%M:%S")."\n"; + print ''.dolibarr_print_date($obj->dl,"dayhour")."\n"; // Statut print ''.$commande->LibStatut($obj->fk_statut,4)."\n"; diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index 46a2115f746..3dfbd5ca80f 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -689,7 +689,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $posy+=6; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($com->date,"%d %b %Y"), '', 'R'); + $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($com->date,"day"), '', 'R'); if ($showadress) { diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 2321dc71732..91f2ce48064 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -578,11 +578,11 @@ else print ''; print ''.$langs->trans('Date').''; - print dolibarr_print_date($fac->datep,'%A %d %B %Y').''; + print dolibarr_print_date($fac->datep,'dayhourtext').''; print ''; print ''.$langs->trans('DateEcheance').''; - print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y'); + print dolibarr_print_date($fac->date_echeance,'dayhourtext'); if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print ''; diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 1734347bd18..250696d45b9 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -934,14 +934,14 @@ class pdf_crabe extends ModelePDFFactures $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dolibarr_print_date($object->date,"%d %b %Y"), '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateInvoice")." : " . dolibarr_print_date($object->date,"day"), '', 'R'); if ($object->type != 2) { $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dolibarr_print_date($object->date_lim_reglement,"%d %b %Y"), '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dolibarr_print_date($object->date_lim_reglement,"day"), '', 'R'); } if ($showadress) diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 7635f01dc1a..753c6922210 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -823,12 +823,12 @@ class pdf_propale_azur extends ModelePDFPropales $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"%d %b %Y"), '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dolibarr_print_date($object->date,"day"), '', 'R'); $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dolibarr_print_date($object->fin_validite,"%d %b %Y"), '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : " . dolibarr_print_date($object->fin_validite,"day"), '', 'R'); if ($showadress) { diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index adb52a3f9fc..6d98237a674 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -71,7 +71,7 @@ class pdf_paiement $pdf->Text(76, 10, $title); $pdf->SetFont('Arial','B',12); - $pdf->Text(11, 16, $langs->transnoentities("Date")." : ".dolibarr_print_date(time(),"%d %b %Y")); + $pdf->Text(11, 16, $langs->transnoentities("Date")." : ".dolibarr_print_date(time(),"day")); $pdf->SetFont('Arial','',12); $pdf->Text(11, 22, $langs->transnoentities("Page")." : ".$page); diff --git a/htdocs/index.php b/htdocs/index.php index ee7d3302c0f..0f14bd34cc2 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -93,7 +93,7 @@ $userstring=$user->fullname; print ''.$langs->trans("User").''.$userstring.''; print ''; print ''.$langs->trans("PreviousConnexion").''; -if ($user->datepreviouslogin) print dolibarr_print_date($user->datepreviouslogin,"%d %b %Y %H:%M:%S"); +if ($user->datepreviouslogin) print dolibarr_print_date($user->datepreviouslogin,"dayhour"); else print $langs->trans("Unknown"); print ''; print "\n"; diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 31e3c7ffbc8..4dbf61d48b1 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -599,31 +599,31 @@ function dolibarr_print_object_info($object) print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '
'; if (isset($object->date_creation)) - print $langs->trans("DateCreation")." : " . dolibarr_print_date($object->date_creation,"%A %d %B %Y %H:%M:%S") . '
'; + print $langs->trans("DateCreation")." : " . dolibarr_print_date($object->date_creation,"dayhourtext") . '
'; if (isset($object->user_modification) && $object->user_modification->fullname) print $langs->trans("ModifiedBy")." : " . $object->user_modification->fullname . '
'; if (isset($object->date_modification)) - print $langs->trans("DateLastModification")." : " . dolibarr_print_date($object->date_modification,"%A %d %B %Y %H:%M:%S") . '
'; + print $langs->trans("DateLastModification")." : " . dolibarr_print_date($object->date_modification,"dayhourtext") . '
'; if (isset($object->user_validation) && $object->user_validation->fullname) print $langs->trans("ValidatedBy")." : " . $object->user_validation->fullname . '
'; if (isset($object->date_validation)) - print $langs->trans("DateValidation")." : " . dolibarr_print_date($object->date_validation,"%A %d %B %Y %H:%M:%S") . '
'; + print $langs->trans("DateValidation")." : " . dolibarr_print_date($object->date_validation,"dayhourtext") . '
'; if (isset($object->user_cloture) && $object->user_cloture->fullname ) print $langs->trans("ClosedBy")." : " . $object->user_cloture->fullname . '
'; if (isset($object->date_cloture)) - print $langs->trans("DateClosing")." : " . dolibarr_print_date($object->date_cloture,"%A %d %B %Y %H:%M:%S") . '
'; + print $langs->trans("DateClosing")." : " . dolibarr_print_date($object->date_cloture,"dayhourtext") . '
'; if (isset($object->user_rappro) && $object->user_rappro->fullname ) print $langs->trans("ConciliatedBy")." : " . $object->user_rappro->fullname . '
'; if (isset($object->date_rappro)) - print $langs->trans("DateConciliating")." : " . dolibarr_print_date($object->date_rappro,"%A %d %B %Y %H:%M:%S") . '
'; + print $langs->trans("DateConciliating")." : " . dolibarr_print_date($object->date_rappro,"dayhourtext") . '
'; } /** diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 988ccd00c04..d96cbc3aa1e 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -442,7 +442,7 @@ else // Date print ''.$langs->trans("Date").''; - print ''.dolibarr_print_date($livraison->date_creation,'%A %d %B %Y')."\n"; + print ''.dolibarr_print_date($livraison->date_creation,'dayhourtext')."\n"; print ''; // Statut @@ -633,7 +633,7 @@ else print "".stripslashes(nl2br($objp->description))."\n"; } print ''.$objp->qty_livre.''; - print ''.dolibarr_print_date($objp->date_livraison).''; + print ''.dolibarr_print_date($objp->date_livraison,"dayhour").''; print ''; $i++; } diff --git a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php index 16f4c77245f..8b2c73e6b3d 100644 --- a/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_sirocco.modules.php @@ -349,7 +349,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',12); - $pdf->Text(11, 88, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y")); + $pdf->Text(11, 88, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"day")); $pdf->Text(11, 94, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref); $pdf->SetFont('Arial','B',9); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 64d128682bc..bfd5650faa2 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -355,8 +355,8 @@ if (! session_id() || ! isset($_SESSION["dol_login"])) $ldap->fetch($login); if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."
\n"; - if ($ldapdebug) print "DEBUG: pwdLastSet = ".dolibarr_print_date($ldap->pwdlastset,'%d %b %Y')."
\n"; - if ($ldapdebug) print "DEBUG: badPasswordTime = ".dolibarr_print_date($ldap->badpwdtime,'%d %b %Y')."
\n"; + if ($ldapdebug) print "DEBUG: pwdLastSet = ".dolibarr_print_date($ldap->pwdlastset,'day')."
\n"; + if ($ldapdebug) print "DEBUG: badPasswordTime = ".dolibarr_print_date($ldap->badpwdtime,'day')."
\n"; //TODO : doit etre géré au niveau de PEAR /* @@ -733,7 +733,7 @@ function top_menu($head, $title="", $target="") if (! isset($_SERVER["REMOTE_USER"]) || ! $_SERVER["REMOTE_USER"]) { $title=$langs->trans("Logout"); - $title.='
'.$langs->trans("ConnectedSince").': '.dolibarr_print_date($user->datelastlogin,"%d/%m/%Y %H:%M:%S"); + $title.='
'.$langs->trans("ConnectedSince").': '.dolibarr_print_date($user->datelastlogin,"dayhour"); if ($dolibarr_main_authentication) $title.='
'.$langs->trans("AuthenticationMode").': '.$dolibarr_main_authentication; $text.='"; // Date - print "".dolibarr_print_date($objp->dp,"%d %b %Y %H:%M:%S").""; + print "".dolibarr_print_date($objp->dp,"dayhour").""; // catégorie de Prix if ($conf->global->PRODUIT_MULTIPRICES) diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 926024cd33b..68503a40d3d 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -248,7 +248,7 @@ if ($_GET["id"] || $_GET["ref"]) print ''; if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file']) && ! $px->isGraphKo()) { - print ''.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"%d %b %Y %H:%M:%S")).''; + print ''.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).''; } else { diff --git a/htdocs/telephonie/client/facture.php b/htdocs/telephonie/client/facture.php index 1c640c76928..9f41b4f0ac0 100644 --- a/htdocs/telephonie/client/facture.php +++ b/htdocs/telephonie/client/facture.php @@ -237,8 +237,8 @@ if ($_GET["facid"] > 0) print "Conditions de réglement" . $fac->cond_reglement .""; print ''.$langs->trans("Date").''; - print "".dolibarr_print_date($fac->date,"%A %d %B %Y")."\n"; - print ''.$langs->trans("DateMaxPayment").'' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y"); + print "".dolibarr_print_date($fac->date,"dayhourtext")."\n"; + print ''.$langs->trans("DateMaxPayment").'' . dolibarr_print_date($fac->date_lim_reglement,"dayhourtext"); print ""; print ''; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index ab8ab7ed3fd..a7d87d72407 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -918,11 +918,11 @@ else print ''; print ''.$langs->trans("LastConnexion").''; - print ''.dolibarr_print_date($fuser->datelastlogin,"%d/%m/%Y %H:%M:%S").''; + print ''.dolibarr_print_date($fuser->datelastlogin,"dayhour").''; print "\n"; print ''.$langs->trans("PreviousConnexion").''; - print ''.dolibarr_print_date($fuser->datepreviouslogin,"%d/%m/%Y %H:%M:%S").''; + print ''.dolibarr_print_date($fuser->datepreviouslogin,"dayhour").''; print "\n"; // Note diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 0ccfd9fd8d6..746e70eba02 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -86,7 +86,7 @@ if ($resql) print ""; print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; - print ''.dolibarr_print_date($obj->datec,"%d %b %Y").''; + print ''.dolibarr_print_date($obj->datec,"day").''; print "\n"; $i++; } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 309a4b39705..78e95d89e83 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -113,7 +113,7 @@ if ($result) } else print $langs->trans("InternalUser"); print ''; - print ''.dolibarr_print_date($obj->datec,"%d %b %Y").''; + print ''.dolibarr_print_date($obj->datec,"day").''; // Statut $userstatic->statut=$obj->statut;