Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

This commit is contained in:
Laurent Destailleur 2017-09-18 15:48:18 +02:00
commit 0c01c7ceba

View File

@ -187,6 +187,7 @@ class ExpenseReport extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (!$resql) $error++; if (!$resql) $error++;
if (is_array($this->lines) && count($this->lines)>0) {
foreach ($this->lines as $i => $val) foreach ($this->lines as $i => $val)
{ {
$newndfline=new ExpenseReportLine($this->db); $newndfline=new ExpenseReportLine($this->db);
@ -202,6 +203,7 @@ class ExpenseReport extends CommonObject
break; break;
} }
} }
}
if (! $error) if (! $error)
{ {