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

Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0

Browse Source
This commit is contained in:
wangyidong
2021-07-01 08:20:21 +08:00
parent f407f70700 26ec63969d
commit f98d12dee8
8 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+2 -2
View File
@@ -1271,12 +1271,12 @@ class block extends control
$i = 1;
while($begin < $end)
{
$charts['labels'][] = $this->lang->block->time . $i . $this->lang->block->week;
$charts['labels'][] = $this->lang->block->time . $i . $this->lang->block->month;
$charts['PV'] .= $this->weekly->getPV($projectID, $begin) . ',';
$charts['EV'] .= $this->weekly->getEV($projectID, $begin) . ',';
$charts['AC'] .= $this->weekly->getAC($projectID, $begin) . ',';
$stageEnd = $this->weekly->getThisSunday($begin);
$begin = date('Y-m-d', strtotime("$stageEnd + 1 day"));
$begin = date('Y-m-d', strtotime("$stageEnd + 30 day"));
$i ++;
}
module/block/lang/de.php
+1
View File
@@ -71,6 +71,7 @@ $lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
$lang->block->week = 'Week';
$lang->block->month = 'Month';
$lang->block->selectProduct = 'Product selection';
$lang->block->of = ' von ';
$lang->block->remain = 'Left';
module/block/lang/en.php
+1
View File
@@ -71,6 +71,7 @@ $lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
$lang->block->week = 'Week';
$lang->block->month = 'Month';
$lang->block->selectProduct = 'Product selection';
$lang->block->of = ' of ';
$lang->block->remain = 'Left';
module/block/lang/fr.php
+1
View File
@@ -71,6 +71,7 @@ $lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
$lang->block->week = 'Week';
$lang->block->month = 'Month';
$lang->block->selectProduct = 'Product selection';
$lang->block->of = ' di ';
$lang->block->remain = 'Left';
module/block/lang/vi.php
+1
View File
@@ -71,6 +71,7 @@ $lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
$lang->block->week = 'Week';
$lang->block->month = 'Month';
$lang->block->selectProduct = 'Product selection';
$lang->block->of = ' thực ';
$lang->block->remain = 'Left';
module/block/lang/zh-cn.php
+1
View File
@@ -71,6 +71,7 @@ $lang->block->estimatedHours = '预计';
$lang->block->consumedHours = '已消耗';
$lang->block->time = '第';
$lang->block->week = '周';
$lang->block->month = '月';
$lang->block->selectProduct = '选择产品';
$lang->block->of = '的';
$lang->block->remain = '剩余工时';
module/execution/model.php
+1 -1
View File
@@ -1733,7 +1733,7 @@ class executionModel extends model
if(isset($oldExecutionProducts[$productID][$branch]))
{
$oldExecutionProduct = $oldExecutionProducts[$productID][$branch];
$oldPlan = $oldExecutionProduct->plan;
$oldPlan = $oldExecutionProduct->plan;
}
$data = new stdclass();
module/my/control.php
+1
View File
@@ -642,6 +642,7 @@ class my extends control
public function audit($browseType = 'wait', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
$this->loadModel('datatable');
$this->loadModel('baseline');
$this->session->set('reviewList', $this->app->getURI(true));
$this->app->loadLang('review');
$this->app->loadClass('pager', true);