Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/datatable/model.php

@@ -158,6 +158,7 @@ class datatableModel extends model
             $title = (isset($col->name) and $col->name) ? "title='$col->name'" : $title;
             if($id == 'id' and (int)$width < 90) $width = '90px';
             $align = $id == 'actions' ? 'text-center' : '';
+            $align = in_array($id, array('budget', 'teamCount', 'estimate', 'consume')) ? 'text-right' : $align;
 
             $style  = '';
             $data   = '';

module/doc/model.php

@@ -1157,10 +1157,10 @@ class docModel extends model
 
     /**
      * Get ordered objects for dic.
-     * 
-     * @param  string $objectType 
+     *
+     * @param  string $objectType
      * @access public
-     * @return array 
+     * @return array
      */
     public function getOrderedObjects($objectType = 'product')
     {
@@ -1169,17 +1169,17 @@ class docModel extends model
         {
             $products = $this->loadModel('product')->getList();
             foreach($products as $id => $product)
-            {   
+            {
                 if($product->status == 'normal' and $product->PO == $this->app->user->account)
-                {   
-                    $myObjects[$id] = $product->name;     
+                {
+                    $myObjects[$id] = $product->name;
                 }
                 elseif($product->status == 'normal' and !($product->PO == $this->app->user->account))
-                {   
+                {
                     $normalObjects[$id] = $product->name;
                 }
                 elseif($product->status == 'closed')
-                {   
+                {
                     $closedObjects[$id] = $product->name;
                 }
             }
@@ -1196,9 +1196,9 @@ class docModel extends model
 
             $orderedProjects = array();
             foreach($programs as $programID => $programName)
-            {    
+            {
                 foreach($projects as $id => $project)
-                {    
+                {
                     if($project->parent and $project->parent != $programID) continue;
                     $orderedProjects[$id] = $project;
                     unset($projects[$project->id]);

module/execution/control.php

@@ -1200,9 +1200,8 @@ class execution extends control
         if($this->app->openApp == 'project')
         {
             if(!empty($copyExecutionID)) $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($copyExecutionID)->fetch('project');
-            $project = $this->project->getByID($projectID);
-            $model   = $project->model;
 
+            $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
             $this->project->setMenu($projectID);
         }
         elseif($this->app->openApp == 'execution')

module/testcase/model.php

@@ -254,7 +254,7 @@ class testcaseModel extends model
             ->leftJoin(TABLE_PROJECTSTORY)->alias('t3')->on('t3.story=t2.story')
             ->leftJoin(TABLE_STORY)->alias('t4')->on('t3.story=t4.id')
             ->where('1=1')
-            ->beginIF(!empty((int)$productID))->andWhere('t2.product')->eq((int)$productID)->fi()
+            ->beginIF(!empty($productID))->andWhere('t2.product')->eq((int)$productID)->fi()
             ->beginIF($this->app->openApp == 'project')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->beginIF($branch)->andWhere('t2.branch')->eq($branch)->fi()
             ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()