Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2020-01-21 20:51:22 +01:00
commit 7e08dc17af

View File

@ -953,7 +953,10 @@ if ($resql)
// Type
if (!empty($arrayfields['p.fk_product_type']['checked']))
{
print '<td>'.$obj->fk_product_type.'</td>';
print '<td>';
if ($obj->fk_product_type == 0) print $langs->trans("Product");
else print $langs->trans("Service");
print '</td>';
if (!$i) $totalarray['nbfield']++;
}