diff --git a/module/productplan/control.php b/module/productplan/control.php
index a1af2406bf..ab9fa46539 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -149,24 +149,7 @@ class productplan extends control
      */
     public function batchEdit($productID, $branch = 0)
     {
-        if(isset($_POST['planIDList']))
-        {
-            $this->commonAction($productID, $branch);
-            $this->view->title      = $this->lang->productplan->batchEdit;
-            $this->view->position[] = html::a(inlink('browse', "productID=$productID&branch=$branch"), $this->lang->productplan->common);
-            $this->view->position[] = $this->lang->productplan->batchEdit;
-
-            $plans     = $this->productplan->getByIDList($this->post->planIDList);
-            $product   = $this->loadModel('product')->getById($productID);
-            $oldBranch = array();
-            foreach($plans as $plan) $oldBranch[$plan->id] = $plan->branch;
-
-            $this->view->plans         = $plans;
-            $this->view->oldBranch     = $oldBranch;
-            $this->view->branchProduct = $product->type == 'normal' ? false : true;
-            die($this->display());
-        }
-        elseif($_POST)
+        if(!empty($_POST['title']))
         {
             $changes = $this->productplan->batchUpdate($productID);
             $this->syncStory($changes);
@@ -176,10 +159,26 @@ class productplan extends control
                 $actionID = $this->action->create('productplan', $planID, 'Edited');
                 $this->action->logHistory($actionID, $change);
             }
+
             $this->loadModel('score')->create('ajax', 'batchOther');
             die(js::locate(inlink('browse', "productID=$productID&branch=$branch"), 'parent'));
         }
-        die(js::locate('back'));
+
+        $planIDList = $this->post->planIDList ? $this->post->planIDList : die(js::locate($this->session->productPlanList, 'parent'));
+
+        $this->commonAction($productID, $branch);
+
+        $plans     = $this->productplan->getByIDList($planIDList);
+        $oldBranch = array();
+
+        foreach($plans as $plan) $oldBranch[$plan->id] = $plan->branch;
+
+        $this->view->title     = $this->lang->productplan->batchEdit;
+        $this->view->plans     = $plans;
+        $this->view->oldBranch = $oldBranch;
+        $this->view->product   = $this->loadModel('product')->getById($productID);;
+
+        $this->display();
     }
 
     /**
diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php
index a9693db645..e4f6bdda05 100644
--- a/module/productplan/view/batchedit.html.php
+++ b/module/productplan/view/batchedit.html.php
@@ -22,11 +22,10 @@
       <thead>
         <tr class='text-center'>
           <th class='c-id'><?php echo $lang->productplan->id?></th>
-          <?php if($branchProduct):?>
+          <?php if($product->type != 'normal'):?>
           <th class='c-branch'><?php echo $lang->productplan->branch;?></th>
           <?php endif;?>
           <th><?php echo $lang->productplan->title?></th>
-          <th><?php echo $lang->productplan->desc?></th>
           <th class='c-status'><?php echo $lang->productplan->status?></th>
           <th class='c-full-date'><?php echo $lang->productplan->begin?></th>
           <th class='c-full-date'><?php echo $lang->productplan->end?></th>
@@ -42,14 +41,13 @@
         <?php $isChecked   = ($plan->begin == '2030-01-01' || $plan->end == '2030-01-01') ? 'checked="checked"' : '';?>
         <tr>
           <td class='text-center'><?php echo $plan->id . html::hidden("id[$plan->id]", $plan->id);?></td>
-          <?php if($branchProduct):?>
+          <?php if($product->type != 'normal'):?>
           <td class='text-left'>
             <?php $disabled = $plan->parent == '-1' ? "disabled='disabled'" : '';?>
             <?php echo html::select("branch[$plan->id]", $plan->parent == '-1' ? '' : $branchTagOption, $plan->branch, "onchange='getConflictStories($plan->id, this.value); 'class='form-control chosen' $disabled");?>
           </td>
           <?php endif;?>
           <td title='<?php echo $plan->title?>'><?php echo html::input("title[$plan->id]", $plan->title, "class='form-control' required")?></td>
-          <td><?php echo html::textarea("desc[$plan->id]", $plan->desc, "class='form-control' rows='1'")?></td>
           <?php if($plan->parent != -1):?>
           <td><?php echo html::select("status[$plan->id]", array_slice($lang->productplan->statusList,($plan->status == 'wait' ? 0 : 1)), $plan->status, "class='form-control chosen' onchange='setPlanStatus($plan->id, this.value)'");?></td>
           <?php else:?>