diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 676e76fe16a..877bb2c5c93 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4744,6 +4744,11 @@ abstract class CommonObject
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key]=$this->db->jdate($value);
 							}
+							// If field is a computed field, value must become result of compute
+							else if (! empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))
+							{
+								$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0);
+							}
 							else
 							{
 								$this->array_options["options_".$key]=$value;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 48eabbefe9e..596486654fa 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1468,14 +1468,6 @@ class ExtraFields
 
 		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
 
-		// If field is a computed field, value must become result of compute
-		if ($computed)
-		{
-		    // Make the eval of compute string
-		    //var_dump($computed);
-		    $value = dol_eval($computed, 1, 0);
-		}
-
 		$showsize=0;
 		if ($type == 'date')
 		{