Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.5' into 3.6

Browse Source 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur 2014-06-29 23:56:23 +02:00
commit 14de1d66c0
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/fiche-rec.php
View File

@ -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'));

22
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -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;
}
/**