FIX: apply eldy's suggestion to not overwrite existing extrafields of $line

(cf. PR#18167)
This commit is contained in:
atm-florian 2021-09-13 08:58:24 +02:00
parent c92278b4df
commit 9ec72acaa0

View File

@ -1183,10 +1183,10 @@ if ($action == 'create')
$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
$line->fetch_optionals();
$line->array_options = array_merge($line->array_options, $srcLine->array_options);
if (empty($line->array_options) && !empty($dispatchLines[$indiceAsked]['array_options'])) {
$line->array_options = $dispatchLines[$indiceAsked]['array_options'];
}
$line->array_options = array_merge($line->array_options, $srcLine->array_options);
print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked);
}