From 65ed01a251530f44a0794c50de654d5eb2e110ec Mon Sep 17 00:00:00 2001 From: jfefe Date: Thu, 7 Mar 2013 02:52:28 +0100 Subject: [PATCH] Extrafields on ODT (propal) : fix value of price with currency & display date with correct format --- htdocs/core/class/commondocgenerator.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index abb88070a6a..105936a0429 100755 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -246,8 +246,8 @@ abstract class CommonDocGenerator if($extrafields->attribute_type[$key] == 'price') { $object->array_options['options_'.$key] = price($object->array_options['options_'.$key]); - $object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key]).' '.$outputlangs->getCurrencySymbol($conf->currency); - // Add value to store price without currency + $object->array_options['options_'.$key.'_currency'] = $object->array_options['options_'.$key].' '.$outputlangs->getCurrencySymbol($conf->currency); + // Add value to store price with currency $array_propal=array_merge($array_propal,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency'])); } else if($extrafields->attribute_type[$key] == 'select') @@ -256,7 +256,11 @@ abstract class CommonDocGenerator } else if($extrafields->attribute_type[$key] == 'date') { - + $object->array_options['options_'.$key] = (strlen($object->array_options['options_'.$key])>0?dol_print_date($object->array_options['options_'.$key],'day'):''); + } + else if($extrafields->attribute_type[$key] == 'datetime') + { + $object->array_options['options_'.$key] = ($object->array_options['options_'.$key]!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):''); } $array_propal=array_merge($array_propal,array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); }