diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index e35c8d2940d..cf2d6054dee 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -81,6 +81,9 @@ $result = restrictedArea($user, 'propal', $id);
 $object = new Propal($db);
 $extrafields = new ExtraFields($db);
 
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label('propal');
+
 // Load object
 if ($id > 0 || ! empty($ref))
 {
@@ -338,15 +341,9 @@ else if ($action == 'add' && $user->rights->propal->creer)
     			}
     		}
 
-    		// Get extra fields
-    		foreach($_POST as $key => $value)
-    		{
-    			if (preg_match("/^options_/",$key))
-    			{
-    				$object->array_options[$key]=GETPOST($key);
-    			}
-    		}
-    		
+    		// Fill array 'array_options' with data from add form
+    		$ret = setOptionalsFromPost($extralabels,$object);*
+
     		$id = $object->create($user);
     	}
 
@@ -1108,13 +1105,22 @@ else if ($action == 'down' && $user->rights->propal->creer)
 else if ($action == 'update_extras')
 {
 	// Get extra fields
-	foreach($_POST as $key => $value)
+	foreach ($extralabels as $key => $value)
 	{
-		if (preg_match("/^options_/",$key))
+		$key_type = $extrafields->attribute_type[$key];
+
+		if (in_array($key_type,array('date','datetime')))
 		{
-			$object->array_options[$key]=$_POST[$key];
+			// Clean parameters
+			$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 		}
+		else
+		{
+			$value_key=GETPOST("options_".$key);
+		}
+		$object->array_options["options_".$key]=$value_key;
 	}
+	
 	// Actions on extra fields (by external module or standard code)
 	// FIXME le hook fait double emploi avec le trigger !!
 	$hookmanager->initHooks(array('propaldao'));
@@ -1208,9 +1214,6 @@ $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
 $companystatic=new Societe($db);
 
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label('propal');
-
 $now=dol_now();
 
 // Add new proposal
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4ddc38301bd..41465636b03 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -761,5 +761,42 @@ class ExtraFields
     	$out = '<tr class="liste_titre"><td colspan="4"><strong>'.$this->attribute_label[$key].'</strong></td></tr>';
     	return $out;
     }
+    
+    /**
+     * Fill array_options array for object by extrafields value (using for data send by forms)
+     *
+     * @param   array	$extralabels    $array of extrafields
+     * @param   object	$object         object
+     * @return	int						1 if array_options set / 0 if no value
+     */
+    function setOptionalsFromPost($extralabels,&$object)
+    {
+    	global $_POST;
+    	
+    	if (is_array($extralabels))
+    	{
+	    	// Get extra fields
+	    	foreach ($extralabels as $key => $value)
+	    	{
+	    		$key_type = $this->attribute_type[$key];
+	    	
+	    		if (in_array($key_type,array('date','datetime')))
+	    		{
+	    			// Clean parameters
+	    			$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+	    		}
+	    		else
+	    		{
+	    			$value_key=GETPOST("options_".$key);
+	    		}
+	    		$object->array_options["options_".$key]=$value_key;
+	    	}
+    	
+    		return 1;
+    	}
+    	else {
+    		return 0;
+    	}
+    }
 }
 ?>