Merge branch 'master' of github.com:easysoft/zentaopms

module/productplan/view/linkstory.html.php

@@ -40,10 +40,7 @@
       </thead>
       <tbody>
       <?php foreach($allStories as $story):?>
-      <?php
-      if(isset($planStories[$story->id])) continue;
-      if($story->plan and helper::diffDate($plans[$story->plan], helper::today()) > 0) continue;
-      ?>
+      <?php if(isset($planStories[$story->id])) continue; ?>
       <tr>
         <td class='text-left'>
           <input class='ml-10px' type='checkbox' name='stories[]'  value='<?php echo $story->id;?>'/> 

module/productplan/view/view.html.php

@@ -71,7 +71,7 @@
                   <th class='w-user'>  <?php echo $lang->assignedToAB;?></th>
                   <th class='w-60px'>  <?php echo $lang->story->estimateAB;?></th>
                   <th class='w-status'><?php echo $lang->statusAB;?></th>
-                  <th class='w-60px'>  <?php echo $lang->story->stageAB;?></th>
+                  <th class='w-80px'>  <?php echo $lang->story->stageAB;?></th>
                   <th class='w-50px {sorter:false}'><?php echo $lang->actions?></th>
                 </tr>
                 </thead>