From ac3116930c58d9593ee76f1a4ad1a30c3501b333 Mon Sep 17 00:00:00 2001 From: jfefe Date: Thu, 7 Mar 2013 02:23:37 +0100 Subject: [PATCH] Add value to store price type extrafield without currency in ODT --- htdocs/core/class/commondocgenerator.class.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index fefc1bfcc89..abb88070a6a 100755 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -245,13 +245,20 @@ abstract class CommonDocGenerator { if($extrafields->attribute_type[$key] == 'price') { - $object->array_options['options_'.$key] = price($object->array_options['options_'.$key]).' '.$outputlangs->getCurrencySymbol($conf->currency); + $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 + $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') { $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]]; } - $array_propal=array_merge($array_propal,array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); + else if($extrafields->attribute_type[$key] == 'date') + { + + } + $array_propal=array_merge($array_propal,array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); } } return $array_propal;