From f345e43dad1b01fa12487bacd2933cf207da21f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Dec 2012 22:23:23 +0100
Subject: [PATCH] Fix: date

---
 htdocs/holiday/admin/holiday.php |  2 +-
 htdocs/holiday/common.inc.php    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index a3d47ea9630..6791cfccf04 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -321,7 +321,7 @@ print '</tr>'."\n";
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td style="padding:5px;">'.$langs->trans('LastUpdateCP').'</td>'."\n";
-print '<td style="padding:5px;"><input class="flat" type="text" name="lastUpdate" value="'.date('d-m-Y à H:i:s',$cp->getConfCP('lastUpdate')).'" disabled="disabled"/></td>'."\n";
+print '<td style="padding:5px;"><input class="flat" type="text" name="lastUpdate" value="'.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').'" disabled="disabled"/></td>'."\n";
 print '</tr>'."\n";
 
 print '</tbody>'."\n";
diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
index 2b01471a36f..4a3f1049557 100644
--- a/htdocs/holiday/common.inc.php
+++ b/htdocs/holiday/common.inc.php
@@ -50,12 +50,16 @@ $sql.= " WHERE name = 'userGroup'";
 $result = $db->query($sql);
 $obj = $db->fetch_object($result);
 
-if ($obj->value == NULL)
+if ($obj->value == null)
 {
     llxHeader('',$langs->trans('CPTitreMenu'));
-    print '<div class="tabBar">';
-    print '<span style="color: #FF0000;">'.$langs->trans('NotConfigModCP').'</span>';
-    print '</div>';
+
+    $langs->load("errors");
+	$warnpicto=img_error($langs->trans("WarningMandatorySetupNotComplete"));
+	print '<div class="tabBar">';
+	print $warnpicto.' '.$langs->trans("NotConfigModCP");
+	print '</div>';
+
     llxFooter();
     exit();
 }