diff --git a/module/productplan/js/batchedit.js b/module/productplan/js/batchedit.js
index 85178abb35..8ecef05f13 100644
--- a/module/productplan/js/batchedit.js
+++ b/module/productplan/js/batchedit.js
@@ -42,6 +42,11 @@ function setPlanStatus(planID, status)
         $("input[name='end[" + planID + "]']").closest('td').addClass('required');
         $("input[name='begin" + planID + "']").removeAttr('disabled');
         $("input[name='end" + planID + "']").removeAttr('disabled');
+        $("input[name='begin[" + planID + "]']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+        $("input[name='end[" + planID + "]']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+        $("input[name='begin" + planID + "']").removeClass('form-input-show').addClass('form-input-hidden');
+        $("input[name='end" + planID + "']").removeClass('form-input-show').addClass('form-input-hidden');
+        $('.form-date').datetimepicker('update');
     }
     else
     {
@@ -50,6 +55,10 @@ function setPlanStatus(planID, status)
         $("input[name='end[" + planID + "]']").closest('td').removeClass('required');
         $("input[name='begin" + planID + "']").attr('disabled', 'disabled').val('');
         $("input[name='end" + planID + "']").attr('disabled', 'disabled').val('');
+        $("input[name='begin[" + planID + "]']").val('2030-01-01').removeClass('form-input-show').addClass('form-input-hidden');
+        $("input[name='end[" + planID + "]']").val('2030-01-01').removeClass('form-input-show').addClass('form-input-hidden');
+        $("input[name='begin" + planID + "']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+        $("input[name='end" + planID + "']").val('').removeClass('form-input-hidden').addClass('form-input-show');
     }
 }
 
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 31960e9330..473a6f08c1 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -393,14 +393,18 @@ class productplanModel extends model
             ->remove('delta,uid,future')
             ->get();
 
-        if($plan->parentBegin != '2030-01-01')
+        if($plan->parent > 0)
         {
-            if($plan->begin < $plan->parentBegin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $plan->parentBegin);
-        }
-        if($plan->parentEnd != '2030-01-01')
-        {
-            if($plan->end !=='2030-01-01' and $plan->end > $plan->parentEnd) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $plan->parentEnd);
+            if($plan->parentBegin != '2030-01-01')
+            {
+                if($plan->begin < $plan->parentBegin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $plan->parentBegin);
+            }
+            if($plan->parentEnd != '2030-01-01')
+            {
+                if($plan->end !=='2030-01-01' and $plan->end > $plan->parentEnd) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $plan->parentEnd);
+            }
         }
+
         unset($plan->parentBegin);
         unset($plan->parentEnd);