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

le statut de la livraison est dj vrifie dans la requete

Browse Source
This commit is contained in:
Regis Houssin 2007-05-16 10:34:26 +00:00
parent fa5f2e3a65
commit 6fef7263ac
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,12 +297,9 @@ class Livraison extends CommonObject
$num = $this->ref; $num = $this->ref;
} }
// \todo Tester si non dejà au statut validé. Si oui, on arrete afin d'éviter
// de décrémenter 2 fois le stock.
$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"; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; // on vérifie déjà le statut dans la requete
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -629,12 +626,12 @@ class Livraison extends CommonObject
if ($statut==0) return $this->statuts[$statut]; if ($statut==0) return $this->statuts[$statut];
if ($statut==1) return $this->statuts[$statut]; if ($statut==1) return $this->statuts[$statut];
} }
if ($mode == 4) if ($mode == 4)
{ {
if ($statut==-1) return img_picto($langs->trans('StatusSendingCanceled'),'statut5').' '.$langs->trans('StatusSendingDraft'); if ($statut==-1) return img_picto($langs->trans('StatusSendingCanceled'),'statut5').' '.$langs->trans('StatusSendingDraft');
if ($statut==0) return img_picto($langs->trans('StatusSendingDraft'),'statut0').' '.$langs->trans('StatusSendingDraft'); if ($statut==0) return img_picto($langs->trans('StatusSendingDraft'),'statut0').' '.$langs->trans('StatusSendingDraft');
if ($statut==1) return img_picto($langs->trans('StatusSendingValidated'),'statut4').' '.$langs->trans('StatusSendingValidated'); if ($statut==1) return img_picto($langs->trans('StatusSendingValidated'),'statut4').' '.$langs->trans('StatusSendingValidated');
} }
} }
/** /**