diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 4d9a67aeeb..24403c4852 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -56,6 +56,7 @@ $lang->custom->role = '职位'; $lang->custom->dept = '部门'; $lang->custom->code = $lang->code; $lang->custom->setCode = '是否启用代号'; +$lang->custom->execution = '1111'; if($config->systemMode == 'new') $lang->custom->execution = '执行'; if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 40cbfc8f97..352fb7ac01 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -47,7 +47,7 @@ $lang->install->guideVideo = 'https://dl.cnezsoft.com/vedio/zentaoconce $lang->install->introductionContent = <<

Dear users,

-

Welcome to ZenTao project management system. ZenTao has two managment modes in version 15.0 and up. One is the lite management mode, providing two core features, Product and Project; the other is a new project management mode, with Program and Execution added. The following is an introduction to the new mode:

+

Welcome to ZenTao project management system. ZenTao has two managment modes in version 15.0 and up. One is the classic management mode, providing two core features, Product and Project; the other is a new project management mode, with Program and Execution added. The following is an introduction to the new mode:

Program

Program is used to manage a group of products and projects, and the company executives or PMO can use it for strategic planning.

diff --git a/module/install/lang/en.php b/module/install/lang/en.php index a328c9a4f2..3333c0cebe 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -47,7 +47,7 @@ $lang->install->guideVideo = 'https://dl.cnezsoft.com/vedio/zentaoconce $lang->install->introductionContent = <<

Dear users,

-

Welcome to ZenTao project management system. ZenTao has two managment modes in version 15.0 and up. One is the lite management mode, providing two core features, Product and Project; the other is a new project management mode, with Program and Execution added. The following is an introduction to the new mode:

+

Welcome to ZenTao project management system. ZenTao has two managment modes in version 15.0 and up. One is the classic management mode, providing two core features, Product and Project; the other is a new project management mode, with Program and Execution added. The following is an introduction to the new mode:

Program

Program is used to manage a group of products and projects, and the company executives or PMO can use it for strategic planning.

diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index 9c2c6bb6fa..0391c6ddf5 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -47,7 +47,7 @@ $lang->install->guideVideo = 'https://dl.cnezsoft.com/vedio/zentaoconce $lang->install->introductionContent = <<

Dear users,

-

Welcome to ZenTao project management system. ZenTao has two managment modes in version 15.0 and up. One is the lite management mode, providing two core features, Product and Project; the other is a new project management mode, with Program and Execution added. The following is an introduction to the new mode:

+

Welcome to ZenTao project management system. ZenTao has two managment modes in version 15.0 and up. One is the classic management mode, providing two core features, Product and Project; the other is a new project management mode, with Program and Execution added. The following is an introduction to the new mode:

Program

Program is used to manage a group of products and projects, and the company executives or PMO can use it for strategic planning.

diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 57624113eb..5b648ee89e 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -47,7 +47,7 @@ $lang->install->guideVideo = 'https://dl.cnezsoft.com/vedio/program0716 $lang->install->introductionContent = <<

尊敬的用户您好,欢迎您使用禅道项目管理系统。

-

禅道自15系列开始提供了两种使用模式,一种是迅捷模式,功能较为精简,主要提供了产品和项目两个核心功能;另一种是综合模式,增加了项目集和执行的概念。下面是综合模式的介绍:

+

禅道自15系列开始提供了两种使用模式,一种是经典管理模式,功能较为精简,主要提供了产品和项目两个核心功能;另一种是综合模式,增加了项目集和执行的概念。下面是全新项目集管理模式的介绍:

项目集

项目集用来管理一组相关的产品和项目,公司高层或者PMO可以用来做战略规划。

diff --git a/module/upgrade/js/to18guide.js b/module/upgrade/js/to18guide.js index 4f141b1662..e6bb22c6cc 100644 --- a/module/upgrade/js/to18guide.js +++ b/module/upgrade/js/to18guide.js @@ -1,11 +1,13 @@ $(function() { - $("#useLean").click(function(){ + $("#useLean").click(function() + { $('#mode').val('lean'); $('form').submit(); }) - $("#useNew").click(function(){ + $("#useNew").click(function() + { $('#mode').val('new'); $('form').submit(); }) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index c1aa63d386..b8d12ae2e6 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -1009,7 +1009,7 @@ class upgradeModel extends model case '17_0_beta2': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0.beta2')); case '17_0': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0')); case '17_1': - $confirmContent .= file_get_contents($this->getUpgradeFile('17.1')); + $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': @@ -7532,6 +7532,7 @@ class upgradeModel extends model /** * Relation default program. * + * @param int $programID * @access public * @return bool */