lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if duration is present on service, we use it

Browse Source 
not logic to entered always 1h
This commit is contained in:
BENKE Charlie 2015-06-04 13:34:08 +02:00
parent 1f92f542a6
commit 2164729bad
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/fichinter/card.php
View File

@ -248,7 +248,24 @@ else if ($action == 'add' && $user->rights->ficheinter->creer)
$prod = new Product($db); $prod = new Product($db);
$prod->id=$lines[$i]->fk_product; $prod->id=$lines[$i]->fk_product;
$prod->getMultiLangs(); $prod->getMultiLangs();
// We show if duration is present on service (so we get it)
$prod->fetch($lines[$i]->fk_product);
if ($prod->duration_value)
{
switch($prod->duration_unit)
{
case 'h':
$durationproduct=$prod->duration_value * 3600 * $lines[$i]->qty;
break;
case 'd':
$durationproduct=$prod->duration_value * 3600 * 24 * $lines[$i]->qty;
break;
case 'w':
$durationproduct=$prod->duration_value * 3600 * 24 * 7 * $lines[$i]->qty;
break;
}
}
$outputlangs = $langs; $outputlangs = $langs;
$newlang=''; $newlang='';
if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id'); if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
@ -268,7 +285,7 @@ else if ($action == 'add' && $user->rights->ficheinter->creer)
$desc = $label; $desc = $label;
$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')'; $desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
}
else { else {
$desc = dol_htmlentitiesbr($lines[$i]->desc); $desc = dol_htmlentitiesbr($lines[$i]->desc);
$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')'; $desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
@ -277,7 +294,7 @@ else if ($action == 'add' && $user->rights->ficheinter->creer)
$date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); $date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
if ($product_type == 1) if ($product_type == 1)
{ //service { //service
$duration = 3600; $duration = ($durationproduct ? $durationproduct : 3600);
} }
else else
{ //product { //product