From b5608fb7998ff557aad3c51db7afff1229a3a6bd Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 6 Jul 2022 08:41:51 +0800
Subject: [PATCH 1/2] * Fix bug #24754.

---
 module/task/js/finish.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/task/js/finish.js b/module/task/js/finish.js
index 6907ed9bf5..06a90a0e5b 100644
--- a/module/task/js/finish.js
+++ b/module/task/js/finish.js
@@ -12,9 +12,6 @@ $(function()
 
     $('#submit').click(function()
     {
-        if(task.consumed != 0 && $('#currentConsumed').val() == 0)
-        {
-            return confirm(consumedEmpty);
-        }
+        if(task.consumed != 0 && $('#currentConsumed').val() == 0 && $('#currentConsumed').val() != '') return confirm(consumedEmpty);
     })
 })

From 6464887f89c41838aac60de9b5445fbddf731bf9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 6 Jul 2022 08:42:21 +0800
Subject: [PATCH 2/2] * Fix bug #24753.

---
 module/task/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index af4aa9ab5b..352e6632dd 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1737,8 +1737,8 @@ class taskModel extends model
 
             if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
             {
-                if(!$record->consumed[$id])   return print(js::alert($this->lang->task->error->consumedThisTime));
-                if($record->left[$id] === '') return print(js::alert($this->lang->task->error->left));
+                if(!$record->consumed[$id])   helper::end(js::alert($this->lang->task->error->consumedThisTime));
+                if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left));
 
                 $estimates[$id] = new stdclass();
                 $estimates[$id]->date     = $record->dates[$id];