lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Missing commit

Browse Source
This commit is contained in:
Laurent Destailleur 2014-06-28 15:03:11 +02:00
parent ef8b555750
commit dd1c5ce3d8
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,9 +390,9 @@ class CommandeFournisseur extends CommonOrder
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('ORDER_SUPPLIER_VALIDATE',$this,$user,$langs,$conf); $result=$interface->run_triggers('ORDER_SUPPLIER_VALIDATE',$this,$user,$langs,$conf);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->errors=$interface->errors; $this->errors=$interface->errors;
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
@ -749,7 +749,7 @@ class CommandeFournisseur extends CommonOrder
} }
else else
{ {
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
} }
@ -780,34 +780,44 @@ class CommandeFournisseur extends CommonOrder
$error=0; $error=0;
dol_syslog(get_class($this)."::refuse");
$result = 0; $result = 0;
if ($user->rights->fournisseur->commande->approuver) if ($user->rights->fournisseur->commande->approuver)
{ {
$this->db->begin(); $this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 9"; $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; $result = 0;
$this->log($user, 9, time()); $this->log($user, 9, time());
if ($error == 0) if (! $error)
{ {
// Appel des triggers // Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('ORDER_SUPPLIER_REFUSE',$this,$user,$langs,$conf); $result=$interface->run_triggers('ORDER_SUPPLIER_REFUSE',$this,$user,$langs,$conf);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->errors=$interface->errors; $this->errors=$interface->errors;
$this->db->rollback();
} }
// Fin appel triggers // Fin appel triggers
} }
if (! $error)
{
$this->db->commit();
}
else
{
$this->db->rollback();
}
} }
else else
{ {
@ -821,7 +831,7 @@ class CommandeFournisseur extends CommonOrder
{ {
dol_syslog(get_class($this)."::refuse Not Authorized"); dol_syslog(get_class($this)."::refuse Not Authorized");
} }
return $result ; return $result;
} }
/** /**
@ -1052,7 +1062,7 @@ class CommandeFournisseur extends CommonOrder
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf); $result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->errors=$interface->errors; $this->errors=$interface->errors;
@ -1305,8 +1315,8 @@ class CommandeFournisseur extends CommonOrder
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('LINEORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf); $result=$interface->run_triggers('LINEORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->errors=$interface->errors; $this->errors=$interface->errors;
$this->db->rollback(); $this->db->rollback();
@ -1377,7 +1387,7 @@ class CommandeFournisseur extends CommonOrder
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('LINEORDER_SUPPLIER_DISPATCH',$this,$user,$langs,$conf); $result=$interface->run_triggers('LINEORDER_SUPPLIER_DISPATCH',$this,$user,$langs,$conf);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->errors=$interface->errors; $this->errors=$interface->errors;
$this->db->rollback(); $this->db->rollback();
@ -1442,7 +1452,7 @@ class CommandeFournisseur extends CommonOrder
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid = ".$idligne; $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid = ".$idligne;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
//TODO: Add trigger for deleted line //TODO: Add trigger for deleted line
dol_syslog(get_class($this)."::deleteline sql=".$sql); dol_syslog(get_class($this)."::deleteline sql=".$sql);
if ($resql) if ($resql)