From 764e215ca109674acf01f7adc3c347dbd4c99dd3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Oct 2017 04:12:46 +0200 Subject: [PATCH] Update commondocgenerator.class.php --- htdocs/core/class/commondocgenerator.class.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 972275059bb..0a78897adcc 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -509,11 +509,14 @@ abstract class CommonDocGenerator 'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs), 'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs), 'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs), - - // Units - 'line_unit'=>$outputlangs->trans($line->getLabelOfUnit('long')), - 'line_unit_short'=>$outputlangs->trans($line->getLabelOfUnit('short')), ); + + // Units + if ($conf->global->PRODUCT_USE_UNITS) + { + $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long')), + $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short')) + } // Retrieve extrafields $extrafieldkey=$line->element;