diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index 486e65544aa..757c8919e83 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -313,7 +313,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) { $arrayoflabels[$codecards] = $labeltoshow; } asort($arrayoflabels); -print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ?GETPOST('modellabel') : $conf->global->ADHERENT_ETIQUETTE_TYPE), 1, 0, 0, '', 0, 0, 0, '', '', 1); +print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : getDolGlobalString('ADHERENT_ETIQUETTE_TYPE')), 1, 0, 0, '', 0, 0, 0, '', '', 1); print ''; // Number of stickers to print diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index ea4b77975d1..7128688a7cc 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -866,8 +866,8 @@ if (empty($reshook)) { } } - $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx)) ?: 0; - $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx)); + $tmpvat = (float) price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx)); + $tmpprodvat = (float) price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx)); // Set unit price to use if (!empty($price_ht) || $price_ht === '0') {