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

Fix: colspan for extrafields

Browse Source
This commit is contained in:
Laurent Destailleur 2014-02-12 00:23:15 +01:00
parent 2d6b5e377c
commit 266b413139
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

@ -2144,7 +2144,7 @@ abstract class CommonObject
$error=0; $error=0;
if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
if (! empty($this->array_options)) if (! empty($this->array_options))
{ {
// Check parameters // Check parameters
@ -2303,7 +2303,7 @@ abstract class CommonObject
$label = '<span class="fieldrequired">'.$label.'</span>'; $label = '<span class="fieldrequired">'.$label.'</span>';
$out .= '<td>'.$label.'</td>'; $out .= '<td>'.$label.'</td>';
$out .='<td colspan="'.$colspan.'">'; $out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
switch($mode) { switch($mode) {
case "view": case "view":

4
htdocs/product/fiche.php
View File

@ -800,11 +800,11 @@ else
print '</td></tr>'; print '</td></tr>';
// Other attributes // Other attributes
$parameters=array('colspan' => ' colspan="2"'); $parameters=array('colspan' => 0);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $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)) if (empty($reshook) && ! empty($extrafields->attribute_label))
{ {
print $object->showOptionals($extrafields,'edit'); print $object->showOptionals($extrafields,'edit',$parameters);
} }
// Note (private, no output on invoices, propales...) // Note (private, no output on invoices, propales...)