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

lib/phpmailer/language/phpmailer.lang-zh-cn.php

@@ -6,7 +6,7 @@
 */
 
 $PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。\n请检查您设置的用户名密码是否正确。\n有的系统登录用户名是完整的邮箱地址。';
-$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机，请确认禅道机器：\n1. 能ping通smtp服务器；\n2. 使用telnet 命令能够连接到smtp的发信端口;\n3. 如果上述步骤都是通的，windows请检查防火墙设置，linux请关闭selnux或者执行"setsebool httpd_can_sendmail true"允许apache可以发信。';
+$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机，请确认禅道机器：\n1. 能ping通smtp服务器。如果不能ping通，请查看网络状态，或查看域名解析是否正确，或联系网管；\n2. 使用telnet 命令能够连接到smtp的发信端口;\n3. 如果上述步骤都是通的，windows请检查防火墙和杀毒软件设置，linux请关闭selnux或者执行"setsebool httpd_can_sendmail true"允许apache可以发信。';
 $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。';
 //$P$PHPMAILER_LANG['empty_message']        = 'Message body empty';
 $PHPMAILER_LANG['encoding'] = '未知编码: ';
@@ -18,7 +18,7 @@ $PHPMAILER_LANG['instantiate'] = '未知函数调用。';
 //$PHPMAILER_LANG['invalid_email']        = 'Not sending, email address is invalid: ';
 $PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。';
 $PHPMAILER_LANG['provide_address'] = '收件人没有设置邮箱，请到组织视图中检查下相应用户的email设置。';
-$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误，或检查SMTP服务设置，是否允许发送该邮件地址：';
 //$PHPMAILER_LANG['signing']              = 'Signing Error: ';
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';

module/task/model.php

@@ -918,8 +918,7 @@ class taskModel extends model
      */
     public function getTaskEstimate($taskID)
     {
-        return $this->dao->select('*')
-          ->from(TABLE_TASKESTIMATE)  
+        return $this->dao->select('*')->from(TABLE_TASKESTIMATE)  
           ->where('task')->eq($taskID)
           ->orderBy('id')
           ->fetchAll();
@@ -934,14 +933,12 @@ class taskModel extends model
      */
     public function getEstimateById($estimateID)
     {
-        $estimate = $this->dao->select('*')
-          ->from(TABLE_TASKESTIMATE)  
+        $estimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)  
           ->where('id')->eq($estimateID)
           ->fetch();
 
         /* If the estimate is the last of its task, status of task will be checked. */
-        $lastID = $this->dao->select('id')
-            ->from(TABLE_TASKESTIMATE)
+        $lastID = $this->dao->select('id')->from(TABLE_TASKESTIMATE)
             ->where('task')->eq($estimate->task)
             ->andWhere('id')->gt($estimate->id)
             ->fetch('id');
@@ -967,16 +964,10 @@ class taskModel extends model
             ->check('consumed', 'notempty')
             ->where('id')->eq((int)$estimateID)
             ->exec();
+
         $consumed     = $task->consumed + $estimate->consumed - $oldEstimate->consumed;
         $lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($task->id)->orderBy('id desc')->fetch();
-        if($lastEstimate and $estimateID == $lastEstimate->id)
-        {
-            $left = $estimate->left; 
-        }
-        else
-        {
-            $left = $task->left; 
-        }
+        $left         = ($lastEstimate and $estimateID == $lastEstimate->id) ? $estimate->left : $task->left; 
         if($left == 0) $task->status = 'done';
 
         $now  = helper::now();

module/task/view/recordestimate.html.php

@@ -43,7 +43,7 @@
         <td class="text-left"><?php echo $estimate->work;?></td>
         <td align='center'>
           <?php
-          if($task->status == 'wait' or $task->status == 'doing')
+          if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing')
           {
               common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
               common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody');
@@ -53,7 +53,7 @@
       </tr>
       <?php endforeach;?>
       <?php endif;?>
-      <?php if($task->status == 'wait' or $task->status == 'doing'):?>
+      <?php if($task->status == 'wait' or $task->status =='pause' or $task->status == 'doing'):?>
       <thead>
         <tr class='text-center'>
           <th class="w-id"><?php echo $lang->idAB;?></th>