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

This commit is contained in:
Laurent Destailleur 2012-11-03 16:58:23 +01:00
commit aae39ecb2e

View File

@ -1694,7 +1694,7 @@ else
}
// Other attributes
$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label))
{