From 9ec72acaa04025185a98bcb6dbce4a52324d5803 Mon Sep 17 00:00:00 2001 From: atm-florian Date: Mon, 13 Sep 2021 08:58:24 +0200 Subject: [PATCH] FIX: apply eldy's suggestion to not overwrite existing extrafields of $line (cf. PR#18167) --- htdocs/reception/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 70dfd7f28b0..c27c544e35d 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -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); }