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

Fix: Description was not visible

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-13 00:08:26 +00:00
parent 4b6f21f0ad
commit 5a7b858d07
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/contrat/services.php
View File

@ -96,7 +96,7 @@ if ($mode == "5") $sql.= " AND cd.statut = 5";
if ($filter == "expired") $sql.= " AND date_fin_validite < ".$db->idate($now); if ($filter == "expired") $sql.= " AND date_fin_validite < ".$db->idate($now);
if ($search_nom) $sql.= " AND s.nom like '%".$db->escape($search_nom)."%'"; if ($search_nom) $sql.= " AND s.nom like '%".$db->escape($search_nom)."%'";
if ($search_contract) $sql.= " AND c.rowid = '".$db->escape($search_contract)."'"; if ($search_contract) $sql.= " AND c.rowid = '".$db->escape($search_contract)."'";
if ($search_service) $sql.= " AND (p.ref like '%".$db->escape($search_service)."%' OR p.description like '%".$db->escape($search_service)."%')"; if ($search_service) $sql.= " AND (p.ref like '%".$db->escape($search_service)."%' OR p.description like '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
if ($socid > 0) $sql.= " AND s.rowid = ".$socid; if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
$filter_date1=dol_mktime(0,0,0,$_REQUEST['op1month'],$_REQUEST['op1day'],$_REQUEST['op1year']); $filter_date1=dol_mktime(0,0,0,$_REQUEST['op1month'],$_REQUEST['op1day'],$_REQUEST['op1year']);
$filter_date2=dol_mktime(0,0,0,$_REQUEST['op2month'],$_REQUEST['op2day'],$_REQUEST['op2year']); $filter_date2=dol_mktime(0,0,0,$_REQUEST['op2month'],$_REQUEST['op2day'],$_REQUEST['op2year']);
@ -197,10 +197,18 @@ if ($resql)
// Service // Service
print '<td>'; print '<td>';
$productstatic->id=$obj->pid; if ($obj->pid)
$productstatic->type=$obj->ptype; {
$productstatic->ref=$obj->label?$obj->label:($obj->description?$obj->description:$obj->pid); $productstatic->id=$obj->pid;
print $productstatic->getNomUrl(1,'',20); $productstatic->type=$obj->ptype;
$productstatic->ref=$obj-label?$obj->label:$obj->pid;
print $productstatic->getNomUrl(1,'',20);
}
else
{
if ($obj->type == 0) print img_object($obj->description,'product').dol_trunc($obj->description,20);
if ($obj->type == 1) print img_object($obj->description,'service').dol_trunc($obj->description,20);
}
print '</td>'; print '</td>';
// Third party // Third party