* Fix bug #29031,#29042,#29039.

module/execution/model.php

@@ -1189,9 +1189,10 @@ class executionModel extends model
                 ->andWhere('t2.type')->eq('stage')
                 ->andWhere('t2.grade')->eq(1)
                 ->andWhere('t2.deleted')->eq(0)
-                ->andWhere('t2.parent')->eq($oldExecution)
+                ->andWhere('t2.parent')->eq($oldExecution->id)
                 ->fetch('total');
 
+            if(!$oldPercentTotal) $oldPercentTotal = 0;
             if($type == 'create') $percentTotal = $percent + $oldPercentTotal;
             if(!empty($oldExecution) and $oldExecution->grade == 1) $percentTotal = $oldPercentTotal - $oldExecution->percent + $this->post->percent;
 
@@ -4713,7 +4714,11 @@ class executionModel extends model
 
         if(!empty($execution->children))
         {
-            foreach($execution->children as $child) $this->printNestedList($child, true, $users, $productID);
+            foreach($execution->children as $child)
+            {
+                $child->division = $execution->division;
+                $this->printNestedList($child, true, $users, $productID);
+            }
         }
 
         if(!empty($execution->tasks))

module/task/model.php

@@ -4053,6 +4053,7 @@ class taskModel extends model
             }
         }
         $list .= '</td>';
+        if(!empty($execution->division) and $this->app->rawModule == 'project') $list .= '<td></td>';
         $list .= "<td class='status-{$task->status} text-center'>" . $this->processStatus('task', $task) . '</td>';
         $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
         $list .= helper::isZeroDate($task->estStarted) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->estStarted . '</td>';