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

Qual: Uniformize code.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-04-28 18:49:01 +02:00
parent edb3178def
commit b9133410c2
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,10 +802,11 @@ class CommandeFournisseur extends Commande
* Cancel an approved order.
* L'annulation se fait apres l'approbation
*
* @param User $user User making action
* @return int >0 if Ok, <0 if Ko
* @param User $user User making action
* @param int $idwarehouse Id warehouse to use for stock change (not used for supplier orders).
* @return int >0 if Ok, <0 if Ko
*/
function Cancel($user)
function Cancel($user, $idwarehouse=-1)
{
global $langs,$conf;
@ -900,12 +901,13 @@ class CommandeFournisseur extends Commande
}
/**
* Create order with draft status
* Create order with draft status
*
* @param User $user User making creation
* @return int <0 if KO, Id of supplier order if OK
* @param User $user User making creation
* @param int $notrigger Disable all triggers
* @return int <0 if KO, Id of supplier order if OK
*/
function create($user)
function create($user, $notrigger=0)
{
global $langs,$conf;
@ -956,12 +958,15 @@ class CommandeFournisseur extends Commande
// On logue creation pour historique
$this->log($user, 0, time());
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
if (! $notrigger)
{
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
}
$this->db->commit();
return $this->id;