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

FIX Description of contract line was not visible.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-29 19:15:14 +02:00
parent b0071a7c6c
commit 83daa67cc6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/contrat/card.php
View File

@ -1302,19 +1302,28 @@ else
$productstatic->id=$objp->fk_product; $productstatic->id=$objp->fk_product;
$productstatic->type=$objp->ptype; $productstatic->type=$objp->ptype;
$productstatic->ref=$objp->pref; $productstatic->ref=$objp->pref;
print $productstatic->getNomUrl(1,'',20); $text = $productstatic->getNomUrl(1,'',20);
if ($objp->label) if ($objp->label)
{ {
print ' - '; $text .= ' - ';
$productstatic->ref=$objp->label; $productstatic->ref=$objp->label;
print $productstatic->getNomUrl(0,'',16); $text .= $productstatic->getNomUrl(0,'',16);
} }
if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($objp->description)) $description = $objp->description;
print '<br>'.dol_nl2br($objp->description);
// Add description in form
if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
{
$text .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
$description = ''; // Already added into main visible desc
}
echo $form->textwithtooltip($text,$description,3,'','',$cursorline,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
print '</td>'; print '</td>';
} }
else else
{ {
print "<td>".dol_htmlentitiesbr($objp->description)."</td>\n"; print "<td>".dol_htmlentitiesbr($objp->description)."</td>\n";
} }
// TVA // TVA