diff --git a/htdocs/bon-prelevement.class.php b/htdocs/bon-prelevement.class.php index 76fdd9e29c9..dcef3bae321 100644 --- a/htdocs/bon-prelevement.class.php +++ b/htdocs/bon-prelevement.class.php @@ -355,7 +355,7 @@ class BonPrelevement $subject = "Crédit prélèvement ".$this->ref." à la banque"; $message = "Le bon de prélèvement ".$this->ref; $message .= " a été crédité par la banque.\n"; - $message .= "Date crédit : ".strftime("%A %e %B %Y", $date); + $message .= "Date crédit : ".dolibarr_print_date($date,'dayhour'); $this->Notify($user, "cr", $subject, $message); } @@ -427,7 +427,7 @@ class BonPrelevement $message .= "\n\n"; $message .= "\nMontant : ".price($this->amount); $message .= "\nMéthode : ".$this->methodes_trans[$this->method_trans]; - $message .= "\nDate : ".strftime("%A %e %B %Y", $date); + $message .= "\nDate : ".dolibarr_print_date($date,'day'); $this->Notify($user,"tr", $subject, $message, 1); } diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index 5a3467a66ee..f3706129c42 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -80,7 +80,7 @@ if ($_GET['id']) print 'Fiche '; - print strftime("%d %B %Y",$objp->date_purchased)."\n"; + print dolibarr_print_date($objp->date_purchased,'dayhour')."\n"; print $objp->total . "\n"; print "\n"; $i++; diff --git a/htdocs/boutique/commande/commande.class.php b/htdocs/boutique/commande/commande.class.php index 136d24897d4..2e6377ee581 100644 --- a/htdocs/boutique/commande/commande.class.php +++ b/htdocs/boutique/commande/commande.class.php @@ -63,7 +63,7 @@ class Commande { $this->payment_method = stripslashes($array["payment_method"]); - $this->date = strftime("%d/%m/%Y %H:%M",$array["date_purchased"]); + $this->date = dolibarr_print_date($array["date_purchased"],'dayhour'); $this->delivery_adr->name = stripslashes($array["delivery_name"]); $this->delivery_adr->street = stripslashes($array["delivery_street_address"]); diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 3c24504c39e..038d1d6b004 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -73,7 +73,7 @@ if ( $dbosc->query($sql) ) print 'Fiche '; print $objp->orders_id .""; - print strftime("%d %B %Y",$objp->date_purchased).''; + print dolibarr_print_date($objp->date_purchased,'dayhour').''; print ''.$objp->customers_name."\n"; print ''.price($objp->value).''; print "\n"; diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index 4221f32cf58..94a5314afad 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -103,7 +103,7 @@ if ($resql) print ''; print 'inactif'; } - print "".strftime("%d/%m/%Y", $objp->fin).""; + print "".dolibarr_print_date($objp->fin,'day').""; print ''.price($objp->products_price).""; print ''.price($objp->specials_new_products_price).""; print ""; diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 75ee1b0c721..af24c4dbb5d 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -219,7 +219,7 @@ if ($_GET["id"] > 0) echo ''.$file.''; print "\n"; print ''.filesize($upload_dir.'/'.$file). ' bytes'; - print ''.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).''; + print ''.dolibarr_print_date(filemtime($upload_dir.'/'.$file),'dayhour').''; print ''; print ''.img_delete($langs->trans('Delete')).''; print "\n"; diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 251be44832b..59bb28949b5 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -122,7 +122,7 @@ if ($resql) if (file_exists($file)) { print ''.img_pdf().''; - print ''.strftime("%d %b %Y %H:%M:%S",filemtime($file)).''; + print ''.dolibarr_print_date(filemtime($file),'dayhour').''; print ''.filesize($file). ' '.$langs->trans("Bytes").''; } else { diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 174037f88cc..9b3715ef1e9 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -75,7 +75,6 @@ if ($_socid > 0) $objsoc->id=$_socid; $objsoc->fetch($_socid,$to); - $dac = strftime("%Y-%m-%d %H:%M", time()); if ($errmesg) { print '
'.$errmesg.'

'; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 0f0fef88bd7..aad29d4581a 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -176,7 +176,7 @@ if ($_GET["propalid"] > 0) print ''.$propal->ref.'.pdf'; print ''.filesize($file). ' bytes'; - print ''.strftime("%d %b %Y %H:%M:%S",filemtime($file)).''; + print ''.dolibarr_print_date(filemtime($file),'dayhour').''; print ''; // Si fichier detail PDF existe @@ -185,7 +185,7 @@ if ($_GET["propalid"] > 0) print ''.$propal->ref.'-detail.pdf'; print ''.filesize($filedetail). ' bytes'; - print ''.strftime("%d %b %Y %H:%M:%S",filemtime($filedetail)).''; + print ''.dolibarr_print_date(filemtime($filedetail),'dayhour').''; print ''; } print "\n"; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index e25a8dc0d63..eb78e43e9cf 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -185,7 +185,7 @@ if ($propalid > 0) echo ''.$file.''; print "\n"; print ''.filesize($upload_dir.'/'.$file). ' bytes'; - print ''.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).''; + print ''.dolibarr_print_date(filemtime($upload_dir.'/'.$file),'dayhour').''; print ''; if ($file == $propref . '.pdf') { diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index 1be2240f2e7..2af52938720 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -87,7 +87,7 @@ $data = array(); for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); + $data[$i-1] = array(ucfirst(substr(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); } if (!$user->rights->commercial->client->voir || $user->societe_id) @@ -122,7 +122,7 @@ $data = array(); for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); + $data[$i-1] = array(ucfirst(substr(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); } if (!$user->rights->commercial->client->voir || $user->societe_id) diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 2a9aac3b3b1..ed083b60ba7 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -83,7 +83,6 @@ if ($_socid > 0) $objsoc->id=$_socid; $objsoc->fetch($_socid,$to); - $dac = strftime("%Y-%m-%d %H:%M", time()); if ($errmesg) { print '
'.$errmesg.'

'; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 2630bacb5e2..1b0a67a2b2a 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -116,8 +116,6 @@ if ($_socid > 0) $objsoc->id=$_socid; $objsoc->fetch($_socid,$to); - $dac = strftime("%Y-%m-%d %H:%M", time()); - /* * Affichage onglets */ diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 796422c3b68..73cb0a14bfa 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -164,7 +164,7 @@ if ($_GET["id"] > 0) { print ''.$commande->ref.'.pdf'; print ''.filesize($file). ' bytes'; - print ''.strftime("%d %b %Y %H:%M:%S",filemtime($file)).''; + print ''.dolibarr_print_date(filemtime($file),'dayhour').''; print ''; // Si fichier detail PDF existe @@ -173,7 +173,7 @@ if ($_GET["id"] > 0) { print ''.$commande->ref.'-detail.pdf'; print ''.filesize($filedetail). ' bytes'; - print ''.strftime("%d %b %Y %H:%M:%S",filemtime($filedetail)).''; + print ''.dolibarr_print_date(filemtime($filedetail),'dayhour').''; print ''; } print "\n"; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 6d98dff45fa..1c80d847c05 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -188,7 +188,7 @@ if ($id > 0) echo ''.$file.''; print "\n"; print ''.filesize($upload_dir.'/'.$file). ' '.$langs->trans("bytes").''; - print ''.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).''; + print ''.dolibarr_print_date(filemtime($upload_dir.'/'.$file),'dayhour').''; print ''; if ($file == $facref . '.pdf') { diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index b2b6ca57183..315ef7d5b44 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -95,7 +95,7 @@ $data = array(); for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); + $data[$i-1] = array(ucfirst(substr(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); } if (!$user->rights->commercial->client->voir || $user->societe_id) @@ -129,7 +129,7 @@ $data = array(); for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); + $data[$i-1] = array(ucfirst(substr(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); } if (!$user->rights->commercial->client->voir || $user->societe_id) diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index f67c167b393..3993447978b 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -138,11 +138,11 @@ for ($mois = 1 ; $mois < 13 ; $mois++) { $var=!$var; print ''; - print "".strftime("%B",mktime(1,1,1,$mois,1,2000)).""; + print "".strftime("%B",dolibarr_mktime(1,1,1,$mois,1,2000)).""; for ($annee = $year_start ; $annee <= $year_end ; $annee++) { print ' '; - $case = strftime("%Y-%m",mktime(1,1,1,$mois,1,$annee)); + $case = strftime("%Y-%m",dolibarr_mktime(1,1,1,$mois,1,$annee)); if ($decaiss[$case]>0) { print price($decaiss[$case]); @@ -151,7 +151,7 @@ for ($mois = 1 ; $mois < 13 ; $mois++) print ""; print ' '; - $case = strftime("%Y-%m",mktime(1,1,1,$mois,1,$annee)); + $case = strftime("%Y-%m",dolibarr_mktime(1,1,1,$mois,1,$annee)); if ($encaiss[$case]>0) { print price($encaiss[$case]); diff --git a/htdocs/compta/bank/bplc.php b/htdocs/compta/bank/bplc.php index e26643234c9..aa20d993617 100644 --- a/htdocs/compta/bank/bplc.php +++ b/htdocs/compta/bank/bplc.php @@ -95,5 +95,5 @@ print ""; $db->close(); -llxFooter(strftime("%H:%M",time()). " - Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index b7613e12d7a..773ae90ca5f 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -408,7 +408,7 @@ if ($account > 0) { $data_credit[$i] = isset($credits[substr("0".($i+1),-2)]) ? $credits[substr("0".($i+1),-2)] : 0; $data_debit[$i] = isset($debits[substr("0".($i+1),-2)]) ? $debits[substr("0".($i+1),-2)] : 0; - $labels[$i] = strftime("%b",mktime(1,1,1,$i+1,1,2000)); + $labels[$i] = strftime("%b",dolibarr_mktime(1,1,1,$i+1,1,2000)); $datamin[$i] = $acct->min_desired; } diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 186b776fc0f..3b902aada6a 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -159,7 +159,7 @@ if ($_GET["facid"] > 0) print ''.$fac->ref.'.pdf'; print ''.filesize($file). ' bytes'; - print ''.strftime("%d %b %Y %H:%M:%S",filemtime($file)).''; + print ''.dolibarr_print_date(filemtime($file),'dayhour').''; print ''; // Si fichier detail PDF existe diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 914773dfb8f..797457ddfe8 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -194,7 +194,7 @@ if ($facid > 0) echo ''.$file.''; print "\n"; print ''.filesize($upload_dir.'/'.$file). ' '.$langs->trans("bytes").''; - print ''.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).''; + print ''.dolibarr_print_date(filemtime($upload_dir.'/'.$file),'dayhour').''; print ''; if ($file == $facref . '.pdf') { diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php index 28fb971bb10..046aebd929b 100644 --- a/htdocs/compta/facture/stats/month.php +++ b/htdocs/compta/facture/stats/month.php @@ -80,7 +80,7 @@ $data = array(); for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); + $data[$i-1] = array(ucfirst(substr(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); } $filename_amount = $conf->facture->dir_temp."/factureamount".$year.".png"; @@ -107,7 +107,7 @@ $data = array(); for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); + $data[$i-1] = array(ucfirst(substr(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]); } $filename_avg = $conf->facture->dir_temp."/factureaverage".$year.".png"; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 1d7d7447faa..7cb809ce404 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -106,7 +106,7 @@ if ($result) print ''.$obj->ref."\n"; - print ''.strftime("%d/%m/%Y",$obj->datec)."\n"; + print ''.dolibarr_print_date($obj->datec,'day')."\n"; print ''.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie)."\n"; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 74dd8496422..d40ef76d881 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -142,7 +142,7 @@ if ($result) print ""; print ' '; print ''.$obj->ref."\n"; - print ''.strftime("%d/%m/%Y",$obj->datec)."\n"; + print ''.dolibarr_print_date($obj->datec,'day')."\n"; print ''.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie)."\n"; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index c2945e1ec65..ecddd5cdc6f 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -149,7 +149,7 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; } diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 09034293ab0..81825580de9 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -106,7 +106,7 @@ if ($_GET["id"]) } else { - print strftime("%d %B %Y",$rej->date_rejet); + print dolibarr_print_date($rej->date_rejet,'day'); } print ''; } diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 5b98e092039..d29afbf54f4 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -247,7 +247,7 @@ if ($conf->compta->mode == "CREANCES-DETTES") { $var=!$var; print ""; - print ''; + print ''; $x_coll = tva_coll($db, $y, $m); print ""; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 690855c6d14..ff0a2918cac 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -249,7 +249,7 @@ if ($conf->compta->mode == "CREANCES-DETTES") $x_coll_ht = 0; $x_paye_sum = 0; $x_paye_ht = 0; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/docs/index.php b/htdocs/docs/index.php index bcfad4a69fd..bf60328eb74 100644 --- a/htdocs/docs/index.php +++ b/htdocs/docs/index.php @@ -60,7 +60,7 @@ if ($resql) $loc = get_exdir($obj->rowid).$obj->rowid.".pdf"; $file = stripslashes($obj->name); echo ''.$file.''; - print ''; + print ''; print "\n"; } diff --git a/htdocs/expedition/mods/methode_expedition.modules.php b/htdocs/expedition/mods/methode_expedition.modules.php index 25ba71f5c60..3943e6a269e 100644 --- a/htdocs/expedition/mods/methode_expedition.modules.php +++ b/htdocs/expedition/mods/methode_expedition.modules.php @@ -297,7 +297,7 @@ Class methode_expedition $pdf->SetTextColor(200,0,0); $pdf->SetFont('Courier','B',12); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date)); + $pdf->Text(11, 88, "Date : " . dolibarr_print_date($propale->date,'day')); $pdf->Text(11, 94, "Proposition commerciale : ".$propale->ref); diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php index 95df34cfb6a..310d456ddab 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php @@ -416,7 +416,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetXY($blSocX,$blSocY+20); $pdf->SetFont('Arial','B',8); $pdf->SetTextColor(0,0,0); - $pdf->MultiCell(50, 8, "Date : " . strftime("%d %b %Y", $exp->date), '' , 'L'); + $pdf->MultiCell(50, 8, "Date : " . dolibarr_print_date($exp->date,'day'), '' , 'L'); //Date Expedition $pdf->SetXY($blSocX2,$blSocY+20); $pdf->SetFont('Arial','B',8); diff --git a/htdocs/expedition/stats/expeditionstats.class.php b/htdocs/expedition/stats/expeditionstats.class.php index 78a4b2084d0..9059575975f 100644 --- a/htdocs/expedition/stats/expeditionstats.class.php +++ b/htdocs/expedition/stats/expeditionstats.class.php @@ -85,7 +85,7 @@ class ExpeditionStats for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(strftime("%b",mktime(12,12,12,$i,1,$year)), $res[$i]); + $data[$i-1] = array(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)), $res[$i]); } return $data; @@ -101,7 +101,7 @@ class ExpeditionStats for ($i = 1 ; $i < 13 ; $i++) { - $data[$i-1] = array(strftime("%b",mktime(12,12,12,$i,1,$year)), + $data[$i-1] = array(strftime("%b",dolibarr_mktime(12,12,12,$i,1,$year)), $data1[$i][1], $data2[$i][1]); } diff --git a/htdocs/fourn/commande/modules/mod_commande_fournisseur_orchidee.php b/htdocs/fourn/commande/modules/mod_commande_fournisseur_orchidee.php index d9cf3cf749f..0a13897c6ec 100644 --- a/htdocs/fourn/commande/modules/mod_commande_fournisseur_orchidee.php +++ b/htdocs/fourn/commande/modules/mod_commande_fournisseur_orchidee.php @@ -354,7 +354,7 @@ function info() // On change d'année fiscal si besoin if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); + $this->yy = substr(strftime("%Y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); } else { @@ -366,7 +366,7 @@ function info() { $this->searchLastWithNoYear .= '[0-9]'; } - $previousYear = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")-1)),$numbityear); + $previousYear = substr(strftime("%Y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")-1)),$numbityear); $this->searchLastWithPreviousYear .= $previousYear; $k++; } diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 0d8b9ab00b5..9b44d8f8ea2 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -134,7 +134,7 @@ if ($_GET["id"] > 0) if ($commande->date_commande) { - print strftime("%A %d %B %Y",$commande->date_commande)."\n"; + print dolibarr_print_date($commande->date_commande,'dayhourtext')."\n"; } print ' \n"; print ''; - print ''; + print ''; print '"; print ""; - print "\n"; + print "\n"; print '\n"; diff --git a/htdocs/lolix/cv/liste.php b/htdocs/lolix/cv/liste.php index 01e59ccef38..ecf5acb9b64 100644 --- a/htdocs/lolix/cv/liste.php +++ b/htdocs/lolix/cv/liste.php @@ -99,7 +99,7 @@ if ($result) print img_file(); print " idp\">$obj->nom\n"; print "\n"; - print '\n"; + print '\n"; print ''; print "\n"; $i++; diff --git a/htdocs/lolix/societe/activation.php b/htdocs/lolix/societe/activation.php index 1cba3972e5b..a575ec0a371 100644 --- a/htdocs/lolix/societe/activation.php +++ b/htdocs/lolix/societe/activation.php @@ -92,7 +92,7 @@ if ($result) print " idp\">$obj->ref\n"; print "\n"; - print '\n"; + print '\n"; print "\n"; $i++; diff --git a/htdocs/lolix/societe/fiche.php b/htdocs/lolix/societe/fiche.php index 24a1d76feea..3ce4ebb948e 100644 --- a/htdocs/lolix/societe/fiche.php +++ b/htdocs/lolix/societe/fiche.php @@ -112,7 +112,7 @@ else print '
'.$langs->trans("Ref").''.$bon->ref.'
'.$langs->trans("Date").''.strftime("%e %B %Y",$bon->datec).'
'.$langs->trans("Date").''.dolibarr_print_date($bon->datec,'dayhour').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; @@ -169,7 +169,7 @@ if ($_GET["id"]) $muser->fetch(); print '
Date Transmission / Par'; - print strftime("%e %B %Y",$bon->date_trans); + print dolibarr_print_date($bon->date_trans,'dayhour'); print ' par '.$muser->fullname.'
Méthode Transmission'; print $bon->methodes_trans[$bon->method_trans]; @@ -178,7 +178,7 @@ if ($_GET["id"]) if($bon->date_credit <> 0) { print '
Crédité le'; - print strftime("%e %B %Y",$bon->date_credit); + print dolibarr_print_date($bon->date_credit,'dayhour'); print '
'.strftime("%b %Y",mktime(0,0,0,$m,1,$y)).''.strftime("%b %Y",dolibarr_mktime(0,0,0,$m,1,$y)).'".price($x_coll)."
'.$langs->trans("Quadri")." $q (".strftime("%b %Y",mktime(0,0,0,(($q-1)*3)+1,1,$y)).' - '.strftime("%b %Y",mktime(0,0,0,($q*3),1,$y)).')
'.$langs->trans("Quadri")." $q (".strftime("%b %Y",dolibarr_mktime(0,0,0,(($q-1)*3)+1,1,$y)).' - '.strftime("%b %Y",mktime(0,0,0,($q*3),1,$y)).')
'.$langs->trans("CustomersInvoices").' '.$langs->trans("Description").''.strftime("%d/%m/%Y %H:%M",$obj->date_generation).''.dolibarr_print_date($obj->date_generation,'dayhour').'
'; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index f4f32dd65b7..3dddbc99c46 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -192,7 +192,7 @@ if ($facid > 0) echo ''.$file.''; print "'.filesize($upload_dir.'/'.$file). ' bytes'.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).''.dolibarr_print_date(filemtime($upload_dir.'/'.$file),'dayhour').''; if ($file == $facref . '.pdf') { diff --git a/htdocs/includes/modules/commande/mod_commande_diamant.php b/htdocs/includes/modules/commande/mod_commande_diamant.php index ce00366bd77..7ae6ea5d14b 100644 --- a/htdocs/includes/modules/commande/mod_commande_diamant.php +++ b/htdocs/includes/modules/commande/mod_commande_diamant.php @@ -108,7 +108,7 @@ class mod_commande_diamant extends ModeleNumRefCommandes //on vérifie si il y a une année précédente //sinon le delta sera appliqué de nouveau sur la nouvelle année - $lastyy = 'C'.strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")-1)); + $lastyy = 'C'.strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")-1)); $sql = "SELECT MAX(ref)"; $sql.= " FROM ".MAIN_DB_PREFIX."commande"; $sql.= " WHERE ref like '${lastyy}%'"; diff --git a/htdocs/includes/modules/commande/mod_commande_emeraude.php b/htdocs/includes/modules/commande/mod_commande_emeraude.php index 27215dd34c2..a62509f61db 100644 --- a/htdocs/includes/modules/commande/mod_commande_emeraude.php +++ b/htdocs/includes/modules/commande/mod_commande_emeraude.php @@ -92,7 +92,7 @@ class mod_commande_emeraude extends ModeleNumRefCommandes $current_month = date("n"); if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); + $yy = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)); } else { diff --git a/htdocs/includes/modules/commande/mod_commande_rubis.php b/htdocs/includes/modules/commande/mod_commande_rubis.php index a18e1c66aa6..b52f64fb5eb 100644 --- a/htdocs/includes/modules/commande/mod_commande_rubis.php +++ b/htdocs/includes/modules/commande/mod_commande_rubis.php @@ -92,7 +92,7 @@ class mod_commande_rubis extends ModeleNumRefCommandes $current_month = date("n"); if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); + $yy = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)); } else { diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php index a237edd5442..2b465922258 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/includes/modules/commande/mod_commande_saphir.php @@ -356,7 +356,7 @@ function info() // On change d'année fiscal si besoin if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); + $this->yy = substr(strftime("%Y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); } else { @@ -368,7 +368,7 @@ function info() { $this->searchLastWithNoYear .= '[0-9]'; } - $previousYear = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")-1)),$numbityear); + $previousYear = substr(strftime("%Y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")-1)),$numbityear); $this->searchLastWithPreviousYear .= $previousYear; $k++; } diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 6d3de2679ac..906a35d01dd 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -363,7 +363,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',12); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $com->date)); + $pdf->Text(11, 88, "Date : " . dolibarr_print_date($com->date,'day')); $pdf->Text(11, 94, $langs->transnoentities("Order")." ".$com->ref); diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index 8e54fd63905..3a3b85b58c4 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -231,7 +231,7 @@ function facture_meta_create($db, $facid, $message="") $nblignes = sizeof($fac->lignes); $client = $fac->client->nom . " " . $fac->client->adresse . " " . $fac->client->cp . " " . $fac->client->ville; $meta = "REFERENCE=\"" . $fac->ref . "\" -DATE=\"" . strftime("%d/%m/%Y",$fac->date) . "\" +DATE=\"" . dolibarr_print_date($fac->date) . "\" NB_ITEMS=\"" . $nblignes . "\" CLIENT=\"" . $client . "\" TOTAL_HT=\"" . $fac->total_ht . "\" diff --git a/htdocs/includes/modules/facture/neptune/neptune.modules.php b/htdocs/includes/modules/facture/neptune/neptune.modules.php index 8ab573e9e10..1b258245b89 100644 --- a/htdocs/includes/modules/facture/neptune/neptune.modules.php +++ b/htdocs/includes/modules/facture/neptune/neptune.modules.php @@ -100,7 +100,7 @@ class mod_facture_neptune extends ModeleNumRefFactures //on vérifie si il y a une année précédente //sinon le delta sera appliqué de nouveau sur la nouvelle année - $lastyy = 'FA'.strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")-1)); + $lastyy = 'FA'.strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")-1)); $sql = "SELECT MAX(facnumber)"; $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber like '${lastyy}%'"; diff --git a/htdocs/includes/modules/facture/orion/orion.modules.php b/htdocs/includes/modules/facture/orion/orion.modules.php index 7c4eebb4568..9d1336f7a18 100644 --- a/htdocs/includes/modules/facture/orion/orion.modules.php +++ b/htdocs/includes/modules/facture/orion/orion.modules.php @@ -95,7 +95,7 @@ function info() if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); + $yy = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)); } else { diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index b361af7b583..3c18830c6b2 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -445,7 +445,7 @@ class pdf_crabe extends ModelePDFFactures $row = $this->db->fetch_row(); $pdf->SetXY ($tab3_posx, $tab3_top+$y ); - $pdf->MultiCell(20, 4, strftime("%d/%m/%y",$row[0]), 0, 'L', 0); + $pdf->MultiCell(20, 4, dolibarr_print_date($row[0],'day'), 0, 'L', 0); $pdf->SetXY ($tab3_posx+21, $tab3_top+$y); $pdf->MultiCell(20, 4, $row[1], 0, 'L', 0); $pdf->SetXY ($tab3_posx+41, $tab3_top+$y); diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index 55b8a2da647..0c53bcd2801 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -588,7 +588,7 @@ class pdf_huitre extends ModelePDFFactures $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',14); $pdf->Text(11, 88, $outputlangs->transnoentities('Date')); - $pdf->Text(35, 88, ": " . strftime("%d %b %Y", $fac->date)); + $pdf->Text(35, 88, ": " . dolibarr_print_date($fac->date,'day')); $pdf->Text(11, 94, $outputlangs->transnoentities('Invoice')); $pdf->Text(35, 94, ": ".$fac->ref); diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index e3094f014de..9164381fb3f 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -433,7 +433,7 @@ class pdf_oursin extends ModelePDFFactures $row = $this->db->fetch_row(); $pdf->SetXY ($tab3_posx, $tab3_top+$y ); - $pdf->MultiCell(20, 4, strftime("%d/%m/%y",$row[0]), 0, 'L', 0); + $pdf->MultiCell(20, 4, dolibarr_print_date($row[0],'day'), 0, 'L', 0); $pdf->SetXY ($tab3_posx+21, $tab3_top+$y); $pdf->MultiCell(20, 4, $row[1], 0, 'L', 0); $pdf->SetXY ($tab3_posx+41, $tab3_top+$y); diff --git a/htdocs/includes/modules/facture/titan/titan.modules.php b/htdocs/includes/modules/facture/titan/titan.modules.php index c15b421d31f..9a8ea4f6377 100644 --- a/htdocs/includes/modules/facture/titan/titan.modules.php +++ b/htdocs/includes/modules/facture/titan/titan.modules.php @@ -96,7 +96,7 @@ function info() if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); + $yy = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)); } else { diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php index e81e9314161..93c27543bc5 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/includes/modules/fichinter/mod_arctic.php @@ -356,7 +356,7 @@ function info() // On change d'année fiscal si besoin if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); + $this->yy = substr(strftime("%Y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); } else { diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index c9e456c2965..62b1e7063f2 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -178,7 +178,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',14); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $fich->date)); + $pdf->Text(11, 88, "Date : " . dolibarr_print_date($fich->date,'day')); $pdf->Text(11, 94, $langs->trans("InterventionCard")." : ".$fich->ref); $pdf->SetFillColor(220,220,220); diff --git a/htdocs/includes/modules/propale/mod_propale_diamant.php b/htdocs/includes/modules/propale/mod_propale_diamant.php index ed697725047..75ae1f15600 100644 --- a/htdocs/includes/modules/propale/mod_propale_diamant.php +++ b/htdocs/includes/modules/propale/mod_propale_diamant.php @@ -97,7 +97,7 @@ class mod_propale_diamant extends ModeleNumRefPropales $prefix='PR'; $current_year = strftime("%y",time()); - $last_year = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")-1)); + $last_year = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")-1)); $pryy = $prefix.$current_year; diff --git a/htdocs/includes/modules/propale/mod_propale_emeraude.php b/htdocs/includes/modules/propale/mod_propale_emeraude.php index 960eae658db..7a0a2205a5c 100644 --- a/htdocs/includes/modules/propale/mod_propale_emeraude.php +++ b/htdocs/includes/modules/propale/mod_propale_emeraude.php @@ -91,7 +91,7 @@ class mod_propale_emeraude extends ModeleNumRefPropales $current_month = date("n"); if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); + $yy = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)); } else { diff --git a/htdocs/includes/modules/propale/mod_propale_ivoire.php b/htdocs/includes/modules/propale/mod_propale_ivoire.php index f802198a27a..b5539b6a507 100644 --- a/htdocs/includes/modules/propale/mod_propale_ivoire.php +++ b/htdocs/includes/modules/propale/mod_propale_ivoire.php @@ -76,7 +76,7 @@ class mod_propale_ivoire extends ModeleNumRefPropales $prefix='PR'; $current_year = strftime("%y",time()); - $last_year = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")-1)); + $last_year = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")-1)); $pryy = $prefix.$current_year; diff --git a/htdocs/includes/modules/propale/mod_propale_rubis.php b/htdocs/includes/modules/propale/mod_propale_rubis.php index e8f7be37f87..e2afed4b5ae 100644 --- a/htdocs/includes/modules/propale/mod_propale_rubis.php +++ b/htdocs/includes/modules/propale/mod_propale_rubis.php @@ -91,7 +91,7 @@ class mod_propale_rubis extends ModeleNumRefPropales $current_month = date("n"); if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)); + $yy = strftime("%y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)); } else { diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php index 0a9970765a7..c2a3c65a9e9 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/includes/modules/propale/mod_propale_saphir.php @@ -345,7 +345,7 @@ function info() // On change d'année fiscal si besoin if($conf->global->SOCIETE_FISCAL_MONTH_START > 1 && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START && $create_month >= $conf->global->SOCIETE_FISCAL_MONTH_START) { - $this->yy = substr(strftime("%Y",mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); + $this->yy = substr(strftime("%Y",dolibarr_mktime(0,0,0,date("m"),date("d"),date("Y")+1)),$numbityear); } else { diff --git a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php index 17c4650c6ba..9838ded2f7f 100644 --- a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php @@ -330,7 +330,7 @@ class pdf_propale_bleu extends ModelePDFPropales $pdf->SetTextColor(200,0,0); $pdf->SetFont('Courier','B',12); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date)); + $pdf->Text(11, 88, "Date : " . dolibarr_print_date($propale->date,'day')); $pdf->Text(11, 94, "Proposition commerciale : ".$propale->ref); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 8364d358334..73c42400fa9 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -341,7 +341,7 @@ class pdf_propale_jaune extends ModelePDFPropales $pdf->SetXY(10,90); $pdf->MultiCell(110, 10, "Numéro : ".$propale->ref); $pdf->SetXY(110,90); - $pdf->MultiCell(100, 10, "Date : " . strftime("%d %B %Y", $propale->date)); + $pdf->MultiCell(100, 10, "Date : " . dolibarr_print_date($propale->date,'day')); } } ?> diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php index 005cf084bac..9be17ce233d 100644 --- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php @@ -350,7 +350,7 @@ class pdf_propale_rouge extends ModelePDFPropales $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',12); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date)); + $pdf->Text(11, 88, "Date : " . dolibarr_print_date($propale->date,'day')); $pdf->Text(11, 94, "Proposition commerciale : ".$propale->ref); diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php index 74b807cd9b8..d44e7717adf 100644 --- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php @@ -364,7 +364,7 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->SetTextColor(200,0,0); $pdf->SetFont('Arial','B',12); - $pdf->Text(11, 88, "Date : " . strftime("%d %b %Y", $propale->date)); + $pdf->Text(11, 88, "Date : " . dolibarr_print_date($propale->date,'day')); $pdf->Text(11, 94, "Proposition commerciale : ".$propale->ref); diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index d96cbc3aa1e..67f0ec645bc 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -215,7 +215,7 @@ if ($_GET["action"] == 'create') print "
".$langs->trans("Date")."".strftime("%A %d %B %Y",$commande->date)."".dolibarr_print_date($commande->date,'dayhourtext')."'.$langs->trans("Order").''.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.''; print "
".$obj->prenom." '.strftime("%d/%m/%Y",$obj->da)."'.dolibarr_print_date($obj->da,'day')."Deac
".$obj->ville." '.strftime("%d/%m/%Y",$obj->da)."'.dolibarr_print_date($obj->da,'day')."
'; print ''; - print ''; @@ -131,7 +131,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -144,7 +144,7 @@ else { print ''; print ''; - print ''; + print ''; } print ''; /* diff --git a/htdocs/lolix/societe/liste.php b/htdocs/lolix/societe/liste.php index 7d030faf8f9..913dbe26ef7 100644 --- a/htdocs/lolix/societe/liste.php +++ b/htdocs/lolix/societe/liste.php @@ -91,7 +91,7 @@ if ($result) print " idp\">$obj->ref\n"; print "\n"; - print '\n"; + print '\n"; print "\n"; $i++; diff --git a/htdocs/product/document.php b/htdocs/product/document.php index c090de00a5c..14dfe4b4977 100755 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -205,7 +205,7 @@ if ($product->id) echo ''.$file.''; print "\n"; print ''; - print ''; + print ''; print '"; print "\n"; - print ''; + print ''; print ''; $total = $total + $commande->total_ht; diff --git a/htdocs/projet/facture.php b/htdocs/projet/facture.php index 1079f54eff4..eccfa75c122 100644 --- a/htdocs/projet/facture.php +++ b/htdocs/projet/facture.php @@ -126,7 +126,7 @@ if (sizeof($factures)>0 && is_array($factures)) $var=!$var; print ""; print "\n"; - print ''; + print ''; print ''; $total = $total + $facture->total_ht; diff --git a/htdocs/public/dons/depenses_code.php b/htdocs/public/dons/depenses_code.php index 5d6232bb94e..1e4dfc1f068 100644 --- a/htdocs/public/dons/depenses_code.php +++ b/htdocs/public/dons/depenses_code.php @@ -60,7 +60,7 @@ if ( $db->query( $sql) ) print ""; print "\n"; - print "\n"; + print "\n"; print '\n"; print "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; $i++; @@ -167,7 +167,7 @@ if ($resql) print "\n"; print "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; $i++;
Nom'.$soc->nom.'Mise à jour'.strftime("%d %B %Y %H:%M",$socdet->date_fiche_update).' '; + print 'Mise à jour'.dolibarr_print_date($socdet->date_fiche_update,'dayhour').' '; print '
Forme juridique'.$soc->forme_juridique.'
'.$langs->trans("Staff").''.$soc->effectif.'Création'.strftime("%d %B %Y",$soc->date_creation).'
Création'.dolibarr_print_date($soc->date_creation,'day').'
Contact'.$socdet->contact_nom.' '.$socdet->contact_email.'  
'.img_pdf().''.filesize($file). ' bytes'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).''.dolibarr_print_date(filemtime($file),'dayhour').'
".$obj->ville." '.strftime("%d/%m/%Y",$obj->da)."'.dolibarr_print_date($obj->da,'day')."
'.filesize($upload_dir.'/'.$file). ' bytes'.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).''.dolibarr_print_date(filemtime($upload_dir.'/'.$file),'dayhour').''; if ($file == $propref . '.pdf') { diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php index eae79bc9efc..69dea215235 100644 --- a/htdocs/projet/commandes.php +++ b/htdocs/projet/commandes.php @@ -128,7 +128,7 @@ if (sizeof($commandes)>0 && is_array($commandes)) $var=!$var; print "
id\">$commande->ref'.strftime("%d %B %Y",$commande->date).''.dolibarr_print_date($commande->date,'day').''.price($commande->total_ht).' 
id\">$facture->ref'.strftime("%d %B %Y",$facture->date).''.dolibarr_print_date($facture->date,'day').''.price($facture->total_ht).' 
".stripslashes($objp->nom)."".strftime("%d %B %Y",$objp->datef)."".dolibarr_print_date($objp->datef,'dayhour')."'.number_format($objp->total,2,'.','').' '.$langs->trans("Currency".$conf->monnaie); if ($objp->paye == 1) diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php index 0e0089a5dd0..76451c8fad3 100644 --- a/htdocs/public/dons/index.php +++ b/htdocs/public/dons/index.php @@ -83,7 +83,7 @@ if ($conf->don->enabled) if ($ref_commande) { - $date_limite = strftime("%A %d %B %Y",time() + (3 * 7 * 24 * 3600)); + $date_limite = dolibarr_print_date(time() + (3 * 7 * 24 * 3600), 'dayhourtext'); include ("mail.php"); diff --git a/htdocs/rapport/Atome.class.php b/htdocs/rapport/Atome.class.php index ad0927c16cd..94aa155e6c7 100644 --- a/htdocs/rapport/Atome.class.php +++ b/htdocs/rapport/Atome.class.php @@ -77,7 +77,7 @@ class Atome $value = $this->datas[$index]; } - $libelle = ucfirst(strftime("%b", mktime(12,0,0,($i+1),1,2004))); + $libelle = ucfirst(strftime("%b", dolibarr_mktime(12,0,0,($i+1),1,2004))); $this->graph_values[$i] = array($libelle, $value); } diff --git a/htdocs/telephonie/tarifs/tarif-log.php b/htdocs/telephonie/tarifs/tarif-log.php index aa4cf46ec6b..bdfeeb985f9 100644 --- a/htdocs/telephonie/tarifs/tarif-log.php +++ b/htdocs/telephonie/tarifs/tarif-log.php @@ -101,7 +101,7 @@ if ($resql) print "".$obj->tarif."".sprintf("%01.4f",$obj->temporel)."".sprintf("%01.4f",$obj->fixe)."".strftime('%d/%m/%y %H:%M',$obj->date)."".dolibarr_print_date($obj->date,'dayhour')."".stripslashes($obj->firstname)." ".stripslashes($obj->name)."
".$obj->tarif."".sprintf("%01.4f",$obj->temporel)."".sprintf("%01.4f",$obj->fixe)."".strftime('%d/%m/%y %H:%M',$obj->date)."".dolibarr_print_date($obj->date,'dayhour')."".stripslashes($obj->firstname)." ".stripslashes($obj->name)."