* Finish task #37931.

module/product/view/browse.html.php

@@ -291,7 +291,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
           <?php
           foreach($setting as $key => $value)
           {
-              if($storyType == 'requirement' and $value->id == 'plan') $value->show = false;
+              if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false;
 
               if($value->show)
               {

module/story/view/edit.html.php

@@ -55,7 +55,7 @@
             </div>
           </div>
           <div class='actions form-actions text-center'>
-            <?php 
+            <?php
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
             echo html::submitButton($lang->save);
             if(!isonlybody()) echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');
@@ -118,7 +118,7 @@
                   <div class='input-group' id='planIdBox'>
                   <?php $multiple = ($this->session->currentProductType != 'normal' and empty($story->branch)) ? true : false;?>
                   <?php echo html::select($multiple ? 'plan[]' : 'plan', $plans, $story->plan, "class='form-control chosen'" . ($multiple ? ' multiple' : ''));
-                  if(count($plans) == 1) 
+                  if(count($plans) == 1)
                   {
                       echo "<span class='input-group-addon'>";
                       echo html::a($this->createLink('productplan', 'create', "productID=$story->product&branch=$story->branch", '', true), $lang->productplan->create, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
@@ -146,7 +146,7 @@
                   <?php echo html::hidden('status', $story->status);?>
                 </td>
               </tr>
-              <?php if($story->status != 'draft'):?>
+              <?php if($story->status != 'draft' and $story->type == 'story'):?>
               <tr>
                 <th><?php echo $lang->story->stage;?></th>
                 <td>
@@ -218,7 +218,7 @@
               <?php endif;?>
             </table>
           </div>
-    
+
           <?php $this->printExtendFields($story, 'div', 'position=right');?>
 
           <div class='detail'>