Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ add tag for zentao 4.0.stable.

Browse Source
This commit is contained in:
wangyidong
2013-03-03 02:58:43 +00:00
parent d856738f60 82dc069ea6
commit 30922f81f7
5 changed files with 1095 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2175
db/zentao.sql
View File

File diff suppressed because it is too large Load Diff

2
module/task/model.php
View File

@@ -466,7 +466,7 @@ class taskModel extends model
$oldTask = new stdClass();
$newTask = new stdClass();
$oldTask->consumed = $task->consumed;
$newTask->consumed = $consumed;
$newTask->consumed = $task->consumed + $consumed;
$oldTask->left = $task->left;
$newTask->left = $left;
$oldTask->status = $oldStatus;

9
module/task/view/batchcreate.html.php
View File

@@ -27,6 +27,11 @@
<th class='w-50px'><?php echo $lang->task->pri;?></th>
</tr>
<?php
$stories['ditto'] = $this->lang->task->ditto;
$lang->task->typeList['ditto'] = $lang->task->ditto;
$members['ditto'] = $lang->task->ditto;
?>
<?php for($i = 0; $i < $config->task->batchCreate; $i++):?>
<?php
if($i == 0)
@@ -37,13 +42,9 @@
}
else
{
$stories['ditto'] = $this->lang->task->ditto;
$lang->task->typeList['ditto'] = $lang->task->ditto;
$members['ditto'] = $lang->task->ditto;
$story = $type = $member = 'ditto';
}
?>
<?php $pri = 3;?>
<tr class='a-center'>
<td><?php echo $i+1;?></td>

2
module/task/view/edit.html.php
View File

@@ -109,7 +109,7 @@ userList = "<?php echo join(',', array_keys($users));?>".split(','
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->consumed;?></th>
<td><?php echo $task->consumed . ' '; common::printIcon('task', 'record', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);?></td>
<td><?php echo $task->consumed . ' '; common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->left;?></th>

2
module/task/view/recordestimate.html.php
View File

@@ -14,7 +14,6 @@
<?php include '../../common/view/datepicker.html.php';?>
<?php js::set('confirmFinish', $lang->task->confirmFinish);?>
<form method='post' target='hiddenwin'>
<?php if($estimates):?>
<table class='table-1'>
<caption><?php echo $task->name;?></caption>
<tr>
@@ -44,7 +43,6 @@
</tr>
<?php endforeach;?>
</table>
<?php endif;?>
<?php if($task->status == 'wait' or $task->status == 'doing'):?>
<table class='table-1'>
<caption><?php echo $lang->task->logEfforts;?></caption>