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

Fix: PHP 5.4

Browse Source
This commit is contained in:
Laurent Destailleur 2012-04-14 20:21:06 +02:00
parent df13921ed4
commit c4c2b4ee7f
1 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
/** /**
* \class CommandeFournisseur * Class to manage predefined suppliers products
* \brief Class to manage predefined suppliers products
*/ */
class CommandeFournisseur extends Commande class CommandeFournisseur extends Commande
{ {
@ -299,16 +298,17 @@ class CommandeFournisseur extends Commande
* Validate an order * Validate an order
* *
* @param User $user Validator User * @param User $user Validator User
* @param int $idwarehouse Id of warehouse to use for stock decrease
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function valid($user) function valid($user,$idwarehouse=0)
{ {
global $langs,$conf; global $langs,$conf;
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$error=0; $error=0;
dol_syslog("CommandeFournisseur::Valid"); dol_syslog(get_class($this)."::valid");
$result = 0; $result = 0;
if ($user->rights->fournisseur->commande->valider) if ($user->rights->fournisseur->commande->valider)
{ {
@ -339,7 +339,7 @@ class CommandeFournisseur extends Commande
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (! $resql) if (! $resql)
{ {
dol_syslog("CommandeFournisseur::valid() Echec update - 10 - sql=".$sql, LOG_ERR); dol_syslog(get_class($this)."::valid Echec update - 10 - sql=".$sql, LOG_ERR);
dol_print_error($this->db); dol_print_error($this->db);
$error++; $error++;
} }
@ -357,7 +357,7 @@ class CommandeFournisseur extends Commande
$dirdest = $conf->fournisseur->dir_output.'/commande/'.$newref; $dirdest = $conf->fournisseur->dir_output.'/commande/'.$newref;
if (file_exists($dirsource)) if (file_exists($dirsource))
{ {
dol_syslog("CommandeFournisseur::valid() rename dir ".$dirsource." into ".$dirdest); dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
if (@rename($dirsource, $dirdest)) if (@rename($dirsource, $dirdest))
{ {
@ -393,7 +393,7 @@ class CommandeFournisseur extends Commande
} }
else else
{ {
dol_syslog("CommandeFournisseur::valid ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
return -1; return -1;
@ -402,7 +402,7 @@ class CommandeFournisseur extends Commande
else else
{ {
$this->error='Not Authorized'; $this->error='Not Authorized';
dol_syslog("CommandeFournisseur::valid ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -424,7 +424,7 @@ class CommandeFournisseur extends Commande
// Protection // Protection
if ($this->statut == 0) if ($this->statut == 0)
{ {
dol_syslog("CommandeFournisseur::set_draft already draft status", LOG_WARNING); dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING);
return 0; return 0;
} }
@ -440,7 +440,7 @@ class CommandeFournisseur extends Commande
$sql.= " SET fk_statut = 0"; $sql.= " SET fk_statut = 0";
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("CommandeFournisseur::set_draft sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::set_draft sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
// If stock is incremented on validate order, we must redecrement it // If stock is incremented on validate order, we must redecrement it
@ -631,7 +631,7 @@ class CommandeFournisseur extends Commande
} }
else else
{ {
dol_print_error($db,"CommandeFournisseur::getNextNumRef ".$obj->error); dol_print_error($db, get_class($this)."::getNextNumRef ".$obj->error);
return -1; return -1;
} }
} }
@ -661,7 +661,7 @@ class CommandeFournisseur extends Commande
$error=0; $error=0;
dol_syslog(get_class($this)."::Approve"); dol_syslog(get_class($this)."::approve");
if ($user->rights->fournisseur->commande->approuver) if ($user->rights->fournisseur->commande->approuver)
{ {
@ -720,13 +720,13 @@ class CommandeFournisseur extends Commande
{ {
$this->db->rollback(); $this->db->rollback();
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("CommandeFournisseur::Approve Error ",$this->error, LOG_ERR); dol_syslog(get_class($this)."::approve Error ",$this->error, LOG_ERR);
return -1; return -1;
} }
} }
else else
{ {
dol_syslog("CommandeFournisseur::Approve Not Authorized", LOG_ERR); dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
} }
return -1; return -1;
} }
@ -743,7 +743,7 @@ class CommandeFournisseur extends Commande
$error=0; $error=0;
dol_syslog("CommandeFournisseur::Refuse"); dol_syslog(get_class($this)."::refuse");
$result = 0; $result = 0;
if ($user->rights->fournisseur->commande->approuver) if ($user->rights->fournisseur->commande->approuver)
{ {
@ -767,13 +767,13 @@ class CommandeFournisseur extends Commande
} }
else else
{ {
dol_syslog("CommandeFournisseur::Refuse Error -1"); dol_syslog(get_class($this)."::refuse Error -1");
$result = -1; $result = -1;
} }
} }
else else
{ {
dol_syslog("CommandeFournisseur::Refuse Not Authorized"); dol_syslog(get_class($this)."::refuse Not Authorized");
} }
return $result ; return $result ;
} }
@ -801,7 +801,7 @@ class CommandeFournisseur extends Commande
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut; $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
$sql .= " WHERE rowid = ".$this->id; $sql .= " WHERE rowid = ".$this->id;
dol_syslog("CommandeFournisseur::Cancel sql=".$sql); dol_syslog(get_class($this)."::cancel sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$result = 0; $result = 0;
@ -830,13 +830,13 @@ class CommandeFournisseur extends Commande
{ {
$this->db->rollback(); $this->db->rollback();
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("CommandeFournisseur::Cancel ".$this->error); dol_syslog(get_class($this)."::cancel ".$this->error);
return -1; return -1;
} }
} }
else else
{ {
dol_syslog("CommandeFournisseur::Cancel Not Authorized"); dol_syslog(get_class($this)."::cancel Not Authorized");
return -1; return -1;
} }
} }
@ -853,14 +853,14 @@ class CommandeFournisseur extends Commande
*/ */
function commande($user, $date, $methode, $comment='') function commande($user, $date, $methode, $comment='')
{ {
dol_syslog("CommandeFournisseur::Commande"); dol_syslog(get_class($this)."::commande");
$result = 0; $result = 0;
if ($user->rights->fournisseur->commande->commander) if ($user->rights->fournisseur->commande->commander)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_methode_commande=".$methode.",date_commande=".$this->db->idate("$date"); $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_methode_commande=".$methode.",date_commande=".$this->db->idate("$date");
$sql .= " WHERE rowid = ".$this->id; $sql .= " WHERE rowid = ".$this->id;
dol_syslog("CommandeFournisseur::Commande sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::commande sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$result = 0; $result = 0;
@ -868,13 +868,13 @@ class CommandeFournisseur extends Commande
} }
else else
{ {
dol_syslog("CommandeFournisseur::Commande Error -1", LOG_ERR); dol_syslog(get_class($this)."::cCommande Error -1", LOG_ERR);
$result = -1; $result = -1;
} }
} }
else else
{ {
dol_syslog("CommandeFournisseur::Commande User not Authorized", LOG_ERR); dol_syslog(get_class($this)."::commande User not Authorized", LOG_ERR);
} }
return $result ; return $result ;
} }
@ -986,7 +986,7 @@ class CommandeFournisseur extends Commande
{ {
global $langs,$mysoc; global $langs,$mysoc;
dol_syslog("FournisseurCommande::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type"); dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type");
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters // Clean parameters
@ -1044,14 +1044,14 @@ class CommandeFournisseur extends Commande
{ {
$this->error="No price found for this quantity. Quantity may be too low ?"; $this->error="No price found for this quantity. Quantity may be too low ?";
$this->db->rollback(); $this->db->rollback();
dol_syslog("FournisseurCommande::addline result=".$result." - ".$this->error, LOG_DEBUG); dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
return -1; return -1;
} }
if ($result < -1) if ($result < -1)
{ {
$this->error=$prod->error; $this->error=$prod->error;
$this->db->rollback(); $this->db->rollback();
dol_syslog("Fournisseur.commande::addline result=".$result." - ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -1105,7 +1105,7 @@ class CommandeFournisseur extends Commande
$sql.= "'".price2num($total_ttc)."'"; $sql.= "'".price2num($total_ttc)."'";
$sql.= ")"; $sql.= ")";
dol_syslog('FournisseurCommande::addline sql='.$sql); dol_syslog(get_class($this)."::addline sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
//print $sql; //print $sql;
if ($resql) if ($resql)
@ -1119,7 +1119,7 @@ class CommandeFournisseur extends Commande
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
$this->db->rollback(); $this->db->rollback();
dol_syslog('FournisseurCommande::addline '.$this->error, LOG_ERR); dol_syslog(get_class($this)."::addline ".$this->error, LOG_ERR);
return -1; return -1;
} }
} }
@ -1160,7 +1160,7 @@ class CommandeFournisseur extends Commande
$sql.= " (fk_commande,fk_product, qty, fk_entrepot, fk_user, datec) VALUES "; $sql.= " (fk_commande,fk_product, qty, fk_entrepot, fk_user, datec) VALUES ";
$sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."')"; $sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."')";
dol_syslog("CommandeFournisseur::DispatchProduct sql=".$sql); dol_syslog(get_class($this)."::DispatchProduct sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (! $resql) if (! $resql)
{ {
@ -1178,7 +1178,7 @@ class CommandeFournisseur extends Commande
if ($result < 0) if ($result < 0)
{ {
$this->error=$mouv->error; $this->error=$mouv->error;
dol_syslog("CommandeFournisseur::DispatchProduct ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::DispatchProduct ".$this->error, LOG_ERR);
$error++; $error++;
} }
} }
@ -1248,14 +1248,14 @@ class CommandeFournisseur extends Commande
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ; $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
dol_syslog("FournisseurCommande::delete sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql) ) if (! $this->db->query($sql) )
{ {
$error++; $error++;
} }
$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id; $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
dol_syslog("FournisseurCommande::delete sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
if ($resql = $this->db->query($sql) ) if ($resql = $this->db->query($sql) )
{ {
if ($this->db->affected_rows($resql) < 1) if ($this->db->affected_rows($resql) < 1)
@ -1277,7 +1277,7 @@ class CommandeFournisseur extends Commande
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
dol_syslog("CommandeFournisseur::delete : Success"); dol_syslog(get_class($this)."::delete : Success");
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }
@ -1334,7 +1334,7 @@ class CommandeFournisseur extends Commande
{ {
$result = 0; $result = 0;
dol_syslog("CommandeFournisseur::Livraison"); dol_syslog(get_class($this)."::Livraison");
if ($user->rights->fournisseur->commande->receptionner) if ($user->rights->fournisseur->commande->receptionner)
{ {
@ -1352,7 +1352,7 @@ class CommandeFournisseur extends Commande
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
$sql.= " AND fk_statut IN (3,4)"; // Process running or Partially received $sql.= " AND fk_statut IN (3,4)"; // Process running or Partially received
dol_syslog("CommandeFournisseur::Livraison sql=".$sql); dol_syslog(get_class($this)."::Livraison sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1365,19 +1365,19 @@ class CommandeFournisseur extends Commande
{ {
$this->db->rollback(); $this->db->rollback();
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("CommandeFournisseur::Livraison Error ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::Livraison Error ".$this->error, LOG_ERR);
$result = -1; $result = -1;
} }
} }
else else
{ {
dol_syslog("CommandeFournisseur::Livraison Error -2", LOG_ERR); dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
$result = -2; $result = -2;
} }
} }
else else
{ {
dol_syslog("CommandeFournisseur::Livraison Not Authorized"); dol_syslog(get_class($this)."::Livraison Not Authorized");
$result = -3; $result = -3;
} }
return $result ; return $result ;
@ -1398,7 +1398,7 @@ class CommandeFournisseur extends Commande
$sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null'); $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("CommandeFournisseur::set_date_livraison sql=".$sql,LOG_DEBUG); dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1408,7 +1408,7 @@ class CommandeFournisseur extends Commande
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("CommandeFournisseur::set_date_livraison ".$this->error,LOG_ERR); dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
return -1; return -1;
} }
} }
@ -1591,7 +1591,7 @@ class CommandeFournisseur extends Commande
$sql.= ",product_type='".$type."'"; $sql.= ",product_type='".$type."'";
$sql.= " WHERE rowid = ".$rowid; $sql.= " WHERE rowid = ".$rowid;
dol_syslog("CommandeFournisseur::updateline sql=".$sql); dol_syslog(get_class($this)."::updateline sql=".$sql);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result > 0) if ($result > 0)
{ {
@ -1604,7 +1604,7 @@ class CommandeFournisseur extends Commande
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("CommandeFournisseur::updateline ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
@ -1612,7 +1612,7 @@ class CommandeFournisseur extends Commande
else else
{ {
$this->error="Order status makes operation forbidden"; $this->error="Order status makes operation forbidden";
dol_syslog("CommandeFournisseur::updateline ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
return -2; return -2;
} }
} }
@ -1629,7 +1629,7 @@ class CommandeFournisseur extends Commande
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
dol_syslog("CommandeFournisseur::initAsSpecimen"); dol_syslog(get_class($this)."::initAsSpecimen");
$now=dol_now(); $now=dol_now();
@ -1754,8 +1754,7 @@ class CommandeFournisseur extends Commande
/** /**
* \class CommandeFournisseurLigne * Classe de gestion des lignes de commande
* \brief Classe de gestion des lignes de commande
*/ */
class CommandeFournisseurLigne extends OrderLine class CommandeFournisseurLigne extends OrderLine
{ {