Merge pull request #2299 from FHenry/3.7
Fix contract if only service modules is enabled
This commit is contained in:
commit
d1957ef8d9
@ -1237,7 +1237,7 @@ else
|
|||||||
* Lines of contracts
|
* Lines of contracts
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ($conf->product->enabled) {
|
if ($conf->product->enabled || $conf->service->enabled) {
|
||||||
$productstatic=new Product($db);
|
$productstatic=new Product($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1306,7 +1306,7 @@ else
|
|||||||
$productstatic->ref=$objp->label;
|
$productstatic->ref=$objp->label;
|
||||||
print $productstatic->getNomUrl(0,'',16);
|
print $productstatic->getNomUrl(0,'',16);
|
||||||
}
|
}
|
||||||
if (! empty($conf->global->PRODUIT_DESC_IN_FORM) and $objp->description)
|
if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($objp->description))
|
||||||
print '<br>'.dol_nl2br($objp->description);
|
print '<br>'.dol_nl2br($objp->description);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user