diff --git a/module/caselib/model.php b/module/caselib/model.php
index 292839d45d..2e2505c81a 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -438,6 +438,7 @@ class caselibModel extends model
foreach($requiredFields as $requiredField)
{
$requiredField = trim($requiredField);
+ if(!isset($caseData->$requiredField)) continue;
if(empty($caseData->$requiredField)) dao::$errors[] = sprintf($this->lang->testcase->noRequire, $line, $this->lang->testcase->$requiredField);
}
}
diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css
index c650c25ecb..99353191ed 100644
--- a/module/productplan/css/browse.css
+++ b/module/productplan/css/browse.css
@@ -1,4 +1,5 @@
.table td.content { overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
+td.c-branch{ overflow:hidden; text-align:left!important; text-overflow:ellipsis; white-space:nowrap;}
.table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index e278721844..393cc76de2 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -103,7 +103,7 @@
?>
session->currentProductType != 'normal'):?>
-
branch];?> |
+ branch];?> |
begin == '2030-01-01' ? $lang->productplan->future : $plan->begin;?> |
end == '2030-01-01' ? $lang->productplan->future : $plan->end;?> |
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index e9faf8d023..cb08f062cc 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -201,7 +201,7 @@ $lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"Verbraucht" muss eine Zahl sein.';
$lang->task->error->estimateNumber = '"Stunden" müss eine Zahl sein.';
$lang->task->error->recordMinus = 'Work hours should not be negative number.';
-$lang->task->error->consumedSmall = '"Verbraucht" muss larger than before.';
+$lang->task->error->consumedSmall = '"Genutzt" muss larger than before.';
$lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an';
$lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"';
$lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index fac85c166f..eed50c8a96 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -201,7 +201,7 @@ $lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"Current Cost" must be numbers.';
$lang->task->error->estimateNumber = '"Estimates" must be numbers.';
$lang->task->error->recordMinus = 'Work hours should not be negative number.';
-$lang->task->error->consumedSmall = '"Hours Cost" must be > the last number.';
+$lang->task->error->consumedSmall = '"Total Cost" must be > the last number.';
$lang->task->error->consumedThisTime = 'Please enter "Hours Cost"';
$lang->task->error->left = 'Please enter "Hours Left"';
$lang->task->error->work = '"Comment" must be < %d characters.';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index fa56d94e4b..5ddf7a1042 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -201,7 +201,7 @@ $lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"Coût" doit être numérique.';
$lang->task->error->estimateNumber = '"Estimé" doit être numérique.';
$lang->task->error->recordMinus = 'Work hours should not be negative number.';
-$lang->task->error->consumedSmall = '"Coût en heures" doit être > au dernier chiffre.';
+$lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.';
$lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"';
$lang->task->error->left = 'Entrez les "Heures Restantes"';
$lang->task->error->work = '"Commentaire" doit être < %d caractères.';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 2e06a5970a..8cd7b47a51 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -201,7 +201,7 @@ $lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"本次消耗"必须为数字';
$lang->task->error->estimateNumber = '"预计剩余"必须为数字';
$lang->task->error->recordMinus = '工时不能为负数';
-$lang->task->error->consumedSmall = '"已经消耗"必须大于之前消耗';
+$lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗';
$lang->task->error->consumedThisTime = '请填写"工时"';
$lang->task->error->left = '请填写"剩余"';
$lang->task->error->work = '"备注"必须小于%d个字符';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index f4680e56d9..6c704d6f5e 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1069,6 +1069,7 @@ class testcaseModel extends model
foreach($requiredFields as $requiredField)
{
$requiredField = trim($requiredField);
+ if(!isset($caseData->$requiredField)) continue;
if(empty($caseData->$requiredField)) dao::$errors[] = sprintf($this->lang->testcase->noRequire, $line, $this->lang->testcase->$requiredField);
}
}