diff --git a/db/updatedatatype.sql b/db/updatedatatype.sql
index 595a744d74..5d0d603957 100644
--- a/db/updatedatatype.sql
+++ b/db/updatedatatype.sql
@@ -761,12 +761,10 @@ ALTER TABLE `zt_issue`
   MODIFY COLUMN `severity` tinyint unsigned NOT NULL DEFAULT 0,
   MODIFY COLUMN `type` varchar(30) NOT NULL DEFAULT '',
   MODIFY COLUMN `resolution` varchar(30) NOT NULL DEFAULT '',
-  MODIFY COLUMN `resolvedDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `lib` int unsigned NOT NULL DEFAULT 0,
   MODIFY COLUMN `from` int unsigned NOT NULL DEFAULT 0,
   MODIFY COLUMN `version` smallint unsigned NOT NULL DEFAULT 1,
   MODIFY COLUMN `activateDate` datetime NULL DEFAULT NULL,
-  MODIFY COLUMN `closedDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `approvedDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `deleted` char(1) NOT NULL DEFAULT '0';
 ALTER TABLE `zt_issue`
@@ -1479,12 +1477,8 @@ ALTER TABLE `zt_risk`
   MODIFY COLUMN `lib` int unsigned NOT NULL DEFAULT 0,
   MODIFY COLUMN `from` int unsigned NOT NULL DEFAULT 0,
   MODIFY COLUMN `version` smallint unsigned NOT NULL DEFAULT 1,
-  MODIFY COLUMN `activateDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `closedDate` datetime NULL DEFAULT NULL,
-  MODIFY COLUMN `cancelDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `cancelReason` varchar(30) NOT NULL DEFAULT '',
-  MODIFY COLUMN `hangupDate` datetime NULL DEFAULT NULL,
-  MODIFY COLUMN `trackedDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `assignedDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `approvedDate` datetime NULL DEFAULT NULL,
   MODIFY COLUMN `deleted` char(1) NOT NULL DEFAULT '0';
diff --git a/db/zentao.sql b/db/zentao.sql
index 382098e562..2a989f7865 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -14619,7 +14619,7 @@ CREATE TABLE IF NOT EXISTS `zt_issue` (
   `resolution` varchar(30) NOT NULL DEFAULT '',
   `resolutionComment` text DEFAULT NULL,
   `objectID` varchar(255) NOT NULL DEFAULT '',
-  `resolvedDate` datetime DEFAULT NULL,
+  `resolvedDate` date DEFAULT NULL,
   `status` varchar(30) NOT NULL DEFAULT '',
   `owner` varchar(255) NOT NULL DEFAULT '',
   `lib` int unsigned NOT NULL DEFAULT 0,
@@ -14632,7 +14632,7 @@ CREATE TABLE IF NOT EXISTS `zt_issue` (
   `activateBy` varchar(30) NOT NULL DEFAULT '',
   `activateDate` datetime DEFAULT NULL,
   `closedBy` varchar(30) NOT NULL DEFAULT '',
-  `closedDate` datetime DEFAULT NULL,
+  `closedDate` date DEFAULT NULL,
   `assignedTo` varchar(30) NOT NULL DEFAULT '',
   `assignedBy` varchar(30) NOT NULL DEFAULT '',
   `assignedDate` datetime DEFAULT NULL,
@@ -14670,18 +14670,18 @@ CREATE TABLE IF NOT EXISTS `zt_risk` (
   `resolution` mediumtext DEFAULT NULL,
   `resolvedBy` varchar(30) NOT NULL DEFAULT '',
   `activateBy` varchar(30) NOT NULL DEFAULT '',
-  `activateDate` datetime DEFAULT NULL,
+  `activateDate` date DEFAULT NULL,
   `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime DEFAULT NULL,
   `closedBy` varchar(30) NOT NULL DEFAULT '',
   `closedDate` datetime DEFAULT NULL,
   `cancelBy` varchar(30) NOT NULL DEFAULT '',
-  `cancelDate` datetime DEFAULT NULL,
+  `cancelDate` date DEFAULT NULL,
   `cancelReason` varchar(30) NOT NULL DEFAULT '',
   `hangupBy` varchar(30) NOT NULL DEFAULT '',
-  `hangupDate` datetime DEFAULT NULL,
+  `hangupDate` date DEFAULT NULL,
   `trackedBy` varchar(30) NOT NULL DEFAULT '',
-  `trackedDate` datetime DEFAULT NULL,
-  `assignedDate` datetime DEFAULT NULL,
+  `trackedDate` date DEFAULT NULL,
   `approvedDate` datetime DEFAULT NULL,
   `deleted` tinyint unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
diff --git a/lib/form/form.class.php b/lib/form/form.class.php
index 4b59c91da3..e1d128a9ce 100644
--- a/lib/form/form.class.php
+++ b/lib/form/form.class.php
@@ -426,7 +426,14 @@ class form extends fixer
         {
             $rawModule = $app->rawModule == 'feedback' && in_array($app->rawMethod, array('touserstory', 'toepic')) ? 'story' : $app->rawModule;
             $errorKey  = isset($config['type']) && $config['type'] == 'array' ? "{$field}[]" : $field;
-            $fieldName = isset($app->lang->{$rawModule}->$field) ? $app->lang->{$rawModule}->$field : $field;
+            if(isset($config['label']))
+            {
+                $fieldName = $config['label'];
+            }
+            else
+            {
+                $fieldName = isset($app->lang->{$rawModule}->$field) ? $app->lang->{$rawModule}->$field : $field;
+            }
             if(!isset($this->errors[$errorKey])) $this->errors[$errorKey] = array();
             $this->errors[$errorKey][] = sprintf($app->lang->error->notempty, $fieldName);
         }