diff --git a/db/update18.1.sql b/db/update18.1.sql
index feba83e887..ef6ffc263f 100644
--- a/db/update18.1.sql
+++ b/db/update18.1.sql
@@ -25,3 +25,6 @@ ALTER table `zt_reviewcl` ADD `type` varchar(255) NOT NULL DEFAULT '' AFTER `cat
 UPDATE `zt_reviewcl` SET `type` = 'waterfall' WHERE `type` = '';
 
 UPDATE `zt_activity` SET `order` = `id` * 5 WHERE `order` = '0';
+
+ALTER table `zt_cmcl` ADD `projectType` varchar(255) NOT NULL DEFAULT '' AFTER `type`;
+UPDATE `zt_cmcl` SET `projectType` = 'waterfall' WHERE `projectType` = '';
diff --git a/db/zentao.sql b/db/zentao.sql
index cad8faf602..9abe206715 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -9780,6 +9780,7 @@ CREATE TABLE IF NOT EXISTS `zt_reviewlist` (
 CREATE TABLE IF NOT EXISTS `zt_cmcl` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `type` char(30) NOT NULL,
+  `projectType` varchar(255) NOT NULL,
   `title` int(11) NOT NULL,
   `contents` text NOT NULL,
   `assignedTo` varchar(30) NOT NULL,
diff --git a/extension/lite/project/ext/view/create.html.php b/extension/lite/project/ext/view/create.html.php
index ce3e1f1454..0308b9d310 100644
--- a/extension/lite/project/ext/view/create.html.php
+++ b/extension/lite/project/ext/view/create.html.php
@@ -40,7 +40,7 @@
           <th><?php echo $lang->project->name;?></th>
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', '', "class='form-control' required");?></td>
diff --git a/framework/helper.class.php b/framework/helper.class.php
index 6435c7b69e..cb474da2c8 100644
--- a/framework/helper.class.php
+++ b/framework/helper.class.php
@@ -339,12 +339,12 @@ class helper extends baseHelper
             $dateInterval->hour    = $interval->format('%H');
             $dateInterval->minute  = $interval->format('%i');
             $dateInterval->secound = $interval->format('%s');
-            $dateInterval->year    = ltrim($dateInterval->year, '0');
-            $dateInterval->month   = ltrim($dateInterval->month, '0');
-            $dateInterval->day     = ltrim($dateInterval->day, '0');
-            $dateInterval->hour    = ltrim($dateInterval->hour, '0');
-            $dateInterval->minute  = ltrim($dateInterval->minute, '0');
-            $dateInterval->secound = ltrim($dateInterval->secound, '0');
+            $dateInterval->year    = $dateInterval->year == '00' ? 0 : ltrim($dateInterval->year, '0');
+            $dateInterval->month   = $dateInterval->month == '00' ? 0 : ltrim($dateInterval->month, '0');
+            $dateInterval->day     = $dateInterval->day == '00' ? 0 : ltrim($dateInterval->day, '0');
+            $dateInterval->hour    = $dateInterval->hour == '00' ? 0 : ltrim($dateInterval->hour, '0');
+            $dateInterval->minute  = $dateInterval->minute == '00' ? 0 : ltrim($dateInterval->minute, '0');
+            $dateInterval->secound = $dateInterval->secound == '00' ? 0 : ltrim($dateInterval->secound, '0');
         }
         return $dateInterval;
     }
diff --git a/lib/cache/cache.class.php b/lib/cache/cache.class.php
new file mode 100644
index 0000000000..7d17873b08
--- /dev/null
+++ b/lib/cache/cache.class.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * The cache library of zentaopms.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Lu Fei <lufei@easycorp.ltd>
+ * @package     cache
+ * @link        http://www.zentao.net
+ */
+
+helper::import(dirname(__FILE__) . DS . 'simple-cache' . DS . 'CacheInterface.php');
+helper::import(dirname(__FILE__) . DS . 'simple-cache' . DS . 'CacheException.php');
+helper::import(dirname(__FILE__) . DS . 'simple-cache' . DS . 'InvalidArgumentException.php');
+helper::import(dirname(__FILE__) . DS . 'driver' . DS . 'ApcuDriver.php');
+helper::import(dirname(__FILE__) . DS . 'driver' . DS . 'YacDriver.php');
+
+use ZenTao\Cache\SimpleCache\InvalidArgumentException;
+
+class cache
+{
+    /**
+     * @var ZenTao\Cache\SimpleCache\CacheInterface
+     */
+    protected $client;
+
+    public function __construct($driver = 'Apcu', $namespace = '', $defaultLifetime = 0)
+    {
+        $driver = ucfirst(strtolower($driver));
+        switch($driver)
+        {
+            case 'Apcu':
+                $className = 'ZenTao\Cache\Driver\ApcuDriver';
+                break;
+            case 'Yac':
+                $className = 'ZenTao\Cache\Driver\YacDriver';
+                break;
+            default:
+                throw new InvalidArgumentException("Driver {$driver} is not supported.");
+        }
+
+        if(!extension_loaded($driver)) throw new InvalidArgumentException("Driver ext-{$driver} is not loaded.");
+
+        $this->client = new $className($namespace, $defaultLifetime);
+    }
+
+    public function __call($name, $arguments)
+    {
+        if(!method_exists($this->client, $name)) throw new InvalidArgumentException("Method {$name} does not exist.");
+
+        return call_user_func_array(array($this->client, $name), $arguments);
+    }
+}
diff --git a/lib/cache/driver/ApcuDriver.php b/lib/cache/driver/ApcuDriver.php
new file mode 100644
index 0000000000..7c2def717a
--- /dev/null
+++ b/lib/cache/driver/ApcuDriver.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * The cache library of zentaopms.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Lu Fei <lufei@easycorp.ltd>
+ * @package     cache
+ * @link        http://www.zentao.net
+ */
+
+namespace ZenTao\Cache\Driver;
+
+use ZenTao\Cache\SimpleCache\CacheInterface;
+use ZenTao\Cache\SimpleCache\InvalidArgumentException;
+
+class ApcuDriver implements CacheInterface
+{
+    /**
+     * @var string
+     */
+    private $namespace;
+
+    /**
+     * @var int
+     */
+    private $defaultLifetime;
+
+    public function __construct($namespace = '', $defaultLifetime = 0)
+    {
+        $this->namespace = $namespace;
+        $this->defaultLifetime = $defaultLifetime;
+    }
+
+    public function get($key, $default = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        $value = apcu_fetch($key, $success);
+
+        return $success === false ? $default : $value;
+    }
+
+    public function set($key, $value, $ttl = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        return apcu_store($key, $value, (int) $ttl);
+    }
+
+    public function delete($key)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return apcu_delete($key);
+    }
+
+    public function clear()
+    {
+        return apcu_clear_cache();
+    }
+
+    public function getMultiple($keys, $default = null)
+    {
+        $this->assertKeyNames($keys);
+        $keys = $this->buildKeyNames($keys);
+
+        $result = apcu_fetch($keys);
+
+        if(!is_null($default) && is_array($result) && count($keys) > count($result))
+        {
+            $notFoundKeys = array_diff($keys, array_keys($result));
+            $result       = array_merge($result, array_fill_keys($notFoundKeys, $default));
+        }
+
+        $mappedResult = array();
+
+        foreach($result as $key => $value)
+        {
+            $key = preg_replace("/^$this->namespace/", '', $key);
+
+            $mappedResult[$key] = $value;
+        }
+
+        return $mappedResult;
+    }
+
+    public function setMultiple($values, $ttl = null)
+    {
+        $this->assertKeyNames(array_keys($values));
+
+        $mappedByNamespaceValues = array();
+
+        foreach($values as $key => $value)
+        {
+            $mappedByNamespaceValues[$this->buildKeyName($key)] = $value;
+        }
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        $result = apcu_store($mappedByNamespaceValues, (int) $ttl);
+
+        return $result === true ? true : (is_array($result) && count($result) == 0 ? true : false);
+    }
+
+    public function deleteMultiple($keys)
+    {
+        $this->assertKeyNames($keys);
+        $keys = $this->buildKeyNames($keys);
+
+        $result = apcu_delete($keys);
+
+        return count($result) === count($keys) ? false : true;
+    }
+
+    public function has($key)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return (bool) apcu_exists($key);
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
+    private function buildKeyName($key)
+    {
+        return $this->namespace . $key;
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @return string[]
+     */
+    private function buildKeyNames(array $keys)
+    {
+        return array_map(function($key) {
+            return $this->buildKeyName($key);
+        }, $keys);
+
+    }
+
+    /**
+     * @param mixed $key
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyName($key)
+    {
+        if(!is_scalar($key) || is_bool($key)) throw new InvalidArgumentException();
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyNames(array $keys)
+    {
+        array_map(function ($value) {
+            $this->assertKeyName($value);
+        }, $keys);
+    }
+}
diff --git a/lib/cache/driver/YacDriver.php b/lib/cache/driver/YacDriver.php
new file mode 100644
index 0000000000..739582c2fa
--- /dev/null
+++ b/lib/cache/driver/YacDriver.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * The cache library of zentaopms.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Lu Fei <lufei@easycorp.ltd>
+ * @package     cache
+ * @link        http://www.zentao.net
+ */
+
+namespace ZenTao\Cache\Driver;
+
+use ZenTao\Cache\SimpleCache\CacheInterface;
+use ZenTao\Cache\SimpleCache\InvalidArgumentException;
+
+class YacDriver implements CacheInterface
+{
+    /**
+     * @var string
+     */
+    private $namespace;
+
+    /**
+     * @var int
+     */
+    private $defaultLifetime;
+
+    /**
+     * yac client
+     *
+     * @var \Yac
+     */
+    protected $yac;
+
+    /**
+     * if your key is longer than this, maybe you can use md5 result as the key
+     */
+    const KEY_MAX_LEN = 48;
+
+    public function __construct($namespace = '', $defaultLifetime = 0)
+    {
+        $this->namespace = $namespace;
+        $this->defaultLifetime = $defaultLifetime;
+        $this->yac = new \Yac($namespace);
+    }
+
+    public function get($key, $default = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return $this->yac->get($key) ?: $default;
+    }
+
+    public function set($key, $value, $ttl = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        return $this->yac->set($key, $value, (int)$ttl);
+    }
+
+    public function delete($key)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return $this->yac->delete($key);
+    }
+
+    public function clear()
+    {
+        return $this->yac->flush();
+    }
+
+    public function getMultiple($keys, $default = null)
+    {
+        if(!is_array($keys)) {
+            return array();
+        }
+
+        $hashKeyMap = array();
+        foreach($keys as $index => $key)
+        {
+            $this->assertKeyName($key);
+            if(strlen($key) > self::KEY_MAX_LEN)
+            {
+                $keys[$index] = $this->buildKeyName($key);
+                $hashKeyMap[$keys[$index]] = $key;
+            }
+        }
+
+        $results = $this->yac->get($keys);
+        if($results !== false)
+        {
+            foreach($results as $key => $value)
+            {
+                if(isset($hashKeyMap[$key]))
+                {
+                    $results[$hashKeyMap[$key]] = $value;
+                    unset($results[$key]);
+                }
+            }
+            return $results;
+        }
+
+        $results = array();
+        foreach($keys as $key)
+        {
+            $results[$key] = $default;
+        }
+        return $results;
+    }
+
+    public function setMultiple($values, $ttl = null)
+    {
+        if(!is_array($values)) return false;
+
+        foreach($values as $key => $value)
+        {
+            if(strlen($key) > self::KEY_MAX_LEN)
+            {
+                $values[$this->buildKeyName($key)] = $value;
+                unset($values[$key]);
+            }
+        }
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        return $this->yac->set($values, $ttl);
+    }
+
+    public function deleteMultiple($keys)
+    {
+        foreach($keys as $index => $key)
+        {
+            $keys[$index] = $this->buildKeyName($key);
+        }
+        return $this->yac->delete($keys);
+    }
+
+    public function has($key)
+    {
+        return $this->get($key) !== null;
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
+    private function buildKeyName($key)
+    {
+        if(strlen($key) > self::KEY_MAX_LEN)
+        {
+            $key = md5($key);
+        }
+        return $key;
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @return string[]
+     */
+    private function buildKeyNames(array $keys)
+    {
+        return array_map(function ($key) {
+            return $this->buildKeyName($key);
+        }, $keys);
+    }
+
+    /**
+     * @param mixed $key
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyName($key)
+    {
+        if(!is_scalar($key) || is_bool($key)) throw new InvalidArgumentException();
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyNames(array $keys)
+    {
+        array_map(function ($value) {
+            $this->assertKeyName($value);
+        }, $keys);
+    }
+}
diff --git a/lib/cache/simple-cache/CacheException.php b/lib/cache/simple-cache/CacheException.php
new file mode 100644
index 0000000000..330b06084b
--- /dev/null
+++ b/lib/cache/simple-cache/CacheException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ZenTao\Cache\SimpleCache;
+
+class CacheException extends \RuntimeException
+{
+}
diff --git a/lib/cache/simple-cache/CacheInterface.php b/lib/cache/simple-cache/CacheInterface.php
new file mode 100644
index 0000000000..e818e7da08
--- /dev/null
+++ b/lib/cache/simple-cache/CacheInterface.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace ZenTao\Cache\SimpleCache;
+
+interface CacheInterface
+{
+    /**
+     * Fetches a value from the cache.
+     *
+     * @param string $key     The unique key of this item in the cache.
+     * @param mixed  $default Default value to return if the key does not exist.
+     *
+     * @return mixed The value of the item from the cache, or $default in case of cache miss.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function get($key, $default = null);
+
+    /**
+     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+     *
+     * @param string                 $key   The key of the item to store.
+     * @param mixed                  $value The value of the item to store, must be serializable.
+     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+     *                                      the driver supports TTL then the library may set a default value
+     *                                      for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function set($key, $value, $ttl = null);
+
+    /**
+     * Delete an item from the cache by its unique key.
+     *
+     * @param string $key The unique cache key of the item to delete.
+     *
+     * @return bool True if the item was successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function delete($key);
+
+    /**
+     * Wipes clean the entire cache's keys.
+     *
+     * @return bool True on success and false on failure.
+     */
+    public function clear();
+
+    /**
+     * Obtains multiple cache items by their unique keys.
+     *
+     * @param iterable<string> $keys    A list of keys that can be obtained in a single operation.
+     * @param mixed            $default Default value to return for keys that do not exist.
+     *
+     * @return iterable<string, mixed> A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if $keys is neither an array nor a Traversable,
+     *   or if any of the $keys are not a legal value.
+     */
+    public function getMultiple($keys, $default = null);
+
+    /**
+     * Persists a set of key => value pairs in the cache, with an optional TTL.
+     *
+     * @param iterable               $values A list of key => value pairs for a multiple-set operation.
+     * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
+     *                                       the driver supports TTL then the library may set a default value
+     *                                       for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if $values is neither an array nor a Traversable,
+     *   or if any of the $values are not a legal value.
+     */
+    public function setMultiple($values, $ttl = null);
+
+    /**
+     * Deletes multiple cache items in a single operation.
+     *
+     * @param iterable<string> $keys A list of string-based keys to be deleted.
+     *
+     * @return bool True if the items were successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if $keys is neither an array nor a Traversable,
+     *   or if any of the $keys are not a legal value.
+     */
+    public function deleteMultiple($keys);
+
+    /**
+     * Determines whether an item is present in the cache.
+     *
+     * NOTE: It is recommended that has() is only to be used for cache warming type purposes
+     * and not to be used within your live applications operations for get/set, as this method
+     * is subject to a race condition where your has() will return true and immediately after,
+     * another script can remove it making the state of your app out of date.
+     *
+     * @param string $key The cache item key.
+     *
+     * @return bool
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function has($key);
+}
diff --git a/lib/cache/simple-cache/InvalidArgumentException.php b/lib/cache/simple-cache/InvalidArgumentException.php
new file mode 100644
index 0000000000..825bcdf380
--- /dev/null
+++ b/lib/cache/simple-cache/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ZenTao\Cache\SimpleCache;
+
+class InvalidArgumentException extends CacheException
+{
+}
diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 72321537fa..3f62faeb22 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -20,6 +20,8 @@
 .font-20 {font-size: 20px;}
 .font-24 {font-size: 24px;}
 .radius-4 {border-radius: 4px;}
+.white-nowrap {white-space: nowrap;}
+.w-full {width: 100%;}
 
 #notice {margin: -20px -20px 20px; padding: 20px;}
 #zentaoLinks {margin-top: 20px;}
@@ -40,8 +42,10 @@
 .settings-list > .setting-box > .btn:hover {background: unset;}
 .settings-list > .setting-box > .btn[disabled] {cursor: not-allowed; pointer-events: unset;}
 .settings-list > .setting-box > .btn[disabled] > a {pointer-events: none;}
+.settings-list > .setting-box > .btn > h4 {padding-right: 5px;}
+.settings-list > .setting-box > .btn > h4  > div {gap: 3px;}
 .settings-list > .setting-box > .btn > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;}
-.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; color: #5E626D; line-height: 25px; height: 50px;}
+.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; color: #5E626D; line-height: 25px; height: 50px; overflow: hidden;}
 .settings-list.lite-setting > .setting-box {flex: 1 1 30%;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
@@ -71,7 +75,7 @@
 .panel.publicClass {padding: 0 10px;}
 .icon.follow-us {font-size: 20px; padding-left: 10px;}
 
-.setting-help {width: 45px; color: #9EA3B0; padding-top: 15px;}
+.setting-help {color: #9EA3B0;}
 [lang^='zh'] .setting-help {padding-top: 0;}
 .pointer-none {pointer-events: none;}
 
@@ -86,7 +90,7 @@
 .time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;}
 .dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
-.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white; color: #5E626D;}
+.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 12px; padding-left: 5px; padding-right: 12px; background: white; color: #5E626D;}
 .time-count {letter-spacing: 1px;}
 
 .patch-block {padding: 10px 16px 12px; line-height: 20px; border-top: 1px solid #E3E4E9;}
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 33b05eeafc..5e09e80592 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -11,6 +11,7 @@ $lang->admin->menuList->user['order'] = 2;
 
 $lang->admin->menuList->switch['name']  = $lang->admin->menuSetting['switch']['name'];
 $lang->admin->menuList->switch['desc']  = $lang->admin->menuSetting['switch']['desc'];
+$lang->admin->menuList->switch['link']  = 'admin|setmodule';
 $lang->admin->menuList->switch['order'] = 3;
 
 $lang->admin->menuList->model['name']  = $lang->admin->menuSetting['model']['name'];
@@ -71,10 +72,6 @@ $lang->admin->menuList->user['menuOrder']['5']  = 'dept';
 $lang->admin->menuList->user['menuOrder']['10'] = 'user';
 $lang->admin->menuList->user['menuOrder']['15'] = 'group';
 
-$lang->admin->menuList->switch['subMenu']['setmodule'] = array('link' => "{$lang->admin->module}|admin|setmodule|");
-
-$lang->admin->menuList->switch['menuOrder']['5'] = 'setmodule';
-
 $lang->admin->menuList->model['subMenu']['common']        = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom,subject,holiday,stage', 'exclude' => 'stage-browse,stage-plusbrowse,stage-create,stage-edit,stage-batchcreate');
 $lang->admin->menuList->model['subMenu']['scrum']         = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl');
 $lang->admin->menuList->model['subMenu']['waterfall']     = array('link' => "{$lang->waterfallModel}|stage|browse|", 'subModule' => 'stage', 'exclude' => 'stage-settype,stage-plusbrowse');
@@ -165,7 +162,7 @@ $lang->admin->menuList->message['menuOrder']['10'] = 'webhook';
 $lang->admin->menuList->message['menuOrder']['20'] = 'browser';
 $lang->admin->menuList->message['menuOrder']['25'] = 'setting';
 
-$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "API|dev|api|module=index");
+$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "{$lang->api}|dev|api|module=index");
 $lang->admin->menuList->dev['subMenu']['db']     = array('link' => "{$lang->database}|dev|db|table=" . trim(TABLE_EFFORT, '`'));
 $lang->admin->menuList->dev['subMenu']['editor'] = array('link' => "{$lang->editor}|dev|editor|");
 $lang->admin->menuList->dev['subMenu']['entry']  = array('link' => "{$lang->admin->entry}|entry|browse|", 'subModule' => 'entry');
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index f695d67c5f..0786657a6c 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -21,9 +21,14 @@
         <?php if($config->vision == 'lite' and !in_array($menuKey, $config->admin->liteMenuList)) continue;?>
         <div class="setting-box">
           <button class="btn shadow-primary-hover" <?php if($menu['disabled']) echo 'disabled';?> data-link='<?php echo $menu['link'];?>'>
-            <h4><img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/><?php echo $menu['name'];?></h4>
+            <h4 class="flex align-center justify-between w-full">
+              <div class="flex align-center">
+                <img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/>
+                <?php echo $menu['name'];?>
+              </div>
+              <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> ", '_blank', 'class="text-muted setting-help"');?>
+            </h4>
             <p class="text-muted setting-desc" title="<?php echo $menu['desc'];?>"><?php echo $menu['desc'];?></p>
-            <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
           </button>
         </div>
         <?php endforeach;?>
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 4a789e9048..e9c596f4de 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -253,7 +253,8 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->database        = 'Database';
+$lang->api             = 'API Document';
+$lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
@@ -303,7 +304,7 @@ $lang->devops->set      = 'Set';
 
 $lang->admin->module      = 'Module';
 $lang->admin->system      = 'System';
-$lang->admin->entry       = 'Application';
+$lang->admin->entry       = 'Access ZenTao';
 $lang->admin->data        = 'Data';
 $lang->admin->cron        = 'Cron';
 $lang->admin->buildIndex  = 'Full Text Search';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 841d43be23..faa72599f3 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -253,7 +253,8 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->database        = 'Database';
+$lang->api             = 'API Document';
+$lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
@@ -303,7 +304,7 @@ $lang->devops->set      = 'Set';
 
 $lang->admin->module      = 'Module';
 $lang->admin->system      = 'System';
-$lang->admin->entry       = 'Application';
+$lang->admin->entry       = 'Access ZenTao';
 $lang->admin->data        = 'Data';
 $lang->admin->cron        = 'Cron';
 $lang->admin->buildIndex  = 'Full Text Search';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 3154e31753..e160ac7054 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -253,7 +253,8 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->database        = 'Database';
+$lang->api             = 'API Document';
+$lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
@@ -303,7 +304,7 @@ $lang->devops->set      = 'Set';
 
 $lang->admin->module      = 'Module';
 $lang->admin->system      = 'System';
-$lang->admin->entry       = 'Application';
+$lang->admin->entry       = 'Access ZenTao';
 $lang->admin->data        = 'Data';
 $lang->admin->cron        = 'Cron';
 $lang->admin->buildIndex  = 'Full Text Search';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 27c1acac06..c3d6b8feab 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -253,7 +253,8 @@ $lang->indexPage       = '首页';
 $lang->model           = '模型';
 $lang->redev           = '二次开发';
 $lang->browser         = '浏览器';
-$lang->database        = '数据库';
+$lang->api             = '接口文档';
+$lang->database        = '数据字典';
 $lang->editor          = '编辑器';
 $lang->timezone        = '时区';
 $lang->security        = '安全';
@@ -303,7 +304,7 @@ $lang->devops->set      = '设置';
 
 $lang->admin->module      = '功能配置';
 $lang->admin->system      = '系统';
-$lang->admin->entry       = '应用';
+$lang->admin->entry       = '接入禅道';
 $lang->admin->data        = '数据';
 $lang->admin->cron        = '定时';
 $lang->admin->buildIndex  = '重建索引';
diff --git a/module/custom/model.php b/module/custom/model.php
index a497df3e59..84e64c72c6 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -204,6 +204,9 @@ class customModel extends model
                 ksort($menuOrder);
                 foreach($menuOrder as $name)
                 {
+                    /* If menu is removed, delete the menuOrder. */
+                    if(!isset($allMenu->$name)) continue;
+
                     $item = new stdclass();
                     $item->name   = $name;
                     $item->hidden = false;
@@ -1134,13 +1137,15 @@ class customModel extends model
         $disabledFeatures = $this->setting->getItem('owner=system&module=common&section=&key=disabledFeatures');
         $disabledFeatures = $disabledFeatures . ',' . $closedFeatures;
 
-        $hasWaterfall           = strpos(",{$disabledFeatures},",  ',waterfall,')           === false;
-        $hasWaterfallPlus       = strpos(",{$disabledFeatures},",  ',waterfallplus,')           === false;
-        $hasScrumMeasrecord     = strpos(",{$disabledFeatures},",  ',scrumMeasrecord,')     === false;
-        $hasWaterfallMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallMeasrecord,') === false and ($hasWaterfall or $hasWaterfallPlus));
+        $hasWaterfall               = strpos(",{$disabledFeatures},",  ',waterfall,')           === false;
+        $hasWaterfallPlus           = strpos(",{$disabledFeatures},",  ',waterfallplus,')       === false;
+        $hasScrumMeasrecord         = strpos(",{$disabledFeatures},",  ',scrumMeasrecord,')     === false;
+        $hasAgilePlusMeasrecord     = strpos(",{$disabledFeatures},",  ',agileMeasrecord,')     === false;
+        $hasWaterfallMeasrecord     = (strpos(",{$disabledFeatures},", ',waterfallMeasrecord,') === false and $hasWaterfall);
+        $hasWaterfallPlusMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallplusMeasrecord,') === false and $hasWaterfallPlus);
 
         $cronStatus = 'normal';
-        if(!$hasScrumMeasrecord and !$hasWaterfallMeasrecord) $cronStatus = 'stop';
+        if(!$hasScrumMeasrecord and !$hasAgilePlusMeasrecord and !$hasWaterfallMeasrecord and $hasWaterfallPlusMeasrecord) $cronStatus = 'stop';
 
         $this->loadModel('cron');
         $cron = $this->dao->select('id,status')->from(TABLE_CRON)->where('command')->like('%methodName=initCrontabQueue')->fetch();
diff --git a/module/custom/view/code.html.php b/module/custom/view/code.html.php
index 65a80730d4..643aeb940b 100644
--- a/module/custom/view/code.html.php
+++ b/module/custom/view/code.html.php
@@ -16,7 +16,7 @@
       <tr>
         <th class='c-setCode'><?php echo $lang->custom->setCode;?></th>
         <td class='c-code text-left'>
-          <?php $checkedKey = isset($config->setCode) ? $config->setCode : 1;?>
+          <?php $checkedKey = isset($config->setCode) ? $config->setCode : 0;?>
           <?php foreach($lang->custom->conceptOptions->URAndSR as $key => $value):?>
           <label class="radio-inline"><input type="radio" name="code" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="code<?php echo $key;?>"><?php echo $value;?></label>
           <?php endforeach;?>
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index 5376929d50..7e7dcfc8e8 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -39,7 +39,7 @@
           <?php if(is_array($feature) and empty($disabledScrumFeatures)) continue;?>
           <tr class='text-center'>
             <td class='text-left'><?php echo (is_array($feature) and !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature];?></td>
-            <td><i class='icon text-red icon-close'></i></td>
+            <td><i class='icon text-red icon-ban-circle'></i></td>
             <td><i class='icon text-success icon-check'></i></td>
           </tr>
           <?php endforeach;?>
diff --git a/module/execution/config.php b/module/execution/config.php
index 216136c250..89311d721e 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -176,7 +176,7 @@ $config->execution->gantt->linkType['end']['end']     = 2;
 $config->execution->gantt->linkType['begin']['end']   = 3;
 
 $config->execution->datatable = new stdclass();
-if(!isset($config->setCode) or $config->setCode == 1)
+if(isset($config->setCode) and $config->setCode == 1)
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'openedDate', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
@@ -201,7 +201,7 @@ $config->execution->datatable->fieldList['name']['nestedToggle'] = true;
 $config->execution->datatable->fieldList['name']['iconRender']   = true;
 $config->execution->datatable->fieldList['name']['required']     = 'yes';
 
-if(!isset($config->setCode) or $config->setCode == 1)
+if(isset($config->setCode) and $config->setCode == 1)
 {
     $config->execution->datatable->fieldList['code']['title']    = 'execCode';
     $config->execution->datatable->fieldList['code']['width']    = '180';
diff --git a/module/execution/control.php b/module/execution/control.php
index b97958c31b..de1faad15c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2732,12 +2732,17 @@ class execution extends control
 
         if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
+
         if(empty($kanbanGroup))
         {
             $this->kanban->createExecutionLane($executionID, $browseType);
             $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
         }
 
+        /* Show lanes of the attribute: no story&bug in request, no bug in design. */
+        if(!isset($this->lang->execution->menu->story)) unset($kanbanGroup['story']);
+        if(!isset($this->lang->execution->menu->qa)) unset($kanbanGroup['bug']);
+
         /* Determines whether an object is editable. */
         $canBeChanged = common::canModify('execution', $execution);
 
diff --git a/module/execution/css/batchedit.css b/module/execution/css/batchedit.css
index 6051595822..5fb6ae17e4 100644
--- a/module/execution/css/batchedit.css
+++ b/module/execution/css/batchedit.css
@@ -2,3 +2,5 @@
 .c-team-name {width: 120px;}
 .c-project, .c-user, .c-code, .c-desc, .c-days {width: 150px;}
 .c-method {width: 45px;}
+.c-type > .icon-help {vertical-align: text-top;}
+.c-type > .popover .popover-content {font-weight: 400;}
diff --git a/module/execution/css/batchedit.en.css b/module/execution/css/batchedit.en.css
index 1bc7227968..d4858d89b7 100644
--- a/module/execution/css/batchedit.en.css
+++ b/module/execution/css/batchedit.en.css
@@ -1,3 +1,4 @@
 .c-user {width: 150px !important;}
 .c-date {width: 125px;}
 .c-method {width: 60px;}
+.c-type {width: 130px;}
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 8a387053df..8ba2c65184 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -39,3 +39,4 @@
 .productsBox .required + .text-danger.help-text {position: relative; left: 10px;}
 .productsBox > #productNameLabel {padding-top: 8px;}
 .productsBox div[id^='branch'].chosen-disabled {pointer-events: none;}
+.methodTip icon:before {margin-bottom: 5px;}
diff --git a/module/execution/js/batchedit.js b/module/execution/js/batchedit.js
index db84c6b085..603122e2bd 100644
--- a/module/execution/js/batchedit.js
+++ b/module/execution/js/batchedit.js
@@ -27,3 +27,8 @@ $('#executionForm').on('change input mousedown', '.has-error', function()
     $(this).parent().find('.text-danger').remove();
     $(this).removeClass('has-error');
 })
+
+$(function()
+{
+    $('[data-toggle="popover"]').popover();
+})
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 750bdae6b0..56ac637410 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -153,6 +153,8 @@ $(function()
     {
         $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled');
     }
+
+    $('[data-toggle="popover"]').popover();
 });
 
 function showLifeTimeTips()
diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index 5527fd5b0b..58f5d31712 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -112,6 +112,8 @@ $(function()
     {
         $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled');
     }
+
+    $('[data-toggle="popover"]').popover();
 })
 var lastProjectID = $("#project").val();
 
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index d6c506033d..aacc1a5dba 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -151,6 +151,8 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Aktivieren';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 995e4f9d53..d8f522124d 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -151,6 +151,8 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Activate';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index ac5351d360..46f9661aa7 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -151,6 +151,8 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
 
 $lang->execution->start    = 'Démarrer';
 $lang->execution->activate = 'Activer';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index a83b65dc25..211e47444a 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -151,6 +151,8 @@ $lang->execution->left     = '剩余';
 $lang->execution->copyTeamTip         = "可以选择复制项目或{$lang->execution->common}团队的成员";
 $lang->execution->daysGreaterProject  = '可用工日不能大于执行的可用工日『%s』';
 $lang->execution->errorHours          = '可用工时/天不能大于『24』';
+$lang->execution->agileplusMethodTip  = '融合敏捷项目创建执行时，支持迭代和看板两种管理方法。';
+$lang->execution->typeTip             = '“综合”类型的父阶段可以创建其它类型的子级，其它父子层级的类型均一致。';
 
 $lang->execution->start    = "开始";
 $lang->execution->activate = "激活";
diff --git a/module/execution/model.php b/module/execution/model.php
index 76f9b07418..ea425e1b3b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -533,7 +533,7 @@ class executionModel extends model
         $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
 
         /* Judgment of required items. */
-        if($oldExecution->type != 'stage' and $this->post->code == '' and (!isset($this->config->setCode) or $this->config->setCode == 1))
+        if($oldExecution->type != 'stage' and $this->post->code == '' and isset($this->config->setCode) and $this->config->setCode == 1)
         {
             dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
             return false;
@@ -5789,7 +5789,7 @@ class executionModel extends model
         $_POST['status']    = $project->status;
         $_POST['acl']       = 'open';
 
-        if(!isset($this->config->setCode) or $this->config->setCode == 1) $_POST['code'] = $project->code;
+        if(isset($this->config->setCode) and $this->config->setCode == 1) $_POST['code'] = $project->code;
 
         $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll();
         foreach($projectProducts as $projectProduct)
diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index 5b95828e0f..7f75310b9d 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -55,14 +55,17 @@
             <th class='c-method'><?php echo $lang->execution->method;?></th>
             <?php endif;?>
             <th class='required <?php echo $minWidth?>' style="width:100%"><?php echo $lang->execution->$name;?></th>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <th class='c-code required'><?php echo $lang->execution->$code;?></th>
             <?php endif;?>
             <th class='c-user<?php echo zget($visibleFields, 'PM',       ' hidden') . zget($requiredFields, 'PM',     '', ' required');?>'><?php echo $lang->execution->$PM;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'PO',       ' hidden') . zget($requiredFields, 'PO',     '', ' required');?>'><?php echo $lang->execution->PO;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'QD',       ' hidden') . zget($requiredFields, 'QD',     '', ' required');?>'><?php echo $lang->execution->QD;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'RD',       ' hidden') . zget($requiredFields, 'RD',     '', ' required');?>'><?php echo $lang->execution->RD;?></th>
-            <th class='c-type<?php echo zget($visibleFields, 'type',     ' hidden') . zget($requiredFields, 'type',   '', ' required');?>'><?php echo $lang->execution->$type;?></th>
+            <th class='c-type<?php echo zget($visibleFields, 'type',     ' hidden') . zget($requiredFields, 'type',   '', ' required');?>'>
+              <?php echo $lang->execution->$type;?>
+              <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
+            </th>
             <th class='c-date required'><?php echo $lang->execution->begin;?></th>
             <th class='c-date required'><?php echo $lang->execution->end;?></th>
             <th class='c-desc <?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->execution->$desc;?></th>
@@ -91,7 +94,7 @@
             <td title='<?php echo zget($lang->execution->typeList, $executions[$executionID]->type);?>'><?php echo zget($lang->execution->typeList, $executions[$executionID]->type);?></td>
             <?php endif;?>
             <td title='<?php echo $executions[$executionID]->name?>'><?php echo html::input("names[$executionID]", $executions[$executionID]->name, "class='form-control' id='names{$executionID}'");?></td>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <td><?php echo html::input("codes[$executionID]", $executions[$executionID]->code, "id='codes{$executionID}' class='form-control'");?></td>
             <?php endif;?>
             <td class='text-left<?php echo zget($visibleFields, 'PM', ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$executionID]", $pmUsers, $executions[$executionID]->PM, "class='form-control picker-select'");?></td>
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index cb134dfd7e..7f3cc53419 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -66,7 +66,10 @@
         <tr>
           <th><?php echo $lang->execution->method;?></th>
           <td class="col-main"><?php echo html::select("type", $lang->execution->typeList, $type, "class='form-control chosen' required onchange='setType(this.value)'");?></td>
-          <td colspan='2'></td>
+          <td class='methodTip'>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->agileplusMethodTip;?>"></icon>
+          </td>
+          <td></td>
         </tr>
         <?php endif;?>
         <tr>
@@ -74,7 +77,7 @@
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td colspan='2'></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $showExecutionExec ? $lang->execution->execCode : $lang->execution->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 6ade126e6e..3eb89bfe7e 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -50,7 +50,7 @@
           <th class='w-120px'><?php echo $lang->execution->name;?></th>
           <td><?php echo html::input('name', $execution->name, "class='form-control' required");?></td><td></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->execution->code;?></th>
           <td><?php echo html::input('code', $execution->code, "class='form-control' required");?></td>
@@ -98,6 +98,9 @@
           }
           ?>
           </td>
+          <td>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
+          </td>
         </tr>
         <?php endif;?>
         <tr>
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 4dccd0971f..5633b05d66 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -63,10 +63,13 @@
         $link  = common::hasPriv('execution', 'importTask') ? $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $class>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
 
-        $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
-        $misc  = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled";
-        $link  = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
-        echo "<li $class id='importBug'>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        if(isset($this->lang->execution->menu->qa))
+        {
+            $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
+            $misc  = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled";
+            $link  = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
+            echo "<li $class id='importBug'>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        }
         ?>
       </ul>
     </div>
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index b1446f0498..2c87281cd1 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -17,7 +17,7 @@
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))):?>
+    <?php if(isset($lang->execution->menu->qa)):?>
     <div class="input-control space c-type">
       <?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
@@ -62,7 +62,7 @@
         $link = common::hasPriv('execution', 'importTask') ?  $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $misc>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
 
-        if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review')))
+        if(isset($lang->execution->menu->qa))
         {
             $misc = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
             $link = common::hasPriv('execution', 'importBug') ?  $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
@@ -102,12 +102,16 @@
     <div class='dropdown' id='createDropdown'>
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
-        <?php if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))):?>
+        <?php $showDivider = false;?>
+        <?php if(isset($lang->execution->menu->story)):?>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe' data-width='80%'") . '</li>';?>
         <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
-        <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
+        <?php $showDivider = true;?>
+        <?php endif;?>
+        <?php if(isset($lang->execution->menu->qa)):?>
+        <?php if($showDivider) echo '<li class="divider"></li>';?>
         <?php if($canCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'create', "productID=$productID&branch=0&extra=executionID=$execution->id", '', true), $lang->bug->create, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateBug)
         {
@@ -115,9 +119,9 @@
             if($productNum > 1) $batchCreateBugLink = '<li>' . html::a('#batchCreateBug', $lang->bug->batchCreate, '', "data-toggle='modal'") . '</li>';
             echo $batchCreateBugLink;
         }?>
-        <?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
         <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "execution=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php endif;?>
+        <?php if($showDivider) echo '<li class="divider"></li>';?>
         <?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe' data-width='80%'") . '</li>';?>
         <?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe' data-width=90%") . '</li>';?>
       </ul>
@@ -234,5 +238,6 @@ js::set('priv',
 <?php js::set('defaultMinColWidth', $this->config->minColWidth);?>
 <?php js::set('defaultMaxColWidth', $this->config->maxColWidth);?>
 <?php js::set('teamWords', $lang->execution->teamWords);?>
-<?php js::set('canImportBug', ($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))))?>
+<?php js::set('canImportBug', isset($lang->execution->menu->qa));?>
+
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 8c059a24d5..1e1232132c 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -269,7 +269,7 @@
         <div class="col-sm-12">
           <div class="cell">
             <div class="detail">
-              <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+              <?php $hiddenCode = (!isset($config->setCode) or $config->setCode == 0) ? 'hidden' : '';?>
               <h2 class="detail-title"><span class="label-id"><?php echo $execution->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $execution->code;?></span> <?php echo $execution->name;?></h2>
               <div class="detail-content article-content">
                 <div><span class="text-limit hidden" data-limit-size="40"><?php echo $execution->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div>
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index 124be88913..4c8bb3b24e 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -279,7 +279,7 @@ if($isCustomExport)
             </tr>
             <tr>
               <th><?php echo $lang->file->extension;?></th>
-              <td><?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control chosen"');?></td>
+              <td><?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control chosen" data-drop_direction="down"');?></td>
             </tr>
             <tr>
               <th><?php echo $lang->file->encoding;?></th>
diff --git a/module/group/control.php b/module/group/control.php
index 525866f45c..eab5efd9b1 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -254,9 +254,9 @@ class group extends control
             foreach($this->lang->resource as $module => $moduleActions)
             {
                 $modules[$module] = $this->lang->$module->common;
-                foreach($moduleActions as $action)
+                foreach($moduleActions as $key => $action)
                 {
-                    $actions[$module][$action] = $this->lang->$module->$action;
+                    $actions[$module][$key] = $this->lang->$module->$action;
                 }
             }
             $this->view->groups  = $this->group->getPairs();
diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php
index bd1b9d3a3f..3fa192bff8 100644
--- a/module/install/view/step4.html.php
+++ b/module/install/view/step4.html.php
@@ -51,7 +51,7 @@
               <?php if(is_array($feature) && empty($disabledScrumFeatures)) continue;?>
               <tr class='text-center'>
                 <td class='text-left'><?php echo (is_array($feature) && !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature];?></td>
-                <td><i class='icon text-red icon-close'></i></td>
+                <td><i class='icon text-red icon-ban-circle'></i></td>
                 <td><i class='icon text-success icon-check'></i></td>
               </tr>
               <?php endforeach;?>
diff --git a/module/my/control.php b/module/my/control.php
index 365efd765b..d683f1f131 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -198,6 +198,8 @@ class my extends control
             $meetingCount = $pager->recTotal;
         }
 
+        if($this->app->viewType != 'json')
+        {
 echo <<<EOF
 <script>
 var taskCount     = $taskCount;
@@ -227,6 +229,7 @@ if(isMax !== 0)
 }
 </script>
 EOF;
+        }
     }
 
     /**
diff --git a/module/product/config.php b/module/product/config.php
index 2982a63191..93a32df9cf 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -96,7 +96,7 @@ $app->loadLang('product');
 $config->product->all = new stdclass();
 $config->product->all->search['module']                = 'product';
 $config->product->all->search['fields']['name']        = $lang->product->name;
-if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code;
+if(isset($config->setCode) and $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code;
 $config->product->all->search['fields']['id']          = $lang->product->id;
 if($config->systemMode == 'ALM')
 {
@@ -113,7 +113,7 @@ $config->product->all->search['fields']['createdDate'] = $lang->product->created
 $config->product->all->search['fields']['createdBy']   = $lang->product->createdBy;
 
 $config->product->all->search['params']['name']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
-if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input',  'values' => '');
+if(isset($config->setCode) and $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->all->search['params']['id']          = array('operator' => '=',       'control' => 'input',  'values' => '');
 if($config->systemMode == 'ALM')
 {
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index c8dfe3c96c..5e67b93b56 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -56,7 +56,7 @@
             <th><?php echo $lang->product->name;?></th>
             <td><?php echo html::input('name', '', "class='form-control input-product-title' required");?></td><td></td>
           </tr>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <tr>
             <th><?php echo $lang->product->code;?></th>
             <td><?php echo html::input('code', '', "class='form-control' required");?></td>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 785a0c3873..69ae505779 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -47,7 +47,7 @@
             <th class='w-140px'><?php echo $lang->product->name;?></th>
             <td class='w-p40-f'><?php echo html::input('name', $product->name, "class='form-control' required");?></td><td></td>
           </tr>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <tr>
             <th><?php echo $lang->product->code;?></th>
             <td><?php echo html::input('code', $product->code, "class='form-control' required");?></td><td></td>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index ba870e1d4b..4f7edfedd0 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -19,7 +19,7 @@
       <div class="col-sm-12">
         <div class="cell">
           <div class="detail">
-            <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+            <?php $hiddenCode = (!isset($config->setCode) or $config->setCode == 0) ? 'hidden' : '';?>
             <h2 class="detail-title"><span class="label-id"><?php echo $product->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $product->code;?></span> <?php echo $product->name;?></h2>
             <div class="detail-content article-content">
               <p><?php echo $product->desc;?></p>
diff --git a/module/program/css/browse.css b/module/program/css/browse.css
old mode 100644
new mode 100755
index fae35ad361..d3e93a49dc
--- a/module/program/css/browse.css
+++ b/module/program/css/browse.css
@@ -20,4 +20,4 @@ div.checkbox-primary + span.table-nest-icon {margin-left: 0px !important;}
 #checkAll + label.hover:after {border-width: 0px;}
 .c-budget {width:100px; text-align: right; padding-right:16px !important;}
 .c-status {width: 65px !important;}
-.icon-scrum.table-nest-toggle:after, .icon-waterfall.table-nest-toggle:after, .icon-kanban.table-nest-toggle:after {content: ''; border: 0;}
+.icon-scrum.table-nest-toggle:after, .icon-waterfall.table-nest-toggle:after, .icon-kanban.table-nest-toggle:after, .icon-waterfallplus.table-nest-toggle:after, .icon-aglieplus.table-nest-toggle:after {content: ''; border: 0;}
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
old mode 100644
new mode 100755
index f0dac233f4..46a69e5651
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -122,6 +122,8 @@ th.table-nest-title > .table-nest-toggle-global:before {width: 100%; left: 0 !im
 #programTableList .icon-scrum:before {content: '\e9a2';}
 #programTableList .icon-waterfall:before {content: '\e9a4';}
 #programTableList .icon-kanban:before {content: '\e983';}
+#programTableList .icon-waterfallplus:before {content: '\e9ed';}
+#programTableList .icon-agileplus:before {content: '\e9ee';}
 #programTableList > tr[data-type="program"] > .c-name > a {color: #0b0f18;}
 #programTableList > tr[data-nest-parent] {background: #f8f8f8;}
 </style>
diff --git a/module/programplan/css/create.css b/module/programplan/css/create.css
index eb0ae52c08..0dadb2e441 100644
--- a/module/programplan/css/create.css
+++ b/module/programplan/css/create.css
@@ -1 +1,2 @@
 #planForm tr td {vertical-align: top;}
+#mainContent .methodTitle, #mainContent .methodTip {display: inline-block; vertical-align: middle;}
diff --git a/module/programplan/js/create.js b/module/programplan/js/create.js
index 241610d959..13f91ece2d 100644
--- a/module/programplan/js/create.js
+++ b/module/programplan/js/create.js
@@ -5,6 +5,8 @@ $(function()
         $(this).removeClass('has-error');
         $(this).closest('td').find('.text-danger.help-text').remove();
     });
+
+    $('[data-toggle="popover"]').popover();
 });
 /**
  * Add item to create view of programplan.
diff --git a/module/programplan/js/edit.js b/module/programplan/js/edit.js
index c8854adfdc..e552fb8cc9 100644
--- a/module/programplan/js/edit.js
+++ b/module/programplan/js/edit.js
@@ -57,4 +57,6 @@ $(function()
             if(!result) return false;
         }
     })
+
+    $('[data-toggle="popover"]').popover();
 })
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index 5068fce91a..50fed29663 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -20,6 +20,7 @@ $lang->programplan->delete        = 'Delete Stage';
 $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Plan';
+$lang->programplan->subPlanManage = 'Sub-stages management';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
 $lang->programplan->checkEnd         = '『End』should be valid date';
+$lang->programplan->methodTip        = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index 689cfeb296..63ff435c7d 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -20,6 +20,7 @@ $lang->programplan->delete        = 'Delete Stage';
 $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Stage';
+$lang->programplan->subPlanManage = 'Sub-stages management';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
 $lang->programplan->checkEnd         = '『End』should be valid date';
+$lang->programplan->methodTip        = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index 5068fce91a..50fed29663 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -20,6 +20,7 @@ $lang->programplan->delete        = 'Delete Stage';
 $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Plan';
+$lang->programplan->subPlanManage = 'Sub-stages management';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
 $lang->programplan->checkEnd         = '『End』should be valid date';
+$lang->programplan->methodTip        = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index fcf4a5d0d6..46ed1022d9 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -20,6 +20,7 @@ $lang->programplan->delete        = '删除阶段';
 $lang->programplan->close         = '关闭阶段';
 $lang->programplan->activate      = '激活阶段';
 $lang->programplan->createSubPlan = '创建子阶段';
+$lang->programplan->subPlanManage = '子阶段的管理方法';
 
 $lang->programplan->parent           = '父阶段';
 $lang->programplan->emptyParent      = '无';
@@ -72,6 +73,7 @@ $lang->programplan->emptyBegin       = '『计划开始』日期不能为空';
 $lang->programplan->emptyEnd         = '『计划完成』日期不能为空';
 $lang->programplan->checkBegin       = '『计划开始』应当为合法的日期';
 $lang->programplan->checkEnd         = '『计划完成』应当为合法的日期';
+$lang->programplan->methodTip        = '融合瀑布项目阶段子阶段创建时，可以选择创建为阶段或创建为迭代/看板。子阶段为迭代/看板，不支持继续向下创建子级。';
 
 $lang->programplan->milestoneList[1] = '是';
 $lang->programplan->milestoneList[0] = '否';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3afbc2b94d..42c004d51b 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -714,7 +714,7 @@ class programplanModel extends model
         $sameNames = array_diff_assoc($names, array_unique($names));
 
         $project   = $this->loadModel('project')->getByID($projectID);
-        $setCode   = (!isset($this->config->setCode) or $this->config->setCode == 1) ? true : false;
+        $setCode   = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
         $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '');
 
         $datas = array();
@@ -1075,7 +1075,7 @@ class programplanModel extends model
         if($projectID) $this->loadModel('execution')->checkBeginAndEndDate($projectID, $plan->begin, $plan->end);
         if(dao::isError()) return false;
 
-        $setCode = (!isset($this->config->setCode) or $this->config->setCode == 1) ? true : false;
+        $setCode = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
         if($setCode and empty($plan->code))
         {
             dao::$errors['code'][] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index ded8e02027..eaea0d735b 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -45,6 +45,7 @@
   <div class='main-header'>
     <?php if(!empty($planID) and $project->model == 'waterfallplus'):?>
     <div class="pull-left">
+      <div class='methodTitle'><strong><?php echo $lang->programplan->subPlanManage . ':'?></strong></div>
       <div class='btn-group'>
         <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo zget($lang->programplan->typeList, $executionType);?>'><?php echo zget($lang->programplan->typeList, $executionType);?></span> <span class='caret'></span></a>
         <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
@@ -57,6 +58,7 @@
           ?>
         </ul>
       </div>
+      <div class='methodTip'><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->programplan->methodTip;?>"></icon></div>
     </div>
     <?php endif;?>
     <div class="btn-toolbar pull-right">
@@ -76,7 +78,7 @@
           <tr class='text-center'>
             <th class='c-type<?php echo $typeClass;?> required'><?php echo $lang->execution->method;?></th>
             <th class='c-name required'><?php echo $executionType == 'stage' ? $name : $lang->nameAB;?></th>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <th class='c-code required'><?php echo $executionType == 'stage' ? $lang->execution->code : $lang->code;?></th>
             <?php endif;?>
             <th class='c-pm <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>'><?php echo $executionType == 'stage' ? $lang->programplan->PM : $lang->programplan->PMAB;?></th>
@@ -106,7 +108,7 @@
             <?php foreach($stages as $stage):?>
             <tr>
               <td><input type='text' name='names[<?php echo $i;?>]' id='names<?php echo $i;?>' value='<?php echo $stage->name;?>' class='form-control' /></td>
-              <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+              <?php if(isset($config->setCode) and $config->setCode == 1):?>
               <td><?php echo html::input("codes[$i]", isset($stage->code) ? $stage->code : '', "class='form-control'");?></td>
               <?php endif;?>
               <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, '', "class='form-control picker-select'");?></td>
@@ -142,7 +144,7 @@
             <tr>
               <td class='<?php echo $typeClass . ' text-center ' .zget($lang->execution->typeList, $plan->type);?>'><?php echo zget($lang->execution->typeList, $plan->type);?></td>
               <td><input type='text' name="names[<?php echo $i;?>]" id='names<?php echo $i;?>' value='<?php echo $plan->name;?>' class='form-control' /></td>
-              <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+              <?php if(isset($config->setCode) and $config->setCode == 1):?>
               <td><?php echo html::input("codes[$i]", $plan->code, "class='form-control'");?></td>
               <?php endif;?>
               <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, $plan->PM, "class='form-control picker-select'");?></td>
@@ -178,7 +180,7 @@
           <tr class='addedItem'>
             <td class='<?php echo $typeClass;?>'><?php echo html::select("type[$i]", $lang->execution->typeList, '', "class='form-control chosen'");?></td>
             <td><input type='text' name='names[<?php echo $i;?>]' id='names<?php echo $i;?>' value='' class='form-control' /></td>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <td><?php echo html::input("codes[$i]", '', "class='form-control'");?></td>
             <?php endif;?>
             <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, '', "class='form-control picker-select'");?></td>
@@ -225,7 +227,7 @@
     <tr id='addItem' class='hidden'>
       <td class='<?php echo $typeClass;?>'><?php echo html::select("type[$i]", $lang->execution->typeList, '', "class='form-control chosen'");?></td>
       <td><input type='text' name='<?php echo "names[$i]";?>' id='names<?php echo $i;?>' class='form-control' /></td>
-      <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+      <?php if(isset($config->setCode) and $config->setCode == 1):?>
       <td><?php echo html::input("codes[$i]", '', "class='form-control'");?></td>
       <?php endif;?>
       <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, '', "class='form-control' id='PM$i'");?></td>
diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php
index ad7e3c569e..73ae92b6c7 100644
--- a/module/programplan/view/edit.html.php
+++ b/module/programplan/view/edit.html.php
@@ -36,7 +36,7 @@
             <th class='w-100px'><?php echo $lang->programplan->name;?> </th>
             <td colspan='2'><?php echo html::input('name', $plan->name, "class='form-control'");?></td>
           </tr>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <tr>
             <th class='w-100px'><?php echo $lang->execution->code;?> </th>
             <td class='required' colspan='2'><?php echo html::input('code', $plan->code, "class='form-control'");?></td>
@@ -60,6 +60,9 @@
             <td colspan='2'>
               <?php echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $plan->attribute, "class='form-control'") : zget($lang->stage->typeList, $plan->attribute);?>
             </td>
+            <td>
+              <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
+            </td>
           </tr>
           <?php if($plan->setMilestone):?>
           <tr>
diff --git a/module/project/config.php b/module/project/config.php
index 6e526e769b..bb8ff5e92d 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -136,7 +136,7 @@ $config->project->datatable->fieldList['actions']['width']    = '165';
 $config->project->datatable->fieldList['actions']['required'] = 'yes';
 $config->project->datatable->fieldList['actions']['pri']      = '1';
 
-if(isset($config->setCode) and $config->setCode == 0) unset($config->project->datatable->fieldList['code']);
+if(!isset($config->setCode) or $config->setCode == 0) unset($config->project->datatable->fieldList['code']);
 
 $config->project->checkList = new stdclass();
 $config->project->checkList->scrum         = array('bug', 'execution', 'build', 'doc', 'release', 'testtask', 'case');
diff --git a/module/project/control.php b/module/project/control.php
index c6d9d53c0a..ba8e5bf44e 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -68,7 +68,7 @@ class project extends control
                 $fields[$fieldName] = zget($projectLang, $fieldName);
                 unset($fields[$key]);
             }
-            if(isset($this->config->setCode) and empty($this->config->setCode)) unset($fields['code']);
+            if(!isset($this->config->setCode) or empty($this->config->setCode)) unset($fields['code']);
 
             if(isset($fields['hasProduct'])) $fields['hasProduct'] = $projectLang->type;
 
diff --git a/module/project/model.php b/module/project/model.php
index cd23ccc3d0..78a943fbe9 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1023,7 +1023,7 @@ class projectModel extends model
         $programPairs += $this->loadModel('program')->getPairs();
         $this->config->project->search['params']['parent']['values'] = $programPairs;
 
-        if(isset($this->config->setCode) and $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']);
+        if(!isset($this->config->setCode) or $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']);
         if($this->config->systemMode == 'light') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']);
 
         $this->loadModel('search')->setSearchParams($this->config->project->search);
@@ -1250,7 +1250,7 @@ class projectModel extends model
             ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags)
             ->remove('products,branch,plans,delta,newProduct,productName,future,contactListMenu,teamMembers')
             ->get();
-        if(isset($this->config->setCode) and $this->config->setCode == 0) unset($project->code);
+        if(!isset($this->config->setCode) or $this->config->setCode == 0) unset($project->code);
 
         /* Lean mode relation defaultProgram. */
         if($this->config->systemMode == 'light') $project->parent = $this->config->global->defaultProgram;
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 0c32848914..796850275a 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -34,7 +34,7 @@
           <th class='c-parent'><?php echo $lang->project->parent;?></th>
           <?php endif;?>
           <th class='c-name required'><?php echo $lang->project->name;?></th>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <th class='c-name required'><?php echo $lang->project->code;?></th>
           <?php endif?>
           <th class="c-user-box <?php echo strpos($requiredFields, 'PM') !== false ?  'required' : '';?>"> <?php echo $lang->project->PM;?></th>
@@ -63,7 +63,7 @@
           <?php endif;?>
           <?php endif;?>
           <td title='<?php echo $project->name;?>'><?php echo html::input("names[$projectID]", $project->name, "class='form-control'");?></td>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <td title='<?php echo $project->code;?>'><?php echo html::input("codes[$projectID]", $project->code, "class='form-control'");?></td>
           <?php endif;?>
           <td><?php echo html::select("PMs[$projectID]", $PMUsers, $project->PM, "class='form-control chosen'");?></td>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 969d9f0164..86aaf07843 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -48,7 +48,11 @@
       <h2><?php echo $createTitle;?></h2>
       <?php if(!commonModel::isTutorialMode()): ?>
       <div class="pull-right btn-toolbar">
+      <?php if($config->edition != 'max' or $model == 'kanban'):?>
+        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
+      <?php else: ?>
         <button type='button' class='btn btn-link open-btn' data-toggle='modal' data-target='#maxCopyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
+      <?php endif; ?>
       </div>
       <?php endif; ?>
     </div>
@@ -69,7 +73,7 @@
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index a0d792571d..a97248f3e5 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -75,7 +75,7 @@
           <td class="col-main"><?php echo html::input('name', $project->name, "class='form-control' required");?></td>
           <td colspan='2'></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', $project->code, "class='form-control' required");?></td>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index f10d9f4121..2a2cf76587 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -114,7 +114,7 @@
       <div class="col-sm-12">
         <div class="cell">
           <div class="detail">
-            <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+            <?php $hiddenCode = (!isset($config->setCode) or $config->setCode == 0) ? 'hidden' : '';?>
             <h2 class="detail-title"><span class="label-id"><?php echo $project->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $project->code;?></span> <?php echo $project->name;?></h2>
             <div class="detail-content article-content">
               <div><span class="text-limit hidden" data-limit-size="40"><?php echo $project->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div>
diff --git a/module/repo/control.php b/module/repo/control.php
index 77e1813617..fead011113 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -599,7 +599,7 @@ class repo extends control
         }
 
         /* Refresh repo. */
-        if($refresh) $this->repo->updateCommit($repoID, $originBranchID);
+        if($refresh) $this->repo->updateCommit($repoID, $objectID, $originBranchID);
 
         /* Get files info. */
         $infos = $this->repo->getFileCommits($repo, $branchID, $path);
diff --git a/module/repo/model.php b/module/repo/model.php
index 9580df4837..3a9aa88859 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -2810,7 +2810,7 @@ class repoModel extends model
      * @access public
      * @return void
      */
-    public function updateCommit($repoID, $branchID = 0)
+    public function updateCommit($repoID, $objectID = 0, $branchID = 0)
     {
         $repo = $this->getRepoByID($repoID);
         /* Update code commit history. */
diff --git a/module/stage/model.php b/module/stage/model.php
index 78e1ce28c6..c475e5e196 100644
--- a/module/stage/model.php
+++ b/module/stage/model.php
@@ -199,7 +199,7 @@ class stageModel extends model
         $moduleName = $this->app->rawModule;
         $methodName = $this->app->rawMethod;
         if(!isset($this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'])) $this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'] = '';
-        if(!isset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'])) $this->lang->admin->menuList->model['subMenu']['agileplus']['exclude'] = '';
+        if(!isset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'])) $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] = '';
         if($type == 'waterfall')
         {
             $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] .= ",{$moduleName}-{$methodName}";
diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php
index 88ba4b613d..d8397efac8 100644
--- a/module/upgrade/view/to18guide.html.php
+++ b/module/upgrade/view/to18guide.html.php
@@ -36,7 +36,7 @@
                 <?php if(is_array($feature) && empty($disabledScrumFeatures)) continue;?>
                 <tr class='text-center'>
                   <td class='text-left'><?php echo (is_array($feature) && !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature];?></td>
-                  <td><i class='icon text-red icon-close'></i></td>
+                  <td><i class='icon text-red icon-ban-circle'></i></td>
                   <td><i class='icon text-success icon-check'></i></td>
                 </tr>
                 <?php endforeach;?>