Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'fixbug' into 'master'

Browse Source 
* Fix bug #24078.

See merge request easycorp/zentaopms!4070
This commit is contained in:
王怡栋
2022-06-22 08:18:14 +00:00
parent 7df829be39 1968070dd4
commit 7f7188a6c2
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/group/ext/lang/resource.php
+4
View File
@@ -551,6 +551,8 @@ $lang->resource->task->recordEstimate = 'recordEstimateAction';
$lang->resource->task->editEstimate = 'editEstimate';
$lang->resource->task->deleteEstimate = 'deleteEstimate';
$lang->resource->task->report = 'reportChart';
$lang->resource->task->exportTemplet = 'exportTemplet';
$lang->resource->task->import = 'import';
$lang->task->methodOrder[5] = 'create';
$lang->task->methodOrder[10] = 'batchCreate';
@@ -575,6 +577,8 @@ $lang->task->methodOrder[100] = 'editEstimate';
$lang->task->methodOrder[105] = 'deleteEstimate';
$lang->task->methodOrder[110] = 'report';
$lang->task->methodOrder[115] = 'batchChangeModule';
$lang->task->methodOrder[120] = 'exportTemplet';
$lang->task->methodOrder[125] = 'import';
/* Doc. */
$lang->resource->doc = new stdclass();
module/upgrade/config.php
+3
View File
@@ -184,6 +184,9 @@ $config->upgrade->liteVersion['lite1_0'] = '16_5_beta1';
$config->upgrade->liteVersion['lite1_1'] = '16_5';
$config->upgrade->liteVersion['lite1_2'] = '17_1';
$config->upgrade->liteVersion['liteVIP1_1'] = 'biz6_5';
$config->upgrade->liteVersion['liteVIP1_2'] = 'biz7_1';
$config->upgrade->lowerTables = array();
$config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep';
$config->upgrade->lowerTables[$config->db->prefix . 'docLib'] = $config->db->prefix . 'doclib';
module/upgrade/lang/version.php
+2
View File
@@ -161,9 +161,11 @@ $lang->upgrade->fromVersions['17_0_beta2'] = '17.0.beta2';
$lang->upgrade->fromVersions['17_0'] = '17.0';
$lang->upgrade->fromVersions['17_1'] = '17.1';
global $config;
/* Lite. */
$lang->upgrade->fromVersions['lite1_0'] = 'Lite1.0';
$lang->upgrade->fromVersions['lite1_1'] = 'Lite1.1';
if($config->edition != 'open') $lang->upgrade->fromVersions['liteVIP1_1'] = 'LiteVIP1.1';
/* Pro. */
$lang->upgrade->fromVersions['pro1_0'] = 'Pro1.0';