diff --git a/module/product/control.php b/module/product/control.php
index 2a7b42f9a9..b5ee228654 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -145,8 +145,7 @@ class product extends control
         setcookie('productStoryOrder', $orderBy, $this->config->cookieLife, $this->config->webRoot);
 
         /* Append id for secend sort. */
-        /* set rule to number when order by plan. */
-        $sort = $this->loadModel('common')->appendOrder(strpos($orderBy, 'plan') !== false ? str_replace('plan', '`plan`+0', $orderBy) : $orderBy);
+        $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index fda792d52f..b23058c54e 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -33,5 +33,5 @@ function computeEndDate(delta)
     }
 
     endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd');
-    $('#end').val(endDate);
+    $('#end').val(endDate).datetimepicker('update')
 }
diff --git a/module/project/js/common.js b/module/project/js/common.js
index 3c382bfeb7..459d94f6c8 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -111,7 +111,7 @@ function computeEndDate(delta)
     }
 
     endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd');
-    $('#end').val(endDate);
+    $('#end').val(endDate).datetimepicker('update');
     computeWorkDays();
 }