From 08e83983d0466fc7573eb6deaaac5e31942a3369 Mon Sep 17 00:00:00 2001 From: atm-ph Date: Thu, 26 Oct 2017 09:40:12 +0200 Subject: [PATCH] Fix empty extrafields if from origin --- htdocs/contrat/card.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index d618a7c4b1e..14571949467 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -333,6 +333,15 @@ if (empty($reshook)) $desc = dol_htmlentitiesbr($lines[$i]->desc); } + // Extrafields + $array_options = array(); + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if + // trigger used + { + $lines[$i]->fetch_optionals($lines[$i]->rowid); + $array_options = $lines[$i]->array_options; + } + $txtva = $lines[$i]->vat_src_code ? $lines[$i]->tva_tx . ' (' . $lines[$i]->vat_src_code . ')' : $lines[$i]->tva_tx; // View third's localtaxes for now @@ -355,7 +364,7 @@ if (empty($reshook)) $lines[$i]->info_bits, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, - array(), + $array_options, $lines[$i]->fk_unit );