diff --git a/module/programplan/model.php b/module/programplan/model.php
index da8c42342c..18cc614af0 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -876,6 +876,7 @@ class programplanModel extends model
             {
                 unset($data->id);
                 $data->status        = 'wait';
+                $data->division      = $project->division;
                 $data->version       = 1;
                 $data->parentVersion = $data->parent == 0 ? 0 : $this->dao->findByID($data->parent)->from(TABLE_PROJECT)->fetch('version');
                 $data->team          = substr($data->name,0, 30);
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index c51d365559..7e49de2f19 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -178,8 +178,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = 'Projects Ownedbyme';
 $lang->project->typeList['other'] = 'Other Projects';
 
-$lang->project->divisionList['0'] = 'Disable';
 $lang->project->divisionList['1'] = 'Enable';
+$lang->project->divisionList['0'] = 'Disable';
 
 $lang->project->waitProjects    = 'Waiting Projects';
 $lang->project->doingProjects   = 'Ongoing Projects';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index ebc9540e26..c470f21c31 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -178,8 +178,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = 'Projects Ownedbyme';
 $lang->project->typeList['other'] = 'Other Projects';
 
-$lang->project->divisionList['0'] = 'Disable';
 $lang->project->divisionList['1'] = 'Enable';
+$lang->project->divisionList['0'] = 'Disable';
 
 $lang->project->waitProjects    = 'Waiting Projects';
 $lang->project->doingProjects   = 'Ongoing Projects';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 3e86cd7cc7..2edf7a3bee 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -178,8 +178,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = 'Projects Ownedbyme';
 $lang->project->typeList['other'] = 'Other Projects';
 
-$lang->project->divisionList['0'] = 'Disable';
 $lang->project->divisionList['1'] = 'Enable';
+$lang->project->divisionList['0'] = 'Disable';
 
 $lang->project->waitProjects    = 'Waiting Projects';
 $lang->project->doingProjects   = 'Ongoing Projects';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 8d691dc9f8..cf47ffc2b7 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -178,8 +178,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = '我负责的项目';
 $lang->project->typeList['other'] = '其他项目';
 
-$lang->project->divisionList['0'] = '关闭';
 $lang->project->divisionList['1'] = '开启';
+$lang->project->divisionList['0'] = '关闭';
 
 $lang->project->waitProjects    = '未开始的项目';
 $lang->project->doingProjects   = '进行中的项目';
diff --git a/module/project/model.php b/module/project/model.php
index afc399e1dd..8447e1359e 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2172,7 +2172,11 @@ class projectModel extends model
             $executions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq((int)$projectID)->fetchPairs('id');
             $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->in($executions)->andWhere('product')->notin($products)->exec();
 
-            if(!empty($_POST['division'])) $this->dao->update(TABLE_PROJECT)->set('division')->eq('1')->where('id')->eq((int)$projectID)->exec();
+            if(!empty($_POST['division']))
+            {
+                $this->dao->update(TABLE_PROJECT)->set('division')->eq('1')->where('id')->eq((int)$projectID)->exec();
+                $this->dao->update(TABLE_EXECUTION)->set('division')->eq('1')->where('project')->eq((int)$projectID)->exec();
+            }
         }
 
         $oldProductKeys = array_keys($oldProjectProducts);
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 8059e09759..9304ecc2cd 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -75,19 +75,36 @@
     </form>
   </div>
 </div>
+
+
 <?php if(!$project->division and count($linkedProducts) == 1):?>
 <?php js::set('noticeDivsion', $lang->project->noticeDivsion);?>
+<?php js::set('divisionList', $lang->project->divisionList);?>
 <script>
 $('#submit').click(function()
 {
-    var checkedProducts = $("input[name*='products']:checked").length;
-    if(checkedProducts > 1)
-    {
-        if(confirm(noticeDivsion))
-        {
-            $('div.form-actions').append("<input type='hidden' value='1' name='division'>");
-        }
-    }
+    bootbox.confirm(
+      {
+          'message' : noticeDivsion,
+          'buttons':{
+            confirm:{
+                label: divisionList['1'],
+                className: 'btn'
+            },
+            cancel:{
+                label: divisionList['0'],
+                className: 'btn-primary'
+            },
+          },
+          callback: function(result)
+          {
+              if(result) $('div.form-actions').append("<input type='hidden' value='1' name='division'>");
+              $('form').submit();
+          }
+      }
+    );
+
+    return false;
 })
 </script>
 <?php endif;?>