Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2014-11-05 07:10:41 +00:00
4 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -55,7 +55,7 @@
<td class='text-left'><?php echo $project->code;?></td>
<td><?php echo $users[$project->PM];?></td>
<td><?php echo $project->end;?></td>
<td><?php echo $lang->project->statusList[$project->status];?></td>
<td class='status-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<td><?php echo $project->hours->totalEstimate;?></td>
<td><?php echo $project->hours->totalConsumed;?></td>
<td><?php echo $project->hours->totalLeft;?></td>
+1 -1
View File
@@ -44,7 +44,7 @@
<td><?php echo $users[$task->owner];?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
<td>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list', 'smile');