Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 09:08:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns

Browse Source 
FIX: showOptionals: column mismatches
This commit is contained in:
Laurent Destailleur
2018-09-27 09:39:51 +02:00
committed by GitHub
parent 2d88b69cf6 af93fc7484
commit 4c8664b297
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4524,7 +4524,7 @@ abstract class CommonObject
{
if (is_array($params) && count($params)>0) {
if (array_key_exists('colspan',$params)) {
$colspan=$params['colspan'];
$colspan=$params['colspan'] - 1;
}
}else {
$colspan='3';
@@ -4581,6 +4581,12 @@ abstract class CommonObject
if($extrafields->attribute_required[$key])
$label = '<span'.($mode != 'view' ? ' class="fieldrequired"':'').'>'.$label.'</span>';
if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
$out .= '<td>&nbsp;</td>';
$colspan--;
}
$out .= '<td>'.$langs->trans($label).'</td>';
$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';