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

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);
                 }
             }

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;}

module/productplan/view/browse.html.php

@@ -103,7 +103,7 @@
           ?>
         </td>
         <?php if($this->session->currentProductType != 'normal'):?>
-        <td><?php echo $branches[$plan->branch];?></td>
+        <td class='c-branch' title='<?php echo $branches[$plan->branch];?>'><?php echo $branches[$plan->branch];?></td>
         <?php endif;?>
         <td><?php echo $plan->begin == '2030-01-01' ? $lang->productplan->future : $plan->begin;?></td>
         <td><?php echo $plan->end == '2030-01-01' ? $lang->productplan->future : $plan->end;?></td>

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.';

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.';

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.';

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个字符';

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);
                 }
             }