diff --git a/VERSION b/VERSION index 85e0458f69..68cb3479cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20.7 \ No newline at end of file +20.7.1 \ No newline at end of file diff --git a/config/config.php b/config/config.php index ae4719e8f6..3e8ef14524 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '20.7'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '20.7.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. diff --git a/doc/CHANGELOG b/doc/CHANGELOG index c38222300d..cfbf5efaa6 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,7 @@ +2024-09-30 20.7.1 +完成的需求 +修复的Bug + 2024-09-14 20.7 完成的需求 开源版： diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index d26e41d4c5..eb50f48f0d 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 6a2dab3f8c..d73d3896f7 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 5ac80033bf..d70bb69db8 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 68b9cfcb22..8cd2b06e70 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; $lang->misc->releaseDate['20.6'] = '2024-08-30'; $lang->misc->releaseDate['20.5'] = '2024-08-16'; @@ -236,6 +237,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; /* Release Detail. */ +$lang->misc->feature->all['20.7.1'][] = array('title' => '', 'desc' => ''); $lang->misc->feature->all['20.7'][] = array('title' => '新手引导优化；菜单自定义；工作流优化；OR界面增加贡献模块。', 'desc' => ''); $lang->misc->feature->all['20.6'][] = array('title' => '工作流支持配置多界面；审批流支持使用工作流中字段配置条件；修复Bug。', 'desc' => ''); $lang->misc->feature->all['20.5'][] = array('title' => '文档优化；新增23个内置度量项。', 'desc' => ''); diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 84246759b8..18c718542b 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -55,7 +55,8 @@ $config->upgrade->maxVersion['max5_3'] = '20_4'; $config->upgrade->maxVersion['max4_13'] = '18_13'; $config->upgrade->maxVersion['max5_4'] = '20_5'; $config->upgrade->maxVersion['max5_5'] = '20_6'; -$config->upgrade->maxVersion['max5_6'] = '20_7'; // max insert position. +$config->upgrade->maxVersion['max5_6'] = '20_7'; +$config->upgrade->maxVersion['max5_6_1'] = '20_7_1'; // max insert position. $config->upgrade->bizVersion = array(); $config->upgrade->bizVersion['biz1_0'] = '9_5_1'; @@ -149,7 +150,8 @@ $config->upgrade->bizVersion['biz10_3'] = '20_4'; $config->upgrade->bizVersion['biz8_13'] = '18_13'; $config->upgrade->bizVersion['biz10_4'] = '20_5'; $config->upgrade->bizVersion['biz10_5'] = '20_6'; -$config->upgrade->bizVersion['biz10_6'] = '20_7'; // biz insert position. +$config->upgrade->bizVersion['biz10_6'] = '20_7'; +$config->upgrade->bizVersion['biz10_6_1'] = '20_7_1'; // biz insert position. $config->upgrade->proVersion = array(); $config->upgrade->proVersion['pro1_0'] = '3_1'; @@ -280,7 +282,8 @@ $config->upgrade->ipdVersion['ipd2_3'] = '20_4'; $config->upgrade->ipdVersion['ipd1_5'] = '18_13'; $config->upgrade->ipdVersion['ipd2_4'] = '20_5'; $config->upgrade->ipdVersion['ipd2_5'] = '20_6'; -$config->upgrade->ipdVersion['ipd2_6'] = '20_7'; // ipd insert position. +$config->upgrade->ipdVersion['ipd2_6'] = '20_7'; +$config->upgrade->ipdVersion['ipd2_6_1'] = '20_7_1'; // ipd insert position. $config->upgrade->lowerTables = array(); $config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 059f202280..653b8b3ded 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -200,7 +200,8 @@ $lang->upgrade->fromVersions['20_3_0'] = '20.3.0'; $lang->upgrade->fromVersions['20_4'] = '20.4'; $lang->upgrade->fromVersions['20_5'] = '20.5'; $lang->upgrade->fromVersions['20_6'] = '20.6'; -$lang->upgrade->fromVersions['20_7'] = '20.7'; // pms insert position. +$lang->upgrade->fromVersions['20_7'] = '20.7'; +$lang->upgrade->fromVersions['20_7_1'] = '20.7.1'; // pms insert position. global $config; /* Lite. */ @@ -401,7 +402,8 @@ $lang->upgrade->fromVersions['biz10_2_0'] = 'Biz10.2.0'; $lang->upgrade->fromVersions['biz10_3'] = 'Biz10.3'; $lang->upgrade->fromVersions['biz10_4'] = 'Biz10.4'; $lang->upgrade->fromVersions['biz10_5'] = 'Biz10.5'; -$lang->upgrade->fromVersions['biz10_6'] = 'Biz10.6'; // biz insert position. +$lang->upgrade->fromVersions['biz10_6'] = 'Biz10.6'; +$lang->upgrade->fromVersions['biz10_6_1'] = 'Biz10.6.1'; // biz insert position. /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4'; @@ -460,7 +462,8 @@ $lang->upgrade->fromVersions['max5_2_0'] = 'Max5.2.0'; $lang->upgrade->fromVersions['max5_3'] = 'Max5.3'; $lang->upgrade->fromVersions['max5_4'] = 'Max5.4'; $lang->upgrade->fromVersions['max5_5'] = 'Max5.5'; -$lang->upgrade->fromVersions['max5_6'] = 'Max5.6'; // max insert position. +$lang->upgrade->fromVersions['max5_6'] = 'Max5.6'; +$lang->upgrade->fromVersions['max5_6_1'] = 'Max5.6.1'; // max insert position. /* Ipd */ $lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1'; @@ -480,4 +483,5 @@ $lang->upgrade->fromVersions['ipd2_1_0'] = 'Ipd2.1.0'; $lang->upgrade->fromVersions['ipd2_2_0'] = 'Ipd2.2.0'; $lang->upgrade->fromVersions['ipd2_3'] = 'Ipd2.3'; $lang->upgrade->fromVersions['ipd2_4'] = 'Ipd2.4'; -$lang->upgrade->fromVersions['ipd2_5'] = 'Ipd2.5'; // ipd insert position. +$lang->upgrade->fromVersions['ipd2_5'] = 'Ipd2.5'; +$lang->upgrade->fromVersions['ipd2_6'] = 'Ipd2.6'; // ipd insert position.