Merge branch 'zentaopms284_bug#25538' into 'master'

* Fix bug #25538.

See merge request easycorp/zentaopms!6854

module/programplan/control.php

@@ -234,6 +234,7 @@ class programplan extends control
         $this->app->loadLang('stage');
         $this->view->title        = $this->lang->programplan->edit;
         $this->view->position[]   = $this->lang->programplan->edit;
+        $this->view->PMUsers      = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $plan->PM);
         $this->view->parentStage  = $this->programplan->getParentStageList($this->session->project, $planID, $plan->product);
         $this->view->isCreateTask = $this->programplan->isCreateTask($planID);
         $this->view->plan         = $plan;

module/programplan/view/edit.html.php

@@ -37,6 +37,10 @@
             <td class='required' colspan='2'><?php echo html::input('code', $plan->code, "class='form-control'");?></td>
           </tr>
           <?php endif;?>
+          <tr>
+            <th><?php echo $lang->programplan->PM;?> </th>
+            <td colspan='2'><?php echo html::select('PM', $PMUsers, '', "class='form-control picker-select'");?></td>
+          </tr>
           <tr>
             <th><?php echo $lang->programplan->percent;?> </th>
             <td colspan='2'>