Merge branch 'sprint/165_tianshujie_42867' into 'sprint/165'

*Finish task #42867

See merge request easycorp/zentaopms!43

module/action/model.php

@@ -774,7 +774,7 @@ class actionModel extends model
 
         /* If is project, select its related. */
         $executions = array();
-        if(is_numeric($projectID)) $executions = $this->loadModel('execution')->getPairs($projectID);
+        if(is_numeric($projectID) and $executionID == 'all') $executions = $this->loadModel('execution')->getPairs($projectID);
 
         $this->loadModel('doc');
         $libs = $this->doc->getLibs('includeDeleted') + array('' => '');

module/company/control.php

@@ -221,7 +221,7 @@ class company extends control
 
         /* Get executions' list.*/
         $executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
-        $executions = array($this->lang->company->execution) + $executions;
+        $executions = array($this->lang->execution->common) + $executions;
         $this->view->executions = $executions;
 
         /* Set account and get users.*/