From d6722bbfbc4b8363878099334890cd084daece05 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 28 Jun 2022 20:23:40 +0800
Subject: [PATCH 1/4] * Fix bug #23978.

---
 module/todo/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index f682d3c489..14eaa91763 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -593,7 +593,7 @@ class todo extends control
             {
                 $issues        = $this->loadModel('issue')->getUserIssuePairs($account);
                 $risks         = $this->loadModel('risk')->getUserRiskPairs($account);
-                $opportunities = $this->loadModel('opprotunity')->getUserOpportunityPairs($account);
+                $opportunities = $this->loadModel('opportunity')->getUserOpportunityPairs($account);
             }
             $testTasks = $this->loadModel('testtask')->getUserTesttaskPairs($account);
             if(isset($this->config->qcVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account, 0, 'wait');

From ba0b9139b5bf61943e15503a5d4582fc5cc3e7b3 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 28 Jun 2022 20:47:56 +0800
Subject: [PATCH 2/4] * Fix bug #24114.

---
 extension/lite/leave/ext/view/browse.oa.html.hook.php         | 1 -
 extension/lite/leave/ext/view/create.oa.html.hook.php         | 1 -
 extension/lite/leave/ext/view/edit.oa.html.hook.php           | 1 -
 extension/lite/leave/ext/view/personalannual.oa.html.hook.php | 1 -
 4 files changed, 4 deletions(-)
 delete mode 100644 extension/lite/leave/ext/view/browse.oa.html.hook.php
 delete mode 100644 extension/lite/leave/ext/view/create.oa.html.hook.php
 delete mode 100644 extension/lite/leave/ext/view/edit.oa.html.hook.php
 delete mode 100644 extension/lite/leave/ext/view/personalannual.oa.html.hook.php

diff --git a/extension/lite/leave/ext/view/browse.oa.html.hook.php b/extension/lite/leave/ext/view/browse.oa.html.hook.php
deleted file mode 100644
index 7a72fbf63f..0000000000
--- a/extension/lite/leave/ext/view/browse.oa.html.hook.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/leave/ext/view/create.oa.html.hook.php b/extension/lite/leave/ext/view/create.oa.html.hook.php
deleted file mode 100644
index 7a72fbf63f..0000000000
--- a/extension/lite/leave/ext/view/create.oa.html.hook.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/leave/ext/view/edit.oa.html.hook.php b/extension/lite/leave/ext/view/edit.oa.html.hook.php
deleted file mode 100644
index 7a72fbf63f..0000000000
--- a/extension/lite/leave/ext/view/edit.oa.html.hook.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
diff --git a/extension/lite/leave/ext/view/personalannual.oa.html.hook.php b/extension/lite/leave/ext/view/personalannual.oa.html.hook.php
deleted file mode 100644
index 7a72fbf63f..0000000000
--- a/extension/lite/leave/ext/view/personalannual.oa.html.hook.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>

From 26ae6a991f74673897004ccacb148db28f2e9903 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 28 Jun 2022 21:33:42 +0800
Subject: [PATCH 3/4] * Fix bug #23354.

---
 module/execution/view/treestory.html.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php
index 31a29464fd..34b8565ec6 100644
--- a/module/execution/view/treestory.html.php
+++ b/module/execution/view/treestory.html.php
@@ -54,6 +54,7 @@
           <td><?php common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch", $branches[$story->branch], '', "data-app='product'");?></td>
         </tr>
       <?php endif;?>
+      <?php if($this->config->vision != 'lite'):?>
       <tr>
         <th><?php echo $lang->story->module;?></th>
           <?php
@@ -101,6 +102,7 @@
           ?>
         </td>
       </tr>
+      <?php endif;?>
       <tr>
         <th><?php echo $lang->story->source;?></th>
         <td id='source'><?php echo $story->source ? $lang->story->sourceList[$story->source] : $lang->noData;?></td>

From e656139643dfdc16d900c20e1bd3c5693fe147e9 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 29 Jun 2022 08:48:23 +0800
Subject: [PATCH 4/4] * Fix bug .

---
 extension/lite/leave/ext/view/browse.oa.html.hook.php         | 0
 extension/lite/leave/ext/view/create.oa.html.hook.php         | 0
 extension/lite/leave/ext/view/edit.oa.html.hook.php           | 0
 extension/lite/leave/ext/view/personalannual.oa.html.hook.php | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 extension/lite/leave/ext/view/browse.oa.html.hook.php
 create mode 100644 extension/lite/leave/ext/view/create.oa.html.hook.php
 create mode 100644 extension/lite/leave/ext/view/edit.oa.html.hook.php
 create mode 100644 extension/lite/leave/ext/view/personalannual.oa.html.hook.php

diff --git a/extension/lite/leave/ext/view/browse.oa.html.hook.php b/extension/lite/leave/ext/view/browse.oa.html.hook.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/extension/lite/leave/ext/view/create.oa.html.hook.php b/extension/lite/leave/ext/view/create.oa.html.hook.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/extension/lite/leave/ext/view/edit.oa.html.hook.php b/extension/lite/leave/ext/view/edit.oa.html.hook.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/extension/lite/leave/ext/view/personalannual.oa.html.hook.php b/extension/lite/leave/ext/view/personalannual.oa.html.hook.php
new file mode 100644
index 0000000000..e69de29bb2