From f79f98d68b2c825149ca9762a66a1e15ca4b51c8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 27 Dec 2007 10:58:21 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20on=20affiche=20le=20d=E9lai=20en=20heure?=
 =?UTF-8?q?=20jusqu'a=2072h=20ensuite=20on=20l'affiche=20en=20jour,=20on?=
 =?UTF-8?q?=20affiche=20une=20erreur=20si=20la=20date=20de=20fin=20est=20p?=
 =?UTF-8?q?lus=20petite=20que=20la=20date=20de=20d=E9but?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/langs/en_US/main.lang |  1 +
 htdocs/langs/fr_FR/main.lang |  1 +
 htdocs/lib/functions.inc.php | 13 ++++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2a82eec18bf..f4a73c89501 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -188,6 +188,7 @@ Today=Today
 Yesterday=Yesterday
 Tomorrow=Tomorrow
 Quadri=Quadri
+HourShort=H
 Rate=Rate
 Bytes=Bytes
 Cut=Cut
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 019be8b9826..6456989b651 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -189,6 +189,7 @@ Today=Aujourd'hui
 Yesterday=Hier
 Tomorrow=Demain
 Quadri=Trimestre
+HourShort=H
 Rate=Taux
 Bytes=Octets
 Cut=Couper
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 2c433cbfa01..e643aa22b61 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -3104,20 +3104,27 @@ function num_between_day($timestampStart, $timestampEnd, $lastday=0)
    \brief     Fonction retournant le nombre de jour entre deux dates sans les jours fériés (jours ouvrés)
    \param	    timestampStart      Timestamp de début
    \param	    timestampEnd        Timestamp de fin
-   \param     inhour              0: sort le nombre de jour , 1: sort le nombre d'heure
+   \param     inhour              0: sort le nombre de jour , 1: sort le nombre d'heure (72 max)
    \param     lastday             On prend en compte le dernier jour, 0: non, 1:oui
    \return    nbjours             Nombre de jours ou d'heures
 */
 function num_open_day($timestampStart, $timestampEnd,$inhour=0,$lastday=0)
 {
+	global $langs;
+	
 	if ($timestampStart < $timestampEnd)
 	{
 		$bit = 0;
 		if ($lastday == 1) $bit = 1;
 	  $nbOpenDay = num_between_day($timestampStart, $timestampEnd, $bit) - num_public_holiday($timestampStart, $timestampEnd);
-	  if ($inhour == 1) $nbOpenDay = $nbOpenDay*24;
+	  $nbOpenDay.= " ".$langs->trans("Days");
+	  if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+	  return $nbOpenDay;
+	}
+	else
+	{
+		return $langs->trans("Error");
 	}
-	return $nbOpenDay;
 }
 
 /**