From 1794cc808fd9d2849c0159c8fc27e94c303878bf Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 27 Nov 2024 16:43:41 +0800
Subject: [PATCH] * [misc] The upgrade program must also be executed when
 upgrading the open-source version.

---
 module/upgrade/config/upgradeflow.php | 3 +--
 module/upgrade/model.php              | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php
index 27ae17f113..0b01b76110 100644
--- a/module/upgrade/config/upgradeflow.php
+++ b/module/upgrade/config/upgradeflow.php
@@ -105,7 +105,7 @@ $config->upgrade->execFlow['20_5']        = array('functions' => 'fixWorkflowFie
 $config->upgrade->execFlow['20_6']        = array('functions' => 'processDemandFiles,processSqlbuilderTables');
 $config->upgrade->execFlow['20_7']        = array('functions' => 'upgradeMyDocSpace');
 $config->upgrade->execFlow['20_8']        = array('functions' => 'processWorkflowGroups');
-$config->upgrade->execFlow['21_0']        = array('functions' => 'importBuildinWorkflow', 'params' => array('importBuildinWorkflow' => array('or', 'charter')));
+$config->upgrade->execFlow['21_0']        = array('functions' => 'importBuildinWorkflow,addCharterApprovalFlow', 'params' => array('importBuildinWorkflow' => array('or', 'charter')));
 
 if(!empty($config->isINT))
 {
@@ -138,7 +138,6 @@ if($config->edition != 'open')
     $config->upgrade->execFlow['18_3']['functions']      .= ',processDataset,processChart,processReport,processDashboard';
     $config->upgrade->execFlow['18_4_beta1']['functions'] = 'processDeployStepAction,updateBISQL,updatePivotStage';
     $config->upgrade->execFlow['20_4']['functions']      .= ',updateTaskRelationPriv';
-    $config->upgrade->execFlow['21_0']['functions']      .= ',addCharterApprovalFlow';
 }
 
 if(in_array($this->config->edition, array('max', 'ipd'))) $config->upgrade->execFlow['18_7']['functions'] = 'processOldMetrics,processHistoryDataForMetric,metric-updateMetricDate';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e7d31a77da..01d75afbd8 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -10472,8 +10472,6 @@ class upgradeModel extends model
      */
     public function addCharterApprovalFlow()
     {
-        $this->app->loadLang('charter');
-
         foreach($this->lang->upgrade->defaultCharterApprovalFlow as $approvalType => $approval)
         {
             $approvalflow = new stdclass();