diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 1fa96a91f37..9b26eecc426 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -749,20 +749,26 @@ if ($resql)
{
print '
';
- $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1);
- $duration_unit = substr($obj->duration,-1);
-
- if ((float) $duration_value > 1)
+ if (preg_match('/([^a-z]+)[a-z]$/i',$obj->duration))
{
- $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
+ $duration_value = substr($obj->duration,0,dol_strlen($obj->duration)-1);
+ $duration_unit = substr($obj->duration,-1);
+
+ if ((float) $duration_value > 1)
+ {
+ $dur=array("i"=>$langs->trans("Minutes"),"h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
+ }
+ else if ((float) $duration_value > 0)
+ {
+ $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+ }
+ print $duration_value;
+ print (! empty($duration_unit) && isset($dur[$duration_unit]) ? ' '.$langs->trans($dur[$duration_unit]) : '');
}
- else if ((float) $duration_value > 0)
+ else
{
- $dur=array("i"=>$langs->trans("Minute"),"h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+ print $obj->duration;
}
- print $duration_value;
- print (! empty($duration_unit) && isset($dur[$duration_unit]) ? ' '.$langs->trans($dur[$duration_unit]) : '');
-
print ' | ';
if (! $i) $totalarray['nbfield']++;
}