diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index d75b37194f..a7be6c79d5 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -27,10 +27,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field) $hasFields[$field] = '';
+    if($field) $visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' class='form-condensed' method='post' target='hiddenwin'>
@@ -38,17 +38,17 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr>
         <th class='w-50px'>  <?php echo $lang->idAB;?></th> 
-        <th class='w-120px<?php echo zget($hasFields, 'module', ' hidden')?>'> <?php echo $lang->bug->module;?></th>
-        <th class='w-130px<?php echo zget($hasFields, 'project', ' hidden')?>'><?php echo $lang->bug->project;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'module', ' hidden')?>'> <?php echo $lang->bug->module;?></th>
+        <th class='w-130px<?php echo zget($visibleFields, 'project', ' hidden')?>'><?php echo $lang->bug->project;?></th>
         <th><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
         <th><?php echo $lang->bug->title;?> <span class='required'></span></th>
-        <th class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>          <?php echo $lang->bug->steps;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'type', ' hidden')?>'>   <?php echo $lang->typeAB;?></th>
-        <th class='w-80px<?php echo zget($hasFields, 'pri', ' hidden')?>'>     <?php echo $lang->bug->pri;?></th>
-        <th class='w-80px<?php echo zget($hasFields, 'severity', ' hidden')?>'><?php echo $lang->bug->severity;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'os', ' hidden')?>'>     <?php echo $lang->bug->os;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'browser', ' hidden')?>'><?php echo $lang->bug->browser;?></th>
-        <th class='<?php echo zget($hasFields, 'keywords', ' hidden')?>'>      <?php echo $lang->bug->keywords;?></th>
+        <th class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>          <?php echo $lang->bug->steps;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden')?>'>   <?php echo $lang->typeAB;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>     <?php echo $lang->bug->pri;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden')?>'><?php echo $lang->bug->severity;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'os', ' hidden')?>'>     <?php echo $lang->bug->os;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden')?>'><?php echo $lang->bug->browser;?></th>
+        <th class='<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>      <?php echo $lang->bug->keywords;?></th>
       </tr>
     </thead>
     <tbody>
@@ -78,17 +78,17 @@ foreach(explode(',', $showFields) as $field)
       ?>
       <tr class='text-center'>
         <td><?php echo $i+1;?></td>
-        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
         <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
         <td><?php echo html::input("title[$i]", $bugTitle, 'class=form-control') . html::hidden("uploadImage[$i]", $fileName);?></td>
-        <td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
-        <td class='<?php echo zget($hasFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
+        <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
+        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
       </tr>
       <?php $i++;?>
       <?php endforeach;?>
@@ -105,22 +105,22 @@ foreach(explode(',', $showFields) as $field)
       ?>
       <tr class='text-center'>
         <td><?php echo $i+1;?></td>
-        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
         <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
         <td><?php echo html::input("title[$i]", '', 'class=form-control');?></td>
-        <td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
-        <td class='<?php echo zget($hasFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
-        <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
+        <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
+        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
       </tr>
       <?php endfor;?>
     </tbody>
     <tfoot>
-      <tr><td colspan='<?php echo count($hasFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+      <tr><td colspan='<?php echo count($visibleFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
     </tfoot>
   </table>
 </form>
@@ -128,17 +128,17 @@ foreach(explode(',', $showFields) as $field)
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
-      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
       <td class='text-left' style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
       <td><?php echo html::input("titles[%s]", '', 'class=form-control');?></td>
-      <td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($hasFields, 'type', 'hidden')?>'>    <?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', 'class=form-control');?></td>
+      <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>    <?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', 'class=form-control');?></td>
     </tr>
   </tbody>
 </table>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index fbd81e8ae2..f5ffab4336 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -22,30 +22,30 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
-$columns = count($hasFields) + 2;
+$columns = count($visibleFields) + 2;
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "productID=$productID");?>">
   <table class='table table-form table-fixed with-border'>
     <thead>
       <tr>
         <th class='w-50px'><?php echo $lang->idAB;?></th>
-        <th class='w-110px<?php echo zget($hasFields, 'type', ' hidden')?>'><?php echo $lang->bug->type;?></th>
-        <th class='w-70px<?php echo zget($hasFields, 'severity', ' hidden')?>'><?php echo $lang->bug->severityAB;?></th>
-        <th class='w-70px<?php echo zget($hasFields, 'pri', ' hidden')?>'><?php echo $lang->bug->pri;?></th>
-        <th <?php if(count($hasFields) >= 10) echo "class='w-150px'"?>><?php echo $lang->bug->title;?> <span class='required'></span></th>
-        <th class='w-150px<?php echo zget($hasFields, 'productplan', ' hidden')?>'><?php echo $lang->bug->productplan;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'assignedTo', ' hidden')?>'><?php echo $lang->bug->assignedTo;?></th>
-        <th class='w-90px<?php echo zget($hasFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'os', ' hidden')?>'><?php echo $lang->bug->os;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'browser', ' hidden')?>'><?php echo $lang->bug->browser;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'keywords', ' hidden')?>'><?php echo $lang->bug->keywords;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'resolvedBy', ' hidden')?>'><?php echo $lang->bug->resolvedByAB;?></th>
-        <th class='w-180px<?php echo zget($hasFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
+        <th class='w-110px<?php echo zget($visibleFields, 'type', ' hidden')?>'><?php echo $lang->bug->type;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'severity', ' hidden')?>'><?php echo $lang->bug->severityAB;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->bug->pri;?></th>
+        <th <?php if(count($visibleFields) >= 10) echo "class='w-150px'"?>><?php echo $lang->bug->title;?> <span class='required'></span></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'productplan', ' hidden')?>'><?php echo $lang->bug->productplan;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo $lang->bug->assignedTo;?></th>
+        <th class='w-90px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'os', ' hidden')?>'><?php echo $lang->bug->os;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden')?>'><?php echo $lang->bug->browser;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->bug->keywords;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>'><?php echo $lang->bug->resolvedByAB;?></th>
+        <th class='w-180px<?php echo zget($visibleFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
       </tr>
     </thead>
     <tbody>
@@ -66,18 +66,18 @@ $columns = count($hasFields) + 2;
       ?>
       <tr class='text-center'>
         <td><?php echo $bugID . html::hidden("bugIDList[$bugID]", $bugID);?></td>
-        <td <?php echo zget($hasFields, 'type', "class='hidden'")?>><?php echo html::select("types[$bugID]",      $typeList, $bugs[$bugID]->type, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'severity', "class='hidden'")?>><?php echo html::select("severities[$bugID]", $severityList, $bugs[$bugID]->severity, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$bugID]",       $priList, $bugs[$bugID]->pri, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'type', "class='hidden'")?>><?php echo html::select("types[$bugID]",      $typeList, $bugs[$bugID]->type, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'severity', "class='hidden'")?>><?php echo html::select("severities[$bugID]", $severityList, $bugs[$bugID]->severity, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$bugID]",       $priList, $bugs[$bugID]->pri, 'class=form-control');?></td>
         <td title='<?php echo $bugs[$bugID]->title?>'> <?php echo html::input("titles[$bugID]", $bugs[$bugID]->title, 'class=form-control');?></td>
-        <td class='text-left<?php echo zget($hasFields, 'productplan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plans[$bugID]", $plans, $bugs[$bugID]->plan, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $users, $bugs[$bugID]->assignedTo, "class='form-control chosen'");?></td>
-        <td <?php echo zget($hasFields, 'status', "class='hidden'")?>><?php echo html::select("statuses[$bugID]", $lang->bug->statusList, $bugs[$bugID]->status, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'os', "class='hidden'")?>><?php echo html::select("os[$bugID]", $lang->bug->osList, $bugs[$bugID]->os, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'browser', "class='hidden'")?>><?php echo html::select("browsers[$bugID]", $lang->bug->browserList, $bugs[$bugID]->browser, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$bugID]", $bugs[$bugID]->keywords, 'class=form-control');?></td>
-        <td class='text-left<?php echo zget($hasFields, 'resolvedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("resolvedBys[$bugID]", $users, $bugs[$bugID]->resolvedBy, "class='form-control chosen'");?></td>
-        <td <?php echo zget($hasFields, 'resolution', "class='hidden'")?>>
+        <td class='text-left<?php echo zget($visibleFields, 'productplan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plans[$bugID]", $plans, $bugs[$bugID]->plan, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $users, $bugs[$bugID]->assignedTo, "class='form-control chosen'");?></td>
+        <td <?php echo zget($visibleFields, 'status', "class='hidden'")?>><?php echo html::select("statuses[$bugID]", $lang->bug->statusList, $bugs[$bugID]->status, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'os', "class='hidden'")?>><?php echo html::select("os[$bugID]", $lang->bug->osList, $bugs[$bugID]->os, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'browser', "class='hidden'")?>><?php echo html::select("browsers[$bugID]", $lang->bug->browserList, $bugs[$bugID]->browser, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$bugID]", $bugs[$bugID]->keywords, 'class=form-control');?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("resolvedBys[$bugID]", $users, $bugs[$bugID]->resolvedBy, "class='form-control chosen'");?></td>
+        <td <?php echo zget($visibleFields, 'resolution', "class='hidden'")?>>
           <table class='w-p100'>
             <tr>
               <td class='pd-0'>
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 820d51f7e7..b84ce126de 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -20,10 +20,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo inLink('batchEdit');?>'>
@@ -33,12 +33,12 @@ foreach(explode(',', $showFields) as $field)
         <th class='w-id'>   <?php echo $lang->idAB;?></th>
         <th><?php echo $lang->product->name;?> <span class='required'></span></th>
         <th class='w-150px'><?php echo $lang->product->code;?> <span class='required'></span></th>
-        <th class='w-150px<?php echo zget($hasFields, 'PO',     ' hidden')?>'><?php echo $lang->product->PO;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'QD',     ' hidden')?>'><?php echo $lang->product->QD;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'RD',     ' hidden')?>'><?php echo $lang->product->RD;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'type',   ' hidden')?>'><?php echo $lang->product->type;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'status', ' hidden')?>'><?php echo $lang->product->status;?></th>
-        <th class='w-200px<?php echo zget($hasFields, 'desc',   ' hidden')?>'><?php echo $lang->product->desc;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'PO',     ' hidden')?>'><?php echo $lang->product->PO;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'QD',     ' hidden')?>'><?php echo $lang->product->QD;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'RD',     ' hidden')?>'><?php echo $lang->product->RD;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'type',   ' hidden')?>'><?php echo $lang->product->type;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->product->status;?></th>
+        <th class='w-200px<?php echo zget($visibleFields, 'desc',   ' hidden')?>'><?php echo $lang->product->desc;?></th>
         <th class='w-80px'><?php echo $lang->product->order;?></th>
       </tr>
     </thead>
@@ -47,16 +47,16 @@ foreach(explode(',', $showFields) as $field)
       <td><?php echo sprintf('%03d', $productID) . html::hidden("productIDList[$productID]", $productID);?></td>
       <td title='<?php echo $products[$productID]->name?>'><?php echo html::input("names[$productID]", $products[$productID]->name, "class='form-control'");?></td>
       <td><?php echo html::input("codes[$productID]", $products[$productID]->code, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$productID]",  $poUsers, $products[$productID]->PO, "class='form-control chosen'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$productID]",  $qdUsers, $products[$productID]->QD, "class='form-control chosen'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$productID]",  $rdUsers, $products[$productID]->RD, "class='form-control chosen'");?></td>
-      <td class='<?php echo zget($hasFields, 'type',   'hidden')?>'><?php echo html::select("types[$productID]",    $lang->product->typeList,   $products[$productID]->type,   "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$productID]", $lang->product->statusList, $products[$productID]->status, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'desc',   'hidden')?>'><?php echo html::textarea("descs[$productID]", htmlspecialchars($products[$productID]->desc), "rows='1' class='form-control autosize'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$productID]",  $poUsers, $products[$productID]->PO, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$productID]",  $qdUsers, $products[$productID]->QD, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$productID]",  $rdUsers, $products[$productID]->RD, "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'type',   'hidden')?>'><?php echo html::select("types[$productID]",    $lang->product->typeList,   $products[$productID]->type,   "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$productID]", $lang->product->statusList, $products[$productID]->status, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'desc',   'hidden')?>'><?php echo html::textarea("descs[$productID]", htmlspecialchars($products[$productID]->desc), "rows='1' class='form-control autosize'");?></td>
       <td><?php echo html::input("orders[$productID]", $products[$productID]->order, "class='form-control'");?></td>
     </tr>
     <?php endforeach;?>
-    <tr><td colspan='<?php echo count($hasFields) + 4?>' class='text-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='<?php echo count($visibleFields) + 4?>' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=product&section=custom&key=batchEditFields')?>
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index ada21ae14c..696b489ef8 100755
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -21,12 +21,12 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
-$minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
+$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo inLink('batchEdit');?>'>
 <table class='table table-form table-fixed'>
@@ -35,17 +35,17 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
       <th class='w-50px'><?php echo $lang->idAB;?></th>
       <th class='<?php echo $minWidth?>'><?php echo $lang->project->name;?> <span class='required'></span></th>
       <th class='w-150px'><?php echo $lang->project->code;?> <span class='required'></span></th>
-      <th class='w-150px<?php echo zget($hasFields, 'PM',     ' hidden')?>'><?php echo $lang->project->PM;?></th>
-      <th class='w-150px<?php echo zget($hasFields, 'PO',     ' hidden')?>'><?php echo $lang->project->PO;?></th>
-      <th class='w-150px<?php echo zget($hasFields, 'QD',     ' hidden')?>'><?php echo $lang->project->QD;?></th>
-      <th class='w-150px<?php echo zget($hasFields, 'RD',     ' hidden')?>'><?php echo $lang->project->RD;?></th>
-      <th class='w-100px<?php echo zget($hasFields, 'type',   ' hidden')?>'><?php echo $lang->project->type;?></th>
-      <th class='w-100px<?php echo zget($hasFields, 'status', ' hidden')?>'><?php echo $lang->project->status;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'PM',     ' hidden')?>'><?php echo $lang->project->PM;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'PO',     ' hidden')?>'><?php echo $lang->project->PO;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'QD',     ' hidden')?>'><?php echo $lang->project->QD;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'RD',     ' hidden')?>'><?php echo $lang->project->RD;?></th>
+      <th class='w-100px<?php echo zget($visibleFields, 'type',   ' hidden')?>'><?php echo $lang->project->type;?></th>
+      <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->project->status;?></th>
       <th class='w-110px'><?php echo $lang->project->begin;?> <span class='required'></span></th>
       <th class='w-110px'><?php echo $lang->project->end;?> <span class='required'></span></th>
-      <th class='w-150px<?php echo zget($hasFields, 'desc', ' hidden')?>'>    <?php echo $lang->project->desc;?></th>
-      <th class='w-150px<?php echo zget($hasFields, 'teamname', ' hidden')?>'><?php echo $lang->project->teamname;?></th>
-      <th class='w-150px<?php echo zget($hasFields, 'days',     ' hidden')?>'><?php echo $lang->project->days;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden')?>'>    <?php echo $lang->project->desc;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'teamname', ' hidden')?>'><?php echo $lang->project->teamname;?></th>
+      <th class='w-150px<?php echo zget($visibleFields, 'days',     ' hidden')?>'><?php echo $lang->project->days;?></th>
       <th class='w-80px'><?php echo $lang->project->order;?></th>
     </tr>
   </thead>
@@ -54,17 +54,17 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
     <td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIDList[$projectID]", $projectID);?></td>
     <td title='<?php echo $projects[$projectID]->name?>'><?php echo html::input("names[$projectID]", $projects[$projectID]->name, "class='form-control'");?></td>
     <td><?php echo html::input("codes[$projectID]",     $projects[$projectID]->code, "class='form-control'");?></td>
-    <td class='text-left<?php echo zget($hasFields, 'PM', ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$projectID]", $pmUsers, $projects[$projectID]->PM, "class='form-control chosen'");?></td>
-    <td class='text-left<?php echo zget($hasFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$projectID]", $poUsers, $projects[$projectID]->PO, "class='form-control chosen'");?></td>
-    <td class='text-left<?php echo zget($hasFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$projectID]", $qdUsers, $projects[$projectID]->QD, "class='form-control chosen'");?></td>
-    <td class='text-left<?php echo zget($hasFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$projectID]", $rdUsers, $projects[$projectID]->RD, "class='form-control chosen'");?></td>
-    <td class='<?php echo zget($hasFields, 'type',   'hidden')?>'><?php echo html::select("types[$projectID]",    $lang->project->typeList,   $projects[$projectID]->type,   'class=form-control');?></td>
-    <td class='<?php echo zget($hasFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$projectID]", $lang->project->statusList, $projects[$projectID]->status, 'class=form-control');?></td>
+    <td class='text-left<?php echo zget($visibleFields, 'PM', ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$projectID]", $pmUsers, $projects[$projectID]->PM, "class='form-control chosen'");?></td>
+    <td class='text-left<?php echo zget($visibleFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$projectID]", $poUsers, $projects[$projectID]->PO, "class='form-control chosen'");?></td>
+    <td class='text-left<?php echo zget($visibleFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$projectID]", $qdUsers, $projects[$projectID]->QD, "class='form-control chosen'");?></td>
+    <td class='text-left<?php echo zget($visibleFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$projectID]", $rdUsers, $projects[$projectID]->RD, "class='form-control chosen'");?></td>
+    <td class='<?php echo zget($visibleFields, 'type',   'hidden')?>'><?php echo html::select("types[$projectID]",    $lang->project->typeList,   $projects[$projectID]->type,   'class=form-control');?></td>
+    <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$projectID]", $lang->project->statusList, $projects[$projectID]->status, 'class=form-control');?></td>
     <td><?php echo html::input("begins[$projectID]", $projects[$projectID]->begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?></td>
     <td><?php echo html::input("ends[$projectID]",   $projects[$projectID]->end,   "class='form-control form-date' onchange='computeWorkDays(this.id)'");?></td>
-    <td class='<?php echo zget($hasFields, 'desc', 'hidden')?>'>    <?php echo html::textarea("descs[$projectID]",  htmlspecialchars($projects[$projectID]->desc),  "rows='1' class='form-control autosize'");?></td>
-    <td class='<?php echo zget($hasFields, 'teamname', 'hidden')?>'><?php echo html::input("teams[$projectID]",  $projects[$projectID]->team,  "class='form-control'");?></td>
-    <td class='<?php echo zget($hasFields, 'days',     'hidden')?>'>
+    <td class='<?php echo zget($visibleFields, 'desc', 'hidden')?>'>    <?php echo html::textarea("descs[$projectID]",  htmlspecialchars($projects[$projectID]->desc),  "rows='1' class='form-control autosize'");?></td>
+    <td class='<?php echo zget($visibleFields, 'teamname', 'hidden')?>'><?php echo html::input("teams[$projectID]",  $projects[$projectID]->team,  "class='form-control'");?></td>
+    <td class='<?php echo zget($visibleFields, 'days',     'hidden')?>'>
       <div class='input-group'>
         <?php echo html::input("dayses[$projectID]",    $projects[$projectID]->days, "class='form-control' autocomplete='off'");?>
         <span class='input-group-addon'><?php echo $lang->project->day;?></span>
@@ -73,7 +73,7 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
     <td><?php echo html::input("orders[$projectID]", $projects[$projectID]->order, "class='form-control' autocomplete='off'")?></td>
   </tr>
   <?php endforeach;?>
-  <tr><td colspan='<?php echo count($hasFields) + 6?>' class='text-center'><?php echo html::submitButton();?></td></tr>
+  <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center'><?php echo html::submitButton();?></td></tr>
 </table>
 </form>
 <?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=project&section=custom&key=batchEditFields')?>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 08884d6da1..d955c01809 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -27,10 +27,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
@@ -38,16 +38,16 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr class='text-center'>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
-        <th class='w-p15<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?></th>
-        <th class='w-p15<?php echo zget($hasFields, 'plan', ' hidden')?>'><?php echo $lang->story->plan;?></th>
+        <th class='w-p15<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?></th>
+        <th class='w-p15<?php echo zget($visibleFields, 'plan', ' hidden')?>'><?php echo $lang->story->plan;?></th>
         <th><?php echo $lang->story->title;?> <span class='required'></span></th>
-        <th class='w-80px<?php echo zget($hasFields, 'source', ' hidden')?>'><?php echo $lang->story->source;?></th>
-        <th class='w-p15<?php echo zget($hasFields, 'spec', ' hidden')?>'><?php echo $lang->story->spec;?></th>
-        <th class='w-p15<?php echo zget($hasFields, 'verify', ' hidden')?>'><?php echo $lang->story->verify;?></th>
-        <th class='w-80px<?php echo zget($hasFields, 'pri', ' hidden')?>'><?php echo $lang->story->pri;?></th>
-        <th class='w-80px<?php echo zget($hasFields, 'estimate', ' hidden')?>'><?php echo $lang->story->estimate;?></th>
-        <th class='w-70px<?php echo zget($hasFields, 'review', ' hidden')?>'><?php echo $lang->story->review;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'source', ' hidden')?>'><?php echo $lang->story->source;?></th>
+        <th class='w-p15<?php echo zget($visibleFields, 'spec', ' hidden')?>'><?php echo $lang->story->spec;?></th>
+        <th class='w-p15<?php echo zget($visibleFields, 'verify', ' hidden')?>'><?php echo $lang->story->verify;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->story->pri;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'><?php echo $lang->story->estimate;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'review', ' hidden')?>'><?php echo $lang->story->review;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
       </tr>
     </thead>
     <?php $i = 0; ?>
@@ -59,16 +59,16 @@ foreach(explode(',', $showFields) as $field)
     <?php $source   = $i == 0 ? '' : 'ditto';?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
       <td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'") . html::hidden("uploadImage[$i]", $fileName);?></td>
-      <td class='text-left<?php echo zget($hasFields, 'source', ' hidden')?>'><?php echo html::select("source[$i]", $sourceList, $source, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'spec', 'hidden')?>'><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($hasFields, 'verify', 'hidden')?>'><?php echo html::textarea("verify[$i]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select("pri[$i]", $priList, $pri, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'estimate', 'hidden')?>'><?php echo html::input("estimate[$i]", $estimate, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($hasFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->story->reviewList, $needReview, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'source', ' hidden')?>'><?php echo html::select("source[$i]", $sourceList, $source, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'spec', 'hidden')?>'><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control autosize'");?></td>
+      <td class='<?php echo zget($visibleFields, 'verify', 'hidden')?>'><?php echo html::textarea("verify[$i]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select("pri[$i]", $priList, $pri, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'estimate', 'hidden')?>'><?php echo html::input("estimate[$i]", $estimate, "class='form-control' autocomplete='off'");?></td>
+      <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->story->reviewList, $needReview, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
     </tr>
     <?php $i++;?>
     <?php endforeach;?>
@@ -82,35 +82,35 @@ foreach(explode(',', $showFields) as $field)
     <?php $source   = $i - $nextStart == 0 ? '' : 'ditto';?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
       <td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'source', ' hidden')?>'><?php echo html::select("source[$i]", $sourceList, $source, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'spec', 'hidden')?>'><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($hasFields, 'verify', 'hidden')?>'><?php echo html::textarea("verify[$i]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select("pri[$i]", $priList, $pri, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'estimate', 'hidden')?>'><?php echo html::input("estimate[$i]", $estimate, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($hasFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->story->reviewList, 0, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'source', ' hidden')?>'><?php echo html::select("source[$i]", $sourceList, $source, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'spec', 'hidden')?>'><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control autosize'");?></td>
+      <td class='<?php echo zget($visibleFields, 'verify', 'hidden')?>'><?php echo html::textarea("verify[$i]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select("pri[$i]", $priList, $pri, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'estimate', 'hidden')?>'><?php echo html::input("estimate[$i]", $estimate, "class='form-control' autocomplete='off'");?></td>
+      <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->story->reviewList, 0, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
     </tr>  
     <?php endfor;?>
-    <tr><td colspan='<?php echo count($hasFields) + 2?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    <tr><td colspan='<?php echo count($visibleFields) + 2?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
 <table class='hide' id='trTemp'>
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
-      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[%s]", $plans, $planID, "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[%s]", $plans, $planID, "class='form-control'");?></td>
       <td><?php echo html::input("title[%s]", $storyTitle, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'source', ' hidden')?>'><?php echo html::select("source[%s]", $sourceList, $source, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'spec', ' hidden')?>'><?php echo html::textarea("spec[%s]", $spec, "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($hasFields, 'verify', ' hidden')?>'><?php echo html::textarea("verify[%s]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select("pri[%s]", $priList, $pri, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'estimate', ' hidden')?>'><?php echo html::input("estimate[%s]", $estimate, "class='form-control autocomplete='off''");?></td>
-      <td class='<?php echo zget($hasFields, 'review', ' hidden')?>'><?php echo html::select("needReview[%s]", $lang->story->reviewList, 0, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'keywords', ' hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control autocomplete='off''");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'source', ' hidden')?>'><?php echo html::select("source[%s]", $sourceList, $source, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'spec', ' hidden')?>'><?php echo html::textarea("spec[%s]", $spec, "rows='1' class='form-control autosize'");?></td>
+      <td class='<?php echo zget($visibleFields, 'verify', ' hidden')?>'><?php echo html::textarea("verify[%s]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'pri', ' hidden')?>' style='overflow:visible'><?php echo html::select("pri[%s]", $priList, $pri, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'estimate', ' hidden')?>'><?php echo html::input("estimate[%s]", $estimate, "class='form-control autocomplete='off''");?></td>
+      <td class='<?php echo zget($visibleFields, 'review', ' hidden')?>'><?php echo html::select("needReview[%s]", $lang->story->reviewList, 0, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control autocomplete='off''");?></td>
     </tr>
   </tbody>
 </table>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 6d72963fb7..696ec05a1a 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -25,10 +25,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "from=storyBatchEdit")?>">
@@ -36,18 +36,18 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr class='text-center'>
         <th class='w-40px'> <?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'plan', ' hidden')?>'><?php echo $lang->story->planAB;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->story->module;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'plan', ' hidden')?>'><?php echo $lang->story->planAB;?></th>
         <th> <?php echo $lang->story->title;?> <span class='required'></span></th>
-        <th class='w-50px<?php echo zget($hasFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
-        <th class='w-70px<?php echo zget($hasFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
+        <th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
         <th class='w-80px'> <?php echo $lang->story->status;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'stage', ' hidden')?>'> <?php echo $lang->story->stageAB;?></th>
-        <th class='w-130px<?php echo zget($hasFields, 'closedBy', ' hidden')?>'><?php echo $lang->story->closedBy;?></th>
-        <th<?php echo zget($hasFields, 'closedReason', "class='hidden'")?>><?php echo $lang->story->closedReason;?></th>
-        <th class='w-80px<?php echo zget($hasFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->story->stageAB;?></th>
+        <th class='w-130px<?php echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo $lang->story->closedBy;?></th>
+        <th<?php echo zget($visibleFields, 'closedReason', "class='hidden'")?>><?php echo $lang->story->closedReason;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
       </tr>
     </thead>
     <tbody>
@@ -66,19 +66,19 @@ foreach(explode(',', $showFields) as $field)
       ?>
       <tr class='text-center'>
         <td><?php echo $storyID . html::hidden("storyIDList[$storyID]", $storyID);?></td>
-        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'>    <?php echo html::select("modules[$storyID]", $modules, $stories[$storyID]->module, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'plan', ' hidden')?>' style='overflow:visible'>    <?php echo html::select("plans[$storyID]",   $productPlans, $stories[$storyID]->plan, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'>    <?php echo html::select("modules[$storyID]", $modules, $stories[$storyID]->module, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'>    <?php echo html::select("plans[$storyID]",   $productPlans, $stories[$storyID]->plan, "class='form-control chosen'");?></td>
         <td title='<?php echo $stories[$storyID]->title?>'><?php echo html::input("titles[$storyID]",   $stories[$storyID]->title, 'class=form-control'); ?></td>
-        <td <?php echo zget($hasFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$storyID]", $stories[$storyID]->estimate, "class='form-control' autocomplete='off'"); ?></td>
-        <td <?php echo zget($hasFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$storyID]",     $priList, $stories[$storyID]->pri, 'class=form-control');?></td>
-        <td class='text-left<?php echo zget($hasFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTo[$storyID]",     $users, $stories[$storyID]->assignedTo, "class='form-control chosen'");?></td>
-        <td <?php echo zget($hasFields, 'source', "class='hidden'")?>><?php echo html::select("sources[$storyID]",  $sourceList, $stories[$storyID]->source, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$storyID]", $stories[$storyID]->estimate, "class='form-control' autocomplete='off'"); ?></td>
+        <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$storyID]",     $priList, $stories[$storyID]->pri, 'class=form-control');?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTo[$storyID]",     $users, $stories[$storyID]->assignedTo, "class='form-control chosen'");?></td>
+        <td <?php echo zget($visibleFields, 'source', "class='hidden'")?>><?php echo html::select("sources[$storyID]",  $sourceList, $stories[$storyID]->source, 'class=form-control');?></td>
         <td class='story-<?php echo $stories[$storyID]->status;?>'><?php echo $lang->story->statusList[$stories[$storyID]->status];?></td>
-        <td <?php echo zget($hasFields, 'stage', "class='hidden'")?>><?php echo html::select("stages[$storyID]", $stageList, $stories[$storyID]->stage, 'class="form-control"' . ($stories[$storyID]->status == 'draft' ? ' disabled="disabled"' : ''));?></td>
-        <td class='text-left<?php echo zget($hasFields, 'closedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("closedBys[$storyID]",     $users, $stories[$storyID]->closedBy, "class='form-control" . ($stories[$storyID]->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?></td>
+        <td <?php echo zget($visibleFields, 'stage', "class='hidden'")?>><?php echo html::select("stages[$storyID]", $stageList, $stories[$storyID]->stage, 'class="form-control"' . ($stories[$storyID]->status == 'draft' ? ' disabled="disabled"' : ''));?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'closedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("closedBys[$storyID]",     $users, $stories[$storyID]->closedBy, "class='form-control" . ($stories[$storyID]->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?></td>
 
         <?php if($stories[$storyID]->status == 'closed'):?>
-        <td <?php echo zget($hasFields, 'closedReason', "class='hidden'")?>>
+        <td <?php echo zget($visibleFields, 'closedReason', "class='hidden'")?>>
           <table class='w-p100'>
             <tr>
               <td class='pd-0'>
@@ -94,17 +94,17 @@ foreach(explode(',', $showFields) as $field)
           </table>
         </td>
         <?php else:?>
-        <td <?php echo zget($hasFields, 'closedReason', "class='hidden'")?>><?php echo html::select("closedReasons[$storyID]", $reasonList, $stories[$storyID]->closedReason, 'class="form-control" disabled="disabled"');?></td>
+        <td <?php echo zget($visibleFields, 'closedReason', "class='hidden'")?>><?php echo html::select("closedReasons[$storyID]", $reasonList, $stories[$storyID]->closedReason, 'class="form-control" disabled="disabled"');?></td>
         <?php endif;?>
-        <td <?php echo zget($hasFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$storyID]", $stories[$storyID]->keywords, 'class="form-control"');?></td>
+        <td <?php echo zget($visibleFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$storyID]", $stories[$storyID]->keywords, 'class="form-control"');?></td>
       </tr>
       <?php endforeach;?>
       <?php if(isset($suhosinInfo)):?>
-      <tr><td colspan='<?php echo count($hasFields) + 3;?>'><div id='suhosinInfo' class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
+      <tr><td colspan='<?php echo count($visibleFields) + 3;?>'><div id='suhosinInfo' class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
       <?php endif;?>
     </tbody>
     <tfoot>
-      <tr><td colspan='<?php echo count($hasFields) + 3;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
+      <tr><td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
     </tfoot>
   </table>
 </form>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 585ff732ee..d282f7ee19 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -23,10 +23,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' target='hiddenwin'>
@@ -34,16 +34,16 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr class='text-center'>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->task->module?></th>
-        <th class='w-200px<?php echo zget($hasFields, 'story', ' hidden')?>'><?php echo $lang->task->story;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->task->module?></th>
+        <th class='w-200px<?php echo zget($visibleFields, 'story', ' hidden')?>'><?php echo $lang->task->story;?></th>
         <th><?php echo $lang->task->name;?> <span class='required'></span></th>
         <th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
-        <th class='w-150px<?php echo zget($hasFields, 'assignedTo', ' hidden')?>'><?php echo $lang->task->assignedTo;?></th>
-        <th class='w-50px<?php echo zget($hasFields, 'estimate', ' hidden')?>'><?php echo $lang->task->estimateAB;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'estStarted', ' hidden')?>'><?php echo $lang->task->estStarted;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'deadline', ' hidden')?>'><?php echo $lang->task->deadline;?></th>
-        <th class='w-p20<?php echo zget($hasFields, 'desc', ' hidden')?>'><?php echo $lang->task->desc;?></th>
-        <th class='w-70px<?php echo zget($hasFields, 'pri', ' hidden')?>'><?php echo $lang->task->pri;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo $lang->task->assignedTo;?></th>
+        <th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'><?php echo $lang->task->estimateAB;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'estStarted', ' hidden')?>'><?php echo $lang->task->estStarted;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden')?>'><?php echo $lang->task->deadline;?></th>
+        <th class='w-p20<?php echo zget($visibleFields, 'desc', ' hidden')?>'><?php echo $lang->task->desc;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->task->pri;?></th>
       </tr>
     </thead>
 
@@ -70,8 +70,8 @@ foreach(explode(',', $showFields) as $field)
     <?php $pri = 3;?>
     <tr>
       <td class='text-center'><?php echo $i+1;?></td>
-      <td <?php echo zget($hasFields, 'module', "class='hidden'")?> style='overflow:visible'><?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen' onchange='setStories(this.value, $project->id, $i)'")?></td>
-      <td <?php echo zget($hasFields, 'story', "class='hidden'")?> style='overflow: visible'>
+      <td <?php echo zget($visibleFields, 'module', "class='hidden'")?> style='overflow:visible'><?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen' onchange='setStories(this.value, $project->id, $i)'")?></td>
+      <td <?php echo zget($visibleFields, 'story', "class='hidden'")?> style='overflow: visible'>
         <div class='input-group'>
         <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
         <span class='input-group-btn'>
@@ -81,23 +81,23 @@ foreach(explode(',', $showFields) as $field)
       </td>
       <td><?php echo html::input("name[$i]", '', 'class=form-control');?></td>
       <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
-      <td <?php echo zget($hasFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
-      <td <?php echo zget($hasFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
-      <td <?php echo zget($hasFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[$i]", '', "class='form-control text-center form-date'");?></td>
-      <td <?php echo zget($hasFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[$i]", '', "class='form-control text-center form-date'");?></td>
-      <td <?php echo zget($hasFields, 'desc', "class='hidden'")?>><?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control autosize'");?></td>
-      <td <?php echo zget($hasFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
+      <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
+      <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
+      <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[$i]", '', "class='form-control text-center form-date'");?></td>
+      <td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[$i]", '', "class='form-control text-center form-date'");?></td>
+      <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control autosize'");?></td>
+      <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
     </tr>
     <?php endfor;?>
-    <tr><td colspan='<?php echo count($hasFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    <tr><td colspan='<?php echo count($visibleFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
 <table class='hide' id='trTemp'>
   <tbody>
     <tr>
       <td class='text-center'>%s</td>
-      <td <?php echo zget($hasFields, 'module', "class='hidden'")?> style='overflow:visible'><?php echo html::select("module[%s]", $modules, $module, "class='form-control' onchange='setStories(this.value, $project->id, \"%s\")'")?></td>
-      <td <?php echo zget($hasFields, 'story', "class='hidden'")?> style='overflow: visible'>
+      <td <?php echo zget($visibleFields, 'module', "class='hidden'")?> style='overflow:visible'><?php echo html::select("module[%s]", $modules, $module, "class='form-control' onchange='setStories(this.value, $project->id, \"%s\")'")?></td>
+      <td <?php echo zget($visibleFields, 'story', "class='hidden'")?> style='overflow: visible'>
         <div class='input-group'>
           <?php echo html::select("story[%s]", $stories, $currentStory, "class='form-control' onchange='setStoryRelated(\"%s\")'");?>
           <span class='input-group-btn'>
@@ -107,12 +107,12 @@ foreach(explode(',', $showFields) as $field)
       </td>
       <td><?php echo html::input("name[%s]", '', 'class=form-control');?></td>
       <td><?php echo html::select("type[%s]", $lang->task->typeList, $type, 'class=form-control');?></td>
-      <td <?php echo zget($hasFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[%s]", $members, $member, "class='form-control'");?></td>
-      <td <?php echo zget($hasFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[%s]", '', "class='form-control text-center' autocomplete='off'");?></td>
-      <td <?php echo zget($hasFields, 'desc', "class='hidden'")?>><?php echo html::textarea("desc[%s]", '', "rows='1' class='form-control autosize'");?></td>
-      <td <?php echo zget($hasFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[%s]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
-      <td <?php echo zget($hasFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[%s]", '', "class='form-control text-center form-date'");?></td>
-      <td <?php echo zget($hasFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[%s]", '', "class='form-control text-center form-date'");?></td>
+      <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[%s]", $members, $member, "class='form-control'");?></td>
+      <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[%s]", '', "class='form-control text-center' autocomplete='off'");?></td>
+      <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("desc[%s]", '', "rows='1' class='form-control autosize'");?></td>
+      <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[%s]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
+      <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[%s]", '', "class='form-control text-center form-date'");?></td>
+      <td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[%s]", '', "class='form-control text-center form-date'");?></td>
     </tr>
   </tbody>
 </table>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 2d3d303d4e..d0a2a89537 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -23,10 +23,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
@@ -34,21 +34,21 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr>
         <th class='w-50px'><?php echo $lang->idAB;?></th>
-        <th <?php if(count($hasFields) > 10) echo "class='w-150px'"?>>   <?php echo $lang->task->name?> <span class='required'></span></th>
-        <th class='w-150px<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->task->module?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'assignedTo', ' hidden')?>'><?php echo $lang->task->assignedTo;?></th>
+        <th <?php if(count($visibleFields) > 10) echo "class='w-150px'"?>>   <?php echo $lang->task->name?> <span class='required'></span></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->task->module?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo $lang->task->assignedTo;?></th>
         <th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
-        <th class='w-100px<?php echo zget($hasFields, 'status', ' hidden')?>'><?php echo $lang->task->status;?></th>
-        <th class='w-70px<?php echo zget($hasFields, 'pri', ' hidden')?>'><?php echo $lang->task->pri;?></th>
-        <th class='w-40px<?php echo zget($hasFields, 'estimate', ' hidden')?>'><?php echo $lang->task->estimateAB;?></th>
-        <th class='w-50px<?php echo zget($hasFields, 'record', ' hidden')?>'><?php echo $lang->task->consumedThisTime?></th>
-        <th class='w-40px<?php echo zget($hasFields, 'left', ' hidden')?>'><?php echo $lang->task->leftAB?></th>
-        <th class='w-90px<?php echo zget($hasFields, 'estStarted', ' hidden')?>'><?php echo $lang->task->estStarted?></th>
-        <th class='w-90px<?php echo zget($hasFields, 'deadline', ' hidden')?>'><?php echo $lang->task->deadline?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'finishedBy', ' hidden')?>'><?php echo $lang->task->finishedBy;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'canceledBy', ' hidden')?>'><?php echo $lang->task->canceledBy;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'closedBy', ' hidden')?>'><?php echo $lang->task->closedBy;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'closedReason', ' hidden')?>'><?php echo $lang->task->closedReason;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->task->status;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->task->pri;?></th>
+        <th class='w-40px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'><?php echo $lang->task->estimateAB;?></th>
+        <th class='w-50px<?php echo zget($visibleFields, 'record', ' hidden')?>'><?php echo $lang->task->consumedThisTime?></th>
+        <th class='w-40px<?php echo zget($visibleFields, 'left', ' hidden')?>'><?php echo $lang->task->leftAB?></th>
+        <th class='w-90px<?php echo zget($visibleFields, 'estStarted', ' hidden')?>'><?php echo $lang->task->estStarted?></th>
+        <th class='w-90px<?php echo zget($visibleFields, 'deadline', ' hidden')?>'><?php echo $lang->task->deadline?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'finishedBy', ' hidden')?>'><?php echo $lang->task->finishedBy;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'canceledBy', ' hidden')?>'><?php echo $lang->task->canceledBy;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo $lang->task->closedBy;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'closedReason', ' hidden')?>'><?php echo $lang->task->closedReason;?></th>
       </tr>
     </thead>
     <tbody>
@@ -68,24 +68,24 @@ foreach(explode(',', $showFields) as $field)
       <tr class='text-center'>
         <td><?php echo $taskID . html::hidden("taskIDList[$taskID]", $taskID);?></td>
         <td title='<?php echo $tasks[$taskID]->name?>'><?php echo html::input("names[$taskID]",        $tasks[$taskID]->name, 'class=form-control');?></td>
-        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$taskID]",     $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
-        <td class='text-left<?php echo zget($hasFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $members, $tasks[$taskID]->assignedTo, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$taskID]",     $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $members, $tasks[$taskID]->assignedTo, "class='form-control chosen'");?></td>
         <td><?php echo html::select("types[$taskID]",    $typeList, $tasks[$taskID]->type, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'status', "class='hidden'")?>><?php echo html::select("statuses[$taskID]", $statusList, $tasks[$taskID]->status, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$taskID]",     $priList, $tasks[$taskID]->pri, 'class=form-control');?></td>
-        <td <?php echo zget($hasFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center' autocomplete='off'");?></td>
-        <td <?php echo zget($hasFields, 'record', "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center' autocomplete='off'");?></td>
-        <td <?php echo zget($hasFields, 'left', "class='hidden'")?>><?php echo html::input("lefts[$taskID]",     $tasks[$taskID]->left, "class='form-control text-center' autocomplete='off'");?></td>
-        <td <?php echo zget($hasFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarteds[$taskID]",     $tasks[$taskID]->estStarted, "class='form-control text-center form-date'");?></td>
-        <td <?php echo zget($hasFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadlines[$taskID]",     $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'finishedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'canceledBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("canceledBys[$taskID]", $members, $tasks[$taskID]->canceledBy, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'closedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("closedBys[$taskID]",   $members, $tasks[$taskID]->closedBy, "class='form-control chosen'");?></td>
-        <td <?php echo zget($hasFields, 'closedReason', "class='hidden'")?>><?php echo html::select("closedReasons[$taskID]", $lang->task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'status', "class='hidden'")?>><?php echo html::select("statuses[$taskID]", $statusList, $tasks[$taskID]->status, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$taskID]",     $priList, $tasks[$taskID]->pri, 'class=form-control');?></td>
+        <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center' autocomplete='off'");?></td>
+        <td <?php echo zget($visibleFields, 'record', "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center' autocomplete='off'");?></td>
+        <td <?php echo zget($visibleFields, 'left', "class='hidden'")?>><?php echo html::input("lefts[$taskID]",     $tasks[$taskID]->left, "class='form-control text-center' autocomplete='off'");?></td>
+        <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarteds[$taskID]",     $tasks[$taskID]->estStarted, "class='form-control text-center form-date'");?></td>
+        <td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadlines[$taskID]",     $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'finishedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'canceledBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("canceledBys[$taskID]", $members, $tasks[$taskID]->canceledBy, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'closedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("closedBys[$taskID]",   $members, $tasks[$taskID]->closedBy, "class='form-control chosen'");?></td>
+        <td <?php echo zget($visibleFields, 'closedReason', "class='hidden'")?>><?php echo html::select("closedReasons[$taskID]", $lang->task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?></td>
       </tr>
       <?php endforeach;?>
 
-      <?php $columns = count($hasFields) + 3?>
+      <?php $columns = count($visibleFields) + 3?>
       <?php if(isset($suhosinInfo)):?>
       <tr><td colspan='<?php echo $columns;?>'><div class='f-left blue'><?php echo $suhosinInfo;?></div></td></tr>
       <?php endif;?>
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 84646d30ca..d8d18b55f6 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -32,10 +32,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
@@ -43,14 +43,14 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr>
         <th class='w-50px'><?php echo $lang->idAB;?></th> 
-        <th class='w-200px<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
-        <th class='w-200px<?php echo zget($hasFields, 'story', ' hidden')?>'> <?php echo $lang->testcase->story;?></th>
+        <th class='w-200px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
+        <th class='w-200px<?php echo zget($visibleFields, 'story', ' hidden')?>'> <?php echo $lang->testcase->story;?></th>
         <th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
         <th class='w-180px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
-        <th class='w-80px<?php echo  zget($hasFields, 'pri', ' hidden')?>'>         <?php echo $lang->testcase->pri;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'precondition', ' hidden')?>'><?php echo $lang->testcase->precondition;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'keywords', ' hidden')?>'>    <?php echo $lang->testcase->keywords;?></th>
-        <th class='w-200px<?php echo zget($hasFields, 'stage', ' hidden')?>'>       <?php echo $lang->testcase->stage;?></th>
+        <th class='w-80px<?php echo  zget($visibleFields, 'pri', ' hidden')?>'>         <?php echo $lang->testcase->pri;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden')?>'><?php echo $lang->testcase->precondition;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>    <?php echo $lang->testcase->keywords;?></th>
+        <th class='w-200px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>       <?php echo $lang->testcase->stage;?></th>
       </tr>
     </thead>
 
@@ -65,18 +65,18 @@ foreach(explode(',', $showFields) as $field)
     ?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'story', ' hidden')?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
       <td><?php echo html::input("title[$i]", '', "class='form-control'");?></td>
       <td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=form-control");?></td>
-      <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[$i]", $lang->testcase->priList, $pri, "class=form-control");?></td>
-      <td class='<?php echo zget($hasFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
-      <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[$i]", $lang->testcase->priList, $pri, "class=form-control");?></td>
+      <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
     </tr>
     <?php endfor;?>
     <tfoot>
-      <tr><td colspan='<?php echo count($hasFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+      <tr><td colspan='<?php echo count($visibleFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
     </tfoot>
   </table>
 </form>
@@ -84,14 +84,14 @@ foreach(explode(',', $showFields) as $field)
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
-      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'story', ' hidden')?>' style='overflow:visible'> <?php echo html::select("story[%s]", '', '', 'class="form-control"');?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'> <?php echo html::select("story[%s]", '', '', 'class="form-control"');?></td>
       <td><?php echo html::input("title[%s]", '', "class='form-control'");?></td>
       <td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class=form-control");?></td>
-      <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control");?></td>
-      <td class='<?php echo zget($hasFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[%s]", '', "class='form-control'")?></td>
-      <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($hasFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control' multiple");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control");?></td>
+      <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[%s]", '', "class='form-control'")?></td>
+      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control' multiple");?></td>
     </tr>
   </tbody>
 </table>
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 0905829114..f33b1b9349 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -22,10 +22,10 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
@@ -33,14 +33,14 @@ foreach(explode(',', $showFields) as $field)
     <thead>
       <tr>
         <th class='w-50px'><?php  echo $lang->idAB;?></th> 
-        <th class='w-70px<?php echo zget($hasFields, 'pri', ' hidden')?>'>    <?php echo $lang->priAB;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'status', ' hidden')?>'><?php echo $lang->statusAB;?></th>
-        <th class='w-150px<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
+        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>    <?php echo $lang->priAB;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->statusAB;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
         <th><?php echo $lang->testcase->title;?></th>
         <th class='w-120px'><?php echo $lang->testcase->type;?></th>
-        <th class='<?php echo zget($hasFields, 'precondition', 'hidden')?>'>    <?php echo $lang->testcase->precondition;?></th>
-        <th class='w-100px<?php echo zget($hasFields, 'keywords', ' hidden')?>'><?php echo $lang->testcase->keywords;?></th>
-        <th class='w-340px<?php echo zget($hasFields, 'stage', ' hidden')?>'>   <?php echo $lang->testcase->stage;?></th>
+        <th class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'>    <?php echo $lang->testcase->precondition;?></th>
+        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->testcase->keywords;?></th>
+        <th class='w-340px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>   <?php echo $lang->testcase->stage;?></th>
       </tr>
     </thead>
     <tbody>
@@ -56,22 +56,22 @@ foreach(explode(',', $showFields) as $field)
       ?>
       <tr class='text-center'>
         <td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
-        <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>   <?php echo html::select("pris[$caseID]",     $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
-        <td class='<?php echo zget($hasFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
-        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules,   $cases[$caseID]->module, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>   <?php echo html::select("pris[$caseID]",     $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
+        <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules,   $cases[$caseID]->module, "class='form-control chosen'");?></td>
         <td title='<?php echo $cases[$caseID]->title?>'><?php echo html::input("titles[$caseID]", $cases[$caseID]->title, 'class=form-control'); echo "<span class='star'>*</span>";?></td>
         <td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
-        <td class='<?php echo zget($hasFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "rows='1' class='form-control autosize'")?></td>
-        <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control'");?></td>
-        <td class='text-left<?php echo zget($hasFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
+        <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "rows='1' class='form-control autosize'")?></td>
+        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
       </tr>
       <?php endforeach;?>
       <?php if(isset($suhosinInfo)):?>
-      <tr><td colspan='<?php echo count($hasFields) + 3;?>'><div class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
+      <tr><td colspan='<?php echo count($visibleFields) + 3;?>'><div class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
       <?php endif;?>
     </tbody>
     <tfoot>
-      <tr><td colspan='<?php echo count($hasFields) + 3;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
+      <tr><td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
     </tfoot>
   </table>
 </form>
diff --git a/module/todo/config.php b/module/todo/config.php
index 48f0048d01..9f9fad9670 100644
--- a/module/todo/config.php
+++ b/module/todo/config.php
@@ -18,8 +18,8 @@ $config->todo->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->todo->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
 
 $config->todo->list = new stdclass();
-$config->todo->list->exportFields      = 'id, account, date, begin, end, type, idvalue, pri, name, desc, status, private'; 
-$config->todo->list->batchCreateFields = 'type,pri,desc,beginAndEnd';
+$config->todo->list->exportFields            = 'id, account, date, begin, end, type, idvalue, pri, name, desc, status, private'; 
+$config->todo->list->customBatchCreateFields = 'type,pri,desc,beginAndEnd';
 
 $config->todo->custom = new stdclass();
-$config->todo->custom->batchcreate = 'type,pri,desc,beginAndEnd';
+$config->todo->custom->batchCreateFields = 'type,pri,desc,beginAndEnd';
diff --git a/module/todo/control.php b/module/todo/control.php
index 26404f78a1..a223cee816 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -94,9 +94,9 @@ class todo extends control
         }
 
         /* Set Custom*/
-        foreach(explode(',', $this->config->todo->list->batchCreateFields) as $field) $customFields[$field] = $this->lang->todo->$field;
+        foreach(explode(',', $this->config->todo->list->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->todo->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->todo->custom->batchcreate;
+        $this->view->showFields   = $this->config->todo->custom->batchCreateFields;
 
         $this->view->title      = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->batchCreate;
         $this->view->position[] = $this->lang->todo->common;
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index bef695fefb..81ddfa07dd 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -28,22 +28,22 @@
     </div>
   </div>
   <?php
-  $hasFields = array();
+  $visibleFields = array();
   foreach(explode(',', $showFields) as $field)
   {
-      if($field)$hasFields[$field] = '';
+      if($field)$visibleFields[$field] = '';
   }
-  $columns = count($hasFields) + 2;
+  $columns = count($visibleFields) + 2;
   ?>
   <table class='table table-form table-fixed with-border'>
     <thead>
       <tr>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
-        <th class='w-120px<?php echo zget($hasFields, 'type', ' hidden')?>'><?php echo $lang->todo->type;?></th>
-        <th class='w-80px<?php echo zget($hasFields, 'pri', ' hidden')?>'><?php echo $lang->todo->pri;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'type', ' hidden')?>'><?php echo $lang->todo->type;?></th>
+        <th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->todo->pri;?></th>
         <th class='w-p30 red'><?php echo $lang->todo->name;?></th>
-        <th <?php echo zget($hasFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
-        <th class='w-300px<?php echo zget($hasFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
+        <th <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
+        <th class='w-300px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
       </tr>
     </thead>
     <?php $pri = 3;?>
@@ -51,18 +51,18 @@
     <?php for($i = 0; $i < $config->todo->batchCreate; $i++):?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td <?php echo zget($hasFields, 'type', "class='hidden'")?>><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control'");?></td>
-      <td <?php echo zget($hasFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, 'class=form-control');?></td>
+      <td <?php echo zget($visibleFields, 'type', "class='hidden'")?>><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control'");?></td>
+      <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, 'class=form-control');?></td>
       <td class='text-left' style='overflow:visible'>
         <div id='<?php echo "nameBox" . ($i+1);?>' class='hidden'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
         <div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
       </td>
-      <td <?php echo zget($hasFields, 'desc', "class='hidden'")?>><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control'");?></td>
-      <td <?php echo zget($hasFields, 'beginAndEnd', "class='hidden'")?>>
+      <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control'");?></td>
+      <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?>>
         <div class='input-group'>
           <?php
-          echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control' style='width: 50%'" . (isset($hasFields['beginAndEnd']) ? '' : " disabled"));
-          echo html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control' style='width: 50%'" . (isset($hasFields['beginAndEnd']) ? '' : " disabled"));
+          echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control' style='width: 50%'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
+          echo html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control' style='width: 50%'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
           ?>
           <span class='input-group-addon'><input type='checkbox' name="switchDate[<?php echo $i?>]" id="switchDate<?php echo $i?>" onclick='switchDateList(<?php echo $i?>);'><?php echo $lang->todo->periods['future'];?></span>
         </div>
@@ -74,7 +74,7 @@
     </tfoot>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=todo&section=custom&key=batchcreate')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=todo&section=custom&key=batchCreateFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include './footer.html.php';?>
 <script language='Javascript'>
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index ec87a471ef..6e507da641 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -23,37 +23,37 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
-$minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
+$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
   <table class='table table-form table-fixed'> 
     <thead>
       <tr>
         <th class='w-40px'><?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($hasFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
         <th class='w-130px'><?php echo $lang->user->account;?> <span class='required'></span></th>
         <th class='w-130px'><?php echo $lang->user->realname;?> <span class='required'></span></th>
         <th class='w-120px'><?php echo $lang->user->role;?> <span class='required'></span></th>
         <th class='w-120px'><?php echo $lang->user->group;?></th>
-        <th class='<?php echo zget($hasFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
-        <th class='w-90px<?php echo zget($hasFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
+        <th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
+        <th class='w-90px<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
         <th class="<?php echo $minWidth?>"><?php echo $lang->user->password;?> <span class='required'></span></th>
-        <th class='w-120px<?php echo zget($hasFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'join', ' hidden')?>'>    <?php echo $lang->user->join;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'skype', ' hidden')?>'>   <?php echo $lang->user->skype;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'qq', ' hidden')?>'>      <?php echo $lang->user->qq;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'yahoo', ' hidden')?>'>   <?php echo $lang->user->yahoo;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'gtalk', ' hidden')?>'>   <?php echo $lang->user->gtalk;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'wangwang', ' hidden')?>'><?php echo $lang->user->wangwang;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'mobile', ' hidden')?>'>  <?php echo $lang->user->mobile;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'phone', ' hidden')?>'>   <?php echo $lang->user->phone;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>    <?php echo $lang->user->join;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>   <?php echo $lang->user->skype;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>      <?php echo $lang->user->qq;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>   <?php echo $lang->user->yahoo;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>   <?php echo $lang->user->gtalk;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'><?php echo $lang->user->wangwang;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>  <?php echo $lang->user->mobile;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>   <?php echo $lang->user->phone;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
       </tr>
     </thead>
     <?php $depts = $depts + array('ditto' => $lang->user->ditto)?>
@@ -62,13 +62,13 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
     <?php for($i = 0; $i < $config->user->batchCreate; $i++):?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td class='text-left<?php echo zget($hasFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
       <td><?php echo html::input("account[$i]", '', "class='form-control account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
       <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
       <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
       <td class='text-left' style='overflow:visible'><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control chosen'");?></td>
-      <td <?php echo zget($hasFields, 'email', "class='hidden'")?>><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>
-      <td <?php echo zget($hasFields, 'gender', "class='hidden'")?>><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
+      <td <?php echo zget($visibleFields, 'email', "class='hidden'")?>><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>
+      <td <?php echo zget($visibleFields, 'gender', "class='hidden'")?>><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
       <td align='left'>
         <div class='input-group'>
         <?php
@@ -77,28 +77,28 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
         ?>
         </div>
       </itd>
-      <td class='<?php echo zget($hasFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$i]", '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$i]",     '', "class='form-control form-date'");?></td>
-      <td class='<?php echo zget($hasFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$i]",    '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$i]",       '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$i]",    '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$i]",    '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$i]", '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$i]",   '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$i]",    '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'address', 'hidden')?>'> <?php echo html::input("address[$i]",  '', "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$i]",  '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$i]", '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$i]",     '', "class='form-control form-date'");?></td>
+      <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$i]",    '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$i]",       '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$i]",    '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$i]",    '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$i]", '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$i]",   '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$i]",    '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$i]",  '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$i]",  '', "class='form-control'");?></td>
     </tr>  
     <?php endfor;?>
     <tr>
       <th colspan='2'><?php echo $lang->user->verifyPassword?></th>
-      <td colspan='<?php echo count($hasFields) + 4?>'>
+      <td colspan='<?php echo count($visibleFields) + 4?>'>
         <div class="required required-wrapper"></div>
         <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
         <?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
       </td>
     </tr>
-    <tr><td colspan='<?php echo count($hasFields) + 6?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
 <?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=user&section=custom&key=batchCreateFields')?>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index fa07784e45..01c5f47968 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -22,34 +22,34 @@
   </div>
 </div>
 <?php
-$hasFields = array();
+$visibleFields = array();
 foreach(explode(',', $showFields) as $field)
 {
-    if($field)$hasFields[$field] = '';
+    if($field)$visibleFields[$field] = '';
 }
-$minWidth = (count($hasFields) > 7) ? 'w-120px' : '';
+$minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
   <table class='table table-form table-fixed'>
     <thead>
       <tr>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($hasFields, 'dept', ' hidden')?>'>         <?php echo $lang->user->dept;?></th>
+        <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'>         <?php echo $lang->user->dept;?></th>
         <th class='<?php echo $minWidth?>'><?php echo $lang->user->account;?></th>
         <th class='<?php echo $minWidth?>'><?php echo $lang->user->realname;?></th>
         <th class='w-120px'><?php echo $lang->user->role;?></th>
-        <th class='<?php echo $minWidth . zget($hasFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
-        <th class='<?php echo $minWidth . zget($hasFields, 'email', ' hidden')?>'>   <?php echo $lang->user->email;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'join', ' hidden')?>'>         <?php echo $lang->user->join;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'skype', ' hidden')?>'>        <?php echo $lang->user->skype;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'qq', ' hidden')?>'>           <?php echo $lang->user->qq;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'yahoo', ' hidden')?>'>        <?php echo $lang->user->yahoo;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'gtalk', ' hidden')?>'>        <?php echo $lang->user->gtalk;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'wangwang', ' hidden')?>'>     <?php echo $lang->user->wangwang;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'mobile', ' hidden')?>'>       <?php echo $lang->user->mobile;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'phone', ' hidden')?>'>        <?php echo $lang->user->phone;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'address', ' hidden')?>'>      <?php echo $lang->user->address;?></th>
-        <th class='w-120px<?php echo zget($hasFields, 'zipcode', ' hidden')?>'>      <?php echo $lang->user->zipcode;?></th>
+        <th class='<?php echo $minWidth . zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
+        <th class='<?php echo $minWidth . zget($visibleFields, 'email', ' hidden')?>'>   <?php echo $lang->user->email;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>         <?php echo $lang->user->join;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>        <?php echo $lang->user->skype;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>           <?php echo $lang->user->qq;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>        <?php echo $lang->user->yahoo;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>        <?php echo $lang->user->gtalk;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'>     <?php echo $lang->user->wangwang;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>       <?php echo $lang->user->mobile;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>        <?php echo $lang->user->phone;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'>      <?php echo $lang->user->address;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'>      <?php echo $lang->user->zipcode;?></th>
       </tr>
     </thead>
     <?php $depts = $depts + array('ditto' => $lang->user->ditto)?>
@@ -63,34 +63,34 @@ $minWidth = (count($hasFields) > 7) ? 'w-120px' : '';
     ?>
     <tr class='text-center'>
       <td><?php echo $user->id;?></td>
-      <td class='text-left<?php echo zget($hasFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
       <td><?php echo html::input("account[$user->id]",  $user->account, "class='form-control' autocomplete='off'");?></td>
       <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
       <td><?php echo html::select("role[$user->id]",    $lang->user->roleList, $role, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'email', 'hidden')?>'>   <?php echo html::input("email[$user->id]",    $user->email, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$user->id]",     $user->join, "class='form-control form-date'");?></td>
-      <td class='<?php echo zget($hasFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$user->id]",    $user->skype, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$user->id]",       $user->qq, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$user->id]",    $user->yahoo, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$user->id]",    $user->gtalk, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$user->id]", $user->wangwang, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$user->id]",   $user->mobile, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$user->id]",    $user->phone, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'address', 'hidden')?>'> <?php echo html::input("address[$user->id]",  $user->address, "class='form-control'");?></td>
-      <td class='<?php echo zget($hasFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$user->id]",  $user->zipcode, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'email', 'hidden')?>'>   <?php echo html::input("email[$user->id]",    $user->email, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$user->id]",     $user->join, "class='form-control form-date'");?></td>
+      <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$user->id]",    $user->skype, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$user->id]",       $user->qq, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$user->id]",    $user->yahoo, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$user->id]",    $user->gtalk, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$user->id]", $user->wangwang, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$user->id]",   $user->mobile, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$user->id]",    $user->phone, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$user->id]",  $user->address, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$user->id]",  $user->zipcode, "class='form-control'");?></td>
     </tr>
     <?php endforeach;?>
     <tr>
       <th colspan='2'><?php echo $lang->user->verifyPassword?></th>
-      <td colspan='<?php echo count($hasFields) + 2?>'>
+      <td colspan='<?php echo count($visibleFields) + 2?>'>
         <div class="required required-wrapper"></div>
         <input type='text'     style="display:none"> <!-- for disable autocomplete all browser -->
         <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
         <?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
       </td>
     </tr>
-    <tr><td colspan='<?php echo count($hasFields) + 4?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    <tr><td colspan='<?php echo count($visibleFields) + 4?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
 <?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=user&section=custom&key=batchEditFields')?>