Merge branch 'sunhuawei_fixbug_22375' into 'master'

*Fix bug #22375

See merge request easycorp/zentaopms!3438

module/task/js/edit.js

@@ -162,7 +162,7 @@ $('#confirmButton').click(function()
     var memberCount   = '';
     var assignedTo    = '';
     var totalEstimate = 0;
-    var totalConsumed = 0;
+    var totalConsumed = oldConsumed;
     var totalLeft     = 0;
     $('select[name^=team]').each(function()
     {

module/task/model.php

@@ -818,6 +818,7 @@ class taskModel extends model
                 $currentTask->consumed += (float)$member->consumed;
                 $currentTask->left     += (float)$member->left;
             }
+            $currentTask->consumed += (float)$oldTask->consumed;
 
             if(!empty($task))
             {

module/task/view/edit.html.php

@@ -17,6 +17,7 @@
 <?php js::set('oldStoryID', $task->story);?>
 <?php js::set('oldAssignedTo', $task->assignedTo);?>
 <?php js::set('oldExecutionID', $task->execution);?>
+<?php js::set('oldConsumed', $task->consumed);?>
 <?php js::set('confirmChangeExecution', $lang->task->confirmChangeExecution);?>
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>