From 646be9b9843035c193a751d1c09e62bf5f11edf9 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Sun, 9 Jun 2013 16:56:29 +0200
Subject: [PATCH 1/2] Fix bug on extrafeild type price and double

---
 htdocs/core/class/extrafields.class.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 8c5f485de32..146237122ca 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -622,7 +622,7 @@ class ExtraFields
 			$out = $formstat->select_date($value, 'options_'.$key, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1);
 			//$out='<input type="text" name="options_'.$key.'" size="'.$showsize.'" maxlength="'.$newsize.'" value="'.$value.'"'.($moreparam?$moreparam:'').'>';
 		}
-		elseif (in_array($type,array('int','double')))
+		elseif (in_array($type,array('int')))
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
@@ -660,6 +660,10 @@ class ExtraFields
 		{
 			$out='<input type="text" name="options_'.$key.'"  size="6" value="'.price($value).'"> '.$langs->getCurrencySymbol($conf->currency);
 		}
+		elseif ($type == 'double')
+		{
+			$out='<input type="text" name="options_'.$key.'"  size="6" value="'.price($value).'"> ';
+		}
 		elseif ($type == 'select')
 		{
 			$out='<select name="options_'.$key.'">';
@@ -790,6 +794,10 @@ class ExtraFields
 		{
 			$showsize=10;
 		}
+		elseif ($type == 'double')
+		{
+			$value=price($value);
+		}
 		elseif ($type == 'boolean')
 		{
 			$checked='';
@@ -900,6 +908,11 @@ class ExtraFields
 					$value_arr=GETPOST("options_".$key);
 					$value_key=implode($value_arr,',');
 				}
+				else if (in_array($key_type,array('price','double')))
+				{
+					$value_arr=GETPOST("options_".$key);
+					$value_key=price2num($value_arr);
+				}
 				else
 				{
 					$value_key=GETPOST("options_".$key);

From f78240c06739e6c4151e66dd9ee59c87d38112ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Jun 2013 18:24:30 +0200
Subject: [PATCH 2/2] Doxygen

---
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 9d497589705..bf03e27dfaa 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -399,8 +399,8 @@ function print_end_menu_array()
  * Core function to output left menu eldy
  *
  * @param	DoliDB		$db                 Database handler
- * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler
- * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler
+ * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
  * @param	array		&$tabMenu       	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	array		&$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).