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

Fix: conflit de variable

Browse Source
This commit is contained in:
Regis Houssin 2007-05-16 13:38:28 +00:00
parent c68e90907e
commit f908a18e83
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,18 +288,14 @@ class Livraison extends CommonObject
// on vérifie si le bon de livraison est en numérotation provisoire
$livref = substr($this->ref, 1, 4);
if ($livref == PROV)
if ($livref == 'PROV')
{
$num = $objMod->livraison_get_num($soc);
}
else
{
$num = $this->ref;
$this->ref = $objMod->livraison_get_num($soc);
}
// 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 <> '0'";
$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."livraison where ref='".$this->ref."' AND fk_statut <> 0";
$resql=$this->db->query($sql);
if ($resql)
{
@ -309,9 +305,9 @@ class Livraison extends CommonObject
return 0;
}
}
$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($this->ref)."', fk_statut = 1, date_valid = now(), fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
$resql=$this->db->query($sql);
if ($resql)