diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 2b3fc89d33b..1929a8a3721 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load('bills'); +$langs->load('compta'); +$langs->load('products'); // Security check $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int')); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 8595bd90231..f083318948e 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -702,21 +702,23 @@ class CommandeFournisseur extends CommonOrder $error=0; - dol_syslog(get_class($this)."::refuse"); $result = 0; if ($user->rights->fournisseur->commande->approuver) { $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 9"; - $sql .= " WHERE rowid = ".$this->id; + $sql.= " WHERE rowid = ".$this->id; - if ($this->db->query($sql)) + dol_syslog(get_class($this)."::refuse sql=".$sql); + $resql=$this->db->query($sql); + + if ($resql) { $result = 0; $this->log($user, 9, time()); - if ($error == 0) + if (! $error) { // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; @@ -726,10 +728,18 @@ class CommandeFournisseur extends CommonOrder { $error++; $this->errors=$interface->errors; - $this->db->rollback(); } // Fin appel triggers } + + if (! $error) + { + $this->db->commit(); + } + else + { + $this->db->rollback(); + } } else { @@ -743,7 +753,7 @@ class CommandeFournisseur extends CommonOrder { dol_syslog(get_class($this)."::refuse Not Authorized"); } - return $result ; + return $result; } /**