From 11eb56b6ad14317e6e10b1be2ce5c06cd7ef7b4c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Oct 2007 21:21:58 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Les=20heures=20dans=20les=20rapports=20d?= =?UTF-8?q?'action=20n'=E9taient=20pas=20affich=E9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/conf/conf.class.php | 1 + htdocs/lib/functions.inc.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 7160a08a805..231c1e4e24b 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -449,6 +449,7 @@ class Conf // Format de la date // \todo Mettre les 4 formats dans fichier langue $this->format_date_short="%d/%m/%Y"; + $this->format_hour_short="%H:%M"; $this->format_date_text_short="%d %b %Y"; $this->format_date_hour_short="%d/%m/%Y %H:%M"; $this->format_date_hour_text_short="%d %b %Y %H:%M"; diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 18965dab4f2..33cae35a21c 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -525,10 +525,11 @@ function dolibarr_print_date($time,$format='') if (! $format) $format=$conf->format_date_text_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 == '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 == 'dayhourldap') $format='%Y%m%d%H%M%SZ'; if (! $format) $format='%Y-%m-%d %H:%M:%S'; // Si date non définie, on renvoie ''