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

Merge pull request #12472 from atm-john/10.0_fix_extrafields_expedition

Browse Source 
Fix dom and showOptionals call
This commit is contained in:
Laurent Destailleur 2019-11-22 14:23:24 +01:00 committed by GitHub
commit fcfe579e14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/expedition/card.php
View File

@ -2443,10 +2443,10 @@ elseif ($id || $ref)
// Display lines extrafields
if (is_array($extralabelslines) && count($extralabelslines)>0) {
$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
$line = new ExpeditionLigne($db);
$line->fetch_optionals($lines[$i]->id);
print '<tr class="oddeven">';
if ($action == 'editline' && $lines[$i]->id == $line_id)
$line = $lines[$i];
$line->fetch_optionals($line->id);
if ($action == 'editline' && $line->id == $line_id)
{
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
}
@ -2454,7 +2454,6 @@ elseif ($id || $ref)
{
print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
}
print '</tr>';
}
}
}