Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 17:02:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update list.php

Browse Source
This commit is contained in:
Laurent Destailleur
2018-08-21 12:15:47 +02:00
committed by GitHub
parent a10b4da6ac
commit c25a968c72
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/product/list.php
View File

@@ -749,20 +749,26 @@ if ($resql)
{
print '<td align="center">';
$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 '</td>';
if (! $i) $totalarray['nbfield']++;
}