Merge pull request #16230 from FHenry/12_fix_error_assignement

12 fix error assignement
This commit is contained in:
Laurent Destailleur 2021-02-09 13:22:57 +01:00 committed by GitHub
commit 1efee54541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 2 deletions

View File

@ -483,6 +483,7 @@ class Propal extends CommonObject
else
{
$this->error = $line->error;
$this->errors = $line->errors;
$this->db->rollback();
return -2;
}
@ -727,6 +728,7 @@ class Propal extends CommonObject
else
{
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->db->rollback();
return -2;
}
@ -924,7 +926,7 @@ class Propal extends CommonObject
else
{
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->db->rollback();
return -1;
}

View File

@ -2002,6 +2002,7 @@ class Commande extends CommonOrder
else
{
$this->error = $line->error;
$this->errors = $line->errors;
$this->db->rollback();
return -2;
}

View File

@ -581,7 +581,8 @@ class Account extends CommonObject
return $accline->id;
} else {
$this->error = $this->db->lasterror();
$this->error = $accline->error;
$this->errors = $accline->errors;
$this->db->rollback();
return -2;

View File

@ -783,6 +783,7 @@ class Facture extends CommonInvoice
if ($result < 0)
{
$this->error = $newinvoiceline->error;
$this->errors = $newinvoiceline->errors;
$error++;
break;
}
@ -3227,6 +3228,7 @@ class Facture extends CommonInvoice
else
{
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->db->rollback();
return -2;
}

View File

@ -318,6 +318,7 @@ class ExpenseReport extends CommonObject
if ($result < 0)
{
$this->error = $newndfline->error;
$this->errors = $newndfline->errors;
$error++;
break;
}

View File

@ -636,6 +636,7 @@ class SupplierProposal extends CommonObject
else
{
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->db->rollback();
return -2;
}