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

Fix: ajout vrification du statut

Browse Source
This commit is contained in:
Regis Houssin 2007-05-16 10:43:00 +00:00
parent 6fef7263ac
commit 81045d4ca0
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/expedition/expedition.class.php
View File

@ -285,16 +285,16 @@ class Expedition extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
if ($num >0) { if ($num > 0)
return 0; {
} return 0;
}
} }
$num = $this->db->num_rows($resql);
$sql .= " WHERE rowid = $this->id AND fk_statut = 0 ;";
$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET ref='".$this->ref."', fk_statut = 1, date_valid=now(), fk_user_valid=$user->id"; $sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
$sql .= " WHERE rowid = $this->id AND fk_statut = 0 ;"; $sql.= " SET ref='".$this->ref."', fk_statut = 1, date_valid = now(), fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {

17
htdocs/livraison/livraison.class.php
View File

@ -297,9 +297,22 @@ class Livraison extends CommonObject
$num = $this->ref; $num = $this->ref;
} }
// Tester si non dejà au statut validé. Si oui, on arrete afin d'éviter
// de décrémenter 2 fois le stock.
$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."livraison where ref='".$this->ref."' AND fk_statut='1'";
$resql=$this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
if ($num > 0)
{
return 0;
}
}
$sql = "UPDATE ".MAIN_DB_PREFIX."livraison "; $sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
$sql.= " SET ref='".addslashes($num)."', fk_statut = 1, date_valid=now(), fk_user_valid=".$user->id; $sql.= " SET ref='".addslashes($num)."', fk_statut = 1, date_valid = now(), fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; // on vérifie déjà le statut dans la requete $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {