From c2cb3e3c7a1590327b21df02bf350d828087e323 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 17 Nov 2008 18:59:02 +0000
Subject: [PATCH] Fix: Minor fix

---
 htdocs/langs/fr_FR/main.lang |  2 ++
 htdocs/product/fiche.php     |  5 ++++-
 htdocs/product/liste.php     | 16 ++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 9ebcce9bc62..cc5051e56f4 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -185,9 +185,11 @@ DatePlanShort=Date planif.
 DateRealShort=Date réal.
 DurationYear=an
 DurationMonth=mois
+DurationWeek=semaine
 DurationDay=jour
 DurationYears=ans
 DurationMonths=mois
+DurationWeeks=semaines
 DurationDays=jours
 Year=Année
 Month=Mois
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index de42e068769..7b5900e3d96 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -915,7 +915,7 @@ if ($_GET["id"] || $_GET["ref"])
 				{
 					$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
 				}
-				else
+				else if ($product->duration_value > 0)
 				{
 					$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
 				}
@@ -936,6 +936,7 @@ if ($_GET["id"] || $_GET["ref"])
 					print '&nbsp;';
 				}
 				print "</td></tr>\n";
+				
 				print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 				if ($product->volume != '')
 				{
@@ -947,8 +948,10 @@ if ($_GET["id"] || $_GET["ref"])
 				}
 				print "</td></tr>\n";
 			}
+			
 			// Note
 			print '<tr><td valign="top">'.$langs->trans("Note").'</td><td>'.nl2br($product->note).'</td></tr>';
+
 			print "</table>\n";
 			print "</div>\n<!-- CUT HERE -->\n";
 		}
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 9c78229b7c5..4501971dbe1 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -19,11 +19,11 @@
  */
 
 /**
-   \file       htdocs/product/liste.php
-   \ingroup    produit
-   \brief      Page liste des produits ou services
-   \version    $Id$
-*/
+ *  \file       htdocs/product/liste.php
+ *  \ingroup    produit
+ *  \brief      Page to list products and services
+ *  \version    $Id$
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/product.class.php');
@@ -305,18 +305,18 @@ if ($resql)
 				print '<td align="center">';
 				if (eregi('([0-9]+)y',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
 				elseif (eregi('([0-9]+)m',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
+				elseif (eregi('([0-9]+)w',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
 				elseif (eregi('([0-9]+)d',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
 				else print $objp->duration;
 				print '</td>';
 			}
-			
+
 			// Price
 			print '<td align="right">';
 			if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
 			else print price($objp->price).' '.$langs->trans("HT");
-			
 			print '</td>';
-			
+
 			// Affichage du stock
 			if ($conf->stock->enabled && $user->rights->stock->lire && $type != 1)
 			{