Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Les heures dans les rapports d'action n'taient pas affiches

Browse Source
This commit is contained in:
Laurent Destailleur
2007-10-07 21:21:58 +00:00
parent 5554de1a68
commit 11eb56b6ad
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/conf/conf.class.php
View File

@@ -449,6 +449,7 @@ class Conf
// Format de la date // Format de la date
// \todo Mettre les 4 formats dans fichier langue // \todo Mettre les 4 formats dans fichier langue
$this->format_date_short="%d/%m/%Y"; $this->format_date_short="%d/%m/%Y";
$this->format_hour_short="%H:%M";
$this->format_date_text_short="%d %b %Y"; $this->format_date_text_short="%d %b %Y";
$this->format_date_hour_short="%d/%m/%Y %H:%M"; $this->format_date_hour_short="%d/%m/%Y %H:%M";
$this->format_date_hour_text_short="%d %b %Y %H:%M"; $this->format_date_hour_text_short="%d %b %Y %H:%M";

3
htdocs/lib/functions.inc.php
View File

@@ -525,10 +525,11 @@ function dolibarr_print_date($time,$format='')
if (! $format) $format=$conf->format_date_text_short; if (! $format) $format=$conf->format_date_text_short;
if ($format == 'day') $format=$conf->format_date_short; if ($format == 'day') $format=$conf->format_date_short;
if ($format == 'hour') $format=$conf->format_hour_short;
if ($format == 'daytext') $format=$conf->format_date_text_short; if ($format == 'daytext') $format=$conf->format_date_text_short;
if ($format == 'dayhour') $format=$conf->format_date_hour_short; if ($format == 'dayhour') $format=$conf->format_date_hour_short;
if ($format == 'dayhourldap') $format='%Y%m%d%H%M%SZ';
if ($format == 'dayhourtext') $format=$conf->format_date_hour_text_short; if ($format == 'dayhourtext') $format=$conf->format_date_hour_text_short;
if ($format == 'dayhourldap') $format='%Y%m%d%H%M%SZ';
if (! $format) $format='%Y-%m-%d %H:%M:%S'; if (! $format) $format='%Y-%m-%d %H:%M:%S';
// Si date non d<>finie, on renvoie '' // Si date non d<>finie, on renvoie ''