diff --git a/VERSION b/VERSION
index 8fad390b2f..1084f6a8ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2
+17.3
diff --git a/config/config.php b/config/config.php
index 7607fb4530..c2ae4e73e7 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version       = '17.2';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '17.3';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->liteVersion   = '1.2';                // 迅捷版版本。      The version of Lite.
 $config->charset       = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The cookie life time.
diff --git a/config/filter.php b/config/filter.php
index c368da4405..95c366a47d 100755
--- a/config/filter.php
+++ b/config/filter.php
@@ -271,6 +271,7 @@ $filter->project->task->cookie['projectTaskOrder']       = 'reg::orderBy';
 $filter->project->task->cookie['windowWidth']            = 'int';
 $filter->project->export->cookie['checkedItem']          = 'reg::checked';
 $filter->project->execution->cookie['pagerExecutionAll'] = 'int';
+$filter->project->execution->cookie['showTask']          = 'code';
 
 $filter->projectstory->story->cookie['storyModuleParam']   = 'int';
 $filter->projectstory->story->cookie['pagerProductBrowse'] = 'int';
diff --git a/db/standard/zentao17.3.sql b/db/standard/zentao17.3.sql
new file mode 100644
index 0000000000..65d576ef4b
--- /dev/null
+++ b/db/standard/zentao17.3.sql
@@ -0,0 +1,3929 @@
+CREATE TABLE `zt_account` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `provider` varchar(255) NOT NULL,
+  `adminURI` varchar(255) NOT NULL,
+  `account` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `email` varchar(255) NOT NULL,
+  `mobile` varchar(255) NOT NULL,
+  `extra` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `name` (`name`),
+  KEY `provider` (`provider`),
+  KEY `status` (`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_acl` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL DEFAULT '0',
+  `type` char(40) NOT NULL DEFAULT 'whitelist',
+  `source` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_action` (
+  `id` int(9) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL DEFAULT '',
+  `objectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` text NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `actor` varchar(100) NOT NULL DEFAULT '',
+  `action` varchar(80) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL,
+  `comment` text NOT NULL,
+  `extra` text,
+  `read` enum('0','1') NOT NULL DEFAULT '0',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `efforted` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `date` (`date`),
+  KEY `actor` (`actor`),
+  KEY `project` (`project`),
+  KEY `action` (`action`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM AUTO_INCREMENT=71 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_activity` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `process` mediumint(9) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `optional` varchar(255) NOT NULL,
+  `tailorNorm` varchar(255) NOT NULL,
+  `content` mediumtext NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `order` mediumint(8) DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=90 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_api` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `product` varchar(255) NOT NULL DEFAULT '',
+  `lib` int(10) unsigned NOT NULL DEFAULT '0',
+  `module` int(10) unsigned NOT NULL DEFAULT '0',
+  `title` varchar(100) NOT NULL DEFAULT '',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `protocol` varchar(10) NOT NULL DEFAULT '',
+  `method` varchar(10) NOT NULL DEFAULT '',
+  `requestType` varchar(100) NOT NULL DEFAULT '',
+  `responseType` varchar(100) NOT NULL DEFAULT '',
+  `status` varchar(20) NOT NULL DEFAULT '',
+  `owner` varchar(30) NOT NULL DEFAULT '0',
+  `desc` mediumtext NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `params` text,
+  `paramsExample` text,
+  `responseExample` text,
+  `response` text,
+  `commonParams` text,
+  `addedBy` varchar(30) NOT NULL DEFAULT '0',
+  `addedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL DEFAULT '0',
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=70 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_api_lib_release` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `lib` int(10) unsigned NOT NULL DEFAULT '0',
+  `desc` varchar(255) NOT NULL DEFAULT '',
+  `version` varchar(255) NOT NULL DEFAULT '',
+  `snap` mediumtext NOT NULL,
+  `addedBy` varchar(30) NOT NULL DEFAULT '0',
+  `addedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_apispec` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `doc` int(10) unsigned NOT NULL DEFAULT '0',
+  `module` int(10) unsigned NOT NULL DEFAULT '0',
+  `title` varchar(100) NOT NULL DEFAULT '',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `protocol` varchar(10) NOT NULL DEFAULT '',
+  `method` varchar(10) NOT NULL DEFAULT '',
+  `requestType` varchar(100) NOT NULL DEFAULT '',
+  `responseType` varchar(100) NOT NULL DEFAULT '',
+  `status` varchar(20) NOT NULL DEFAULT '',
+  `owner` varchar(255) NOT NULL DEFAULT '0',
+  `desc` mediumtext NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `params` text,
+  `paramsExample` text,
+  `responseExample` text,
+  `response` text,
+  `addedBy` varchar(30) NOT NULL DEFAULT '0',
+  `addedDate` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=176 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_apistruct` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `lib` int(10) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(30) NOT NULL DEFAULT '',
+  `type` varchar(50) NOT NULL DEFAULT '',
+  `desc` mediumtext NOT NULL DEFAULT '',
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `attribute` text,
+  `addedBy` varchar(30) NOT NULL DEFAULT '0',
+  `addedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL DEFAULT '0',
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_apistruct_spec` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `type` varchar(50) NOT NULL DEFAULT '',
+  `desc` varchar(255) NOT NULL DEFAULT '',
+  `attribute` text,
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `addedBy` varchar(30) NOT NULL DEFAULT '0',
+  `addedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approval` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `flow` mediumint(8) NOT NULL,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `nodes` mediumtext NOT NULL,
+  `version` mediumint(9) NOT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'doing',
+  `result` varchar(20) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approvalflow` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `code` varchar(100) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `version` mediumint(8) NOT NULL DEFAULT '1',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `deleted` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approvalflowobject` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `root` int(8) NOT NULL,
+  `flow` int(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `extra` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approvalflowspec` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `flow` mediumint(8) NOT NULL,
+  `version` mediumint(8) NOT NULL,
+  `nodes` mediumtext NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approvalnode` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `approval` mediumint(8) NOT NULL,
+  `type` enum('review','cc') NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `account` char(30) NOT NULL,
+  `node` varchar(100) NOT NULL,
+  `reviewType` varchar(100)  NOT NULL DEFAULT 'manual',
+  `multipleType` enum('and','or') NOT NULL DEFAULT 'and',
+  `prev` mediumtext NOT NULL,
+  `next` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'wait',
+  `result` varchar(10) NOT NULL,
+  `date` date NOT NULL,
+  `opinion` mediumtext NOT NULL,
+  `extra` mediumtext NOT NULL,
+  `reviewedBy` char(30) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approvalobject` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `approval` int(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(8) NOT NULL,
+  `extra` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_approvalrole` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `code` char(30) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `users` longtext NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_asset` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `group` varchar(128) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_assetlib` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_attend` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `date` date NOT NULL,
+  `signIn` time NOT NULL,
+  `signOut` time NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `ip` varchar(15) NOT NULL,
+  `device` varchar(30) NOT NULL,
+  `client` varchar(20) NOT NULL,
+  `manualIn` time NOT NULL,
+  `manualOut` time NOT NULL,
+  `reason` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `reviewStatus` varchar(30) NOT NULL DEFAULT '',
+  `reviewedBy` char(30) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `attend` (`date`,`account`),
+  KEY `account` (`account`),
+  KEY `date` (`date`),
+  KEY `status` (`status`),
+  KEY `reason` (`reason`),
+  KEY `reviewStatus` (`reviewStatus`),
+  KEY `reviewedBy` (`reviewedBy`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_attendstat` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `month` char(10) NOT NULL DEFAULT '',
+  `normal` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `late` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `early` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `absent` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `trip` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `egress` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `lieu` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `paidLeave` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `unpaidLeave` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `timeOvertime` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `restOvertime` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `holidayOvertime` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `deserve` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `actual` decimal(12,2) NOT NULL DEFAULT '0.00',
+  `status` char(30) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `attend` (`month`,`account`),
+  KEY `account` (`account`),
+  KEY `month` (`month`),
+  KEY `status` (`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_auditcl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `model` char(30) NOT NULL DEFAULT 'waterfall',
+  `practiceArea` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` int(10) DEFAULT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_auditplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `dateType` char(30) DEFAULT NULL,
+  `config` text,
+  `objectID` mediumint(9) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `process` mediumint(9) NOT NULL,
+  `processType` char(30) NOT NULL,
+  `checkDate` date NOT NULL,
+  `checkedBy` varchar(30) NOT NULL,
+  `realCheckDate` date NOT NULL,
+  `result` char(30) NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `checkBy` varchar(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_auditresult` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `auditplan` mediumint(8) NOT NULL,
+  `listID` mediumint(8) NOT NULL,
+  `result` char(30) NOT NULL,
+  `checkedBy` varchar(30) NOT NULL,
+  `checkedDate` date NOT NULL,
+  `comment` text NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_baseimage` (
+  `id` smallint(7) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `osType` varchar(50) NOT NULL DEFAULT '',
+  `os` varchar(50) NOT NULL DEFAULT '',
+  `osCategory` varchar(50) NOT NULL DEFAULT '',
+  `osArch` varchar(50) NOT NULL DEFAULT '',
+  `osLang` varchar(50) NOT NULL DEFAULT '',
+  `suggestCore` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `suggestMemory` mediumint(6) unsigned NOT NULL DEFAULT '0',
+  `suggestVolume` mediumint(6) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_baseimagebrowser` (
+  `vmBackingID` int(10) NOT NULL,
+  `browserID` int(10) NOT NULL,
+  PRIMARY KEY (`vmBackingID`,`browserID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_basicmeas` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `purpose` varchar(50) NOT NULL,
+  `scope` char(30) NOT NULL,
+  `object` char(30) NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` char(30) NOT NULL,
+  `unit` varchar(10) NOT NULL,
+  `configure` text,
+  `params` text,
+  `definition` text,
+  `source` varchar(255) DEFAULT NULL,
+  `collectType` varchar(30) NOT NULL,
+  `collectConf` text NOT NULL,
+  `execTime` varchar(30) NOT NULL,
+  `collectedBy` varchar(10) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`)
+) ENGINE=MyISAM AUTO_INCREMENT=54 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_block` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `module` varchar(20) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(100) NOT NULL,
+  `source` varchar(20) NOT NULL,
+  `block` varchar(20) NOT NULL,
+  `params` text NOT NULL,
+  `order` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `grid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `height` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account_vision_module_type_order` (`account`,`vision`,`module`,`type`,`order`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_branch` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `default` enum('0','1') NOT NULL DEFAULT '0',
+  `status` enum('active','closed') NOT NULL DEFAULT 'active',
+  `desc` varchar(255) NOT NULL,
+  `createdDate` date NOT NULL,
+  `closedDate` date NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_browser` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `type` varchar(255) NOT NULL DEFAULT '',
+  `version` varchar(255) NOT NULL DEFAULT '',
+  `lang` varchar(255) NOT NULL DEFAULT '',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_budget` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `stage` char(30) NOT NULL,
+  `subject` mediumint(8) NOT NULL,
+  `amount` char(30) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_bug` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `injection` mediumint(8) unsigned NOT NULL,
+  `identify` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `plan` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `story` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `storyVersion` smallint(6) NOT NULL DEFAULT '1',
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `toTask` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `toStory` mediumint(8) NOT NULL DEFAULT '0',
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `severity` tinyint(4) NOT NULL DEFAULT '0',
+  `pri` tinyint(3) unsigned NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `os` varchar(30) NOT NULL DEFAULT '',
+  `browser` varchar(30) NOT NULL DEFAULT '',
+  `hardware` varchar(30) NOT NULL,
+  `found` varchar(30) NOT NULL DEFAULT '',
+  `steps` mediumtext NOT NULL,
+  `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `confirmed` tinyint(1) NOT NULL DEFAULT '0',
+  `activatedCount` smallint(6) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `feedbackBy` varchar(100) NOT NULL,
+  `notifyEmail` varchar(100) NOT NULL,
+  `mailto` text,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedBuild` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `deadline` date NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL DEFAULT '',
+  `resolution` varchar(30) NOT NULL DEFAULT '',
+  `resolvedBuild` varchar(30) NOT NULL DEFAULT '',
+  `resolvedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `duplicateBug` mediumint(8) unsigned NOT NULL,
+  `linkBug` varchar(255) NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `caseVersion` smallint(6) NOT NULL DEFAULT '1',
+  `feedback` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `result` mediumint(8) unsigned NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `mr` mediumint(8) unsigned NOT NULL,
+  `entry` text NOT NULL,
+  `lines` varchar(10) NOT NULL,
+  `v1` varchar(40) NOT NULL,
+  `v2` varchar(40) NOT NULL,
+  `repoType` varchar(30) NOT NULL DEFAULT '',
+  `issueKey` varchar(50) NOT NULL DEFAULT '',
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `status` (`status`),
+  KEY `plan` (`plan`),
+  KEY `story` (`story`),
+  KEY `case` (`case`),
+  KEY `toStory` (`toStory`),
+  KEY `result` (`result`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_build` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` char(150) NOT NULL,
+  `scmPath` char(255) NOT NULL,
+  `filePath` char(255) NOT NULL,
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `builder` char(30) NOT NULL DEFAULT '',
+  `desc` mediumtext NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_burn` (
+  `execution` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `estimate` float NOT NULL,
+  `left` float NOT NULL,
+  `consumed` float NOT NULL,
+  `storyPoint` float NOT NULL,
+  PRIMARY KEY (`execution`,`date`,`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_case` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `execution` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `story` mediumint(30) unsigned NOT NULL DEFAULT '0',
+  `storyVersion` smallint(6) NOT NULL DEFAULT '1',
+  `title` varchar(255) NOT NULL,
+  `precondition` text NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `type` char(30) NOT NULL DEFAULT '1',
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `frame` varchar(10) NOT NULL,
+  `stage` varchar(255) NOT NULL,
+  `howRun` varchar(30) NOT NULL,
+  `scriptedBy` varchar(30) NOT NULL,
+  `scriptedDate` date NOT NULL,
+  `scriptStatus` varchar(30) NOT NULL,
+  `scriptLocation` varchar(255) NOT NULL,
+  `status` char(30) NOT NULL DEFAULT '1',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `frequency` enum('1','2','3') NOT NULL DEFAULT '1',
+  `order` tinyint(30) unsigned NOT NULL DEFAULT '0',
+  `openedBy` char(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `linkCase` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL,
+  `fromCaseID` mediumint(8) unsigned NOT NULL,
+  `fromCaseVersion` mediumint(8) unsigned NOT NULL DEFAULT '1',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `story` (`story`),
+  KEY `fromBug` (`fromBug`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_casestep` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(3) unsigned NOT NULL DEFAULT '0',
+  `type` varchar(10) NOT NULL DEFAULT 'step',
+  `desc` text NOT NULL,
+  `expect` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cfd` (
+  `id` int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `execution` int(8) NOT NULL,
+  `type` char(30) NOT NULL,
+  `name` char(30) NOT NULL,
+  `count` smallint NOT NULL,
+  `date` date NOT NULL,
+  UNIQUE KEY `execution_type_name_date` (`execution`,`type`,`name`,`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cmcl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` char(30) NOT NULL,
+  `title` int(11) NOT NULL,
+  `contents` text NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `order` int(11) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_company` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(120) DEFAULT NULL,
+  `phone` char(20) DEFAULT NULL,
+  `fax` char(20) DEFAULT NULL,
+  `address` char(120) DEFAULT NULL,
+  `zipcode` char(10) DEFAULT NULL,
+  `website` char(120) DEFAULT NULL,
+  `backyard` char(120) DEFAULT NULL,
+  `guest` enum('1','0') NOT NULL DEFAULT '0',
+  `admins` char(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_compile` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `queue` mediumint(8) NOT NULL,
+  `status` varchar(255) NOT NULL,
+  `logs` text,
+  `atTime` varchar(10) NOT NULL,
+  `testtask` mediumint(8) unsigned NOT NULL,
+  `tag` varchar(255) NOT NULL,
+  `times` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `updateDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_config` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `owner` char(30) NOT NULL DEFAULT '',
+  `module` varchar(30) NOT NULL,
+  `section` char(30) NOT NULL DEFAULT '',
+  `key` char(30) NOT NULL DEFAULT '',
+  `value` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`vision`,`owner`,`module`,`section`,`key`)
+) ENGINE=MyISAM AUTO_INCREMENT=33 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_cron` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `m` varchar(20) NOT NULL,
+  `h` varchar(20) NOT NULL,
+  `dom` varchar(20) NOT NULL,
+  `mon` varchar(20) NOT NULL,
+  `dow` varchar(20) NOT NULL,
+  `command` text NOT NULL,
+  `remark` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `buildin` tinyint(1) NOT NULL DEFAULT '0',
+  `status` varchar(20) NOT NULL,
+  `lastTime` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `lastTime` (`lastTime`)
+) ENGINE=MyISAM AUTO_INCREMENT=20 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_deploy` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `begin` datetime NOT NULL,
+  `end` datetime NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL,
+  `owner` char(30) NOT NULL,
+  `members` text NOT NULL,
+  `notify` text NOT NULL,
+  `cases` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `result` varchar(20) NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_deployproduct` (
+  `deploy` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `release` mediumint(8) unsigned NOT NULL,
+  `package` varchar(255) NOT NULL,
+  UNIQUE KEY `deploy_product_release` (`deploy`,`product`,`release`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_deployscope` (
+  `deploy` mediumint(8) unsigned NOT NULL,
+  `service` mediumint(8) unsigned NOT NULL,
+  `hosts` text NOT NULL,
+  `remove` text NOT NULL,
+  `add` text NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_deploystep` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `deploy` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `begin` datetime NOT NULL,
+  `end` datetime NOT NULL,
+  `stage` varchar(30) NOT NULL,
+  `content` text NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `assignedTo` char(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `finishedBy` char(30) NOT NULL,
+  `finishedDate` datetime NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_dept` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(60) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `order` smallint(4) unsigned NOT NULL DEFAULT '0',
+  `position` char(30) NOT NULL DEFAULT '',
+  `function` char(255) NOT NULL DEFAULT '',
+  `manager` char(30) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_design` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` varchar(255) NOT NULL,
+  `product` varchar(255) NOT NULL,
+  `commit` text NOT NULL,
+  `commitedBy` varchar(30) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(255) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `story` char(30) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `type` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_designspec` (
+  `design` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `files` varchar(255) NOT NULL,
+  UNIQUE KEY `design` (`design`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doc` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `lib` varchar(30) NOT NULL,
+  `template` varchar(30) NOT NULL,
+  `templateType` varchar(30) NOT NULL,
+  `chapterType` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `parent` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `order` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `views` smallint(5) unsigned NOT NULL,
+  `assetLib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `assetLibType` varchar(30) NOT NULL DEFAULT '',
+  `from` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `fromVersion` smallint(6) NOT NULL DEFAULT '1',
+  `draft` longtext NOT NULL,
+  `collector` text NOT NULL,
+  `addedBy` varchar(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `approvedDate` date NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `mailto` text,
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT '1',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`),
+  KEY `lib` (`lib`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doccontent` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `doc` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `digest` varchar(255) NOT NULL,
+  `content` longtext NOT NULL,
+  `files` text NOT NULL,
+  `type` varchar(10) NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `doc_version` (`doc`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_doclib` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `product` mediumint(8) unsigned NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `name` varchar(60) NOT NULL,
+  `baseUrl` varchar(255) NOT NULL DEFAULT '',
+  `acl` varchar(10) NOT NULL DEFAULT 'open',
+  `groups` varchar(255) NOT NULL,
+  `users` text NOT NULL,
+  `main` enum('0','1') NOT NULL DEFAULT '0',
+  `collector` text NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `order` tinyint(5) unsigned NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `execution` (`execution`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_domain` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `domain` varchar(255) NOT NULL,
+  `adminURI` varchar(255) NOT NULL,
+  `resolverURI` varchar(255) NOT NULL,
+  `register` varchar(255) NOT NULL,
+  `expiredDate` datetime NOT NULL,
+  `renew` varchar(255) NOT NULL,
+  `account` varchar(255) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `domain` (`domain`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_durationestimation` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `stage` mediumint(9) NOT NULL,
+  `workload` varchar(255) NOT NULL,
+  `worktimeRate` varchar(255) NOT NULL,
+  `people` varchar(255) NOT NULL,
+  `startDate` date NOT NULL,
+  `endDate` date NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_effort` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `product` text NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `account` varchar(30) NOT NULL,
+  `work` text,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `date` date NOT NULL,
+  `left` float NOT NULL,
+  `consumed` float NOT NULL,
+  `begin` smallint(4) unsigned zerofill NOT NULL,
+  `end` smallint(4) unsigned zerofill NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `execution` (`execution`),
+  KEY `objectID` (`objectID`),
+  KEY `date` (`date`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_entry` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `account` varchar(30) NOT NULL DEFAULT '',
+  `code` varchar(20) NOT NULL,
+  `key` varchar(32) NOT NULL,
+  `freePasswd` enum('0','1') NOT NULL DEFAULT '0',
+  `ip` varchar(100) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `calledTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_expect` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `userID` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT '0',
+  `expect` text NOT NULL,
+  `progress` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_extension` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(150) NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `version` varchar(50) NOT NULL,
+  `author` varchar(100) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `license` text NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'extension',
+  `site` varchar(150) NOT NULL,
+  `zentaoCompatible` varchar(100) NOT NULL,
+  `installedTime` datetime NOT NULL,
+  `depends` varchar(100) NOT NULL,
+  `dirs` mediumtext NOT NULL,
+  `files` mediumtext NOT NULL,
+  `status` varchar(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`),
+  KEY `name` (`name`),
+  KEY `installedTime` (`installedTime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_faq` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `module` mediumint(9) NOT NULL,
+  `product` mediumint(9) NOT NULL,
+  `question` varchar(255) NOT NULL,
+  `answer` text NOT NULL,
+  `addedtime` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_feedback` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `module` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `type` char(30) NOT NULL,
+  `solution` char(30) NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  `notify` enum('0','1') NOT NULL DEFAULT '0',
+  `notifyEmail` varchar(100) NOT NULL,
+  `likes` text NOT NULL,
+  `result` mediumint(8) unsigned NOT NULL,
+  `faq` mediumint(8) unsigned NOT NULL,
+  `openedBy` char(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  `processedBy` char(30) NOT NULL,
+  `processedDate` datetime NOT NULL,
+  `closedBy` char(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedTo` varchar(255) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `feedbackBy` varchar(100) NOT NULL,
+  `mailto` varchar(255) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_feedbackview` (
+  `account` char(30) NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  UNIQUE KEY `account_product` (`account`,`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_file` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `pathname` char(100) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `extension` char(30) NOT NULL,
+  `size` int(10) unsigned NOT NULL DEFAULT '0',
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `addedBy` char(30) NOT NULL DEFAULT '',
+  `addedDate` datetime NOT NULL,
+  `downloads` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `extra` varchar(255) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_gapanalysis` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `account` varchar(30) NOT NULL,
+  `role` varchar(20) NOT NULL,
+  `analysis` mediumtext NOT NULL,
+  `needTrain` enum('no','yes') NOT NULL DEFAULT 'no',
+  `createdBy` char(30) DEFAULT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `project_account` (`project`,`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_group` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `name` char(30) NOT NULL,
+  `role` char(30) NOT NULL DEFAULT '',
+  `desc` char(255) NOT NULL DEFAULT '',
+  `acl` text,
+  `developer` enum('0','1') NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_grouppriv` (
+  `group` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` char(30) NOT NULL DEFAULT '',
+  `method` char(30) NOT NULL DEFAULT '',
+  UNIQUE KEY `group` (`group`,`module`,`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_history` (
+  `id` int(9) unsigned NOT NULL AUTO_INCREMENT,
+  `action` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `field` varchar(30) NOT NULL DEFAULT '',
+  `old` text NOT NULL,
+  `new` text NOT NULL,
+  `diff` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `action` (`action`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_holiday` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) NOT NULL DEFAULT '',
+  `type` enum('holiday','working') NOT NULL DEFAULT 'holiday',
+  `desc` mediumtext NOT NULL,
+  `year` char(4) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `year` (`year`),
+  KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_host` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `assetID` mediumint(8) unsigned NOT NULL,
+  `admin` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `serverRoom` mediumint(8) unsigned NOT NULL,
+  `cabinet` varchar(128) NOT NULL,
+  `serverModel` varchar(256) NOT NULL,
+  `hardwareType` varchar(64) NOT NULL,
+  `hostType` enum('physical','virtual') NOT NULL,
+  `cpuBrand` varchar(128) NOT NULL,
+  `cpuModel` varchar(128) NOT NULL,
+  `cpuNumber` varchar(16) NOT NULL,
+  `cpuCores` varchar(30) NOT NULL,
+  `cpuRate` varchar(30) NOT NULL,
+  `memory` varchar(30) NOT NULL,
+  `diskType` varchar(30) NOT NULL,
+  `diskSize` varchar(30) NOT NULL,
+  `unit` enum('GB','TB') NOT NULL DEFAULT 'GB',
+  `privateIP` varchar(128) NOT NULL,
+  `publicIP` varchar(128) NOT NULL,
+  `nic` varchar(128) NOT NULL,
+  `mac` varchar(128) NOT NULL,
+  `osName` varchar(64) NOT NULL,
+  `osVersion` varchar(64) NOT NULL,
+  `webserver` varchar(128) NOT NULL,
+  `database` varchar(128) NOT NULL,
+  `language` varchar(16) NOT NULL,
+  `status` varchar(50) NOT NULL,
+  `agentPort` varchar(10) NOT NULL,
+  `instanceNum` tinyint(4) NOT NULL DEFAULT '0',
+  `pri` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `heartbeatTime` datetime NOT NULL,
+  `tags` varchar(50) NOT NULL DEFAULT '',
+  `provider` varchar(255) NOT NULL DEFAULT '',
+  `bridgeID` varchar(255) NOT NULL DEFAULT '',
+  `cloudKey` varchar(255) NOT NULL DEFAULT '',
+  `cloudSecret` varchar(255) NOT NULL DEFAULT '',
+  `cloudRegion` varchar(255) NOT NULL DEFAULT '',
+  `cloudNamespace` varchar(255) NOT NULL DEFAULT '',
+  `cloudUser` varchar(255) NOT NULL DEFAULT '',
+  `cloudAccount` varchar(255) NOT NULL DEFAULT '',
+  `cloudPassword` varchar(255) NOT NULL DEFAULT '',
+  `couldVPC` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_chat` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `gid` char(40) NOT NULL DEFAULT '',
+  `name` varchar(60) NOT NULL DEFAULT '',
+  `type` varchar(20) NOT NULL DEFAULT 'group',
+  `admins` varchar(255) NOT NULL DEFAULT '',
+  `committers` varchar(255) NOT NULL DEFAULT '',
+  `subject` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  `createdBy` varchar(30) NOT NULL DEFAULT '',
+  `createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ownedBy` varchar(30) NOT NULL DEFAULT '',
+  `editedBy` varchar(30) NOT NULL DEFAULT '',
+  `editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastMessage` int(11) unsigned NOT NULL DEFAULT '0',
+  `lastMessageIndex` int(11) unsigned NOT NULL DEFAULT 0,
+  `dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `pinnedMessages` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `gid` (`gid`),
+  KEY `name` (`name`),
+  KEY `type` (`type`),
+  KEY `public` (`public`),
+  KEY `createdBy` (`createdBy`),
+  KEY `editedBy` (`editedBy`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_chat_message_index` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `gid` char(40) NOT NULL,
+  `tableName` char(64) NOT NULL,
+  `start` int(11) unsigned NOT NULL,
+  `end` int(11) unsigned NOT NULL,
+  `startIndex` int(11) unsigned NOT NULL,
+  `endIndex` int(11) unsigned NOT NULL,
+  `startDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `endDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `count` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `chattable` (`gid`,`tableName`),
+  KEY `start` (`start`),
+  KEY `end` (`end`),
+  KEY `startDate` (`startDate`),
+  KEY `endDate` (`endDate`),
+  KEY `chatstartindex` (`gid`,`startIndex`),
+  KEY `chatendindex` (`gid`,`endIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_chatuser` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `user` mediumint(8) NOT NULL DEFAULT '0',
+  `order` smallint(5) NOT NULL DEFAULT '0',
+  `star` enum('0','1') NOT NULL DEFAULT '0',
+  `hide` enum('0','1') NOT NULL DEFAULT '0',
+  `mute` enum('0','1') NOT NULL DEFAULT '0',
+  `freeze` enum('0','1') NOT NULL DEFAULT '0',
+  `join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `category` varchar(40) NOT NULL DEFAULT '',
+  `lastReadMessage` int(11) unsigned NOT NULL DEFAULT '0',
+  `lastReadMessageIndex` int(11) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `chatuser` (`cgid`,`user`),
+  KEY `cgid` (`cgid`),
+  KEY `user` (`user`),
+  KEY `order` (`order`),
+  KEY `star` (`star`),
+  KEY `hide` (`hide`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_client` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `version` char(30) NOT NULL DEFAULT '',
+  `desc` varchar(100) NOT NULL DEFAULT '',
+  `changeLog` text NOT NULL,
+  `strategy` varchar(10) NOT NULL DEFAULT '',
+  `downloads` text NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdBy` varchar(30) NOT NULL DEFAULT '',
+  `editedDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL DEFAULT '',
+  `status` enum('released','wait') NOT NULL DEFAULT 'wait',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_conference` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `rid` char(40) NOT NULL DEFAULT '',
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `status` enum('closed','open') NOT NULL DEFAULT 'closed',
+  `participants` text NOT NULL,
+  `invitee` text NOT NULL,
+  `openedBy` mediumint(8) NOT NULL DEFAULT '0',
+  `openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_conferenceaction` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `rid` char(40) NOT NULL DEFAULT '',
+  `type` enum('create','invite','join','leave','close','publish') NOT NULL DEFAULT 'create',
+  `data` text NOT NULL,
+  `user` mediumint(8) NOT NULL DEFAULT '0',
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `device` char(40) NOT NULL DEFAULT 'default',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_message` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `gid` char(40) NOT NULL DEFAULT '',
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `user` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `index` int(11) unsigned NOT NULL DEFAULT 0,
+  `type` enum('normal','broadcast','notify','bulletin') NOT NULL DEFAULT 'normal',
+  `content` text NOT NULL,
+  `contentType` enum('text','plain','emotion','image','file','object','code') NOT NULL DEFAULT 'text',
+  `data` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `mgid` (`gid`),
+  KEY `mcgid` (`cgid`),
+  KEY `muser` (`user`),
+  KEY `mtype` (`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_message_backup` (
+  `id` int(11) unsigned NOT NULL,
+  `gid` char(40) NOT NULL DEFAULT '',
+  `cgid` char(40) NOT NULL DEFAULT '',
+  `user` varchar(30) NOT NULL DEFAULT '',
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `index` int(11) unsigned NOT NULL DEFAULT 0,
+  `type` enum('normal','broadcast','notify') NOT NULL DEFAULT 'normal',
+  `content` text NOT NULL,
+  `contentType` enum('text','plain','emotion','image','file','object','code') NOT NULL DEFAULT 'text',
+  `data` text NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_message_index` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `tableName` char(64) NOT NULL,
+  `start` int(11) unsigned NOT NULL,
+  `end` int(11) unsigned NOT NULL,
+  `startDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `endDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `chats` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `tableName` (`tableName`),
+  KEY `start` (`start`),
+  KEY `end` (`end`),
+  KEY `startDate` (`startDate`),
+  KEY `endDate` (`endDate`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_messagestatus` (
+  `user` mediumint(8) NOT NULL DEFAULT '0',
+  `message` int(11) unsigned NOT NULL,
+  `status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
+  UNIQUE KEY `user` (`user`,`message`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_queue` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` char(30) NOT NULL,
+  `content` text NOT NULL,
+  `addDate` datetime NOT NULL,
+  `processDate` datetime NOT NULL,
+  `result` text NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_im_userdevice` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `user` mediumint(8) NOT NULL DEFAULT '0',
+  `device` char(40) NOT NULL DEFAULT 'default',
+  `deviceID` char(40) NOT NULL DEFAULT '',
+  `token` char(64) NOT NULL DEFAULT '',
+  `validUntil` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastLogin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `lastLogout` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `userdevice` (`user`,`device`),
+  KEY `user` (`user`),
+  KEY `lastLogin` (`lastLogin`),
+  KEY `lastLogout` (`lastLogout`)
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_intervention` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `activity` mediumint(8) NOT NULL,
+  `status` char(30) NOT NULL,
+  `partake` text NOT NULL,
+  `begin` date NOT NULL,
+  `realBegin` date NOT NULL,
+  `situation` varchar(255) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `project` (`project`,`activity`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_issue` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `resolvedBy` varchar(30) NOT NULL,
+  `project` varchar(255) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `pri` char(30) NOT NULL,
+  `severity` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `activity` varchar(255) NOT NULL,
+  `deadline` date NOT NULL,
+  `resolution` char(30) NOT NULL,
+  `resolutionComment` text NOT NULL,
+  `objectID` varchar(255) NOT NULL,
+  `resolvedDate` date NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `owner` varchar(255) NOT NULL,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `from` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `activateBy` varchar(30) NOT NULL,
+  `activateDate` date NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` date NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `approvedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_job` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `frame` varchar(20) NOT NULL,
+  `engine` varchar(20) NOT NULL,
+  `server` mediumint(8) unsigned NOT NULL,
+  `pipeline` varchar(500) NOT NULL,
+  `triggerType` varchar(255) NOT NULL,
+  `sonarqubeServer` mediumint(8) unsigned NOT NULL,
+  `projectKey` varchar(255) NOT NULL,
+  `svnDir` varchar(255) NOT NULL,
+  `atDay` varchar(255) DEFAULT NULL,
+  `atTime` varchar(10) DEFAULT NULL,
+  `customParam` text NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `lastExec` datetime DEFAULT NULL,
+  `lastStatus` varchar(255) DEFAULT NULL,
+  `lastTag` varchar(255) DEFAULT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanban` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `space` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `team` text NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `archived` enum('0','1') NOT NULL DEFAULT '1',
+  `performable` enum('0','1') NOT NULL DEFAULT '0',
+  `status` enum('active','closed') NOT NULL DEFAULT 'active',
+  `order` mediumint(8) NOT NULL DEFAULT '0',
+  `displayCards` smallint(6) NOT NULL DEFAULT '0',
+  `showWIP` enum('0','1') NOT NULL DEFAULT '1',
+  `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
+  `object` varchar(255) NOT NULL,
+  `alignment` varchar(10) NOT NULL DEFAULT 'center',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `closedBy` char(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `activatedBy` char(30) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbancard` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `kanban` mediumint(8) unsigned NOT NULL,
+  `region` mediumint(8) unsigned NOT NULL,
+  `group` mediumint(8) unsigned NOT NULL,
+  `fromID` mediumint(8) unsigned NOT NULL,
+  `fromType` varchar(30) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT 'doing',
+  `pri` mediumint(8) unsigned NOT NULL,
+  `assignedTo` text NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `estimate` float unsigned NOT NULL,
+  `progress` float unsigned NOT NULL DEFAULT '0',
+  `color` char(7) NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `order` mediumint(8) NOT NULL DEFAULT '0',
+  `archived` enum('0','1') NOT NULL DEFAULT '0',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `archivedBy` char(30) NOT NULL,
+  `archivedDate` datetime NOT NULL,
+  `assignedBy` char(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbancell` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `kanban` mediumint(8) NOT NULL,
+  `lane` mediumint(8) NOT NULL,
+  `column` mediumint(8) NOT NULL,
+  `type` char(30) NOT NULL,
+  `cards` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `card_group` (`kanban`,`type`,`lane`,`column`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbancolumn` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `parent` mediumint(8) NOT NULL DEFAULT '0',
+  `type` char(30) NOT NULL,
+  `region` mediumint(8) unsigned NOT NULL,
+  `group` mediumint(8) NOT NULL DEFAULT '0',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `color` char(30) NOT NULL,
+  `limit` smallint(6) NOT NULL DEFAULT '-1',
+  `order` mediumint(8) NOT NULL DEFAULT '0',
+  `archived` enum('0','1') NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbangroup` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `kanban` mediumint(8) unsigned NOT NULL,
+  `region` mediumint(8) unsigned NOT NULL,
+  `order` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbanlane` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `execution` mediumint(8) NOT NULL DEFAULT '0',
+  `type` char(30) NOT NULL,
+  `region` mediumint(8) unsigned NOT NULL,
+  `group` mediumint(8) unsigned NOT NULL,
+  `groupby` char(30) NOT NULL,
+  `extra` char(30) NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `color` char(30) NOT NULL,
+  `order` smallint(6) NOT NULL DEFAULT '0',
+  `lastEditedTime` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbanregion` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `space` mediumint(8) unsigned NOT NULL,
+  `kanban` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `order` mediumint(8) NOT NULL DEFAULT '0',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_kanbanspace` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(50) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `team` text NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `status` enum('active','closed') NOT NULL DEFAULT 'active',
+  `order` mediumint(8) NOT NULL DEFAULT '0',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `closedBy` char(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `activatedBy` char(30) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_lang` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `lang` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `section` varchar(30) NOT NULL,
+  `key` varchar(60) NOT NULL,
+  `value` text NOT NULL,
+  `system` enum('0','1') NOT NULL DEFAULT '1',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`,`vision`)
+) ENGINE=MyISAM AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_leave` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `year` char(4) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `start` time NOT NULL,
+  `finish` time NOT NULL,
+  `hours` float(4,1) unsigned NOT NULL DEFAULT '0.0',
+  `backDate` datetime NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `reviewedBy` char(30) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  `level` tinyint(3) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `reviewers` text NOT NULL,
+  `backReviewers` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `year` (`year`),
+  KEY `type` (`type`),
+  KEY `status` (`status`),
+  KEY `createdBy` (`createdBy`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_lieu` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `year` char(4) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `start` time NOT NULL,
+  `finish` time NOT NULL,
+  `hours` float(4,1) unsigned NOT NULL DEFAULT '0.0',
+  `overtime` char(255) NOT NULL,
+  `trip` char(255) NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `reviewedBy` char(30) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  `level` tinyint(3) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `reviewers` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `year` (`year`),
+  KEY `status` (`status`),
+  KEY `createdBy` (`createdBy`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_log` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(8) unsigned NOT NULL,
+  `date` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL,
+  `data` text NOT NULL,
+  `result` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType` (`objectType`),
+  KEY `obejctID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_measqueue` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `mid` mediumint(8) unsigned NOT NULL,
+  `status` varchar(255) NOT NULL,
+  `logs` text,
+  `execTime` varchar(10) NOT NULL,
+  `params` text,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `updateDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_measrecords` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `type` varchar(30) NOT NULL,
+  `mid` mediumint(8) NOT NULL,
+  `measCode` char(50) NOT NULL DEFAULT '',
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `params` text NOT NULL,
+  `year` char(4) NOT NULL,
+  `month` char(6) NOT NULL,
+  `week` char(8) NOT NULL,
+  `day` char(8) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  `date` date NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `project` (`project`),
+  KEY `time` (`year`,`month`,`day`,`week`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_meastemplate` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `model` char(30) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `content` mediumtext NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_meeting` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL,
+  `execution` mediumint(8) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `begin` time NOT NULL,
+  `end` time NOT NULL,
+  `dept` mediumint(8) NOT NULL,
+  `mode` varchar(255) NOT NULL,
+  `host` varchar(30) NOT NULL,
+  `participant` text NOT NULL,
+  `date` date NOT NULL,
+  `room` int(11) NOT NULL,
+  `minutes` text NOT NULL,
+  `minutedBy` varchar(30) NOT NULL,
+  `minutedDate` datetime NOT NULL,
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_meetingroom` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `position` varchar(30) NOT NULL,
+  `seats` int(11) NOT NULL,
+  `equipment` varchar(255) NOT NULL,
+  `openTime` varchar(255) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_module` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` char(60) NOT NULL DEFAULT '',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `order` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `type` char(30) NOT NULL,
+  `from` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `owner` varchar(30) NOT NULL,
+  `collector` text NOT NULL,
+  `short` varchar(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `root` (`root`),
+  KEY `type` (`type`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_mr` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `gitlabID` mediumint(8) unsigned NOT NULL,
+  `sourceProject` int(10) unsigned NOT NULL,
+  `sourceBranch` varchar(100) NOT NULL,
+  `targetProject` int(10) unsigned NOT NULL,
+  `targetBranch` varchar(100) NOT NULL,
+  `mriid` int(10) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `description` text NOT NULL,
+  `assignee` varchar(255) NOT NULL,
+  `reviewer` varchar(255) NOT NULL,
+  `approver` varchar(255) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `status` char(30) NOT NULL,
+  `mergeStatus` char(30) NOT NULL,
+  `approvalStatus` char(30) NOT NULL,
+  `needApproved` enum('0','1') NOT NULL DEFAULT '0',
+  `needCI` enum('0','1') NOT NULL DEFAULT '0',
+  `repoID` mediumint(8) unsigned NOT NULL,
+  `jobID` mediumint(8) unsigned NOT NULL,
+  `compileID` mediumint(8) unsigned NOT NULL,
+  `compileStatus` char(30) NOT NULL,
+  `removeSourceBranch` enum('0','1') NOT NULL DEFAULT '0',
+  `synced` enum('0','1') NOT NULL DEFAULT '1',
+  `syncError` varchar(255) NOT NULL,
+  `hasNoConflict` enum('0','1') NOT NULL DEFAULT '0',
+  `diffs` longtext,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_mrapproval` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `mrID` mediumint(8) unsigned NOT NULL,
+  `account` varchar(255) NOT NULL,
+  `date` datetime NOT NULL,
+  `action` char(30) NOT NULL,
+  `comment` text NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_nc` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `auditplan` mediumint(8) NOT NULL,
+  `listID` mediumint(8) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `type` char(30) NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT 'active',
+  `severity` char(30) NOT NULL,
+  `deadline` date NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL,
+  `resolution` char(30) NOT NULL,
+  `resolvedDate` date NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` date NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` date NOT NULL,
+  `activateDate` date NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_notify` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `objectType` varchar(50) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `action` mediumint(9) NOT NULL,
+  `toList` varchar(255) NOT NULL,
+  `ccList` text NOT NULL,
+  `subject` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `sendTime` datetime NOT NULL,
+  `status` varchar(10) NOT NULL DEFAULT 'wait',
+  `failReason` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `objectType_toList_status` (`objectType`,`toList`,`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_oauth` (
+  `account` varchar(30) NOT NULL,
+  `openID` varchar(255) NOT NULL,
+  `providerType` varchar(30) NOT NULL,
+  `providerID` mediumint(8) unsigned NOT NULL,
+  KEY `account` (`account`),
+  KEY `providerType` (`providerType`),
+  KEY `providerID` (`providerID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_object` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) NOT NULL,
+  `from` mediumint(8) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `category` char(30) NOT NULL,
+  `version` varchar(255) NOT NULL,
+  `type` enum('reviewed','taged') NOT NULL,
+  `range` text NOT NULL,
+  `data` text NOT NULL,
+  `storyEst` char(30) NOT NULL,
+  `taskEst` char(30) NOT NULL,
+  `requestEst` char(30) NOT NULL,
+  `testEst` char(30) NOT NULL,
+  `devEst` char(30) NOT NULL,
+  `designEst` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_opportunity` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `source` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `strategy` char(30) NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT 'active',
+  `impact` mediumint(8) NOT NULL,
+  `chance` mediumint(8) NOT NULL,
+  `ratio` mediumint(8) NOT NULL,
+  `pri` char(30) NOT NULL,
+  `identifiedDate` date NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` date NOT NULL,
+  `approvedDate` date NOT NULL,
+  `prevention` mediumtext NOT NULL,
+  `plannedClosedDate` date NOT NULL,
+  `actualClosedDate` date NOT NULL,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `from` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `activatedBy` varchar(30) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `canceledBy` varchar(30) NOT NULL,
+  `canceledDate` datetime NOT NULL,
+  `cancelReason` char(30) NOT NULL,
+  `hangupedBy` varchar(30) NOT NULL,
+  `hangupedDate` datetime NOT NULL,
+  `resolution` mediumtext NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL,
+  `resolvedDate` datetime NOT NULL,
+  `lastCheckedBy` varchar(30) NOT NULL,
+  `lastCheckedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_overtime` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `year` char(4) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `start` time NOT NULL,
+  `finish` time NOT NULL,
+  `hours` float(4,1) unsigned NOT NULL DEFAULT '0.0',
+  `leave` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `rejectReason` varchar(100) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `reviewedBy` char(30) NOT NULL,
+  `reviewedDate` datetime NOT NULL,
+  `level` tinyint(3) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `reviewers` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `year` (`year`),
+  KEY `type` (`type`),
+  KEY `status` (`status`),
+  KEY `createdBy` (`createdBy`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_pipeline` (
+  `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` char(30) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `account` varchar(30) DEFAULT NULL,
+  `password` varchar(255) NOT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  `private` char(32) DEFAULT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_planstory` (
+  `plan` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL,
+  `order` mediumint(9) NOT NULL,
+  UNIQUE KEY `plan_story` (`plan`,`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_process` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `model` char(30) NOT NULL DEFAULT 'waterfall',
+  `name` varchar(255) NOT NULL,
+  `type` char(30) NOT NULL,
+  `abbr` char(30) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `order` mediumint(9) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_product` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `bind` enum('0','1') NOT NULL DEFAULT '0',
+  `line` mediumint(8) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'normal',
+  `status` varchar(30) NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `desc` mediumtext NOT NULL,
+  `PO` varchar(30) NOT NULL,
+  `QD` varchar(30) NOT NULL,
+  `RD` varchar(30) NOT NULL,
+  `feedback` varchar(30) NOT NULL,
+  `acl` enum('open','private','custom') NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `reviewer` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `createdVersion` varchar(20) NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_productplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(9) NOT NULL DEFAULT '0',
+  `title` varchar(90) NOT NULL,
+  `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+  `desc` mediumtext NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `order` text NOT NULL,
+  `closedReason` varchar(20) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `end` (`end`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_programactivity` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `process` mediumint(8) NOT NULL,
+  `activity` mediumint(8) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `content` text NOT NULL,
+  `reason` varchar(255) NOT NULL,
+  `result` char(30) NOT NULL,
+  `linkedBy` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_programoutput` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `process` mediumint(8) NOT NULL,
+  `activity` mediumint(8) NOT NULL,
+  `output` mediumint(8) NOT NULL,
+  `content` text NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `reason` varchar(255) NOT NULL,
+  `result` char(30) NOT NULL,
+  `linkedBy` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_programprocess` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `process` mediumint(8) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `type` char(30) NOT NULL,
+  `abbr` char(30) NOT NULL,
+  `desc` text NOT NULL,
+  `reason` varchar(255) NOT NULL,
+  `linkedBy` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_programreport` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `template` mediumint(8) NOT NULL,
+  `project` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `params` text NOT NULL,
+  `content` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_project` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL DEFAULT '0',
+  `model` char(30) NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'sprint',
+  `lifetime` char(30) NOT NULL DEFAULT '',
+  `budget` varchar(30) NOT NULL DEFAULT '0',
+  `budgetUnit` char(30) NOT NULL DEFAULT 'CNY',
+  `attribute` varchar(30) NOT NULL DEFAULT '',
+  `percent` float unsigned NOT NULL DEFAULT '0',
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `output` text NOT NULL,
+  `auth` char(30) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` varchar(255) NOT NULL,
+  `grade` tinyint(3) unsigned NOT NULL,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `realBegan` date NOT NULL,
+  `realEnd` date NOT NULL,
+  `days` smallint(5) unsigned NOT NULL,
+  `status` varchar(10) NOT NULL,
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `pri` enum('1','2','3','4') NOT NULL DEFAULT '1',
+  `desc` mediumtext NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `parentVersion` smallint(6) NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `openedVersion` varchar(20) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `canceledBy` varchar(30) NOT NULL DEFAULT '',
+  `canceledDate` datetime NOT NULL,
+  `suspendedDate` date NOT NULL,
+  `PO` varchar(30) NOT NULL DEFAULT '',
+  `PM` varchar(30) NOT NULL DEFAULT '',
+  `QD` varchar(30) NOT NULL DEFAULT '',
+  `RD` varchar(30) NOT NULL DEFAULT '',
+  `team` varchar(90) NOT NULL,
+  `acl` char(30) NOT NULL DEFAULT 'open',
+  `whitelist` text NOT NULL,
+  `order` mediumint(8) unsigned NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `displayCards` smallint(6) NOT NULL DEFAULT '0',
+  `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `begin` (`begin`),
+  KEY `end` (`end`),
+  KEY `status` (`status`),
+  KEY `acl` (`acl`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectadmin` (
+  `group` smallint(6) NOT NULL,
+  `account` char(30) NOT NULL,
+  `programs` text NOT NULL,
+  `projects` text NOT NULL,
+  `products` text NOT NULL,
+  `executions` text NOT NULL,
+  UNIQUE KEY `group_account` (`group`, `account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectcase` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `count` mediumint(8) unsigned NOT NULL DEFAULT '1',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectproduct` (
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `plan` varchar(255) NOT NULL,
+  PRIMARY KEY (`project`,`product`,`branch`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectspec` (
+  `project` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_projectstory` (
+  `project` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `product` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `order` smallint(6) unsigned NOT NULL,
+  UNIQUE KEY `project` (`project`,`story`),
+  KEY `story` (`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_relation` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) NOT NULL,
+  `product` mediumint(8) NOT NULL,
+  `execution` mediumint(8) NOT NULL,
+  `AType` char(30) NOT NULL,
+  `AID` mediumint(8) NOT NULL,
+  `AVersion` char(30) NOT NULL,
+  `relation` char(30) NOT NULL,
+  `BType` char(30) NOT NULL,
+  `BID` mediumint(8) NOT NULL,
+  `BVersion` char(30) NOT NULL,
+  `extra` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `relation` (`product`,`relation`,`AType`,`BType`,`AID`,`BID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_relationoftasks` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `pretask` mediumint(8) unsigned NOT NULL,
+  `condition` enum('begin','end') NOT NULL,
+  `task` mediumint(8) unsigned NOT NULL,
+  `action` enum('begin','end') NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `relationoftasks` (`execution`,`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_release` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `build` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `marker` enum('0','1') NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `leftBugs` text NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `mailto` text,
+  `notify` varchar(255) DEFAULT NULL,
+  `status` varchar(20) NOT NULL DEFAULT 'normal',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repo` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `product` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `prefix` varchar(100) NOT NULL,
+  `encoding` varchar(20) NOT NULL,
+  `SCM` varchar(10) NOT NULL,
+  `client` varchar(100) NOT NULL,
+  `commits` mediumint(8) unsigned NOT NULL,
+  `account` varchar(30) NOT NULL,
+  `password` varchar(30) NOT NULL,
+  `encrypt` varchar(30) NOT NULL DEFAULT 'plain',
+  `acl` text NOT NULL,
+  `synced` tinyint(1) NOT NULL DEFAULT '0',
+  `lastSync` datetime NOT NULL,
+  `desc` text NOT NULL,
+  `extra` char(30) NOT NULL,
+  `preMerge` enum('0','1') NOT NULL DEFAULT '0',
+  `job` mediumint(8) unsigned NOT NULL,
+  `fileServerUrl` text,
+  `fileServerAccount` varchar(40) NOT NULL DEFAULT '',
+  `fileServerPassword` varchar(100) NOT NULL DEFAULT '',
+  `deleted` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repobranch` (
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `branch` varchar(255) NOT NULL,
+  UNIQUE KEY `repo_revision_branch` (`repo`,`revision`,`branch`),
+  KEY `branch` (`branch`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repofiles` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `revision` mediumint(8) unsigned NOT NULL,
+  `path` varchar(255) NOT NULL,
+  `parent` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `action` char(1) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `path` (`path`),
+  KEY `parent` (`parent`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_repohistory` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `repo` mediumint(9) NOT NULL,
+  `revision` varchar(40) NOT NULL,
+  `commit` mediumint(8) unsigned NOT NULL,
+  `comment` text NOT NULL,
+  `committer` varchar(100) NOT NULL,
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `repo` (`repo`),
+  KEY `revision` (`revision`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_report` (
+  `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `code` varchar(100) NOT NULL,
+  `name` text NOT NULL,
+  `module` varchar(100) NOT NULL,
+  `sql` text NOT NULL,
+  `vars` text NOT NULL,
+  `langs` text NOT NULL,
+  `params` text NOT NULL,
+  `step` tinyint(1) NOT NULL DEFAULT '2',
+  `desc` text NOT NULL,
+  `addedBy` char(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`)
+) ENGINE=MyISAM AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_researchplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `customer` varchar(255) NOT NULL,
+  `stakeholder` varchar(255) NOT NULL,
+  `objective` varchar(255) NOT NULL,
+  `begin` datetime NOT NULL,
+  `end` datetime NOT NULL,
+  `location` varchar(255) NOT NULL,
+  `team` varchar(255) NOT NULL,
+  `method` enum('','videoConference','interview','questionnaire','telephoneInterview') NOT NULL,
+  `outline` mediumtext NOT NULL,
+  `schedule` mediumtext NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_researchreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `relatedPlan` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `author` varchar(30) NOT NULL,
+  `content` mediumtext NOT NULL,
+  `customer` varchar(255) NOT NULL,
+  `researchObjects` varchar(255) NOT NULL,
+  `begin` datetime NOT NULL,
+  `end` datetime NOT NULL,
+  `location` varchar(255) NOT NULL,
+  `method` enum('','videoConference','interview','questionnaire','telephoneInterview') NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_review` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `object` mediumint(8) NOT NULL,
+  `template` mediumint(8) NOT NULL,
+  `doc` mediumint(8) DEFAULT NULL,
+  `docVersion` smallint(6) NOT NULL,
+  `status` char(30) NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `auditedBy` varchar(255) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deadline` date NOT NULL,
+  `lastReviewedBy` varchar(255) DEFAULT NULL,
+  `lastReviewedDate` date NOT NULL,
+  `lastAuditedBy` varchar(255) NOT NULL,
+  `lastAuditedDate` date NOT NULL,
+  `lastEditedBy` varchar(255) NOT NULL,
+  `lastEditedDate` date NOT NULL,
+  `result` char(30) NOT NULL,
+  `auditResult` char(30) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=39 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_reviewcl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) NOT NULL,
+  `object` char(30) NOT NULL,
+  `category` char(30) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `order` mediumint(8) DEFAULT '0',
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=30 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_reviewissue` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `review` mediumint(8) NOT NULL,
+  `approval` mediumint(8) NOT NULL,
+  `injection` mediumint(8) NOT NULL,
+  `identify` mediumint(8) NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'review',
+  `listID` mediumint(8) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `opinion` varchar(255) NOT NULL,
+  `opinionDate` date NOT NULL,
+  `status` char(30) NOT NULL,
+  `resolution` char(30) NOT NULL,
+  `resolutionBy` char(30) NOT NULL,
+  `resolutionDate` date NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_reviewlist` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) NOT NULL,
+  `object` char(30) NOT NULL,
+  `category` char(30) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_reviewresult` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `review` mediumint(8) NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'review',
+  `result` char(30) NOT NULL,
+  `opinion` text NOT NULL,
+  `reviewer` char(30) NOT NULL,
+  `remainIssue` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `consumed` float NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `reviewer` (`review`,`reviewer`,`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_risk` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` varchar(255) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `source` char(30) NOT NULL,
+  `category` char(30) NOT NULL,
+  `strategy` char(30) NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT 'active',
+  `impact` char(30) NOT NULL,
+  `probability` char(30) NOT NULL,
+  `rate` char(30) NOT NULL,
+  `pri` char(30) NOT NULL,
+  `identifiedDate` date NOT NULL,
+  `prevention` mediumtext NOT NULL,
+  `remedy` mediumtext NOT NULL,
+  `plannedClosedDate` date NOT NULL,
+  `actualClosedDate` date NOT NULL,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `from` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `resolution` mediumtext NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL,
+  `activateBy` varchar(30) NOT NULL,
+  `activateDate` date NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` date NOT NULL,
+  `cancelBy` varchar(30) NOT NULL,
+  `cancelDate` date NOT NULL,
+  `cancelReason` char(30) NOT NULL,
+  `hangupBy` varchar(30) NOT NULL,
+  `hangupDate` date NOT NULL,
+  `trackedBy` varchar(30) NOT NULL,
+  `trackedDate` date NOT NULL,
+  `assignedDate` date NOT NULL,
+  `approvedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_riskissue` (
+  `risk` mediumint(8) unsigned NOT NULL,
+  `issue` mediumint(8) unsigned NOT NULL,
+  UNIQUE KEY `risk_issue` (`risk`,`issue`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_score` (
+  `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT,
+  `account` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL DEFAULT '',
+  `method` varchar(30) NOT NULL,
+  `desc` varchar(250) NOT NULL DEFAULT '',
+  `before` int(11) NOT NULL DEFAULT '0',
+  `score` int(11) NOT NULL DEFAULT '0',
+  `after` int(11) NOT NULL DEFAULT '0',
+  `time` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `model` (`module`),
+  KEY `method` (`method`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchdict` (
+  `key` smallint(5) unsigned NOT NULL,
+  `value` char(3) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_searchindex` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `objectType` char(20) NOT NULL,
+  `objectID` mediumint(9) NOT NULL,
+  `title` text NOT NULL,
+  `content` text NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `object` (`objectType`,`objectID`),
+  KEY `addedDate` (`addedDate`),
+  FULLTEXT KEY `content` (`content`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_serverroom` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL,
+  `city` varchar(128) NOT NULL,
+  `line` varchar(20) NOT NULL,
+  `bandwidth` varchar(128) NOT NULL,
+  `provider` varchar(128) NOT NULL,
+  `owner` varchar(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_service` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `external` enum('0','1') NOT NULL DEFAULT '0',
+  `port` smallint(5) unsigned NOT NULL,
+  `entry` varchar(255) NOT NULL,
+  `deploy` varchar(255) NOT NULL,
+  `version` varchar(64) NOT NULL,
+  `color` char(7) NOT NULL,
+  `desc` mediumtext,
+  `dept` varchar(128) NOT NULL,
+  `devel` varchar(30) NOT NULL,
+  `qa` varchar(30) NOT NULL,
+  `ops` varchar(30) NOT NULL,
+  `hosts` text,
+  `softName` varchar(128) NOT NULL,
+  `softVersion` varchar(128) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `order` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_solutions` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `contents` text NOT NULL COMMENT '问题描述',
+  `support` text NOT NULL COMMENT '是否需要高层支持',
+  `measures` text NOT NULL COMMENT '解决建议',
+  `type` char(30) NOT NULL,
+  `addedBy` varchar(30) NOT NULL,
+  `addedDate` date NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_sqlview` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(90) NOT NULL,
+  `code` varchar(45) NOT NULL,
+  `sql` text NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_stage` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `percent` varchar(255) NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_stakeholder` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `objectID` mediumint(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `user` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `key` enum('0','1') NOT NULL,
+  `from` char(30) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  KEY `objectID` (`objectID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_story` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `parent` mediumint(9) NOT NULL DEFAULT '0',
+  `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `branch` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `plan` text,
+  `source` varchar(20) NOT NULL,
+  `sourceNote` varchar(255) NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `feedback` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `title` varchar(255) NOT NULL,
+  `keywords` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL DEFAULT 'story',
+  `category` varchar(30) NOT NULL DEFAULT 'feature',
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `estimate` float unsigned NOT NULL,
+  `status` enum('','changed','active','draft','closed') NOT NULL DEFAULT '',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released','closed') NOT NULL DEFAULT 'wait',
+  `stagedBy` char(30) NOT NULL,
+  `mailto` text,
+  `lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `fromStory` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `fromVersion` smallint(6) NOT NULL DEFAULT '1',
+  `openedBy` varchar(30) NOT NULL DEFAULT '',
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `approvedDate` date NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL DEFAULT '',
+  `lastEditedDate` datetime NOT NULL,
+  `changedBy` VARCHAR(30) NOT NULL,
+  `changedDate` DATETIME NOT NULL,
+  `reviewedBy` varchar(255) NOT NULL,
+  `reviewedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `toBug` mediumint(8) unsigned NOT NULL,
+  `childStories` varchar(255) NOT NULL,
+  `linkStories` varchar(255) NOT NULL,
+  `duplicateStory` mediumint(8) unsigned NOT NULL,
+  `version` smallint(6) NOT NULL DEFAULT '1',
+  `storyChanged` enum('0','1') NOT NULL DEFAULT '0',
+  `feedbackBy` varchar(100) NOT NULL,
+  `notifyEmail` varchar(100) NOT NULL,
+  `URChanged` enum('0','1') NOT NULL DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `status` (`status`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyestimate` (
+  `story` mediumint(9) NOT NULL,
+  `round` smallint(6) NOT NULL,
+  `estimate` text NOT NULL,
+  `average` float NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`round`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyreview` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `reviewer` varchar(30) NOT NULL,
+  `result` varchar(30) NOT NULL,
+  `reviewDate` datetime NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`,`reviewer`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storyspec` (
+  `story` mediumint(9) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `spec` mediumtext NOT NULL,
+  `verify` mediumtext NOT NULL,
+  UNIQUE KEY `story` (`story`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_storystage` (
+  `story` mediumint(8) unsigned NOT NULL,
+  `branch` mediumint(8) unsigned NOT NULL,
+  `stage` varchar(50) NOT NULL,
+  `stagedBy` char(30) NOT NULL,
+  UNIQUE KEY `story_branch` (`story`,`branch`),
+  KEY `story` (`story`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_suitecase` (
+  `suite` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  UNIQUE KEY `suitecase` (`suite`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_task` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `parent` mediumint(8) NOT NULL DEFAULT '0',
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `module` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `design` mediumint(8) unsigned NOT NULL,
+  `story` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `storyVersion` smallint(6) NOT NULL DEFAULT '1',
+  `designVersion` smallint(6) unsigned NOT NULL,
+  `fromBug` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `fromIssue` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `feedback` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `mode` varchar(10) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `estimate` float unsigned NOT NULL,
+  `consumed` float unsigned NOT NULL,
+  `left` float unsigned NOT NULL,
+  `deadline` date NOT NULL,
+  `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `color` char(7) NOT NULL,
+  `mailto` text,
+  `desc` mediumtext NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `openedBy` varchar(30) NOT NULL,
+  `openedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `estStarted` date NOT NULL,
+  `realStarted` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL,
+  `finishedDate` datetime NOT NULL,
+  `finishedList` text NOT NULL,
+  `canceledBy` varchar(30) NOT NULL,
+  `canceledDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL,
+  `closedDate` datetime NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
+  `closedReason` varchar(30) NOT NULL,
+  `lastEditedBy` varchar(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `activatedDate` datetime NOT NULL,
+  `repo` mediumint(8) unsigned NOT NULL,
+  `mr` mediumint(8) unsigned NOT NULL,
+  `entry` varchar(255) NOT NULL,
+  `lines` varchar(10) NOT NULL,
+  `v1` varchar(40) NOT NULL,
+  `v2` varchar(40) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  PRIMARY KEY (`id`),
+  KEY `execution` (`execution`),
+  KEY `story` (`story`),
+  KEY `parent` (`parent`),
+  KEY `assignedTo` (`assignedTo`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskestimate` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `date` date NOT NULL,
+  `left` float unsigned NOT NULL DEFAULT '0',
+  `consumed` float unsigned NOT NULL,
+  `account` char(30) NOT NULL DEFAULT '',
+  `work` text,
+  PRIMARY KEY (`id`),
+  KEY `task` (`task`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_team` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `root` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `type` enum('project','task','execution') NOT NULL DEFAULT 'project',
+  `account` char(30) NOT NULL DEFAULT '',
+  `role` char(30) NOT NULL DEFAULT '',
+  `position` varchar(30) NOT NULL,
+  `limited` char(8) NOT NULL DEFAULT 'no',
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `days` smallint(5) unsigned NOT NULL,
+  `hours` float(3,1) unsigned NOT NULL DEFAULT '0.0',
+  `estimate` decimal(12,2) unsigned NOT NULL DEFAULT '0.00',
+  `consumed` decimal(12,2) unsigned NOT NULL DEFAULT '0.00',
+  `left` decimal(12,2) unsigned NOT NULL DEFAULT '0.00',
+  `order` tinyint(3) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `team` (`root`,`type`,`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL,
+  `tasks` varchar(255) NOT NULL,
+  `builds` varchar(255) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `owner` char(30) NOT NULL,
+  `members` text NOT NULL,
+  `stories` text NOT NULL,
+  `bugs` text NOT NULL,
+  `cases` text NOT NULL,
+  `report` text NOT NULL,
+  `objectType` varchar(20) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testresult` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `run` mediumint(8) unsigned NOT NULL,
+  `case` mediumint(8) unsigned NOT NULL,
+  `version` smallint(5) unsigned NOT NULL,
+  `job` mediumint(8) unsigned NOT NULL,
+  `compile` mediumint(8) unsigned NOT NULL,
+  `caseResult` char(30) NOT NULL,
+  `stepResults` text NOT NULL,
+  `lastRunner` varchar(30) NOT NULL,
+  `date` datetime NOT NULL,
+  `duration` float NOT NULL,
+  `xml` text NOT NULL,
+  `deploy` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `case` (`case`),
+  KEY `version` (`version`),
+  KEY `run` (`run`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testrun` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `case` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `version` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `assignedTo` char(30) NOT NULL DEFAULT '',
+  `lastRunner` varchar(30) NOT NULL,
+  `lastRunDate` datetime NOT NULL,
+  `lastRunResult` char(30) NOT NULL,
+  `status` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `task` (`task`,`case`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testsuite` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `addedBy` char(30) NOT NULL,
+  `addedDate` datetime NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_testtask` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
+  `name` char(90) NOT NULL,
+  `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `build` char(30) NOT NULL,
+  `type` varchar(255) NOT NULL DEFAULT '',
+  `owner` varchar(30) NOT NULL,
+  `pri` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `realFinishedDate` datetime NOT NULL,
+  `mailto` text,
+  `desc` mediumtext NOT NULL,
+  `report` text NOT NULL,
+  `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait',
+  `testreport` mediumint(8) unsigned NOT NULL,
+  `auto` varchar(10) NOT NULL DEFAULT 'no',
+  `subStatus` varchar(30) NOT NULL DEFAULT '',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `product` (`product`),
+  KEY `build` (`build`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_todo` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `date` date NOT NULL,
+  `begin` smallint(4) unsigned zerofill NOT NULL,
+  `end` smallint(4) unsigned zerofill NOT NULL,
+  `feedback` mediumint(8) unsigned NOT NULL,
+  `type` char(15) NOT NULL,
+  `cycle` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `idvalue` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `pri` tinyint(3) unsigned NOT NULL,
+  `name` char(150) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait',
+  `private` tinyint(1) NOT NULL,
+  `config` varchar(255) NOT NULL,
+  `assignedTo` varchar(30) NOT NULL DEFAULT '',
+  `assignedBy` varchar(30) NOT NULL DEFAULT '',
+  `assignedDate` datetime NOT NULL,
+  `finishedBy` varchar(30) NOT NULL DEFAULT '',
+  `finishedDate` datetime NOT NULL,
+  `closedBy` varchar(30) NOT NULL DEFAULT '',
+  `closedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `assignedTo` (`assignedTo`),
+  KEY `finishedBy` (`finishedBy`),
+  KEY `date` (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_traincategory` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL DEFAULT '',
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `grade` tinyint(3) NOT NULL,
+  `order` mediumint(8) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `parent` (`parent`),
+  KEY `path` (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_traincontents` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `code` varchar(50) NOT NULL,
+  `course` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(255) NOT NULL,
+  `type` varchar(30) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `path` char(255) NOT NULL DEFAULT '',
+  `desc` text NOT NULL,
+  `order` mediumint(8) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_traincourse` (
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
+  `code` varchar(50) NOT NULL,
+  `category` mediumint(8) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `status` varchar(10) NOT NULL,
+  `teacher` varchar(30) NOT NULL DEFAULT '',
+  `desc` mediumtext NOT NULL,
+  `createdBy` varchar(255) NOT NULL,
+  `createdDate` date NOT NULL,
+  `editedBy` varchar(255) NOT NULL,
+  `editedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_trainplan` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `place` varchar(255) NOT NULL,
+  `trainee` text NOT NULL,
+  `lecturer` varchar(20) NOT NULL,
+  `type` enum('inside','outside') NOT NULL DEFAULT 'inside',
+  `status` varchar(20) NOT NULL,
+  `summary` mediumtext NOT NULL,
+  `createdBy` char(30) DEFAULT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_trainrecords` (
+  `user` char(30) NOT NULL,
+  `objectId` mediumint(8) unsigned NOT NULL,
+  `objectType` varchar(10) NOT NULL,
+  `status` varchar(10) NOT NULL,
+  PRIMARY KEY (`user`,`objectId`,`objectType`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_trip` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` enum('trip','egress') NOT NULL DEFAULT 'trip',
+  `customers` varchar(20) NOT NULL,
+  `name` char(30) NOT NULL,
+  `desc` text NOT NULL,
+  `year` char(4) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  `start` time NOT NULL,
+  `finish` time NOT NULL,
+  `from` char(50) NOT NULL,
+  `to` char(50) NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `year` (`year`),
+  KEY `createdBy` (`createdBy`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_user` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `company` mediumint(8) unsigned NOT NULL,
+  `type` char(30) NOT NULL DEFAULT 'inside',
+  `dept` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `account` char(30) NOT NULL DEFAULT '',
+  `password` char(32) NOT NULL DEFAULT '',
+  `role` char(10) NOT NULL DEFAULT '',
+  `realname` varchar(100) NOT NULL DEFAULT '',
+  `pinyin` varchar(255) NOT NULL DEFAULT '',
+  `nickname` char(60) NOT NULL DEFAULT '',
+  `commiter` varchar(100) NOT NULL,
+  `avatar` text NOT NULL,
+  `birthday` date NOT NULL DEFAULT '0000-00-00',
+  `gender` enum('f','m') NOT NULL DEFAULT 'f',
+  `email` char(90) NOT NULL DEFAULT '',
+  `skype` char(90) NOT NULL DEFAULT '',
+  `qq` char(20) NOT NULL DEFAULT '',
+  `mobile` char(11) NOT NULL DEFAULT '',
+  `phone` char(20) NOT NULL DEFAULT '',
+  `weixin` varchar(90) NOT NULL DEFAULT '',
+  `dingding` varchar(90) NOT NULL DEFAULT '',
+  `slack` varchar(90) NOT NULL DEFAULT '',
+  `whatsapp` varchar(90) NOT NULL DEFAULT '',
+  `address` char(120) NOT NULL DEFAULT '',
+  `zipcode` char(10) NOT NULL DEFAULT '',
+  `nature` text NOT NULL,
+  `analysis` text NOT NULL,
+  `strategy` text NOT NULL,
+  `join` date NOT NULL DEFAULT '0000-00-00',
+  `visits` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `visions` varchar(20) NOT NULL DEFAULT 'rnd,lite',
+  `ip` char(15) NOT NULL DEFAULT '',
+  `last` int(10) unsigned NOT NULL DEFAULT '0',
+  `fails` tinyint(5) NOT NULL DEFAULT '0',
+  `locked` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `feedback` enum('0','1') NOT NULL DEFAULT '0',
+  `ranzhi` char(30) NOT NULL DEFAULT '',
+  `ldap` char(30) NOT NULL,
+  `score` int(11) NOT NULL DEFAULT '0',
+  `scoreLevel` int(11) NOT NULL DEFAULT '0',
+  `resetToken` varchar(50) NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `clientStatus` enum('online','away','busy','offline','meeting') NOT NULL DEFAULT 'offline',
+  `clientLang` varchar(10) NOT NULL DEFAULT 'zh-cn',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `account` (`account`),
+  KEY `dept` (`dept`),
+  KEY `email` (`email`),
+  KEY `commiter` (`commiter`),
+  KEY `deleted` (`deleted`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usercontact` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `listName` varchar(60) NOT NULL,
+  `userList` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usergroup` (
+  `account` char(30) NOT NULL DEFAULT '',
+  `group` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `project` text NOT NULL,
+  UNIQUE KEY `account` (`account`,`group`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userquery` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `title` varchar(90) NOT NULL,
+  `form` text NOT NULL,
+  `sql` text NOT NULL,
+  `shortcut` enum('0','1') NOT NULL DEFAULT '0',
+  `common` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_usertpl` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `account` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `title` varchar(150) NOT NULL,
+  `content` text NOT NULL,
+  `public` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_userview` (
+  `account` char(30) NOT NULL,
+  `programs` mediumtext NOT NULL,
+  `products` mediumtext NOT NULL,
+  `projects` mediumtext NOT NULL,
+  `sprints` mediumtext NOT NULL,
+  UNIQUE KEY `account` (`account`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_vm` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `hostID` int(10) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `osCategory` varchar(50) NOT NULL DEFAULT '',
+  `osType` varchar(50) NOT NULL DEFAULT '',
+  `osArch` varchar(50) NOT NULL DEFAULT '',
+  `osLang` varchar(50) NOT NULL DEFAULT '',
+  `osCpu` tinyint(2) NOT NULL DEFAULT 0,
+  `osMemory` smallint(6) NOT NULL DEFAULT 0,
+  `osDisk` smallint(6) NOT NULL DEFAULT 0,
+  `status` varchar(50) NOT NULL DEFAULT '',
+  `destroyAt` datetime DEFAULT NULL,
+  `macAddress` varchar(255) NOT NULL DEFAULT '',
+  `workspace` varchar(255) NOT NULL DEFAULT '',
+  `templateID` int(10) unsigned NOT NULL DEFAULT '0',
+  `baseImageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `baseImagePath` varchar(255) NOT NULL DEFAULT '',
+  `desc` varchar(255) NOT NULL DEFAULT '',
+  `heatbeat` datetime DEFAULT NULL,
+  `vncPort` int(10) NOT NULL DEFAULT 0,
+  `instance` varchar(255) NOT NULL DEFAULT '',
+  `eip` varchar(255) NOT NULL DEFAULT '',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `public` varchar(50) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_vmtemplate` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `hostID` int(10) unsigned NOT NULL DEFAULT '0',
+  `templateName` varchar(255) NOT NULL DEFAULT '',
+  `osType` varchar(50) NOT NULL DEFAULT '',
+  `osCategory` varchar(50) NOT NULL DEFAULT '',
+  `osVersion` varchar(50) NOT NULL DEFAULT '',
+  `osLang` varchar(50) NOT NULL,
+  `cpuCoreNum` smallint(4) NOT NULL DEFAULT 0,
+  `memorySize` int NOT NULL DEFAULT 0,
+  `diskSize` int NOT NULL DEFAULT 0,
+  `osArch` varchar(50) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_webhook` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(15) NOT NULL DEFAULT 'default',
+  `name` varchar(50) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `secret` varchar(255) NOT NULL,
+  `contentType` varchar(30) NOT NULL DEFAULT 'application/json',
+  `sendType` enum('sync','async') NOT NULL DEFAULT 'sync',
+  `products` text NOT NULL,
+  `executions` text NOT NULL,
+  `params` varchar(100) NOT NULL,
+  `actions` text NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_weeklyreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `weekStart` date NOT NULL,
+  `pv` float(9,2) NOT NULL,
+  `ev` float(9,2) NOT NULL,
+  `ac` float(9,2) NOT NULL,
+  `sv` float(9,2) NOT NULL,
+  `cv` float(9,2) NOT NULL,
+  `staff` smallint(5) unsigned NOT NULL,
+  `progress` varchar(255) NOT NULL,
+  `workload` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `week` (`project`,`weekStart`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workestimation` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `project` mediumint(8) unsigned NOT NULL,
+  `scale` decimal(10,2) unsigned NOT NULL,
+  `productivity` decimal(10,2) unsigned NOT NULL,
+  `duration` decimal(10,2) unsigned NOT NULL,
+  `unitLaborCost` decimal(10,2) unsigned NOT NULL,
+  `totalLaborCost` decimal(10,2) unsigned NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `dayHour` decimal(10,2) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflow` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `parent` varchar(30) NOT NULL,
+  `child` varchar(30) NOT NULL,
+  `type` varchar(10) NOT NULL DEFAULT 'flow',
+  `navigator` varchar(10) NOT NULL,
+  `app` varchar(20) NOT NULL,
+  `position` varchar(30) NOT NULL,
+  `module` varchar(30) NOT NULL,
+  `table` varchar(50) NOT NULL,
+  `name` varchar(30) NOT NULL,
+  `titleField` varchar(30) NOT NULL,
+  `contentField` text NOT NULL,
+  `flowchart` text NOT NULL,
+  `js` text NOT NULL,
+  `css` text NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `buildin` tinyint(1) unsigned NOT NULL,
+  `administrator` text NOT NULL,
+  `desc` text NOT NULL,
+  `version` varchar(10) NOT NULL DEFAULT '1.0',
+  `status` varchar(10) NOT NULL DEFAULT 'wait',
+  `approval` enum('enabled', 'disabled') NOT NULL DEFAULT 'disabled',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`app`,`module`,`vision`),
+  KEY `type` (`type`),
+  KEY `app` (`app`),
+  KEY `module` (`module`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM AUTO_INCREMENT=19 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowaction` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL,
+  `action` varchar(50) NOT NULL,
+  `method` varchar(50) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `type` enum('single','batch') NOT NULL DEFAULT 'single',
+  `batchMode` enum('same','different') NOT NULL DEFAULT 'different',
+  `extensionType` varchar(10) NOT NULL DEFAULT 'override' COMMENT 'none | extend | override',
+  `open` varchar(20) NOT NULL,
+  `position` enum('menu','browseandview','browse','view') NOT NULL DEFAULT 'browseandview',
+  `layout` char(20) NOT NULL,
+  `show` enum('dropdownlist','direct') NOT NULL DEFAULT 'dropdownlist',
+  `order` smallint(5) unsigned NOT NULL,
+  `buildin` tinyint(1) unsigned NOT NULL,
+  `role` varchar(10) NOT NULL DEFAULT 'custom',
+  `virtual` tinyint(1) unsigned NOT NULL,
+  `conditions` text NOT NULL,
+  `verifications` text NOT NULL,
+  `hooks` text NOT NULL,
+  `linkages` text NOT NULL,
+  `js` text NOT NULL,
+  `css` text NOT NULL,
+  `toList` char(255) NOT NULL,
+  `blocks` text NOT NULL,
+  `desc` text NOT NULL,
+  `status` varchar(10) NOT NULL DEFAULT 'enable',
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`module`,`action`,`vision`),
+  KEY `module` (`module`),
+  KEY `action` (`action`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM AUTO_INCREMENT=190 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowdatasource` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` enum('system','sql','func','option','lang','category') NOT NULL DEFAULT 'option',
+  `name` varchar(30) NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `datasource` text NOT NULL,
+  `view` varchar(20) NOT NULL,
+  `keyField` varchar(50) NOT NULL,
+  `valueField` varchar(50) NOT NULL,
+  `buildin` tinyint(1) unsigned NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `type` (`type`)
+) ENGINE=MyISAM AUTO_INCREMENT=71 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowfield` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `type` varchar(20) NOT NULL DEFAULT 'varchar',
+  `length` varchar(10) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `control` varchar(20) NOT NULL,
+  `expression` text NOT NULL,
+  `options` text NOT NULL,
+  `default` varchar(100) NOT NULL,
+  `rules` varchar(255) NOT NULL,
+  `placeholder` varchar(100) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `searchOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `exportOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `canExport` enum('0','1') NOT NULL DEFAULT '0',
+  `canSearch` enum('0','1') NOT NULL DEFAULT '0',
+  `isValue` enum('0','1') NOT NULL DEFAULT '0',
+  `readonly` enum('0','1') NOT NULL DEFAULT '0',
+  `buildin` tinyint(1) unsigned NOT NULL,
+  `role` varchar(10) NOT NULL DEFAULT 'custom',
+  `desc` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`module`,`field`),
+  KEY `module` (`module`),
+  KEY `field` (`field`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM AUTO_INCREMENT=360 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowlabel` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL,
+  `action` varchar(30) NOT NULL DEFAULT 'browse',
+  `code` varchar(30) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `params` text NOT NULL,
+  `orderBy` text NOT NULL,
+  `order` tinyint(3) NOT NULL,
+  `buildin` tinyint(1) unsigned NOT NULL,
+  `role` varchar(10) NOT NULL DEFAULT 'custom',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM AUTO_INCREMENT=53 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowlayout` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL,
+  `action` varchar(50) NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  `width` smallint(5) NOT NULL,
+  `position` text NOT NULL,
+  `readonly` enum('0','1') NOT NULL DEFAULT '0',
+  `mobileShow` enum('0','1') NOT NULL DEFAULT '1',
+  `summary` varchar(20) NOT NULL,
+  `defaultValue` text NOT NULL,
+  `layoutRules` varchar(255) NOT NULL,
+  `vision` varchar(10) NOT NULL DEFAULT 'rnd',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`module`,`action`,`field`,`vision`),
+  KEY `module` (`module`),
+  KEY `action` (`action`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM AUTO_INCREMENT=138 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowlinkdata` (
+  `objectType` varchar(30) NOT NULL,
+  `objectID` mediumint(8) unsigned NOT NULL,
+  `linkedType` varchar(30) NOT NULL,
+  `linkedID` mediumint(8) unsigned NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  UNIQUE KEY `unique` (`objectType`,`objectID`,`linkedType`,`linkedID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowrelation` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `prev` varchar(30) NOT NULL,
+  `next` varchar(30) NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `actions` varchar(20) NOT NULL,
+  `actionCodes` text NOT NULL,
+  `buildin` enum('0','1') NOT NULL DEFAULT '0',
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowrelationlayout` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `prev` varchar(30) NOT NULL,
+  `next` varchar(30) NOT NULL,
+  `action` varchar(50) NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `order` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique` (`prev`,`next`,`action`,`field`),
+  KEY `prev` (`prev`),
+  KEY `next` (`next`),
+  KEY `action` (`action`),
+  KEY `order` (`order`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowreport` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL COMMENT 'module name',
+  `name` varchar(100) NOT NULL COMMENT 'report name',
+  `type` enum('pie','line','bar') NOT NULL DEFAULT 'pie' COMMENT 'report type',
+  `countType` enum('sum','count') NOT NULL DEFAULT 'sum' COMMENT 'report count method',
+  `displayType` enum('value','percent') NOT NULL DEFAULT 'value' COMMENT 'report display method',
+  `dimension` varchar(130) NOT NULL COMMENT 'dimension field code of zt_workflowfield',
+  `fields` text NOT NULL COMMENT 'count fileds code of zt_workflowfield,use comma split',
+  `order` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowrule` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `type` enum('system','regex','func') NOT NULL DEFAULT 'regex',
+  `name` varchar(30) NOT NULL,
+  `rule` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` char(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `type` (`type`)
+) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowsql` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `action` varchar(50) NOT NULL,
+  `sql` text NOT NULL,
+  `vars` text NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `module` (`module`),
+  KEY `field` (`field`),
+  KEY `action` (`action`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_workflowversion` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `module` varchar(30) NOT NULL,
+  `version` varchar(10) NOT NULL,
+  `fields` text NOT NULL,
+  `actions` text NOT NULL,
+  `layouts` text NOT NULL,
+  `sqls` text NOT NULL,
+  `labels` text NOT NULL,
+  `table` text NOT NULL,
+  `datas` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `moduleversion` (`module`,`version`),
+  KEY `module` (`module`),
+  KEY `version` (`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE `zt_zoutput` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `activity` mediumint(8) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `content` mediumtext NOT NULL,
+  `optional` char(20) NOT NULL,
+  `tailorNorm` varchar(255) NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `order` mediumint(8) DEFAULT '0',
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=130 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_dayactions` AS SELECT
+ 1 AS `actions`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_daybugopen` AS SELECT
+ 1 AS `bugopen`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_daybugresolve` AS SELECT
+ 1 AS `bugresolve`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_dayeffort` AS SELECT
+ 1 AS `consumed`,
+ 1 AS `date`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_daystoryclose` AS SELECT
+ 1 AS `storyclose`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_daystoryopen` AS SELECT
+ 1 AS `storyopen`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_daytaskfinish` AS SELECT
+ 1 AS `taskfinish`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_daytaskopen` AS SELECT
+ 1 AS `taskopen`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_dayuserlogin` AS SELECT
+ 1 AS `userlogin`,
+ 1 AS `day`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_executionsummary` AS SELECT
+ 1 AS `execution`,
+ 1 AS `estimate`,
+ 1 AS `consumed`,
+ 1 AS `left`,
+ 1 AS `number`,
+ 1 AS `undone`,
+ 1 AS `totalReal`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_productbugs` AS SELECT
+ 1 AS `product`,
+ 1 AS `bugs`,
+ 1 AS `resolutions`,
+ 1 AS `seriousBugs`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_productstories` AS SELECT
+ 1 AS `product`,
+ 1 AS `stories`,
+ 1 AS `undone`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_projectbugs` AS SELECT
+ 1 AS `execution`,
+ 1 AS `bugs`,
+ 1 AS `resolutions`,
+ 1 AS `seriousBugs`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_projectstories` AS SELECT
+ 1 AS `execution`,
+ 1 AS `stories`,
+ 1 AS `undone`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_projectsummary` AS SELECT
+ 1 AS `project`,
+ 1 AS `estimate`,
+ 1 AS `consumed`,
+ 1 AS `left`,
+ 1 AS `number`,
+ 1 AS `undone`,
+ 1 AS `totalReal`*/;
+SET character_set_client = @saved_cs_client;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `ztv_projectteams` AS SELECT
+ 1 AS `execution`,
+ 1 AS `teams`*/;
+SET character_set_client = @saved_cs_client;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_10`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_10` AS select `zt_build`.`id` AS `id`,`zt_build`.`name` AS `name` from `zt_build` where (`zt_build`.`deleted` = '0') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_11`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_11` AS select `zt_module`.`id` AS `id`,`zt_module`.`name` AS `name` from `zt_module` where (`zt_module`.`deleted` = '0') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_12`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_12` AS select `zt_productplan`.`id` AS `id`,`zt_productplan`.`title` AS `title` from `zt_productplan` where (`zt_productplan`.`deleted` = '0') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_4`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_4` AS select `zt_story`.`id` AS `id`,`zt_story`.`title` AS `title` from `zt_story` where (`zt_story`.`deleted` = '0') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_41`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_41` AS select `zt_case`.`id` AS `id`,`zt_case`.`title` AS `title` from `zt_case` where (`zt_case`.`deleted` = '0') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_46`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_46` AS select `zt_task`.`id` AS `id`,`zt_task`.`name` AS `name` from `zt_task` where ((`zt_task`.`deleted` = '0') and (`zt_task`.`vision` = 'lite')) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_5`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_5` AS select `zt_task`.`id` AS `id`,`zt_task`.`name` AS `name` from `zt_task` where ((`zt_task`.`deleted` = '0') and (`zt_task`.`vision` = 'rnd')) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `view_datasource_6`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `view_datasource_6` AS select `zt_bug`.`id` AS `id`,`zt_bug`.`title` AS `title` from `zt_bug` where (`zt_bug`.`deleted` = '0') */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_dayactions`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_dayactions` AS select count(0) AS `actions`,left(`zt_action`.`date`,10) AS `day` from `zt_action` group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_daybugopen`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_daybugopen` AS select count(0) AS `bugopen`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'bug') and (`zt_action`.`action` = 'opened')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_daybugresolve`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_daybugresolve` AS select count(0) AS `bugresolve`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'bug') and (`zt_action`.`action` = 'resolved')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_dayeffort`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_dayeffort` AS select round(sum(`zt_effort`.`consumed`),1) AS `consumed`,`zt_effort`.`date` AS `date` from `zt_effort` group by `zt_effort`.`date` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_daystoryclose`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_daystoryclose` AS select count(0) AS `storyclose`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'story') and (`zt_action`.`action` = 'closed')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_daystoryopen`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_daystoryopen` AS select count(0) AS `storyopen`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'story') and (`zt_action`.`action` = 'opened')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_daytaskfinish`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_daytaskfinish` AS select count(0) AS `taskfinish`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'task') and (`zt_action`.`action` = 'finished')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_daytaskopen`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_daytaskopen` AS select count(0) AS `taskopen`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'task') and (`zt_action`.`action` = 'opened')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_dayuserlogin`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_dayuserlogin` AS select count(0) AS `userlogin`,left(`zt_action`.`date`,10) AS `day` from `zt_action` where ((`zt_action`.`objectType` = 'user') and (`zt_action`.`action` = 'login')) group by left(`zt_action`.`date`,10) */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_executionsummary`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_executionsummary` AS select `zt_task`.`execution` AS `execution`,sum(if((`zt_task`.`parent` >= '0'),`zt_task`.`estimate`,0)) AS `estimate`,sum(if((`zt_task`.`parent` >= '0'),`zt_task`.`consumed`,0)) AS `consumed`,sum(if(((`zt_task`.`status` <> 'cancel') and (`zt_task`.`status` <> 'closed') and (`zt_task`.`parent` >= '0')),`zt_task`.`left`,0)) AS `left`,count(0) AS `number`,sum(if(((`zt_task`.`status` <> 'done') and (`zt_task`.`status` <> 'closed')),1,0)) AS `undone`,sum((if((`zt_task`.`parent` >= '0'),`zt_task`.`consumed`,0) + if(((`zt_task`.`status` <> 'cancel') and (`zt_task`.`status` <> 'closed') and (`zt_task`.`parent` >= '0')),`zt_task`.`left`,0))) AS `totalReal` from `zt_task` where (`zt_task`.`deleted` = '0') group by `zt_task`.`execution` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_productbugs`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_productbugs` AS select `zt_bug`.`product` AS `product`,count(0) AS `bugs`,sum(if((`zt_bug`.`resolution` = ''),0,1)) AS `resolutions`,sum(if((`zt_bug`.`severity` <= 2),1,0)) AS `seriousBugs` from `zt_bug` where (`zt_bug`.`deleted` = '0') group by `zt_bug`.`product` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_productstories`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_productstories` AS select `zt_story`.`product` AS `product`,count('*') AS `stories`,sum(if((`zt_story`.`status` = 'closed'),0,1)) AS `undone` from `zt_story` where (`zt_story`.`deleted` = '0') group by `zt_story`.`product` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_projectbugs`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_projectbugs` AS select `zt_bug`.`execution` AS `execution`,count(0) AS `bugs`,sum(if((`zt_bug`.`resolution` = ''),0,1)) AS `resolutions`,sum(if((`zt_bug`.`severity` <= 2),1,0)) AS `seriousBugs` from `zt_bug` where (`zt_bug`.`deleted` = '0') group by `zt_bug`.`execution` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_projectstories`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_projectstories` AS select `t1`.`project` AS `execution`,count('*') AS `stories`,sum(if((`t2`.`status` = 'closed'),0,1)) AS `undone` from ((`zt_projectstory` `t1` left join `zt_story` `t2` on((`t1`.`story` = `t2`.`id`))) left join `zt_project` `t3` on((`t1`.`project` = `t3`.`id`))) where ((`t2`.`deleted` = '0') and (`t3`.`type` in ('sprint','stage'))) group by `t1`.`project` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_projectsummary`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_projectsummary` AS select `zt_task`.`project` AS `project`,sum(if((`zt_task`.`parent` >= '0'),`zt_task`.`estimate`,0)) AS `estimate`,sum(if((`zt_task`.`parent` >= '0'),`zt_task`.`consumed`,0)) AS `consumed`,sum(if(((`zt_task`.`status` <> 'cancel') and (`zt_task`.`status` <> 'closed') and (`zt_task`.`parent` >= '0')),`zt_task`.`left`,0)) AS `left`,count(0) AS `number`,sum(if(((`zt_task`.`status` <> 'done') and (`zt_task`.`status` <> 'closed')),1,0)) AS `undone`,sum((if((`zt_task`.`parent` >= '0'),`zt_task`.`consumed`,0) + if(((`zt_task`.`status` <> 'cancel') and (`zt_task`.`status` <> 'closed') and (`zt_task`.`parent` >= '0')),`zt_task`.`left`,0))) AS `totalReal` from `zt_task` where (`zt_task`.`deleted` = '0') group by `zt_task`.`project` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
+/*!50001 DROP VIEW IF EXISTS `ztv_projectteams`*/;
+/*!50001 SET @saved_cs_client          = @@character_set_client */;
+/*!50001 SET @saved_cs_results         = @@character_set_results */;
+/*!50001 SET @saved_col_connection     = @@collation_connection */;
+/*!50001 SET character_set_client      = utf8 */;
+/*!50001 SET character_set_results     = utf8 */;
+/*!50001 SET collation_connection      = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `ztv_projectteams` AS select `zt_team`.`root` AS `execution`,count('*') AS `teams` from `zt_team` where (`zt_team`.`type` = 'execution') group by `zt_team`.`root` */;
+/*!50001 SET character_set_client      = @saved_cs_client */;
+/*!50001 SET character_set_results     = @saved_cs_results */;
+/*!50001 SET collation_connection      = @saved_col_connection */;
diff --git a/db/update17.2.sql b/db/update17.2.sql
index b179886a63..766260a619 100644
--- a/db/update17.2.sql
+++ b/db/update17.2.sql
@@ -14,3 +14,5 @@ ALTER TABLE `zt_doc` CHANGE `assignedDate` `assignedDate` datetime NOT NULL AFTE
 
 UPDATE `zt_approval` SET  `createdDate` = '';
 ALTER TABLE `zt_approval` CHANGE `createdDate` `createdDate` datetime NOT NULL AFTER `createdBy`;
+
+ALTER TABLE `zt_reviewissue` ADD `approval` MEDIUMINT  NOT NULL  AFTER `review`;
diff --git a/db/zentao.sql b/db/zentao.sql
index 14814badb6..0b05f10896 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -9526,6 +9526,7 @@ CREATE TABLE IF NOT EXISTS `zt_reviewissue` (
   `id` mediumint(8) NOT NULL AUTO_INCREMENT,
   `project` mediumint(8) unsigned NOT NULL,
   `review` mediumint(8) NOT NULL,
+  `approval` mediumint(8) NOT NULL,
   `injection` mediumint(8) NOT NULL,
   `identify` mediumint(8) NOT NULL,
   `type` char(30) NOT NULL DEFAULT 'review',
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index d967860ee2..d7d9d383e2 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,96 @@
+2022-07-13 17.3
+完成的需求
+14130 点击按钮执行升级后禁用升级按钮
+14578 总计消耗不为0时再次点击完成任务后消耗工时可以填写为0
+15349 产品模块的维护增加历史记录
+26444 重新激活父任务时需要同步更新子任务的历史记录
+27723 年度总结按部门查看增加权限控制
+30114 实现禅道中累积流图的帮助功能
+30121 实现禅道执行视图下的需求累积流图
+30128 实现禅道执行视图下的任务累积流图
+30190 创建看板时增加复制看板功能
+31342 批量创建任务表单的右侧增加添加和删除行的操作
+31746 Scrum看板中任务看板按需求分组时需求以卡片方式展示
+31848 删除测试测试单列表中操作按钮中间的小竖线
+32329 跨应用跳转页面时直接展示跳转后的页面
+32584 瀑布项目阶段列表中阶段名称前增加展开、收起按钮
+32834 任务创建页面修改自定义表单后不影响已录入内容
+32994 时间设置错误提示删除日历自动展开效果
+33003 非所有标签的列表内容为空时，删除新建操作
+33085 需求提交页面修改自定义表单后不影响已录入内容
+33132 修改干系人新增页面中用户字段未定义提示
+33168 复制执行页面增加项目的选择菜单
+33170 BUG提交页面修改自定义表单后不影响已录入内容
+33171 用例提交页面修改自定义表单后不影响已录入内容
+33180 批量提需求表单的右侧增加添加和删除行的操作
+33181 批量提Bug表单的右侧增加添加和删除行的操作
+33182 批量建用例表单的右侧增加添加和删除行的操作
+33307 加大bug提交页面中操作系统输入框的宽度
+33308 加大bug提交页面中“关键词“字段标题框宽度
+33415 用例库中的用例可以多次导入到同一个产品的不同模块
+33418 瀑布项目阶段设置页面里程碑字段居中显示
+33419 瀑布项目阶段设置页面中操作字段居中显示
+33438 缩短组织下团队列表页面姓名跟用户名字段的间距
+33445 bug提交页面中刷新按钮改为图标显示
+33446 列表中日期没有定义时展示为空
+33448 缩小bug编辑页面中标题输入框宽度
+33516 后台全局设置中文档模板列表的的删除按钮改为垃圾桶样式
+33519 后台自定义页面修改提示语样式
+33540 优化搜索条件保存按钮样式
+33542 用例列表页面的执行时间格式调整
+33547 项目测试单列表的报告列表按钮修改
+33607 项目集列表中对展开和收起的状态做记录
+33617 瀑布项目阶段列表增加显示任务设置
+33673 我参与标签中能显示我负责和我在团队中的空间和看板
+33705 项目中测试的Bug列表增加产品模块功能
+33706 执行中测试的Bug列表增加产品模块功能
+33707 执行中测试的用例列表增加产品模块功能
+33775 详情页面中附件增加预览和下载按钮
+33777 研发需求变更页面增加附件编辑操作
+33782 地盘仪表盘待处理区块对齐调整
+33807 产品矩阵列表居左显示
+33879 阶段列表中展示任务列表
+33896 实现禅道执行视图下的Bug累积流图
+33939 后台通知设置页面中“评论”字段修改为“备注”
+33953 项目创建页面中，关联产品下拉框增加不可点击状态
+33970 测试仪表盘测试统计区块中统计字体颜色调整
+33972 增加国际版地盘任务列表页面截止日期字段的宽度
+33973 计划详情列表中返回路径优化
+33983 我的地盘日程中右侧任务和软需切换样式调整
+33986 产品发布创建页面里程碑选中状态修改
+33987 执行任务列表预计、消耗、剩余、进度字段居右显示
+33988 执行任务列表"截止"字段居左显示
+33999 统计产品页面删除“筛选条件"字段
+34028 后台二次开发API列表页面表头字段加粗
+34029 执行任务列表页面“完成者”字段内容过多时省略显示
+34036 专业研发看板项目的执行模块添加累积流图入口
+34038 累积流图中增加更新按钮
+34048 累积流图页增加下拉框支持切换类型
+34049 累积流图展示平均周期时间和吞吐率
+34050 累积流图中增加悬浮样式
+34138 scrum看板页面卡片局部刷新
+34139 通用看板页面卡片局部刷新
+34140 看板项目专业研发看板编辑区域后自动刷新
+34142 专业研发看板页面卡片局部刷新
+34266 修改产品计划详情页面提研发需求按钮的下拉菜单为右对齐
+34349 国际版地盘仪表盘添加区块弹窗中待办和待处理的英文修改
+34350 国际版中编辑和详情页面附件重命名的英文修改为Rename
+34354 修改产品研发需求提交页面中附件操作按钮颜色
+34367 累积流图增加隐藏周末按钮
+34387 需求提交页面产品分支输入框显示完整
+34497 邮箱修改密码优化格式校验提示语
+34580 任务详情编辑页面中，团队设置弹窗增加关闭按钮
+34609 修改产品分支合并的提示样式
+34610 当所有标签的列表内容均为空时，增加新建按钮
+34611 修改后台系统安全设置页面的提示语样式
+修复的Bug
+23123 项目/执行的Bug页左上角下拉组件未显示多分支产品的分支下拉
+23827 批量编辑项目时，提示文案不清晰
+24923 英文下项目集下新增干系人页面字段名称换行
+24976 内禅3.3版本需求列表需求名称显示3个点
+24981 隐藏来源没有同步隐藏其关联的文本框
+25070 后台-自定义-必填项-任务-建任务页面设置最初预计为必填项，创建多人任务团队成员预计工时为空也可以保存
+
 2022-06-29 17.2
 完成的需求
 12709 创建某一类型的待办时，若无指派给我的内容列表提示用户
diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php
index f1628a9f41..48c45f580f 100644
--- a/extension/lite/kanban/ext/model/lite.php
+++ b/extension/lite/kanban/ext/model/lite.php
@@ -12,10 +12,11 @@ public function __construct($appName = '')
  * @param  int    $browseType
  * @param  int    $groupBy
  * @param  string $searchValue
+ * @param  string $orderBy
  * @access public
  * @return array
  */
-public function getKanban4Group($executionID, $browseType, $groupBy, $searchValue = '')
+public function getKanban4Group($executionID, $browseType, $groupBy, $searchValue = '', $orderBy = 'pri_asc')
 {
     /* Get card  data. */
     $cardList = array();
@@ -23,7 +24,8 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu
     if($browseType == 'bug')   $cardList = $this->loadModel('bug')->getExecutionBugs($executionID);
     if($browseType == 'task')  $cardList = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
 
-    $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
+    if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'pri_asc';
+    $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList, $orderBy);
     if(empty($lanes)) return array();
 
     $execution = $this->loadModel('execution')->getByID($executionID);
@@ -70,6 +72,33 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu
         $laneData['type']            = $browseType;
         $laneData['defaultCardType'] = $browseType;
 
+        if($browseType == 'task' and $groupBy == 'story')
+        {
+            $columnData[0]['id']         = 0;
+            $columnData[0]['type']       = 'story';
+            $columnData[0]['name']       = zget($this->lang->kanban->orderList, $orderBy, '');
+            $columnData[0]['color']      = '#333';
+            $columnData[0]['limit']      = '-1';
+            $columnData[0]['laneType']   = $browseType;
+            $columnData[0]['asParent']   = false;
+            $columnData[0]['parentType'] = '';
+            $columnData[0]['actions']    = array();
+
+            if(empty($searchValue) or strpos($lane->name, $searchValue) !== false)
+            {
+                $cardData = array();
+                $cardData['id']         = $laneID;
+                $cardData['title']      = $lane->name;
+                $cardData['order']      = 1;
+                $cardData['pri']        = $lane->pri;
+                $cardData['estimate']   = '';
+                $cardData['assignedTo'] = $lane->assignedTo;
+                $cardData['deadline']   = '';
+                $cardData['severity']   = '';
+                $laneData['cards']['story'][] = $cardData;
+            }
+        }
+
         /* Construct kanban column data. */
         foreach($columns as $column)
         {
diff --git a/extension/lite/project/ext/control/execution.php b/extension/lite/project/ext/control/execution.php
index e989151d0c..d5532e7411 100644
--- a/extension/lite/project/ext/control/execution.php
+++ b/extension/lite/project/ext/control/execution.php
@@ -21,6 +21,9 @@ class project extends control
             if($this->execution->isClickable($kanban, 'delete')) $executionActions[$kanbanID][] = 'delete';
         }
 
+        $allExecution = $this->execution->getList($projectID, 'all', 'all');
+        $this->view->allExecutionsNum = count($allExecution);
+
         $this->view->title            = $this->lang->project->kanban;
 
         $this->view->kanbanList       = array_values($kanbanList);
diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php
index ced9774f35..6dfc235595 100644
--- a/extension/lite/project/ext/view/execution.html.php
+++ b/extension/lite/project/ext/view/execution.html.php
@@ -30,7 +30,7 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->execution->noExecution;?></span>
-      <?php if(common::hasPriv('execution', 'create') and $status == "all"):?>
+      <?php if(common::hasPriv('execution', 'create') and empty($allExecutionsNum)):?>
       <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->project->createKanban, '', "class='btn btn-info' data-app='project'");?>
       <?php endif;?>
     </p>
diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index fff699c0a3..b71849b423 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -966,8 +966,9 @@ class baseJS
         {
             $cancleAction = "$cancleTarget.location = '$cancleURL';";
         }
-
-        $js .= <<<EOT
+        if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') === false)
+        {
+            $js .= <<<EOT
 if(confirm("$message"))
 {
     $confirmAction
@@ -977,6 +978,12 @@ else
     $cancleAction
 }
 EOT;
+        }
+        else
+        {
+            $js .= $confirmAction;
+        }
+
         $js .= self::end();
         return $js;
     }
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 3e6cb30e3f..9d6dc7ae54 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -210,6 +210,7 @@ $lang->action->desc->importedbuild        = '$date, imported to <strong>$extra</
 $lang->action->desc->fromsonarqube        = '$date, created by <strong>$actor</strong> from <strong>SonarQube Issue</strong>.' . "\n";
 $lang->action->desc->tolib                = '$date, imported by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->updatetolib          = '$date, updated to ' . $lang->testcase->common . ' by  <strong>$actor</strong>.' . "\n";
+$lang->action->desc->adjusttasktowait     = '$date, System Reminder: The task status will be set to Not Started as the consumed work hour is adjusted to 0. ' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
 $lang->action->desc->createchildren     = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -306,7 +307,7 @@ $lang->action->label->suspended             = 'suspended ';
 $lang->action->label->login                 = 'Login';
 $lang->action->label->logout                = "Logout";
 $lang->action->label->notified              = "Notified";
-$lang->action->label->deleteestimate        = "deleted ";
+$lang->action->label->deleteestimate        = "deleted hours";
 $lang->action->label->linked2build          = "linked ";
 $lang->action->label->linked2bug            = "linked ";
 $lang->action->label->linked2testtask       = "linked";
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 2ca3bbdd58..cca3731b9f 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -210,6 +210,7 @@ $lang->action->desc->importedbuild        = '$date, imported to <strong>$extra</
 $lang->action->desc->fromsonarqube        = '$date, created by <strong>$actor</strong> from <strong>SonarQube Issue</strong>.' . "\n";
 $lang->action->desc->tolib                = '$date, imported by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->updatetolib          = '$date, updated to ' . $lang->testcase->common . ' by  <strong>$actor</strong>.' . "\n";
+$lang->action->desc->adjusttasktowait     = '$date, System Reminder: The task status will be set to Not Started as the consumed work hour is adjusted to 0. ' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
 $lang->action->desc->createchildren     = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -306,7 +307,7 @@ $lang->action->label->suspended             = 'suspended ';
 $lang->action->label->login                 = 'login';
 $lang->action->label->logout                = "logout";
 $lang->action->label->notified              = "Notified";
-$lang->action->label->deleteestimate        = "deleted ";
+$lang->action->label->deleteestimate        = "deleted hours";
 $lang->action->label->linked2build          = "linked ";
 $lang->action->label->linked2bug            = "linked ";
 $lang->action->label->linked2testtask       = "linked";
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 75212cf95b..098e2d0cdc 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -210,6 +210,7 @@ $lang->action->desc->importedbuild        = '$date, imported to <strong>$extra</
 $lang->action->desc->fromsonarqube        = '$date, created by <strong>$actor</strong> from <strong>SonarQube Issue</strong>.' . "\n";
 $lang->action->desc->tolib                = '$date, Importé par <strong>$actor</strong> .' . "\n";
 $lang->action->desc->updatetolib          = '$date, MàJ de ' . $lang->testcase->common . ' par  <strong>$actor</strong>.' . "\n";
+$lang->action->desc->adjusttasktowait     = '$date, System Reminder: The task status will be set to Not Started as the consumed work hour is adjusted to 0. ' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
 $lang->action->desc->createchildren     = '$date, <strong>$actor</strong> a créé un sous-tâche <strong>$extra</strong>。' . "\n";
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 84a25b2372..38dee71117 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -210,6 +210,7 @@ $lang->action->desc->importedbuild        = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->fromsonarqube        = '$date, 由 <strong>$actor</strong> 从<strong>SonarQube问题</strong>转化而来。' . "\n";
 $lang->action->desc->tolib                = '$date, 由 <strong>$actor</strong> 导入。' . "\n";
 $lang->action->desc->updatetolib          = '$date, 由 <strong>$actor</strong> 从' . $lang->testcase->common . '更新。' . "\n";
+$lang->action->desc->adjusttasktowait     = '$date, 系统判断由于消耗工时调整为0，将任务状态置为未开始。' . "\n";
 
 /* 用来描述和父子任务相关的操作历史记录。*/
 $lang->action->desc->createchildren     = '$date, 由 <strong>$actor</strong> 创建子任务 <strong>$extra</strong>。' . "\n";
diff --git a/module/action/model.php b/module/action/model.php
index 9512d4cbd8..843eab0388 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -73,7 +73,7 @@ class actionModel extends model
         if($this->post->uid) $this->file->updateObjectID($this->post->uid, $objectID, $objectType);
 
         /* Call the message notification function. */
-        $this->loadModel('message')->send(strtolower($objectType), $objectID, $actionType, $actionID, $actor);
+        $this->loadModel('message')->send(strtolower($objectType), $objectID, $actionType, $actionID, $actor, $extra);
 
         /* Add index for global search. */
         $this->saveIndex($objectType, $objectID, $actionType);
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index 2aa17ecc16..e2e44aac2d 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -18,6 +18,7 @@
     $i = 0;
     foreach($actions as $action)
     {
+        if($action->action == 'adjusttasktowait') continue;
         $user = zget($users, $action->actor);
         if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
         if($action->objectType == 'sonarqubeproject') $action->objectName = $action->extra;
diff --git a/module/bug/control.php b/module/bug/control.php
index 594872a371..23103be3ca 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -417,22 +417,23 @@ class bug extends control
                 $execution   = $this->loadModel('execution')->getByID($executionID);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
 
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"bug\", $kanbanData)"));
                     }
                 }
@@ -726,22 +727,23 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($executionID);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                     }
                 }
@@ -999,22 +1001,23 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
 
                     if(isset($execution->type) and $execution->type == 'kanban')
                     {
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                         $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
                         $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                     }
                 }
@@ -1415,23 +1418,24 @@ class bug extends control
 
             if(isonlybody())
             {
-                $bug           = $this->bug->getById($bugID);
-                $execution     = $this->loadModel('execution')->getByID($bug->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $bug          = $this->bug->getById($bugID);
+                $execution    = $this->loadModel('execution')->getByID($bug->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and isset($execution->type) and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                 }
                 else
@@ -1644,23 +1648,24 @@ class bug extends control
             parse_str($extra, $output);
             if(isonlybody())
             {
-                $execution     = $this->loadModel('execution')->getByID($bug->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->loadModel('execution')->getByID($bug->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and isset($execution->type) and $execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                 }
                 else
@@ -1748,22 +1753,23 @@ class bug extends control
             parse_str($extra, $output);
             if(isonlybody())
             {
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and isset($execution->type) and $execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                 }
                 else
@@ -1857,23 +1863,24 @@ class bug extends control
             parse_str($extra, $output);
             if(isonlybody())
             {
-                $execution = $this->loadModel('execution')->getByID($bug->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->loadModel('execution')->getByID($bug->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and isset($execution->type) and $execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                 }
                 else
@@ -1926,23 +1933,24 @@ class bug extends control
             parse_str($extra, $output);
             if(isonlybody())
             {
-                $execution     = $this->loadModel('execution')->getByID($bug->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->loadModel('execution')->getByID($bug->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and isset($execution->type) and $execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
                 }
                 else
@@ -2022,11 +2030,14 @@ class bug extends control
     /**
      * Batch close bugs.
      *
+     * @param  int    $releaseID
+     * @param  string $viewType
      * @access public
      * @return void
      */
-    public function batchClose()
+    public function batchClose($releaseID = '', $viewType = '')
     {
+        if($releaseID) $this->post->bugIDList = $this->post->unlinkBugs;
         if($this->post->bugIDList)
         {
             $bugIDList = $this->post->bugIDList;
@@ -2051,6 +2062,10 @@ class bug extends control
             }
             $this->loadModel('score')->create('ajax', 'batchOther');
             if(isset($skipBugs)) echo js::alert(sprintf($this->lang->bug->skipClose, join(',', $skipBugs)));
+            if($viewType)
+            {
+                return print(js::locate($this->createLink($viewType, 'view', "releaseID=$releaseID&type=bug"), 'parent'));
+            }
         }
         return print(js::reload('parent'));
     }
@@ -2144,13 +2159,13 @@ class bug extends control
 
             if($from == 'taskkanban')
             {
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                $kanbanData    = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                $kanbanType    = $execLaneType == 'all' ? 'bug' : key($kanbanData);
-                $kanbanData    = $kanbanData[$kanbanType];
-                $kanbanData    = json_encode($kanbanData);
+                $execLaneType    = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                $kanbanType      = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                $kanbanData      = $kanbanData[$kanbanType];
+                $kanbanData      = json_encode($kanbanData);
                 return print(js::closeModal('parent', '', "parent.updateKanban(\"bug\", $kanbanData)"));
             }
 
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index e04e481637..68341def99 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -425,6 +425,7 @@ $lang->bug->placeholder->newBuildName = 'Nom Nouv Build';
 
 $lang->bug->featureBar['browse']['all']          = $lang->bug->allBugs;
 $lang->bug->featureBar['browse']['unclosed']     = $lang->bug->unclosed;
+$lang->bug->featureBar['browse']['openedbyme']   = $lang->bug->openedByMe;
 $lang->bug->featureBar['browse']['assigntome']   = $lang->bug->assignToMe;
 $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
 
@@ -432,7 +433,6 @@ $lang->bug->featureBar['browse']['unresolved']   = $lang->bug->unResolved;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
 $lang->bug->moreSelects['assignedbyme']  = $lang->bug->assignedByMe;
-$lang->bug->moreSelects['openedbyme']    = $lang->bug->openedByMe;
 $lang->bug->moreSelects['unconfirmed']   = $lang->bug->unconfirmed;
 $lang->bug->moreSelects['assigntonull']  = $lang->bug->assignToNull;
 $lang->bug->moreSelects['longlifebugs']  = $lang->bug->longLifeBugs;
diff --git a/module/caselib/model.php b/module/caselib/model.php
index 54b4a8bb71..977bc56463 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -28,6 +28,8 @@ class caselibModel extends model
         if(!empty($products) and $this->session->product) $this->loadModel('qa')->setMenu($products, $this->session->product);
         if(empty($products)) $this->loadModel('qa')->setMenu(array(0 => ''), 0);
 
+        $this->lang->qa->menu->caselib['subModule'] .= ',testcase';
+
         if($libraries)
         {
             $libName = '';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 0e4bf624be..12a8020011 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -245,7 +245,7 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->
 /* Waterfall menu. */
 $lang->waterfall->menu = new stdclass();
 $lang->waterfall->menu->index       = array('link' => "$lang->dashboard|project|index|project=%s");
-$lang->waterfall->menu->execution   = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s", 'subModule' => 'programplan');
+$lang->waterfall->menu->execution   = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s", 'subModule' => 'programplan,task');
 $lang->waterfall->menu->story       = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory,tree', 'exclude' => 'projectstory-track');
 $lang->waterfall->menu->design      = array('link' => "{$lang->design->common}|design|browse|project=%s");
 $lang->waterfall->menu->qa          = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport');
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index d8f5338795..0b4a7e45ad 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -64,6 +64,7 @@
       </div>
       <ul class="timeline timeline-tag-left <?php if($browseType == 'all') echo 'margin-l-50px';?>">
         <?php foreach($actions as $i => $action):?>
+        <?php if($action->action == 'adjusttasktowait') continue;?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
         <li <?php if($action->major) echo "class='active'";?>>
           <div>
diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php
index 5327fdae85..7d2a4e7c2a 100644
--- a/module/custom/view/browsestoryconcept.html.php
+++ b/module/custom/view/browsestoryconcept.html.php
@@ -44,9 +44,10 @@
             <?php endif;?>
             <td class='text-left SRBox'><?php echo $URSR['SRName'];?></td>
             <td class='c-actions'>
-              <?php $disabled = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
+              <?php $disabled   = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
+              <?php $deleteLink = empty($disabled) ? $this->createLink('custom', 'deleteStoryConcept', "id=$key") : '#';?>
               <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' data-width=" . ($this->config->URAndSR ? "480px" : "330px") . " title={$lang->edit}");?>
-              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
+              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($deleteLink, "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
             </td>
           </tr>
         <?php endforeach;?>
diff --git a/module/execution/control.php b/module/execution/control.php
index d1eb1d4b4e..4f5b724920 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3260,22 +3260,23 @@ class execution extends control
                 return $this->send($response);
             }
 
-            $execution     = $this->execution->getByID($executionID);
-            $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-            $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-            $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+            $execution    = $this->execution->getByID($executionID);
+            $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+            $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
             if($this->app->tab == 'execution' and $execution->type == 'kanban')
             {
-                $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                $kanbanData = json_encode($kanbanData);
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                $kanbanData    = json_encode($kanbanData);
                 return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
             }
             elseif($from == 'taskkanban')
             {
-                $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy);
-                $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                $kanbanData = $kanbanData[$kanbanType];
-                $kanbanData = json_encode($kanbanData);
+                $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $taskSearchValue);
+                $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                $kanbanData      = $kanbanData[$kanbanType];
+                $kanbanData      = json_encode($kanbanData);
                 return print(js::closeModal('parent', '', "parent.updateKanban(\"story\", $kanbanData)"));
             }
 
@@ -3668,18 +3669,6 @@ class execution extends control
         $from = $this->app->tab;
         if($from == 'execution') $this->session->set('executionList', $this->app->getURI(true), 'execution');
 
-        if($from == 'project')
-        {
-            $projects  = $this->project->getPairsByProgram();
-            $projectID = $this->project->saveState($projectID, $projects);
-            $project   = $this->loadModel('project')->getByID($projectID);
-            $this->view->project = $project;
-            $this->project->setMenu($projectID);
-
-            if(!$projectID) return print(js::locate($this->createLink('project', 'browse')));
-            if(!empty($project->model) and $project->model == 'kanban' and !(defined('RUN_MODE') and RUN_MODE == 'api')) return print(js::locate($this->createLink('project', 'index', "projectID=$projectID")));
-        }
-
         if($this->app->viewType == 'mhtml')
         {
             if($this->app->rawModule == 'project' and $this->app->rawMethod == 'execution')
@@ -3713,11 +3702,8 @@ class execution extends control
         $parents = array();
         if($parentIdList) $parents = $this->execution->getByIdList($parentIdList);
 
-        $allExecutionsNum = $this->dao->select('COUNT(id) AS count')->from(TABLE_PROJECT)
-            ->where('project')->eq($projectID)
-            ->andWhere('deleted')->eq(0)
-            ->fetch();
-        $this->view->allExecutionsNum = $allExecutionsNum;
+        $allExecutionsNum = $this->project->getStats($projectID, 'all');
+        $this->view->allExecutionsNum = count($allExecutionsNum);
 
         $this->view->executionStats = $executionStats;
         $this->view->productList    = $this->loadModel('product')->getProductPairsByProject($projectID);
@@ -3978,8 +3964,8 @@ class execution extends control
             $projectID   = $this->dao->findByID($executionID)->from(TABLE_EXECUTION)->fetch('project');
             $planStories = array_keys($planStory);
 
-            $this->execution->linkStory($executionID, $planStories, $planProducts, $extra);
             if($this->config->systemMode == 'new' and $executionID != $projectID) $this->execution->linkStory($projectID, $planStories, $planProducts);
+            $this->execution->linkStory($executionID, $planStories, $planProducts, $extra);
         }
 
         $moduleName = 'execution';
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 6c6036438a..1be0d9bd5f 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -811,8 +811,6 @@ function tips()
 function renderHeaderCol($column, column, $header, kanbanData)
 {
     if(groupBy == 'story' && column.type == 'story') return;
-    console.log(groupBy);
-    console.log(column.type);
     /* Render group header. */
     var privs       = kanbanData.actions;
     var columnPrivs = kanbanData.columns[0].actions;
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 70ccf7c086..980d2630c3 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -434,8 +434,7 @@ $lang->execution->charts->cfd = new stdclass();
 $lang->execution->charts->cfd->cfdTip        = "<p>
 1. The CFD（Cumulative Flow Diagram）reflects the trend of accumulated workload at each stage over time.<br>
 2. The horizontal axis represents the date, and the vertical axis represents the number of work items.<br>
-3. To learn about the team's delivery, you can calculate the WIP quantity, delivery rate and average lead time through the CFD.
-<p>";
+3. To learn about the team's delivery, you can calculate the WIP quantity, delivery rate and average lead time through the CFD. <p>";
 $lang->execution->charts->cfd->cycleTime     = 'Average cycle time';
 $lang->execution->charts->cfd->cycleTimeTip  = 'Average cycle time of each card from development start to completion';
 $lang->execution->charts->cfd->throughput    = 'Throughput Rate';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index b558ee70c8..073dca6109 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -434,8 +434,7 @@ $lang->execution->charts->cfd = new stdclass();
 $lang->execution->charts->cfd->cfdTip        = "<p>
 1. The CFD（Cumulative Flow Diagram）reflects the trend of accumulated workload at each stage over time.<br>
 2. The horizontal axis represents the date, and the vertical axis represents the number of work items.<br>
-3. To learn about the team's delivery, you can calculate the WIP quantity, delivery rate and average lead time through the CFD.
-<p>";
+3. To learn about the team's delivery, you can calculate the WIP quantity, delivery rate and average lead time through the CFD. <p>";
 $lang->execution->charts->cfd->cycleTime     = 'Average cycle time';
 $lang->execution->charts->cfd->cycleTimeTip  = 'Average cycle time of each card from development start to completion';
 $lang->execution->charts->cfd->throughput    = 'Throughput Rate';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 1e5fe6bf27..41db8fde8b 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -300,10 +300,7 @@ $lang->execution->statusSelects['']             = 'Plus...';
 $lang->execution->statusSelects['wait']         = 'En Attente';
 $lang->execution->statusSelects['doing']        = 'En Cours';
 $lang->execution->statusSelects['undone']       = 'Non terminées';
-$lang->execution->statusSelects['myinvolved']   = $lang->execution->myInvolved;
 $lang->execution->statusSelects['finishedbyme'] = 'Terminées par moi';
-$lang->execution->statusSelects['assignedbyme'] = $lang->execution->assignedByMe;
-$lang->execution->statusSelects['needconfirm']  = 'A confirmer';
 $lang->execution->statusSelects['done']         = 'Faites';
 $lang->execution->statusSelects['closed']       = 'Fermées';
 $lang->execution->statusSelects['cancel']       = 'Annulées';
@@ -503,6 +500,9 @@ $lang->execution->typeList['kanban'] = 'Kanban';
 $lang->execution->featureBar['task']['all']          = $lang->execution->allTasks;
 $lang->execution->featureBar['task']['unclosed']     = $lang->execution->unclosed;
 $lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assignedToMe;
+$lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
+$lang->execution->featureBar['task']['assignedbyme'] = $lang->execution->assignedByMe;
+$lang->execution->featureBar['task']['needconfirm']  = 'Changed';
 $lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
 
 $lang->execution->featureBar['all']['all']       = $lang->execution->all;
diff --git a/module/execution/model.php b/module/execution/model.php
index c628c87878..b9af4cc3eb 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4305,6 +4305,103 @@ class executionModel extends model
         return $html;
     }
 
+    /**
+     * Print execution nested list.
+     *
+     * @param  object $execution
+     * @param  int    $isChild
+     * @param  array  $users
+     * @access public
+     * @return void
+     */
+    public function printNestedList($execution, $isChild = false, $users, $productID)
+    {
+        $this->loadModel('task');
+        $this->loadModel('execution');
+        $this->loadModel('programplan');
+
+        if(!$isChild)
+        {
+            $trClass = 'is-top-level table-nest-child-hide';
+            $trAttrs = "data-id='$execution->id' data-order='$execution->order' data-nested='true'";
+        }
+        else
+        {
+            $trClass  = 'is-nest-child';
+            $trAttrs  = "data-id={$execution->id} data-parent={$execution->parent}";
+            $trAttrs .= " data-nest-parent='$execution->parent' data-order='$execution->order' data-nest-path=',$execution->parent,$execution->id,'";
+        }
+
+        $burns = join(',', $execution->burns);
+        echo "<tr $trAttrs class=$trClass>";
+        echo "<td><span id=$execution->id class='table-nest-icon icon table-nest-toggle'></span>";
+        if($this->config->systemMode == 'new')
+        {
+            $spanClass = $execution->type == 'stage' ? 'label-warning' : 'label-info';
+            echo "<span class='project-type-label label label-outline $spanClass'>{$this->lang->execution->typeList[$execution->type]}</span> ";
+        }
+        echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name);
+        echo '<td>' . zget($users, $execution->PM) . '</td>';
+        echo "<td class='status-{$execution->status}'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
+        echo '<td>' . html::ring($execution->hours->progress) . '</td>';
+        echo '<td>' . $execution->begin . '</td>';
+        echo '<td>' . $execution->end . '</td>';
+        echo "<td class='hours' title='{$execution->hours->totalEstimate}{$this->lang->execution->workHour}'>" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . '</td>';
+        echo "<td class='hours' title='{$execution->hours->totalConsumed}{$this->lang->execution->workHour}'>" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . '</td>';
+        echo "<td class='hours' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';
+        echo "<td id='spark-{$execution->id}' class='sparkline text-left no-padding' values='$burns'></td>";
+        echo '<td class="c-actions">';
+        common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);
+        $class = !empty($execution->children) ? 'disabled' : '';
+        common::printIcon('task', 'create', "executionID={$execution->id}", $execution, 'list', '', '', $class, false, "data-app='execution'");
+
+        if($execution->type == 'stage')
+        {
+            if($execution->grade == 1 && $this->loadModel('programplan')->isCreateTask($execution->id))
+            {
+                common::printIcon('programplan', 'create', "program={$execution->parent}&productID=$productID&planID=$execution->id", $execution, 'list', 'split', '', '', '', '', $this->lang->programplan->createSubPlan);
+            }
+            else
+            {
+                $disabled = ($execution->grade == 2) ? ' disabled' : '';
+                echo common::hasPriv('programplan', 'create') ? html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '<i class="icon-programplan-create icon-split"></i>', '', 'class="btn ' . $disabled . '"') : '';
+            }
+        }
+
+        common::printIcon('programplan', 'edit', "stageID=$execution->id&projectID=$execution->project", $execution, 'list', '', '', 'iframe', true);
+
+        $disabled = !empty($execution->children) ? ' disabled' : '';
+        if($execution->status != 'closed' and common::hasPriv('execution', 'close', $execution))
+        {
+            common::printIcon('execution', 'close', "stageID=$execution->id", $execution, 'list', 'off', 'hiddenwin' , $disabled . ' iframe', true, '', $this->lang->execution->close);
+        }
+        elseif($execution->status == 'closed' and common::hasPriv('execution', 'activate', $execution))
+        {
+            common::printIcon('execution', 'activate', "stageID=$execution->id", $execution, 'list', 'magic', 'hiddenwin' , $disabled . ' iframe', true, '', $this->lang->execution->activate);
+        }
+
+        if(common::hasPriv('execution', 'delete', $execution))
+        {
+            common::printIcon('execution', 'delete', "stageID=$execution->id&confirm=no", $execution, 'list', 'trash', 'hiddenwin' , $disabled, '', '', $this->lang->delete);
+        }
+        echo '</td>';
+        echo '</tr>';
+
+        if(!empty($execution->children))
+        {
+            foreach($execution->children as $child) $this->printNestedList($child, true, $users, $productID);
+        }
+
+        if(!empty($execution->tasks))
+        {
+            foreach($execution->tasks as $task)
+            {
+                $showmore = (count($execution->tasks) == 50) && ($task == end($execution->tasks));
+                echo $this->task->buildNestedList($execution, $task, false, $showmore, $users);
+            }
+        }
+    }
+
     /**
      * Update user view of execution and it's product.
      *
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index d99ca0f0fe..b1aa1a8181 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -73,7 +73,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $from == 'execution' ? $lang->execution->noExecutions : $lang->execution->noExecution;?></span>
-      <?php if(empty($allExecutionsNum->count)):?>
+      <?php if(empty($allExecutionsNum)):?>
         <?php if(common::hasPriv('programplan', 'create') and $isStage):?>
         <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-info'");?>
         <?php else: ?>
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 3b9e898d70..85767b6478 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -148,7 +148,7 @@ js::set('priv',
   <div class='btn-toolbar pull-right'>
     <div class="input-group" id="rdKanbanSearch">
       <div class="input-control search-box" id="rdSearchBox">
-        <input type="text" name="rdKanbanSearchInput" id="rdKanbanSearchInput" value="" class="form-control" oninput="searchCards(this.value)" placeholder="<?php echo $lang->execution->pleaseInput?>">
+        <input type="text" name="rdKanbanSearchInput" id="rdKanbanSearchInput" value="" class="form-control" oninput="searchCards(this.value)" placeholder="<?php echo $lang->execution->pleaseInput?>" autocomplete="off">
       </div>
     </div>
     <?php
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index e650e79467..fc4173c750 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -40,7 +40,7 @@
   <div class='btn-toolbar pull-right'>
     <div class="input-group" id="taskKanbanSearch">
       <div class="input-control search-box" id="searchBox">
-      <input type="text" name="taskKanbanSearchInput" id="taskKanbanSearchInput" value="" class="form-control" oninput="searchCards(this.value)" placeholder="<?php echo $lang->execution->pleaseInput;?>">
+      <input type="text" name="taskKanbanSearchInput" id="taskKanbanSearchInput" value="" class="form-control" oninput="searchCards(this.value)" placeholder="<?php echo $lang->execution->pleaseInput;?>" autocomplete="off">
       </div>
     </div>
     <?php
diff --git a/module/file/control.php b/module/file/control.php
index 79f09b08eb..5320c04355 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -280,9 +280,14 @@ class file extends control
             $file = $this->file->getById($fileID);
             $this->dao->delete()->from(TABLE_FILE)->where('id')->eq($fileID)->exec();
             $this->loadModel('action')->create($file->objectType, $file->objectID, 'deletedFile', '', $extra=$file->title);
+
             /* Fix Bug #1518. */
             $fileRecord = $this->dao->select('id')->from(TABLE_FILE)->where('pathname')->eq($file->pathname)->fetch();
             if(empty($fileRecord)) @unlink($file->realPath);
+
+            /* Update test case version for test case synchronization. */
+            if($file->objectType == 'testcase') $this->file->updateTestcaseVersion($file);
+
             return print(js::reload('parent'));
         }
     }
@@ -331,9 +336,12 @@ class file extends control
 
             $extension = "." . $file->extension;
             $actionID  = $this->loadModel('action')->create($file->objectType, $file->objectID, 'editfile', '', $fileName);
-            $changes[] = array('field' => 'fileName', 'old' => $file->title . $extension, 'new' => $fileName);
+            $changes[] = array('field' => 'fileName', 'old' => $file->title, 'new' => $fileName);
             $this->action->logHistory($actionID, $changes);
 
+            /* Update test case version for test case synchronization. */
+            if($file->objectType == 'testcase' and $file->title != $fileName) $this->file->updateTestcaseVersion($file);
+
             return print(js::reload('parent.parent'));
         }
 
diff --git a/module/file/model.php b/module/file/model.php
index 378bfbf5a5..2e68a57ab0 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -1046,4 +1046,23 @@ class fileModel extends model
             ->andWhere('deleted')->eq('0')
             ->fetchPairs();
     }
+
+    /**
+     * Update test case version.
+     *
+     * @param  object $file
+     * @access public
+     * @return void
+     */
+    public function updateTestcaseVersion($file)
+    {
+        $oldCase   = $this->loadModel('testcase')->getByID($file->objectID);
+        $isLibCase = ($oldCase->lib and empty($oldCase->product));
+        if($isLibCase)
+        {
+            $fromcaseVersion  = $this->dao->select('fromCaseVersion')->from(TABLE_CASE)->where('fromCaseID')->eq($file->objectID)->fetch('fromCaseVersion');
+            $fromcaseVersion += 1;
+            $this->dao->update(TABLE_CASE)->set('`fromCaseVersion`')->eq($fromcaseVersion)->where('`fromCaseID`')->eq($file->objectID)->exec();
+        }
+    }
 }
diff --git a/module/kanban/css/createregion.css b/module/kanban/css/createregion.css
index dd83c6c8eb..2cb3cd8608 100644
--- a/module/kanban/css/createregion.css
+++ b/module/kanban/css/createregion.css
@@ -1 +1 @@
-.radio-inline {margin-left: 10px !important;}
+#region_chosen.chosen-container .chosen-results {max-height: 115px;}
diff --git a/module/kanban/view/createregion.html.php b/module/kanban/view/createregion.html.php
index 1f4e1c2916..85b0a37875 100644
--- a/module/kanban/view/createregion.html.php
+++ b/module/kanban/view/createregion.html.php
@@ -24,7 +24,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->kanbanregion->style;?></th>
-          <td><?php echo html::radio('region', $regions, 'custom');?></td>
+          <td><?php echo html::select('region', $regions, 'custom', "class='form-control chosen' data-drop_direction='up'");?></td>
         </tr>
         <tr>
           <td colspan='2' class='form-actions text-center'>
diff --git a/module/message/model.php b/module/message/model.php
index a5f2cccd7f..b640916bc4 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -59,10 +59,12 @@ class messageModel extends model
      * @param  int    $objectID
      * @param  string $actionType
      * @param  int    $actionID
+     * @param  string $actor
+     * @param  string $extra
      * @access public
      * @return void
      */
-    public function send($objectType, $objectID, $actionType, $actionID, $actor = '')
+    public function send($objectType, $objectID, $actionType, $actionID, $actor = '', $extra = '')
     {
         $objectType     = strtolower($objectType);
         $messageSetting = $this->config->message->setting;
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index dce91a3f12..341c93caff 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
+$lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
 $lang->misc->releaseDate['17.0']        = '2022-06-02';
@@ -184,6 +185,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.3'][]       = array('title' => "UI optimization of the modules such as statistics and background, the use case library will synchronize the function optimization information. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.0'][]       = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 869801fd8c..d4b289044a 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
+$lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
 $lang->misc->releaseDate['17.0']        = '2022-06-02';
@@ -184,6 +185,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.3'][]       = array('title' => "UI optimization of the modules such as statistics and background, the use case library will synchronize the function optimization information. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.0'][]       = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 456df06e7c..3f2a5d7395 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
+$lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
 $lang->misc->releaseDate['17.0']        = '2022-06-02';
@@ -184,6 +185,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.3'][]       = array('title' => "UI optimization of the modules such as statistics and background, the use case library will synchronize the function optimization information. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.0'][]       = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index ce36309d0e..a864238790 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“
 $lang->misc->feature->visionsDesc    = "<p>从16.5开始增加了界面概念，用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[迅捷界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面，点击当前界面名称可查看和切换其他的界面。</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions.png';
 
+$lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
 $lang->misc->releaseDate['17.0']        = '2022-06-02';
@@ -184,6 +185,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['17.3'][]       = array('title' => '统计、后台等模块的UI优化，用例库同步用例信息功能优化。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => '调整敏捷项目区块的展示，项目集、项目和测试相关UI优化，细节体验优化。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => '修改执行、项目模块的交互问题，完成客户巴高优先级需求，细节体验优化。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.0'][]       = array('title' => '细节体验优化。修复Bug。', 'desc' => '');
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index ec8f1e6c14..5c30a03101 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -207,6 +207,8 @@ $lang->product->noMatched      = '"%s" cannot be found.' . $lang->productCommon;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+$lang->product->featureBar['browse']['openedbyme']   = $lang->product->openedByMe;
+$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
 $lang->product->featureBar['browse']['reviewbyme']   = $lang->product->reviewByMe;
 $lang->product->featureBar['browse']['draftstory']   = $lang->product->draftStory;
 $lang->product->featureBar['browse']['more']         = $lang->more;
@@ -215,9 +217,7 @@ $lang->product->featureBar['all']['all']      = $lang->product->allProduct;
 $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
 $lang->product->featureBar['all']['closed']   = $lang->product->statusList['closed'];
 
-$lang->product->moreSelects['openedbyme']   = $lang->product->openedByMe;
 $lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['reviewedbyme'] = $lang->product->reviewedByMe;
 $lang->product->moreSelects['closedbyme']   = $lang->product->closedByMe;
 $lang->product->moreSelects['activestory']  = $lang->product->activeStory;
 $lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 4327d7b130..3b82972ed3 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -72,7 +72,7 @@ class productplan extends control
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $planID));
             if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'parent.refreshPlan()'));
-            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('productplan', 'browse', "productID=$productID&branch=$branchID&browseType=wait")));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('productplan', 'browse', "productID=$productID&branch=$branchID&browseType=all")));
         }
 
         $this->commonAction($productID, $branchID);
diff --git a/module/program/css/browse.css b/module/program/css/browse.css
index 412e5acb45..096b146d90 100644
--- a/module/program/css/browse.css
+++ b/module/program/css/browse.css
@@ -15,3 +15,4 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
 .has-suffix > a {max-width: calc(100% - 100px); padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
 
 div.checkbox-primary + span.table-nest-icon {margin-left:0px !important;}
+#checkAll + label.hover:after {border-width: 0px;}
diff --git a/module/program/js/browse.js b/module/program/js/browse.js
index 446f978422..75843fe82e 100644
--- a/module/program/js/browse.js
+++ b/module/program/js/browse.js
@@ -59,6 +59,7 @@ $(function()
             $('#programSummary').addClass('hidden');
             $('#projectsSummary').remove();
             $('.editCheckbox').after(statistic);
+            $(this).next('label').addClass('hover');
         }
         else
         {
@@ -66,8 +67,19 @@ $(function()
             $('#programForm').removeClass('has-row-checked');
             $('#programSummary').removeClass('hidden');
             $('#projectsSummary').addClass('hidden');
+            $(this).next('label').removeClass('hover');
         }
     });
+
+    /* Solve the problem that clicking the browser back button causes the checkbox to be selected by default. */
+    setTimeout(function()
+    {
+        $(":checkbox[name^='projectIdList']").each(function()
+        {
+            $(this).prop('checked', false);
+        });
+        $('.table-footer #checkAll').prop('checked', false);
+    }, 10);
 });
 
 function showEditCheckbox(show)
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index d223c0aba5..c715d8d2c9 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -23,6 +23,7 @@ $lang->programplan->createSubPlan = 'Create Sub Plan';
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
 $lang->programplan->name             = 'Stage Name';
+$lang->programplan->status           = 'Stage Progress';
 $lang->programplan->PM               = 'Stage Manager';
 $lang->programplan->acl              = 'Access Control';
 $lang->programplan->subStageName     = 'Sub Stage Name';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index ecfaad4b07..9bd54976bf 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -23,6 +23,7 @@ $lang->programplan->createSubPlan = 'Create Sub Stage';
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
 $lang->programplan->name             = 'Stage Name';
+$lang->programplan->status           = 'Stage Progress';
 $lang->programplan->PM               = 'Stage Manager';
 $lang->programplan->acl              = 'Access Control';
 $lang->programplan->subStageName     = 'Sub Stage Name';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index d223c0aba5..c715d8d2c9 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -23,6 +23,7 @@ $lang->programplan->createSubPlan = 'Create Sub Plan';
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
 $lang->programplan->name             = 'Stage Name';
+$lang->programplan->status           = 'Stage Progress';
 $lang->programplan->PM               = 'Stage Manager';
 $lang->programplan->acl              = 'Access Control';
 $lang->programplan->subStageName     = 'Sub Stage Name';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index e1352b4db9..d5eaad065b 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -23,6 +23,7 @@ $lang->programplan->createSubPlan = '创建二级阶段';
 $lang->programplan->parent           = '父阶段';
 $lang->programplan->emptyParent      = '无';
 $lang->programplan->name             = '阶段名称';
+$lang->programplan->status           = '阶段进度';
 $lang->programplan->PM               = '阶段负责人';
 $lang->programplan->acl              = '访问控制';
 $lang->programplan->subStageName     = '子阶段名称';
diff --git a/module/project/control.php b/module/project/control.php
index e67c4917a4..c039a63e8e 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -493,7 +493,10 @@ class project extends control
             $products = $this->product->getProducts($copyProjectID);
             foreach($products as $product)
             {
-                $productPlans[$product->id] = $this->loadModel('productplan')->getPairs($product->id, '', 'noclosed');
+                foreach($product->branches as $branch)
+                {
+                    $productPlans[$product->id][$branch] = $this->loadModel('productplan')->getPairs($product->id, $branch, 'noclosed', true);
+                }
             }
         }
 
@@ -962,10 +965,40 @@ class project extends control
      */
     public function execution($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $uri = $this->app->getURI(true);
-        $this->app->session->set('executionList', $uri, 'project');
+        $this->loadModel('execution');
+        $this->loadModel('task');
+        $this->loadModel('programplan');
 
-        echo $this->fetch('execution', 'all', "status=$status&projectID=$projectID&orderBy=$orderBy&productID=$productID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        $projects  = $this->project->getPairsByProgram();
+        $projectID = $this->project->saveState($projectID, $projects);
+        $project   = $this->project->getByID($projectID);
+        $this->project->setMenu($projectID);
+
+        if(!$projectID) return print(js::locate($this->createLink('project', 'browse')));
+        if(!empty($project->model) and $project->model == 'kanban' and !(defined('RUN_MODE') and RUN_MODE == 'api')) return print(js::locate($this->createLink('project', 'index', "projectID=$projectID")));
+
+        /* Load pager and get tasks. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager($recTotal, $recPerPage, $pageID);
+
+        $allExecution = $this->project->getStats($projectID, 'all');
+        $this->view->allExecutionNum = count($allExecution);
+
+        $this->view->title      = $this->lang->execution->allExecutions;
+        $this->view->position[] = $this->lang->execution->allExecutions;
+
+        $this->view->executionStats = $this->project->getStats($projectID, $status, $productID, 0, 30, $orderBy, $pager, $this->cookie->showTask);
+        $this->view->productList    = $this->loadModel('product')->getProductPairsByProject($projectID);
+        $this->view->productID      = $productID;
+        $this->view->projectID      = $projectID;
+        $this->view->project        = $project;
+        $this->view->pager          = $pager;
+        $this->view->orderBy        = $orderBy;
+        $this->view->users          = $this->loadModel('user')->getPairs('noletter');
+        $this->view->status         = $status;
+        $this->view->isStage        = (isset($project->model) and $project->model == 'waterfall') ? true : false;
+
+        $this->display();
     }
 
     /**
diff --git a/module/project/css/execution.css b/module/project/css/execution.css
new file mode 100644
index 0000000000..5c581d47fc
--- /dev/null
+++ b/module/project/css/execution.css
@@ -0,0 +1,4 @@
+#executionList > thead > tr > th .table-nest-toggle-global {top: 6px}
+#executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
+#mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
+.main-table tbody>tr>td:first-child, .main-table thead>tr>th:first-child { padding-left: 8px; }
diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index 266e060664..7e391f405d 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -146,6 +146,17 @@ $(function()
     });
 
     $(document).on('change', "select[id^='branch']", disableSelectedBranch);
+
+    if(requiredFields.indexOf('budget') >= 0 && budget == 0)
+    {
+        $('#budget').removeAttr('disabled');
+        $('td .checkbox-primary').addClass('hidden');
+    }
+    if(requiredFields.indexOf('budget') >= 0 && budget != 0)
+    {
+        $('td .checkbox-primary').addClass('hidden');
+    }
+
 });
 
 /**
diff --git a/module/project/js/execution.js b/module/project/js/execution.js
new file mode 100644
index 0000000000..7e49d3e892
--- /dev/null
+++ b/module/project/js/execution.js
@@ -0,0 +1,82 @@
+$(function()
+{
+    $('input[name^="showTask"]').click(function()
+    {
+        var show = $(this).is(':checked') ? 1 : 0;
+        $.cookie('showTask', show, {expires:config.cookieLife, path:config.webRoot});
+        window.location.reload();
+    });
+})
+
+window.addEventListener('scroll', this.handleScroll)
+function handleScroll(e)
+{
+    var relative = 200; // 相对距离
+    $('tr.showmore').each(function()
+    {
+        var $showmore = $(this);
+        var offsetTop = $showmore[0].offsetTop;
+        if(offsetTop == 0) return true;
+
+        if(getScrollTop() + getWindowHeight() >= offsetTop - relative)
+        {
+            throttle(loadData($showmore), 150)
+        }
+    })
+}
+
+function loadData($showmore)
+{
+    $showmore.removeClass('showmore');
+
+    var executionID = $showmore.attr('data-parent');
+    var maxTaskID   = $showmore.attr('data-id');
+    var link = createLink('task', 'ajaxGetTasks', 'executionID=' + executionID + '&maxTaskID=' + maxTaskID);
+    $.get(link, function(data)
+    {
+        $showmore.after(data);
+        $(".iframe").modalTrigger({type:'iframe'});
+
+        $('#executionForm').table('initNestedList');
+    })
+}
+
+function throttle(fn, threshhold)
+{
+    var last;
+    var timer;
+    threshhold || (threshhold = 250);
+
+    return function()
+    {
+        var context = this;
+        var args = arguments;
+
+        var now = +new Date()
+
+        if (last && now < last + threshhold)
+        {
+            clearTimeout(timer);
+            timer = setTimeout(function ()
+            {
+                last = now
+                fn.apply(context, args)
+            }, threshhold)
+        }
+        else
+        {
+            last = now
+            fn.apply(context, args)
+        }
+    }
+}
+
+function getScrollTop()
+{
+    return scrollTop = document.body.scrollTop + document.documentElement.scrollTop
+}
+
+function getWindowHeight()
+{
+    return document.compatMode == "CSS1Compat" ? windowHeight = document.documentElement.clientHeight : windowHeight = document.body.clientHeight
+}
diff --git a/module/project/model.php b/module/project/model.php
index ba3103f9a5..54fdc93e02 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1527,6 +1527,7 @@ class projectModel extends model
             $projects[$projectID]->id             = $projectID;
             $projects[$projectID]->name           = $projectName;
             $projects[$projectID]->code           = $projectCode;
+            $projects[$projectID]->model          = $oldProjects[$projectID]->model;
             $projects[$projectID]->PM             = $data->PMs[$projectID];
             $projects[$projectID]->begin          = $data->begins[$projectID];
             $projects[$projectID]->end            = isset($data->ends[$projectID]) ? $data->ends[$projectID] : LONG_TIME;
@@ -1582,7 +1583,17 @@ class projectModel extends model
                 ->where('id')->eq($projectID)
                 ->exec();
 
-            if(dao::isError()) helper::end(js::error('project#' . $projectID . dao::getError(true)));
+            if(dao::isError())
+            {
+                $errors = dao::getError();
+                foreach($errors as $key => $error)
+                {
+                    dao::$errors[$key][0] = 'project#' . $projectID . $error[0];
+                }
+
+                return false;
+            }
+
             if(!dao::isError())
             {
                 $linkedProducts = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs();
@@ -2306,7 +2317,7 @@ class projectModel extends model
      * @access public
      * @return array
      */
-    public function getStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'id_asc', $pager = null)
+    public function getStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'id_asc', $pager = null, $withTasks = false)
     {
         if(empty($productID))
         {
@@ -2382,6 +2393,31 @@ class projectModel extends model
             $burns[$executionID] = $executionBurns;
         }
 
+        if($withTasks)
+        {
+            $executionTasks = $this->dao->select('*')->from(TABLE_TASK)
+                ->where('deleted')->eq(0)
+                ->andWhere('status')->notin('closed,cancel')
+                ->andWhere('execution')->in(array_keys($executions))
+                ->orderBy('id_asc')
+                ->fetchGroup('execution', 'id');
+
+            foreach($executionTasks as $executionID => $tasks)
+            {
+                foreach($tasks as $task)
+                {
+                    if($task->parent > 0)
+                    {
+                        if(isset($executionTasks[$executionID][$task->parent]))
+                        {
+                            $executionTasks[$executionID][$task->parent]->children[$task->id] = $task;
+                            unset($executionTasks[$executionID][$task->id]);
+                        }
+                    }
+                }
+            }
+        }
+
         /* Process executions. */
         $parents  = array();
         $children = array();
@@ -2407,6 +2443,11 @@ class projectModel extends model
 
             $execution->children = array();
             $execution->grade == 1 ? $parents[$execution->id] = $execution : $children[$execution->parent][] = $execution;
+            if(isset($executionTasks) and isset($executionTasks[$execution->id]))
+            {
+                $tasks = array_chunk($executionTasks[$execution->id], 50, true);
+                $execution->tasks = $tasks[0];
+            }
         }
 
         /* In the case of the waterfall model, calculate the sub-stage. */
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 6a8febe208..0680873efb 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -27,6 +27,7 @@
 <?php js::set('productName', $lang->product->name);?>
 <?php js::set('manageProducts', $lang->project->manageProducts);?>
 <?php $requiredFields = $config->project->create->requiredFields;?>
+<?php js::set('requiredFields', $requiredFields);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -77,7 +78,7 @@
             </div>
           </td>
           <td>
-            <div class='checkbox-primary c-future'>
+            <div class="checkbox-primary c-future <?php echo strpos($requiredFields, 'budget') !== false ? 'hidden' : '';?>">
               <input type='checkbox' id='future' name='future' value='1' />
               <label for='future'><?php echo $lang->project->future;?></label>
             </div>
@@ -109,16 +110,18 @@
             <div class='row'>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
+              <?php foreach($product->branches as $branch):?>
               <div class="col-sm-4" style="margin-bottom: 10px; padding-right: 6px;">
                 <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                 <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
                   <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
                   <span class='input-group-addon fix-border'></span>
-                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], key($product->branches), "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
+                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $branch, "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
                 </div>
               </div>
               <?php $i++;?>
               <?php endforeach;?>
+              <?php endforeach;?>
               <div class='col-sm-4 <?php if($programID) echo 'required';?>' style="padding-right: 6px;">
                 <div class='input-group'>
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
@@ -146,12 +149,15 @@
               <?php if($copyProjectID):?>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
-              <?php $plans = zget($productPlans, $product->id, array(0 => ''));?>
-              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[" . $product->id . "]", $plans, '', "class='form-control chosen' multiple");?></div>
+              <?php $productPlan = zget($productPlans, $product->id, array(0 => ''));?>
+              <?php foreach($product->branches as $branch):?>
+              <?php $plans = zget($productPlan, $branch, array(0 => ''));?>
+              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select('plans[' . $product->id . '][' . $branch . '][]', $plans, '', "class='form-control chosen' multiple");?></div>
               <?php $i++;?>
               <?php endforeach;?>
+              <?php endforeach;?>
               <?php else:?>
-              <div class="col-sm-4" id="plan0" style="padding-right: 6px;"><?php echo html::select("plans[][]", '', '', "class='form-control chosen' multiple");?></div>
+              <div class="col-sm-4" id="plan0" style="padding-right: 6px;"><?php echo html::select("plans[][][]", '', '', "class='form-control chosen' multiple");?></div>
               <?php endif;?>
             </div>
           </td>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index db110c8a34..f58d75b508 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -28,6 +28,8 @@
 <?php js::set('multiBranchProducts', $multiBranchProducts);?>
 <?php $aclList = $project->parent ? $lang->project->subAclList : $lang->project->aclList;?>
 <?php $requiredFields = $config->project->edit->requiredFields;?>
+<?php js::set('requiredFields', $requiredFields);?>
+<?php js::set('budget', $project->budget);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
new file mode 100644
index 0000000000..5a7c921eee
--- /dev/null
+++ b/module/project/view/execution.html.php
@@ -0,0 +1,93 @@
+<?php include '../../common/view/header.html.php';?>
+<?php js::set('projectID', $projectID);?>
+<div id='mainMenu' class='clearfix'>
+  <div class='btn-toolbar pull-left'>
+    <div class='btn-group'>
+      <?php $viewName = $productID != 0 ? zget($productList,$productID) : $lang->product->allProduct;?>
+      <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
+      <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+        <?php
+          $class = '';
+          if($productID == 0) $class = 'class="active"';
+          echo "<li $class>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy"), $lang->product->allProduct) . "</li>";
+          foreach($productList as $key => $product)
+          {
+              $class = $productID == $key ? 'class="active"' : '';
+              echo "<li $class>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy&productID=$key"), $product) . "</li>";
+          }
+        ?>
+      </ul>
+    </div>
+    <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
+    <?php $label = "<span class='text'>$label</span>";?>
+    <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
+    <?php echo html::a($this->createLink('project', 'execution', "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), $label, '', "class='btn btn-link' id='{$key}Tab'");?>
+    <?php endforeach;?>
+    <?php echo html::checkbox('showTask', array('1' => $lang->programplan->stageCustom->task), '', $this->cookie->showTask ? 'checked=checked' : '');?>
+  </div>
+  <div class='btn-toolbar pull-right'>
+    <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=project", "<i class='icon-export muted'> </i> " . $lang->export, '', "class='btn btn-link export'")?>
+     <?php if(common::hasPriv('programplan', 'create') and $isStage):?>
+     <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-primary'");?>
+    <?php else: ?>
+    <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'></i> " . $lang->execution->create, '', "class='btn btn-primary create-execution-btn' data-app='execution' onclick='$(this).removeAttr(\"data-toggle\")'");?>
+    <?php endif;?>
+  </div>
+</div>
+<div id='mainContent' class="main-row fade">
+  <?php if(empty($executionStats)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->execution->noExecution;?></span>
+      <?php if(empty($allExecutionNum)):?>
+        <?php if(common::hasPriv('programplan', 'create') and $isStage):?>
+        <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-info'");?>
+        <?php else: ?>
+          <?php if(common::hasPriv('execution', 'create')):?>
+          <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->execution->create, '', "class='btn btn-info' data-app='execution'");?>
+          <?php endif;?>
+        <?php endif;?>
+      <?php endif;?>
+    </p>
+  </div>
+  <?php else:?>
+  <?php $canBatchEdit = common::hasPriv('execution', 'batchEdit'); ?>
+  <form class='main-table' id='executionForm' method='post' data-ride='table' data-nested='true' data-expand-nest-child='false' data-checkable='false' data-enable-empty-nested-row='true' data-replace-id='executionTableList' data-preserve-nested='true'>
+    <table class="table table-from table-fixed table-nested" id="executionList">
+      <?php $vars = "status=$status&orderBy=%s";?>	
+      <thead>
+        <tr>
+          <th class='table-nest-title'>
+          <a class='table-nest-toggle icon table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse;?>'></a>
+          <?php echo $lang->nameAB;?>
+          </th>
+          <th class='c-user'><?php echo $lang->execution->owner;?></th>
+          <th class='c-status'><?php echo $lang->project->status;?></th>
+          <th class='c-hours'><?php echo $lang->project->progress;?></th>
+          <th class='c-date'><?php echo $lang->programplan->begin;?></th>
+          <th class='c-date'><?php echo $lang->programplan->end;?></th>
+          <th class='c-hours'><?php echo $lang->task->estimateAB;?></th>
+          <th class='c-hours'><?php echo $lang->task->consumedAB;?></th>
+          <th class='c-hours'><?php echo $lang->task->leftAB;?> </th>
+          <th class='c-progress'><?php echo $lang->execution->burn;?> </th>
+          <th class='text-center c-actions-6'><?php echo $lang->actions;?></th> 
+        </tr>
+      </thead>
+      <tbody id="executionTableList">
+        <?php foreach($executionStats as $execution):?>
+        <?php $this->execution->printNestedList($execution, false, $users, $productID);?>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <div class='table-footer'>
+    <?php $pager->show('right', 'pagerjs');?>
+    </div>
+  </form>
+  <?php endif;?>
+</div>
+<?php js::set('status', $status)?>
+<?php js::set('orderBy', $orderBy)?>
+<script>
+$("#<?php echo $status;?>Tab").addClass('btn-active-text');
+</script>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index e7fd0c2722..caca4f25dd 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -150,9 +150,10 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm' data-ride="table">
+            <form class='main-table table-bug' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
               <table class='table has-sort-head' id='bugList'>
                 <?php $canBatchUnlink = common::hasPriv('projectrelease', 'batchUnlinkBug');?>
+                <?php $canBatchClose  = common::hasPriv('bug', 'batchClose');?>
                 <?php $vars = "releaseID={$release->id}&type=bug&link=$link&param=$param&orderBy=%s";?>
                 <thead>
                   <tr class='text-center'>
@@ -178,7 +179,7 @@
                   <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
                   <tr>
                     <td class='c-id text-left'>
-                      <?php if($canBatchUnlink and $canBeChanged):?>
+                      <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                       <div class="checkbox-primary">
                         <input type='checkbox' name='unlinkBugs[]'  value='<?php echo $bug->id;?>'/>
                         <label></label>
@@ -208,10 +209,21 @@
                 </tbody>
               </table>
               <div class='table-footer'>
-                <?php if($countBugs and $canBatchUnlink and $canBeChanged):?>
+                <?php if($countBugs and ($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                 <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
                 <div class="table-actions btn-toolbar">
-                  <?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
+                <?php
+                if($canBatchUnlink and $canBeChanged)
+                {
+                    $unlinkURL = $this->createLink('projectrelease', 'batchUnlinkBug', "releaseID=$release->id");
+                    echo html::a("###", $lang->release->batchUnlink, '', "onclick='setFormAction(\"$unlinkURL\", \"hiddenwin\", this)' class='btn'");
+                }
+                if($canBatchClose and $canBeChanged)
+                {
+                    $closeURL = $this->createLink('bug', 'batchClose', "releaseID=$release->id&viewType=projectrelease");
+                    echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"hiddenwin\", this)' class='btn'");
+                }
+                ?>
                 </div>
                 <div class='table-statistic'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
                 <?php endif;?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index baea1be218..2b753f8408 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -152,9 +152,10 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm' data-ride="table">
+            <form class='main-table table-bug' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
               <table class='table has-sort-head' id='bugList'>
                 <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
+                <?php $canBatchClose  = common::hasPriv('bug', 'batchClose');?>
                 <?php $vars = "releaseID={$release->id}&type=bug&link=$link&param=$param&orderBy=%s";?>
                 <thead>
                   <tr class='text-center'>
@@ -180,7 +181,7 @@
                   <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
                   <tr>
                     <td class='c-id text-left'>
-                      <?php if($canBatchUnlink and $canBeChanged):?>
+                      <?php if($canBatchUnlink or $canBatchClose and $canBeChanged):?>
                       <div class="checkbox-primary">
                         <input type='checkbox' name='unlinkBugs[]'  value='<?php echo $bug->id;?>'/>
                         <label></label>
@@ -210,10 +211,21 @@
                 </tbody>
               </table>
               <div class='table-footer'>
-                <?php if($countBugs and $canBatchUnlink and $canBeChanged):?>
+                <?php if($countBugs and ($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                 <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
                 <div class="table-actions btn-toolbar">
-                  <?php echo html::submitButton($lang->release->batchUnlink, '', 'btn');?>
+                <?php
+                if($canBatchUnlink)
+                {
+                    $unlinkURL = inlink('batchUnlinkBug', "release=$release->id");
+                    echo html::a('###', $lang->release->batchUnlink, '', "onclick='setFormAction(\"$unlinkURL\", \"hiddenwin\", this)' class='btn'");
+                }
+                if($canBatchClose)
+                {
+                    $closeURL = $this->createLink('bug', 'batchClose', "release=$release->id&viewType=release");
+                    echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"hiddenwin\", this)' class='btn'");
+                }
+                ?>
                 </div>
                 <div class='table-statistic'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
                 <?php endif;?>
diff --git a/module/story/config.php b/module/story/config.php
index 13992a4a8c..db14392346 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -129,7 +129,7 @@ $config->story->datatable->fieldList['estimate']['required'] = 'no';
 
 $config->story->datatable->fieldList['stage']['title']    = 'stageAB';
 $config->story->datatable->fieldList['stage']['fixed']    = 'no';
-$config->story->datatable->fieldList['stage']['width']    = '70';
+$config->story->datatable->fieldList['stage']['width']    = '75';
 $config->story->datatable->fieldList['stage']['required'] = 'no';
 
 $config->story->datatable->fieldList['openedBy']['title']    = 'openedByAB';
diff --git a/module/story/control.php b/module/story/control.php
index 82ed897f27..1f55ce3d71 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -162,12 +162,14 @@ class story extends control
                 $object = $this->dao->findById((int)$objectID)->from(TABLE_PROJECT)->fetch();
                 if($object->type != 'project')
                 {
+                    if($this->config->systemMode == 'new') $this->action->create('story', $storyID, 'linked2project', '', $object->project);
+
                     $actionType = $object->type == 'kanban' ? 'linked2kanban' : 'linked2execution';
-                    $this->loadModel('action')->create('story', $storyID, $actionType, '', $objectID);
+                    $this->action->create('story', $storyID, $actionType, '', $objectID);
                 }
                 else
                 {
-                    $this->loadModel('action')->create('story', $storyID, 'linked2project', '', $objectID);
+                    $this->action->create('story', $storyID, 'linked2project', '', $objectID);
                 }
             }
 
@@ -195,23 +197,24 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
 
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
@@ -499,8 +502,8 @@ class story extends control
             {
                 $products = array();
                 foreach($mails as $story) $products[$story->storyID] = $productID;
-                $this->execution->linkStory($executionID, $stories, $products, $extra, $lanes);
                 if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $stories, $products);
+                $this->execution->linkStory($executionID, $stories, $products, $extra, $lanes);
             }
 
             /* If storyID not equal zero, subdivide this story to child stories and close it. */
@@ -518,22 +521,23 @@ class story extends control
                 $execution   = $this->execution->getByID($executionID);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
 
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
@@ -749,22 +753,23 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
 
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
@@ -1081,21 +1086,22 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
@@ -1163,11 +1169,11 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $execLaneType    = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $taskSearchValue);
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -1315,13 +1321,13 @@ class story extends control
 
             if($this->app->tab == 'execution' and $from == 'taskkanban')
             {
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                $kanbanData    = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                $kanbanType    = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                $kanbanData    = $kanbanData[$kanbanType];
-                $kanbanData    = json_encode($kanbanData);
+                $execLaneType    = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                $kanbanData      = $kanbanData[$kanbanType];
+                $kanbanData      = json_encode($kanbanData);
                 return print(js::closeModal('parent', '', "parent.updateKanban(\"story\", $kanbanData)"));
             }
 
@@ -1363,21 +1369,22 @@ class story extends control
                 {
                     $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID);
 
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
@@ -1506,12 +1513,12 @@ class story extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($this->session->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->execution->getByID($this->session->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID);
 
                     $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
@@ -1520,10 +1527,11 @@ class story extends control
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
                 }
                 else
@@ -1870,23 +1878,24 @@ class story extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($this->session->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $execution    = $this->execution->getByID($this->session->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 elseif($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban('$execLaneType', $kanbanData)"));
                 }
                 else
                 {
diff --git a/module/story/model.php b/module/story/model.php
index dfd559a590..1595bda203 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3931,7 +3931,7 @@ class storyModel extends model
                             if($story->stage == 'projected') $title = $this->lang->story->subDivideTip['projected'];
                         }
                     }
-                    $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID={$this->session->project}", $story, $type, 'split', '', 'showinonlybody', '', '', $title);
+                    $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params", $story, $type, 'split', '', 'showinonlybody', '', '', $title);
                 }
                 if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') $menu .= $this->buildMenu('projectstory', 'unlinkStory', "projectID={$this->session->project}&$params", $story, $type, 'unlink', 'hiddenwin', 'showinonlybody');
 
diff --git a/module/task/control.php b/module/task/control.php
index 5ba9aaae47..8cb9eedb1b 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -49,6 +49,7 @@ class task extends control
         $executionID = $this->execution->saveState($executionID, $executions);
         $execution   = $this->execution->getById($executionID);
         $this->execution->setMenu($executionID);
+        if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
 
         $this->execution->getLimitedExecution();
         $limitedExecutions = !empty($_SESSION['limitedExecutions']) ? $_SESSION['limitedExecutions'] : '';
@@ -185,22 +186,23 @@ class task extends control
             {
                 if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                     }
                     else
                     {
-                        $kanbanData = $this->kanban->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->kanban->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
 
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"task\", $kanbanData)"));
                     }
@@ -347,6 +349,7 @@ class task extends control
 
         /* Set menu. */
         $this->execution->setMenu($execution->id);
+        if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
 
         /* When common task are child tasks, query whether common task are consumed. */
         $taskConsumed = 0;
@@ -372,22 +375,23 @@ class task extends control
             {
                 if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData = json_encode($kanbanData);
+                        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)"));
                     }
                     else
                     {
-                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                        $kanbanData = $kanbanData[$kanbanType];
-                        $kanbanData = json_encode($kanbanData);
+                        $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                        $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $taskSearchValue);
+                        $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData      = $kanbanData[$kanbanType];
+                        $kanbanData      = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                     }
@@ -542,23 +546,24 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 else
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -575,6 +580,8 @@ class task extends control
             }
         }
 
+        if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
+
         $tasks = $this->task->getParentTaskPairs($this->view->execution->id, $this->view->task->parent);
         if(isset($tasks[$taskID])) unset($tasks[$taskID]);
 
@@ -777,24 +784,25 @@ class task extends control
             if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'success'));
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $task         = $this->task->getById($taskID);
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroup, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroup, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 if($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -899,6 +907,7 @@ class task extends control
         $this->session->set('executionList', $this->app->getURI(true), 'execution');
 
         $this->commonAction($taskID);
+        if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
 
         $taskID = (int)$taskID;
         $task   = $this->task->getById($taskID, true);
@@ -1035,24 +1044,25 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 if($output['from'] == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1110,20 +1120,21 @@ class task extends control
                 $execution     = $this->execution->getByID($task->execution);
                 $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                 $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                 if($execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 if($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1182,19 +1193,36 @@ class task extends control
      */
     public function deleteEstimate($estimateID, $confirm = 'no')
     {
-        if($confirm == 'no')
+        $estimate = $this->task->getEstimateById($estimateID);
+        $task     = $this->task->getById($estimate->task);
+        if($confirm == 'no' and $task->consumed - $estimate->consumed != 0)
         {
             return print(js::confirm($this->lang->task->confirmDeleteEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
         }
+        elseif($confirm == 'no' and $task->consumed - $estimate->consumed == 0)
+        {
+            return print(js::confirm($this->lang->task->confirmDeleteLastEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
+        }
         else
         {
-            $estimate = $this->task->getEstimateById($estimateID);
             $changes  = $this->task->deleteEstimate($estimateID);
             if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->loadModel('action')->create('task', $estimate->task, 'DeleteEstimate');
             $this->action->logHistory($actionID, $changes);
-            return print(js::reload('parent'));
+            if($task->consumed - $estimate->consumed == 0)
+            {
+                $actionID = $this->loadModel('action')->create('task', $estimate->task, 'Adjusttasktowait');
+                $this->action->logHistory($actionID, $changes);
+            }
+            if($task->consumed - $estimate->consumed == 0)
+            {
+                return print(js::reload('parent.parent'));
+            }
+            else
+            {
+                return print(js::reload('parent'));
+            }
         }
     }
 
@@ -1251,24 +1279,25 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == "kanban")
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 if($output['from'] == "taskkanban")
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1347,25 +1376,26 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $task         = $this->task->getById($taskID);
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 if($output['from'] == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1413,24 +1443,25 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $task         = $this->task->getById($taskID);
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 if($from == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1495,23 +1526,24 @@ class task extends control
                     }
                 }
 
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 if($output['from'] == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1665,25 +1697,26 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $task         = $this->task->getById($taskID);
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == 'kanban')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 if($output['from'] == 'taskkanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1730,25 +1763,26 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $task         = $this->task->getById($taskID);
+                $execution    = $this->execution->getByID($task->execution);
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 if($execution->type == "kanban")
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
                 if($output['from'] == "taskkanban")
                 {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                    $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData      = $kanbanData[$kanbanType];
+                    $kanbanData      = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1806,13 +1840,13 @@ class task extends control
             if(isonlybody()) return print(js::reload('parent.parent'));
             if($from == 'taskkanban')
             {
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                $kanbanData    = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                $kanbanType    = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                $kanbanData    = $kanbanData[$kanbanType];
-                $kanbanData    = json_encode($kanbanData);
+                $execLaneType    = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
+                $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $taskSearchValue);
+                $kanbanType      = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                $kanbanData      = $kanbanData[$kanbanType];
+                $kanbanData      = json_encode($kanbanData);
                 return print(js::closeModal('parent', '', "parent.updateKanban(\"task\", $kanbanData)"));
             }
 
@@ -1862,6 +1896,56 @@ class task extends control
         echo html::select('task', empty($tasks) ? array('' => '') : $tasks, $taskID, "class='form-control'");
     }
 
+    /**
+     * Ajax get tasks for execution list.
+     *
+     * @param  int    $executionID
+     * @param  int    $maxTaskID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetTasks($executionID, $maxTaskID = 0)
+    {
+        $this->loadModel('task');
+        $this->loadModel('execution');
+        $execution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
+
+        $tasks = $this->dao->select('*')->from(TABLE_TASK)
+            ->where('deleted')->eq(0)
+            ->andWhere('status')->notin('closed,cancel')
+            ->andWhere('execution')->eq($executionID)
+            ->andWhere('id')->gt($maxTaskID)
+            ->orderBy('id_asc')
+            ->fetchAll('id');
+
+        $users = $this->loadModel('user')->getPairs('noletter|nodeleted');
+        foreach($tasks as $task)
+        {
+            if($task->parent > 0)
+            {
+                if(isset($tasks[$task->parent]))
+                {
+                    $tasks[$task->parent]->children[$task->id] = $task;
+                    unset($tasks[$task->id]);
+                }
+            }
+        }
+
+        if(empty($tasks)) die('');
+
+        $list  = '';
+        $tasks = array_chunk($tasks, 50, true);
+        $tasks = $tasks[0];
+        $count = count($tasks);
+        foreach($tasks as $task)
+        {
+            $showmore = ($count == 50) && ($task == end($tasks));
+            $list    .= $this->task->buildNestedList($execution, $task, false, $showmore, $users);
+        }
+
+        die($list);
+    }
+
     /**
      * AJAX: get the actions of a task. for web app.
      *
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 08ad7b1547..fa6378c063 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -127,7 +127,8 @@ function loadExecutionStories(executionID)
  */
 function loadModuleMenu(executionID)
 {
-    var link = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + executionID + '&viewtype=task');
+    var extra = $('#showAllModule').prop('checked') ? 'allModule' : '';
+    var link  = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + executionID + '&viewtype=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra);
     $('#moduleIdBox').load(link, function(){$('#module').chosen();});
 }
 
@@ -501,11 +502,12 @@ $(document).ready(function()
 
     $('#showAllModule').change(function()
     {
-        var moduleID = $('#moduleIdBox #module').val();
-        var extra    = $(this).prop('checked') ? 'allModule' : '';
+        var executionID = $('#execution').val();
+        var moduleID    = $('#moduleIdBox #module').val();
+        var extra       = $(this).prop('checked') ? 'allModule' : '';
         $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + executionID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function()
         {
-            $('#moduleIdBox #module').val(moduleID).chosen();
+            $('#module').val(moduleID).chosen();
         });
     });
 });
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 137364c86d..6bd4ae30b7 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -214,27 +214,27 @@ $lang->task->legendDesc   = 'Aufgabenbeschreibung';
 $lang->task->legendDetail = 'Task Detail';
 $lang->task->legendMisc   = 'Misc.';
 
-$lang->task->confirmDelete          = "Möchten Sie diese Aufgabe löschen?";
-$lang->task->confirmDeleteEstimate  = "Möchten Sie das löschen?";
-$lang->task->copyStoryTitle         = "Story kopieren";
-$lang->task->afterSubmit            = "Nach der Erstellung,";
-$lang->task->successSaved           = "Erstellt!";
-$lang->task->delayWarning           = " <strong class='text-danger'> Verzögerung %s Tage </strong>";
-$lang->task->remindBug              = "Diese Aufgabe wurde aus einem Bus erzeugt. Möchten Sie den Bug aktualisieren:%s?";
-$lang->task->remindIssue            = "This task is converted from a issue. Do you want to update the Issue:%s?";
-$lang->task->confirmChangeExecution = "Wenn Sie {$lang->executionCommon} ändern, das verwendete Modul, Story and Assignor will be changed. Do you want to do it?";
-$lang->task->confirmFinish          = '"Reststunden " sind 0. Möchten Sue den Status auf Erledigt setzen?';
-$lang->task->confirmRecord          = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?';
-$lang->task->confirmTransfer        = '"Reststunden " sind 0. Möchten Sie den Task transferieren?';
-$lang->task->noticeTaskStart        = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
-$lang->task->noticeLinkStory        = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s.";
-$lang->task->noticeSaveRecord       = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.';
-$lang->task->commentActions         = '%s. %s, kommentiert von <strong>%s</strong>.';
-$lang->task->deniedNotice           = 'Nur %s kann die Aufgabe %s.';
-$lang->task->noTask                 = 'Keine Aufagben. ';
-$lang->task->createDenied           = 'Aufgben erstellen it in diesem Projekt gesperrt';
-$lang->task->cannotDeleteParent     = 'Cannot delete parent task';
-$lang->task->addChildTask           = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
+$lang->task->confirmDelete             = "Möchten Sie diese Aufgabe löschen?";
+$lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started.";
+$lang->task->copyStoryTitle            = "Story kopieren";
+$lang->task->afterSubmit               = "Nach der Erstellung,";
+$lang->task->successSaved              = "Erstellt!";
+$lang->task->delayWarning              = " <strong class='text-danger'> Verzögerung %s Tage </strong>";
+$lang->task->remindBug                 = "Diese Aufgabe wurde aus einem Bus erzeugt. Möchten Sie den Bug aktualisieren:%s?";
+$lang->task->remindIssue               = "This task is converted from a issue. Do you want to update the Issue:%s?";
+$lang->task->confirmChangeExecution    = "Wenn Sie {$lang->executionCommon} ändern, das verwendete Modul, Story and Assignor will be changed. Do you want to do it?";
+$lang->task->confirmFinish             = '"Reststunden " sind 0. Möchten Sue den Status auf Erledigt setzen?';
+$lang->task->confirmRecord             = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?';
+$lang->task->confirmTransfer           = '"Reststunden " sind 0. Möchten Sie den Task transferieren?';
+$lang->task->noticeTaskStart           = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
+$lang->task->noticeLinkStory           = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s.";
+$lang->task->noticeSaveRecord          = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.';
+$lang->task->commentActions            = '%s. %s, kommentiert von <strong>%s</strong>.';
+$lang->task->deniedNotice              = 'Nur %s kann die Aufgabe %s.';
+$lang->task->noTask                    = 'Keine Aufagben. ';
+$lang->task->createDenied              = 'Aufgben erstellen it in diesem Projekt gesperrt';
+$lang->task->cannotDeleteParent        = 'Cannot delete parent task';
+$lang->task->addChildTask              = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
 
 $lang->task->error = new stdclass();
 $lang->task->error->totalNumber       = '"Total Cost" must be numbers.';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index ab272e262c..3561bfae37 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -214,27 +214,28 @@ $lang->task->legendDesc   = 'Task Description';
 $lang->task->legendDetail = 'Task Detail';
 $lang->task->legendMisc   = 'Misc.';
 
-$lang->task->confirmDelete          = "Do you want to delete this task?";
-$lang->task->confirmDeleteEstimate  = "Do you want to delete it?";
-$lang->task->copyStoryTitle         = "Copy Story";
-$lang->task->afterSubmit            = "Next ";
-$lang->task->successSaved           = "Created!";
-$lang->task->delayWarning           = " <strong class='text-danger'> Delay %s days </strong>";
-$lang->task->remindBug              = "This task is converted from a bug. Do you want to update the Bug:%s?";
-$lang->task->remindIssue            = "This task is converted from a issue. Do you want to update the Issue:%s?";
-$lang->task->confirmChangeExecution = "If you change {$lang->executionCommon}, Module, Story and AssignedTo will also be changed. Do you want to change it?";
-$lang->task->confirmFinish          = '"Left Hour" is 0. Do you want to change the status to "Finished"?';
-$lang->task->confirmRecord          = '"Left Hour" is 0. Do you want to set the task as "Finished"?';
-$lang->task->confirmTransfer        = '"Left Hour" is 0，Do you want to transfer task?';
-$lang->task->noticeTaskStart        = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
-$lang->task->noticeLinkStory        = "No story has been linked. You can %s for this project, then %s.";
-$lang->task->noticeSaveRecord       = 'Your Hour is not saved. Please save it first.';
-$lang->task->commentActions         = '%s. %s, commented by <strong>%s</strong>.';
-$lang->task->deniedNotice           = 'Only the %s can %s the task.';
-$lang->task->noTask                 = 'No tasks yet. ';
-$lang->task->createDenied           = 'Create Task is denied in this project';
-$lang->task->cannotDeleteParent     = 'Cannot delete parent task';
-$lang->task->addChildTask           = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
+$lang->task->confirmDelete             = "Do you want to delete this task?";
+$lang->task->confirmDeleteEstimate     = "Do you want to delete it?";
+$lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started.";
+$lang->task->copyStoryTitle            = "Copy Story";
+$lang->task->afterSubmit               = "Next ";
+$lang->task->successSaved              = "Created!";
+$lang->task->delayWarning              = " <strong class='text-danger'> Delay %s days </strong>";
+$lang->task->remindBug                 = "This task is converted from a bug. Do you want to update the Bug:%s?";
+$lang->task->remindIssue               = "This task is converted from a issue. Do you want to update the Issue:%s?";
+$lang->task->confirmChangeExecution    = "If you change {$lang->executionCommon}, Module, Story and AssignedTo will also be changed. Do you want to change it?";
+$lang->task->confirmFinish             = '"Left Hour" is 0. Do you want to change the status to "Finished"?';
+$lang->task->confirmRecord             = '"Left Hour" is 0. Do you want to set the task as "Finished"?';
+$lang->task->confirmTransfer           = '"Left Hour" is 0，Do you want to transfer task?';
+$lang->task->noticeTaskStart           = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
+$lang->task->noticeLinkStory           = "No story has been linked. You can %s for this project, then %s.";
+$lang->task->noticeSaveRecord          = 'Your Hour is not saved. Please save it first.';
+$lang->task->commentActions            = '%s. %s, commented by <strong>%s</strong>.';
+$lang->task->deniedNotice              = 'Only the %s can %s the task.';
+$lang->task->noTask                    = 'No tasks yet. ';
+$lang->task->createDenied              = 'Create Task is denied in this project';
+$lang->task->cannotDeleteParent        = 'Cannot delete parent task';
+$lang->task->addChildTask              = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
 
 $lang->task->error = new stdclass();
 $lang->task->error->totalNumber       = '"Total Cost" must be numbers.';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 555df916b6..eb892c7518 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -214,27 +214,28 @@ $lang->task->legendDesc   = 'Description Tâche';
 $lang->task->legendDetail = 'Task Detail';
 $lang->task->legendMisc   = 'Misc.';
 
-$lang->task->confirmDelete          = "Voulez-vous réellement supprimer cette tâche ?";
-$lang->task->confirmDeleteEstimate  = "Voulez-vous la supprimer ?";
-$lang->task->copyStoryTitle         = '<span style="color:blue;">StoryModel</span>';
-$lang->task->afterSubmit            = "Suiv. ";
-$lang->task->successSaved           = "Créée !";
-$lang->task->delayWarning           = " <strong class='text-danger'> Retard %s jours </strong>";
-$lang->task->remindBug              = "Cette tâche a été convertie depuis un bug. Voulez-vous mettre à jour le Bug : %s ?";
-$lang->task->remindIssue            = "This task is converted from a issue. Do you want to update the Issue:%s?";
-$lang->task->confirmChangeExecution = "Si vous changez {$lang->executionCommon}, Module, Story et AssignedTo seront également changés. Voulez-vous le faire ?";
-$lang->task->confirmFinish          = '"Heures Restantes" à 0. Voulez-vous passer le statut à "Terminée" ?';
-$lang->task->confirmRecord          = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?';
-$lang->task->confirmTransfer        = '"Heures Restantes" à 0. Voulez-vous transférer la tâche ?';
-$lang->task->noticeTaskStart        = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
-$lang->task->noticeLinkStory        = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s.";
-$lang->task->noticeSaveRecord       = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord.";
-$lang->task->commentActions         = '%s. %s, commenté par <strong>%s</strong>.';
-$lang->task->deniedNotice           = 'Seulement le %s peut %s la tâche.';
-$lang->task->noTask                 = "Pas de tâche pour l'instant. ";
-$lang->task->createDenied           = 'La création de tâches est interdite dans ce projet';
-$lang->task->cannotDeleteParent     = 'Impossible de supprimer la tâche parente';
-$lang->task->addChildTask           = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
+$lang->task->confirmDelete             = "Voulez-vous réellement supprimer cette tâche ?";
+$lang->task->confirmDeleteEstimate     = "Voulez-vous la supprimer ?";
+$lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started.";
+$lang->task->copyStoryTitle            = '<span style="color:blue;">StoryModel</span>';
+$lang->task->afterSubmit               = "Suiv. ";
+$lang->task->successSaved              = "Créée !";
+$lang->task->delayWarning              = " <strong class='text-danger'> Retard %s jours </strong>";
+$lang->task->remindBug                 = "Cette tâche a été convertie depuis un bug. Voulez-vous mettre à jour le Bug : %s ?";
+$lang->task->remindIssue               = "This task is converted from a issue. Do you want to update the Issue:%s?";
+$lang->task->confirmChangeExecution    = "Si vous changez {$lang->executionCommon}, Module, Story et AssignedTo seront également changés. Voulez-vous le faire ?";
+$lang->task->confirmFinish             = '"Heures Restantes" à 0. Voulez-vous passer le statut à "Terminée" ?';
+$lang->task->confirmRecord             = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?';
+$lang->task->confirmTransfer           = '"Heures Restantes" à 0. Voulez-vous transférer la tâche ?';
+$lang->task->noticeTaskStart           = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
+$lang->task->noticeLinkStory           = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s.";
+$lang->task->noticeSaveRecord          = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord.";
+$lang->task->commentActions            = '%s. %s, commenté par <strong>%s</strong>.';
+$lang->task->deniedNotice              = 'Seulement le %s peut %s la tâche.';
+$lang->task->noTask                    = "Pas de tâche pour l'instant. ";
+$lang->task->createDenied              = 'La création de tâches est interdite dans ce projet';
+$lang->task->cannotDeleteParent        = 'Impossible de supprimer la tâche parente';
+$lang->task->addChildTask              = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
 
 $lang->task->error = new stdclass();
 $lang->task->error->totalNumber       = '"Coût Total" doit être numérique.';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index c7a13670fa..fb3a7b85ca 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -214,27 +214,28 @@ $lang->task->legendDesc   = '任务描述';
 $lang->task->legendDetail = '任务详情';
 $lang->task->legendMisc   = '其他相关';
 
-$lang->task->confirmDelete          = "您确定要删除这个任务吗？";
-$lang->task->confirmDeleteEstimate  = "您确定要删除这个记录吗？";
-$lang->task->copyStoryTitle         = "同{$lang->SRCommon}";
-$lang->task->afterSubmit            = "添加之后";
-$lang->task->successSaved           = "成功添加，";
-$lang->task->delayWarning           = " <strong class='text-danger'> 延期%s天 </strong>";
-$lang->task->remindBug              = "该任务为Bug转化得到，是否更新Bug:%s ?";
-$lang->task->remindIssue            = "该任务为问题转化得到，是否更新问题:%s ?";
-$lang->task->confirmChangeExecution = "修改{$lang->executionCommon}会导致相应的所属模块、相关{$lang->SRCommon}和指派人发生变化，确定吗？";
-$lang->task->confirmFinish          = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
-$lang->task->confirmRecord          = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
-$lang->task->confirmTransfer        = '"当前剩余"为0，任务将被转交，您确定吗？';
-$lang->task->noticeTaskStart        = '"总计消耗"和"预计剩余"不能同时为0';
-$lang->task->noticeLinkStory        = "没有可关联的相关{$lang->SRCommon}，您可以为当前项目%s，然后%s";
-$lang->task->noticeSaveRecord       = '您有尚未保存的工时记录，请先将其保存。';
-$lang->task->commentActions         = '%s. %s, 由 <strong>%s</strong> 添加备注。';
-$lang->task->deniedNotice           = '当前任务只有%s才可以%s。';
-$lang->task->noTask                 = '暂时没有任务。';
-$lang->task->createDenied           = '你不能在该项目添加任务';
-$lang->task->cannotDeleteParent     = '不能删除父任务。';
-$lang->task->addChildTask           = '因该任务已经产生消耗，为保证数据一致性，我们会帮您创建一条同名子任务记录该消耗。';
+$lang->task->confirmDelete             = "您确定要删除这个任务吗？";
+$lang->task->confirmDeleteEstimate     = "您确定要删除这个记录吗？";
+$lang->task->confirmDeleteLastEstimate = "您确定要删除该条日志吗？删除最后一条工时日志后，该任务状态将调整为未开始。";
+$lang->task->copyStoryTitle            = "同{$lang->SRCommon}";
+$lang->task->afterSubmit               = "添加之后";
+$lang->task->successSaved              = "成功添加，";
+$lang->task->delayWarning              = " <strong class='text-danger'> 延期%s天 </strong>";
+$lang->task->remindBug                 = "该任务为Bug转化得到，是否更新Bug:%s ?";
+$lang->task->remindIssue               = "该任务为问题转化得到，是否更新问题:%s ?";
+$lang->task->confirmChangeExecution    = "修改{$lang->executionCommon}会导致相应的所属模块、相关{$lang->SRCommon}和指派人发生变化，确定吗？";
+$lang->task->confirmFinish             = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
+$lang->task->confirmRecord             = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
+$lang->task->confirmTransfer           = '"当前剩余"为0，任务将被转交，您确定吗？';
+$lang->task->noticeTaskStart           = '"总计消耗"和"预计剩余"不能同时为0';
+$lang->task->noticeLinkStory           = "没有可关联的相关{$lang->SRCommon}，您可以为当前项目%s，然后%s";
+$lang->task->noticeSaveRecord          = '您有尚未保存的工时记录，请先将其保存。';
+$lang->task->commentActions            = '%s. %s, 由 <strong>%s</strong> 添加备注。';
+$lang->task->deniedNotice              = '当前任务只有%s才可以%s。';
+$lang->task->noTask                    = '暂时没有任务。';
+$lang->task->createDenied              = '你不能在该项目添加任务';
+$lang->task->cannotDeleteParent        = '不能删除父任务。';
+$lang->task->addChildTask              = '因该任务已经产生消耗，为保证数据一致性，我们会帮您创建一条同名子任务记录该消耗。';
 
 $lang->task->error                    = new stdclass();
 $lang->task->error->totalNumber       = '"总计消耗"必须为数字';
diff --git a/module/task/model.php b/module/task/model.php
index b2bd96a984..3d5e36a323 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -719,7 +719,6 @@ class taskModel extends model
                     $task->assignedTo   = $childTask->assignedTo;
                     $task->assignedDate = $now;
                 }
-
                 $task->finishedBy   = '';
                 $task->finishedDate = '';
                 $task->closedBy     = '';
@@ -749,6 +748,7 @@ class taskModel extends model
                 if($status == 'doing' and $parentTask->status == 'wait')    $action = 'Started';
                 if($status == 'doing' and $parentTask->status == 'pause')   $action = 'Restarted';
                 if($status == 'doing' and $parentTask->status != 'wait' and $parentTask->status != 'pause') $action = 'Activated';
+                if($status == 'wait' and $parentTask->status != 'wait')     $action = 'Adjusttasktowait';
                 if($action)
                 {
                     $actionID = $this->loadModel('action')->create('task', $parentID, $action, '', '', '', false);
@@ -833,7 +833,8 @@ class taskModel extends model
                 $currentTask->consumed += (float)$member->consumed;
                 $currentTask->left     += (float)$member->left;
             }
-            if(empty($oldTask->team) and isset($oldTask->consumed)) $currentTask->consumed += (float)$oldTask->consumed;
+
+            if($this->app->rawMethod == 'edit' and empty($oldTask->team) and isset($oldTask->consumed)) $currentTask->consumed += (float)$oldTask->consumed;
 
             if(!empty($task))
             {
@@ -1236,7 +1237,7 @@ class taskModel extends model
                 return false;
             }
 
-            if(empty($task->closedReason))
+            if(empty($task->closedReason) and $task->status == 'closed')
             {
                 if($oldTask->status == 'done')   $task->closedReason = 'done';
                 if($oldTask->status == 'cancel') $task->closedReason = 'cancel';
@@ -2834,7 +2835,19 @@ class taskModel extends model
         $data->consumed = $consumed;
         $data->left     = $left;
         $data->status   = ($left == 0 && $consumed != 0) ? 'done' : $task->status;
-
+        if($left == 0 and $consumed != 0)
+        {
+            $data->status = 'done';
+        }
+        elseif($consumed == 0)
+        {
+            $data->status = 'wait';
+            $data->left   = $task->left + $estimate->consumed;
+        }
+        else
+        {
+            $data->status = $task->status;
+        }
         if(!empty($task->team))
         {
             $oldConsumed = $task->team[$estimate->account]->consumed;
@@ -3734,6 +3747,64 @@ class taskModel extends model
             ->fetchPairs('actor');
     }
 
+    /**
+     * Build nested list.
+     *
+     * @param  objecct $execution
+     * @param  object  $task
+     * @param  bool    $isChild
+     * @param  bool    $showmore
+     * @access public
+     * @return string
+     */
+    public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users)
+    {
+        $showmore = $showmore ? 'showmore' : '';
+        $trAttrs  = "data-id=$task->id";
+        if(!$isChild)
+        {
+            $path     = $execution->grade == 2 ? "$execution->parent,$execution->id,$task->id," : ",$execution->id,$task->id,";
+            $trAttrs .= " data-parent=$execution->id data-nest-parent=$execution->id data-nest-path=$path";
+            if(empty($task->children)) $trAttrs .= " data-nested='false'";
+            $trClass  = empty($task->children) ? '' : " has-nest-child";
+        }
+        else
+        {
+            $path     = $execution->grade == 2 ? "$execution->parent,$execution->id,$task->parent,$task->id," : ",$execution->id,$task->parent,$task->id,";
+            $trClass  = 'is-nest-child no-nest';
+            $trAttrs .= " data-nested='false' data-parent=$task->parent data-nest-parent=$task->parent data-nest-path=$path";
+        }
+
+        $list  = "<tr $trAttrs class='$trClass $showmore'>";
+        $list .= '<td>';
+        if($task->parent > 0) $list .= '<span class="label label-badge label-light" title="' . $this->lang->task->children . '">' . $this->lang->task->childrenAB . '</span> ';
+        $list .= html::a(helper::createLink('task', 'view', "id=$task->id"), $task->name, '', "data-app='project'");
+        $list .= '</td>';
+        $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
+        $list .= "<td class='status-{$task->status}'>" . $this->processStatus('task', $task) . '</td>';
+        $list .= '<td></td>';
+        $list .= '<td>' . $task->estStarted . '</td>';
+        $list .= '<td>' . $task->deadline . '</td>';
+        $list .= '<td>' . $task->estimate . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td>' . $task->consumed . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td>' . $task->left . $this->lang->execution->workHourUnit . '</td>';
+        $list .= '<td></td>';
+        $list .= '<td class="c-actions">';
+        $list .= $this->buildOperateMenu($task, 'browse');
+        $list .= '</td></tr>';
+
+        if(!empty($task->children))
+        {
+            foreach($task->children as $child)
+            {
+                $showmore = (count($task->children) == 50) && ($child == end($task->children));
+                $list .= $this->buildNestedList($execution, $child, true, $showmore, $users);
+            }
+        }
+
+        return $list;
+    }
+
     /**
      * Build task menu.
      *
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 2806380aac..ce43238469 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1403,10 +1403,33 @@ class testcase extends control
         $case    = $this->testcase->getById($caseID);
         $libCase = $this->testcase->getById($libcaseID);
         $version = $case->version + 1;
+
+        $this->dao->delete()->from(TABLE_FILE)->where('objectType')->eq('testcase')->andWhere('objectID')->eq($caseID)->exec();
+        foreach($libCase->files as $fileID => $file)
+        {
+            $fileName = pathinfo($file->pathname, PATHINFO_FILENAME);
+            $datePath = substr($file->pathname, 0, 6);
+            $realPath = $this->app->getAppRoot() . "www/data/upload/{$this->app->company->id}/" . "{$datePath}/" . $fileName;
+
+            $rand        = rand();
+            $newFileName = $fileName . 'copy' . $rand;
+            $newFilePath = $this->app->getAppRoot() . "www/data/upload/{$this->app->company->id}/" . "{$datePath}/" .  $newFileName;
+            copy($realPath, $newFilePath);
+
+            $newFileName = $file->pathname;
+            $newFileName = str_replace('.', "copy$rand.", $newFileName);
+
+            unset($file->id, $file->realPath, $file->webPath);
+            $file->objectID = $caseID;
+            $file->pathname = $newFileName;
+            $this->dao->insert(TABLE_FILE)->data($file)->exec();
+        }
+
         $this->dao->update(TABLE_CASE)
             ->set('version')->eq($version)
             ->set('fromCaseVersion')->eq($version)
             ->set('precondition')->eq($libCase->precondition)
+            ->set('title')->eq($libCase->title)
             ->where('id')->eq($caseID)
             ->exec();
 
@@ -1417,6 +1440,7 @@ class testcase extends control
             $step->version = $version;
             $this->dao->insert(TABLE_CASESTEP)->data($step)->exec();
         }
+
         echo js::locate($this->createLink('testcase', 'view', "caseID=$caseID&version=$version"), 'parent');
     }
 
diff --git a/module/testcase/js/view.js b/module/testcase/js/view.js
index f35a6c8bbc..1f96fb429d 100644
--- a/module/testcase/js/view.js
+++ b/module/testcase/js/view.js
@@ -1,5 +1,16 @@
 $(document).ready(function()
 {
+    if(isLibCase)
+    {
+        $('#subNavbar [data-id=testcase]').removeClass('active');
+        $('#navbar [data-id=testcase]').removeClass('active');
+    }
+    else
+    {
+        $('#subNavbar [data-id=testcase]').addClass('active');
+        $('#navbar [data-id=testcase]').addClass('active');
+    }
+
     if(config.onlybody != 'yes')$(".runCase").modalTrigger({width:'90%', type:'iframe', afterHide:function(){parent.location.href=parent.location.href;}});
     if(config.onlybody != 'yes')$(".results").modalTrigger({width:'90%', type:'iframe'});
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 0c58f2582e..2130aa43ea 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -285,7 +285,7 @@ class testcaseModel extends model
             ->leftJoin(TABLE_STORY)->alias('t4')->on('t3.story=t4.id')
             ->where('t1.project')->in($executions)
             ->beginIF(!empty($productID))->andWhere('t2.product')->eq((int)$productID)->fi()
-            ->beginIF($branch !== 'all')->andWhere('t2.branch')->eq($branch)->fi()
+            ->beginIF(!empty($productID) and $branch !== 'all')->andWhere('t2.branch')->eq($branch)->fi()
             ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()
             ->beginIF($browseType == 'wait')->andWhere('t2.status')->eq($browseType)->fi()
             ->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi()
@@ -342,7 +342,7 @@ class testcaseModel extends model
                 ->where('t1.project')->eq((int)$executionID)
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
                 ->beginIF(!empty($moduleID))->andWhere('t4.path')->like("%,$moduleID,%")->fi()
-                ->andWhere('t2.branch')->eq($branchID)
+                ->beginIF(!empty($productID))->andWhere('t2.branch')->eq($branchID)->fi()
                 ->andWhere('t2.deleted')->eq('0')
                 ->andWhere('t3.version > t2.storyVersion')
                 ->andWhere("t3.status")->eq('active')
@@ -358,7 +358,7 @@ class testcaseModel extends model
             ->beginIF($browseType != 'all' and $browseType != 'byModule')->andWhere('t2.status')->eq($browseType)->fi()
             ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
             ->beginIF(!empty($moduleID))->andWhere('t3.path')->like("%,$moduleID,%")->fi()
-            ->andWhere('t2.branch')->eq($branchID)
+            ->beginIF(!empty($productID))->andWhere('t2.branch')->eq($branchID)->fi()
             ->andWhere('t2.deleted')->eq('0')
             ->orderBy($orderBy)
             ->page($pager)
@@ -520,7 +520,7 @@ class testcaseModel extends model
                 ->andWhere('t2.version > t1.storyVersion')
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
                 ->beginIF($this->app->tab == 'project')->andWhere('t3.project')->eq($this->session->project)->fi()
-                ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
+                ->beginIF($branch !== 'all' and !empty($productID))->andWhere('t1.branch')->eq($branch)->fi()
                 ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
                 ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
                 ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
@@ -799,15 +799,12 @@ class testcaseModel extends model
         $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($requiredFields, 'notempty')->checkFlow()->where('id')->eq((int)$caseID)->exec();
         if(!$this->dao->isError())
         {
-            $isLibCase    = ($oldCase->lib and empty($oldCase->product));
-            $titleChanged = ($case->title != $oldCase->title);
-            if($isLibCase and $titleChanged) $this->dao->update(TABLE_CASE)->set('`title`')->eq($case->title)->where('`fromCaseID`')->eq($caseID)->exec();
-
             $this->updateCase2Project($oldCase, $case, $caseID);
 
             if($stepChanged)
             {
                 $parentStepID = 0;
+                $isLibCase    = ($oldCase->lib and empty($oldCase->product));
                 if($isLibCase)
                 {
                     $fromcaseVersion  = $this->dao->select('fromCaseVersion')->from(TABLE_CASE)->where('fromCaseID')->eq($caseID)->fetch('fromCaseVersion');
@@ -1103,6 +1100,11 @@ class testcaseModel extends model
         foreach($cases as $caseID => $case)
         {
             $oldCase = $this->getByID($caseID);
+
+            $caseChanged = false;
+            if($oldCase->title != $case->title)               $caseChanged = true;
+            if($oldCase->precondition != $case->precondition) $caseChanged = true;
+
             $this->dao->update(TABLE_CASE)->data($case)
                 ->autoCheck()
                 ->batchCheck($this->config->testcase->edit->requiredFields, 'notempty')
@@ -1112,11 +1114,7 @@ class testcaseModel extends model
 
             if(!dao::isError())
             {
-                $isLibCase     = ($oldCase->lib and empty($oldCase->product));
-                $titleChanged  = ($case->title != $oldCase->title);
                 $case->product = $oldCase->product;
-                if($isLibCase and $titleChanged) $this->dao->update(TABLE_CASE)->set('`title`')->eq($case->title)->where('`fromCaseID`')->eq($caseID)->exec();
-
                 $this->updateCase2Project($oldCase, $case, $caseID);
 
                 $this->executeHooks($caseID);
@@ -1138,6 +1136,14 @@ class testcaseModel extends model
                         }
                     }
                 }
+
+                $isLibCase = ($oldCase->lib and empty($oldCase->product));
+                if($isLibCase and $caseChanged)
+                {
+                    $fromcaseVersion  = $this->dao->select('fromCaseVersion')->from(TABLE_CASE)->where('fromCaseID')->eq($caseID)->fetch('fromCaseVersion');
+                    $fromcaseVersion += 1;
+                    $this->dao->update(TABLE_CASE)->set('`fromCaseVersion`')->eq($fromcaseVersion)->where('`fromCaseID`')->eq($caseID)->exec();
+                }
             }
             else
             {
@@ -2357,6 +2363,10 @@ class testcaseModel extends model
 
             if(!$this->forceNotReview() and $stepChanged) $status = 'wait';
 
+            if(!empty($_POST['title']) and $case->title != $this->post->title)                      $stepChanged = true;
+            if(!empty($_POST['precondition']) and $case->precondition != $this->post->precondition) $stepChanged = true;
+            if(!empty($_POST['labels'][0]))                                                         $stepChanged = true;
+
             return array($stepChanged, $status);
         }
 
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 87d95d09e1..80068e2523 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -261,7 +261,7 @@ js::set('suiteID',        $suiteID);
         <h4 class="modal-title"><?php echo $lang->testcase->importToLib;?></h4>
       </div>
       <div class="modal-body">
-        <form method='post' class='form-ajax' action='<?php echo $this->createLink('testcase', 'importToLib');?>'>
+        <form method='post' class='form-ajax not-watch' action='<?php echo $this->createLink('testcase', 'importToLib');?>'>
           <table class='table table-form'>
             <tr>
               <td class='select-lib'><?php echo $lang->testcase->selectLibAB;?></td>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 0f8784eb45..0b45563774 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -366,14 +366,6 @@
 <?php
 js::set('fullscreen', $lang->fullscreen);
 js::set('retrack', $lang->retrack);
+js::set('isLibCase', $isLibCase);
 ?>
-<?php if(!$isLibCase):?>
-<script>
-$(function()
-{
-    $('#subNavbar [data-id=testcase]').addClass('active');
-    $('#navbar [data-id=testcase]').addClass('active');
-})
-</script>
-<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/tree/control.php b/module/tree/control.php
index bad64ebd6e..2255856940 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -517,6 +517,7 @@ class tree extends control
             {
                 $changeFunc = '';
                 if($viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
+                if($viewType == 'task') $changeFunc = "onchange='setStories(this.value, $rootID)'";
                 $field = $fieldID ? "modules[$fieldID]" : 'module';
 
                 $currentModule   = $this->tree->getById($currentModuleID);
@@ -538,7 +539,8 @@ class tree extends control
         if($returnType == 'mhtml')
         {
             $changeFunc = '';
-            if($viewType == 'task' or $viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
+            if($viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
+            if($viewType == 'task') $changeFunc = "onchange='setStories(this.value, $rootID)'";
             $field  = $fieldID ? "modules[$fieldID]" : 'module';
             $output = html::select("$field", $optionMenu, '', "class='input' $changeFunc");
             die($output);
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index c33947fe1a..b6260e7958 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -20,6 +20,7 @@ $config->upgrade->maxVersion['max3_1_beta2'] = '17_0_beta2';
 $config->upgrade->maxVersion['max3_1']       = '17_0';
 $config->upgrade->maxVersion['max3_2']       = '17_1';
 $config->upgrade->maxVersion['max3_3']       = '17_2';
+$config->upgrade->maxVersion['max3_4']       = '17_3';
 
 $config->upgrade->bizVersion = array();
 $config->upgrade->bizVersion['biz1_0']       = '9_5_1';
@@ -78,6 +79,7 @@ $config->upgrade->bizVersion['biz7_0_beta2'] = '17_0_beta2';
 $config->upgrade->bizVersion['biz7_0']       = '17_0';
 $config->upgrade->bizVersion['biz7_1']       = '17_1';
 $config->upgrade->bizVersion['biz7_2']       = '17_2';
+$config->upgrade->bizVersion['biz7_3']       = '17_3';
 
 $config->upgrade->proVersion = array();
 $config->upgrade->proVersion['pro1_0']        = '3_1';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 1e9db751b3..009706d6a6 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -161,6 +161,7 @@ $lang->upgrade->fromVersions['17_0_beta2'] = '17.0.beta2';
 $lang->upgrade->fromVersions['17_0']       = '17.0';
 $lang->upgrade->fromVersions['17_1']       = '17.1';
 $lang->upgrade->fromVersions['17_2']       = '17.2';
+$lang->upgrade->fromVersions['17_3']       = '17.3';
 
 global $config;
 /* Lite. */
@@ -326,6 +327,7 @@ $lang->upgrade->fromVersions['biz7_0_beta2'] = 'Biz7.0.beta2';
 $lang->upgrade->fromVersions['biz7_0']       = 'Biz7.0';
 $lang->upgrade->fromVersions['biz7_1']       = 'Biz7.1';
 $lang->upgrade->fromVersions['biz7_2']       = 'Biz7.2';
+$lang->upgrade->fromVersions['biz7_3']       = 'Biz7.3';
 
 /* Max. */
 $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -347,3 +349,4 @@ $lang->upgrade->fromVersions['max3_1_beta1'] = 'Max3.1.beta1';
 $lang->upgrade->fromVersions['max3_1_beta2'] = 'Max3.1.beta2';
 $lang->upgrade->fromVersions['max3_1']       = 'Max3.1';
 $lang->upgrade->fromVersions['max3_2']       = 'Max3.2';
+$lang->upgrade->fromVersions['max3_3']       = 'Max3.3';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 8c7b9380b5..d92a655196 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -692,6 +692,9 @@ class upgradeModel extends model
             case 'max3_0':
                 $this->moveResult2Node();
                 break;
+            case 'max3_3':
+                $this->addReviewIssusApprovalData();
+                break;
         }
     }
 
@@ -969,6 +972,8 @@ class upgradeModel extends model
                 $confirmContent .= file_get_contents($this->getUpgradeFile('17.1'));
                 $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan5.6.sql';
                 $confirmContent .= file_get_contents($xuanxuanSql);
+            case '17_2':
+                $confirmContent .= file_get_contents($this->getUpgradeFile('17.2'));
         }
 
         return $confirmContent;
@@ -6509,6 +6514,46 @@ class upgradeModel extends model
         return true;
     }
 
+    /*
+     * Add review issue approval data.
+     *
+     * @access public
+     * @return bool
+     */
+    public function addReviewIssusApprovalData()
+    {
+        $reviewIssues = $this->dao->select('id,review,type')->from(TABLE_REVIEWISSUE)
+            ->where('type')->eq('review')
+            ->andWhere('approval')->eq(0)
+            ->andWhere('deleted')->eq('0')
+            ->fetchAll('review');
+
+        if(empty($reviewIssues)) return false;
+
+        $reviewIds = array_unique(array_column($reviewIssues, 'review'));
+
+        $approvalsPairs = $this->dao->select('objectID, max(id) as approval')->from(TABLE_APPROVAL)
+            ->where('objectID')->in($reviewIds)
+            ->andWhere('objectType')->eq('review')
+            ->andWhere('result')->eq('fail')
+            ->andWhere('deleted')->eq(0)
+            ->groupBy('objectID')
+            ->fetchAll('objectID');
+
+        /* Add approval data. */
+        foreach($reviewIssues as $reviewIssue)
+        {
+            if(!isset($approvalsPairs[$reviewIssue->review]->approval)) continue;
+            $this->dao->update(TABLE_REVIEWISSUE)
+                ->set('approval')->eq($approvalsPairs[$reviewIssue->review]->approval)
+                ->where('review')->eq($reviewIssue->review)
+                ->andWhere('type')->eq('review')
+                ->andWhere('approval')->eq(0)
+                ->andWhere('deleted')->eq('0')
+                ->exec();
+        }
+    }
+
     /**
      * Xuan: Add `index` column to all message partition tables.
      *
diff --git a/module/user/css/forgetpassword.css b/module/user/css/forgetpassword.css
index bd3d30b0cd..d9378a445d 100644
--- a/module/user/css/forgetpassword.css
+++ b/module/user/css/forgetpassword.css
@@ -10,3 +10,5 @@ body {background: #1183fb linear-gradient(-90deg, #0a48d1 0%, #1183fb 100%); bac
 #forgetForm .form-actions {padding-bottom: 20px;}
 .required:after {top: 32px; right: -15px;}
 .resetBox {float: right; font-size: 8px; margin-right: 2px;}
+#forgetForm .form-actions > .btn-wide {min-width: 45%;}
+#forgetForm .form-actions > a.btn-wide {margin-right: 0px;}
diff --git a/module/user/css/resetpassword.css b/module/user/css/resetpassword.css
index 8320dcbfb1..6a798688b0 100644
--- a/module/user/css/resetpassword.css
+++ b/module/user/css/resetpassword.css
@@ -11,3 +11,5 @@ body {background: #1183fb linear-gradient(-90deg, #0a48d1 0%, #1183fb 100%); bac
 .required:after {top: 32px; right: -15px;}
 #resetPanel .form-group .input-group {width: 100%}
 #resetPanel .form-group .input-group.required:after {top: 6px;}
+#resetPanel .form-actions > .btn-wide {min-width: 45%;}
+#resetPanel .form-actions > a.btn-wide {margin-right: 0px;}
diff --git a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
index f134a049b4..8391277656 100644
--- a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
@@ -207,14 +207,22 @@ class xuanxuanIm extends imModel
             foreach($userMessages as $message)
             {
                 /* Group by $message->content->content->objectType, ...->parentType, ...->action, ...->actor */
-                $contentData = json_decode($message->content);
-                $contentData = json_decode($contentData->content);
+                $contentDataOuter = json_decode($message->content);
+                $contentData = json_decode($contentDataOuter->content);
                 if(isset($contentData->contentType) && $contentData->contentType == 'text')
                 {
                     $messageGroups[$contentData->contentType][] = $message;
                     continue;
                 }
-                $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor"][] = $message;
+                if ($contentData->objectType == 'story' && $contentData->action == 'reviewed')
+                {
+                    $extra = explode(',', $contentDataOuter->extra)[0];
+                    $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor-$extra"][] = $message;
+                }
+                else
+                {
+                    $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor"][] = $message;
+                }
             }
             foreach($messageGroups as $groupKey => $messages)
             {
@@ -225,25 +233,24 @@ class xuanxuanIm extends imModel
                 $notificationContent = json_decode($notification->content);
                 $notificationInnerContent = json_decode($notificationContent->content);
 
-                /* Inner content: array($parentID => array($content1, $content2)) */
-                $objectGroups = array($notificationInnerContent->parent => array($notificationInnerContent));
+                /* Inner content: array($id => array($content1, $content2)) */
+                $objectGroups = array($notificationInnerContent->id => array($notificationInnerContent));
                 foreach($messages as $message)
                 {
                     $messageContent = json_decode($message->content);
                     $messageInnerContent = json_decode($messageContent->content);
-                    $objectGroups[$messageInnerContent->parent][] = $messageInnerContent;
+                    $objectGroups[$messageInnerContent->id][] = $messageInnerContent;
                 }
-                $objectTotal = 0;
-                foreach($objectGroups as $parent => $objectGroup)
+                foreach($objectGroups as $id => $objectGroup)
                 {
                     $object = current($objectGroup);
                     $object->count = count($objectGroup);
                     $object->url   = $object->parentURL;
                     unset($object->title);
 
-                    $objectGroups[$parent] = $object;
-                    $objectTotal += $object->count;
+                    $objectGroups[$id] = $object;
                 }
+                $objectTotal = count($objectGroups);
                 $notificationContent->content = json_encode(array_values($objectGroups));
                 /* Hack alert: title count replacement currently assumes that default count is 1. */
                 $notification->title = substr_replace($notification->title, "$objectTotal", strrpos($notification->title, '1'), 1);
diff --git a/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
index 7fbcf17e93..8fbd39f334 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
@@ -3,7 +3,10 @@ $lang->message->typeList['xuanxuan'] = 'Chat';
 
 $lang->message->sender = 'ZenTao';
 
-$lang->message->notifyTitle = '%s %s%d %s';
+$lang->message->notifyTitle        = '%s %s%d %s';
+$lang->message->notifyPassTitle    = '%s passed %d stories';
+$lang->message->notifyClarifyTitle = '%s clarify %d stories';
+$lang->message->notifyRejectTitle  = '%s reject %d stories';
 
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
index 7fbcf17e93..8fbd39f334 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
@@ -3,7 +3,10 @@ $lang->message->typeList['xuanxuan'] = 'Chat';
 
 $lang->message->sender = 'ZenTao';
 
-$lang->message->notifyTitle = '%s %s%d %s';
+$lang->message->notifyTitle        = '%s %s%d %s';
+$lang->message->notifyPassTitle    = '%s passed %d stories';
+$lang->message->notifyClarifyTitle = '%s clarify %d stories';
+$lang->message->notifyRejectTitle  = '%s reject %d stories';
 
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
index 7fbcf17e93..8fbd39f334 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
@@ -3,7 +3,10 @@ $lang->message->typeList['xuanxuan'] = 'Chat';
 
 $lang->message->sender = 'ZenTao';
 
-$lang->message->notifyTitle = '%s %s%d %s';
+$lang->message->notifyTitle        = '%s %s%d %s';
+$lang->message->notifyPassTitle    = '%s passed %d stories';
+$lang->message->notifyClarifyTitle = '%s clarify %d stories';
+$lang->message->notifyRejectTitle  = '%s reject %d stories';
 
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
index 32599f2ce7..7503db0276 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
@@ -3,7 +3,10 @@ $lang->message->typeList['xuanxuan'] = '聊天';
 
 $lang->message->sender = '禅道项目管理';
 
-$lang->message->notifyTitle = '%s %s%d个%s';
+$lang->message->notifyTitle        = '%s %s%d个%s';
+$lang->message->notifyPassTitle    = '%s 通过了%d个研发需求';
+$lang->message->notifyClarifyTitle = '%s 驳回了%d个研发需求';
+$lang->message->notifyRejectTitle  = '%s 拒绝了%d个研发需求';
 
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = '构建日志';
diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index ad3d677375..5ec9449fb8 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -1,7 +1,7 @@
 <?php
 class xuanxuanMessage extends messageModel
 {
-    public function send($objectType, $objectID, $actionType, $actionID, $actor = '')
+    public function send($objectType, $objectID, $actionType, $actionID, $actor = '', $extra = '')
     {
         $messageSetting = $this->config->message->setting;
         if(is_string($messageSetting)) $messageSetting = json_decode($messageSetting, true);
@@ -44,6 +44,22 @@ class xuanxuanMessage extends messageModel
                     ->fetch();
                 $field = $this->config->action->objectNameFields[$objectType];
                 $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyTitle, $this->app->user->realname, $this->lang->action->label->$actionType, 1, $this->lang->action->objectTypes[$objectType]);
+                if ($objectType == 'story' && $actionType == 'reviewed' && !empty($extra))
+                {
+                    $notifyType = strtolower(explode(',', $extra)[0]);
+                    if ($notifyType == 'pass')
+                    {
+                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
+                    }
+                    else if($notifyType == 'clarify')
+                    {
+                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
+                    }
+                    else if($notifyType == 'reject')
+                    {
+                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
+                    }
+                }
 
                 $server   = $this->loadModel('im')->getServer('zentao');
                 $onlybody = isset($_GET['onlybody']) ? $_GET['onlybody'] : '';
@@ -52,7 +68,7 @@ class xuanxuanMessage extends messageModel
                 $url    = $server . helper::createLink($objectType == 'kanbancard' ? 'kanban' : $objectType, 'view', "id=$dataID", 'html');
 
                 $target = '';
-                if(!empty($object->assignedTo)) $target .= $object->assignedTo;
+                if(!empty($object->assignedTo)) $target .= $object->assignedTo == 'closed' ? $object->openedBy : $object->assignedTo;
                 if(!empty($object->mailto))     $target .= ",{$object->mailto}";
                 if(($objectType == 'mr' or $objectType == 'kanbancard') and !empty($object->createdBy)) $target .= ",{$object->createdBy}";
                 $target = trim($target, ',');
@@ -130,6 +146,7 @@ class xuanxuanMessage extends messageModel
                     $contentData->actions     = array();
                     $contentData->url         = "xxc:openInApp/zentao-integrated/" . urlencode($url);
                 }
+                $contentData->extra = $extra;
 
                 $content = json_encode($contentData);
                 $avatarUrl = $server . $this->app->getWebRoot() . 'favicon.ico';
diff --git a/xuanxuan/extension/xuan/message/ext/model/hook/send.xuanxuan.php b/xuanxuan/extension/xuan/message/ext/model/hook/send.xuanxuan.php
index 23d82e1381..ef1529ceaa 100644
--- a/xuanxuan/extension/xuan/message/ext/model/hook/send.xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/model/hook/send.xuanxuan.php
@@ -1,2 +1,2 @@
 <?php
-$this->loadExtension('xuanxuan')->send($objectType, $objectID, $actionType, $actionID, $actor);
+$this->loadExtension('xuanxuan')->send($objectType, $objectID, $actionType, $actionID, $actor, $extra);