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

This commit is contained in:
Laurent Destailleur 2016-11-27 20:03:11 +01:00
commit 604b3eff8d

View File

@ -1961,6 +1961,7 @@ class CommandeFournisseur extends CommonOrder
if ($resql) if ($resql)
{ {
$result = 0; $result = 0;
$old_statut = $this->statut;
$this->statut = $statut; $this->statut = $statut;
// Call trigger // Call trigger
@ -1974,6 +1975,7 @@ class CommandeFournisseur extends CommonOrder
} }
else else
{ {
$this->statut = $old_statut;
$this->db->rollback(); $this->db->rollback();
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
$result = -1; $result = -1;