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,20 +187,22 @@ class ExpenseReport extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (!$resql) $error++; if (!$resql) $error++;
foreach ($this->lines as $i => $val) if (is_array($this->lines) && count($this->lines)>0) {
{ foreach ($this->lines as $i => $val)
$newndfline=new ExpenseReportLine($this->db); {
$newndfline=$this->lines[$i]; $newndfline=new ExpenseReportLine($this->db);
$newndfline->fk_expensereport=$this->id; $newndfline=$this->lines[$i];
if ($result >= 0) $newndfline->fk_expensereport=$this->id;
{ if ($result >= 0)
$result=$newndfline->insert(); {
} $result=$newndfline->insert();
if ($result < 0) }
{ if ($result < 0)
$error++; {
break; $error++;
} break;
}
}
} }
if (! $error) if (! $error)