Merge branch 'sprint/master_tanghucheng_project' into 'master'

* Fix project execution privilege.

See merge request easycorp/zentaopms!777

module/execution/view/all.html.php

@@ -51,9 +51,13 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $from == 'execution' ? $lang->execution->noExecutions : $lang->execution->noExecution;?></span>
+      <?php if(common::hasPriv('programplan', 'create') and $isStage):?>
+      <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-info'");?>
+      <?php else: ?>
       <?php if(common::hasPriv('execution', 'create')):?>
       <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='$from'");?>
       <?php endif;?>
+      <?php endif;?>
     </p>
   </div>
   <?php else:?>

module/group/lang/resource.php

@@ -235,13 +235,11 @@ if($config->systemMode == 'new')
 
     /* Program plan. */
     $lang->resource->programplan = new stdclass();
-    $lang->resource->programplan->browse = 'browse';
     $lang->resource->programplan->create = 'create';
     $lang->resource->programplan->edit   = 'edit';
 
-    $lang->programplan->methodOrder[5]  = 'browse';
-    $lang->programplan->methodOrder[10] = 'create';
-    $lang->programplan->methodOrder[15] = 'edit';
+    $lang->programplan->methodOrder[0] = 'create';
+    $lang->programplan->methodOrder[5] = 'edit';
 
     /* Project. */
     $lang->resource->project = new stdclass();

module/programplan/lang/zh-cn.php

@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->programplan->common        = '项目计划';
+$lang->programplan->common        = '项目阶段';
 $lang->programplan->browse        = '浏览阶段计划';
 $lang->programplan->gantt         = '甘特图';
 $lang->programplan->list          = '阶段列表';