diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 2180546dc39..e2db251db1c 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -879,22 +879,27 @@ class DoliDBMysqli
         {
             $sqlfields[$i] = $field_name." ";
             $sqlfields[$i]  .= $field_desc['type'];
+
             if( preg_match("/^[^\s]/i",$field_desc['value']))
-            $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-            $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            else if( preg_match("/^[^\s]/i",$field_desc['default']))
+                $sqlfields[$i]  .= "(".$field_desc['value'].")";
+
+            if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+                $sqlfields[$i]  .= " ".$field_desc['attribute'];
+
+            if( preg_match("/^[^\s]/i",$field_desc['default']))
             {
                 if(preg_match("/null/i",$field_desc['default']))
-                $sqlfields[$i]  .= " default ".$field_desc['default'];
+                    $sqlfields[$i]  .= " default ".$field_desc['default'];
+		elseif ($field_desc['default'] == 'CURRENT_TIMESTAMP')
+		    $sqlfields[$i]  .= " default ".$field_desc['default'];
                 else
-                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                    $sqlfields[$i]  .= " default '".$field_desc['default']."'";
             }
-            else if( preg_match("/^[^\s]/i",$field_desc['null']))
-            $sqlfields[$i]  .= " ".$field_desc['null'];
+            if( preg_match("/^[^\s]/i",$field_desc['null']))
+                $sqlfields[$i]  .= " ".$field_desc['null'];
 
-            else if( preg_match("/^[^\s]/i",$field_desc['extra']))
-            $sqlfields[$i]  .= " ".$field_desc['extra'];
+            if( preg_match("/^[^\s]/i",$field_desc['extra']))
+                $sqlfields[$i]  .= " ".$field_desc['extra'];
             $i++;
         }
         if($primary_key != "")