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

Fix: add code mutualized

Browse Source
This commit is contained in:
Regis Houssin 2009-12-15 08:15:11 +00:00
parent 5cdeed6ea3
commit 0559ace73c
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/commonobject.class.php
View File

@ -491,7 +491,7 @@ class CommonObject
/** /**
* \brief Link ekement with a project * \brief Link element with a project
* \param projid Project id to link element to * \param projid Project id to link element to
* \return int <0 if KO, >0 if OK * \return int <0 if KO, >0 if OK
*/ */
@ -909,6 +909,32 @@ class CommonObject
} }
} }
/**
* \brief Set statut of an element
* \param statut Statut to set
* \param elementid Id of element to force
* \param elementtype Type of element to force
* \return int <0 if ko, >0 if ok
*/
function setStatut($statut,$elementId='',$elementType='')
{
$elementId = (!empty($elementId)?$elementId:$this->id);
$elementType = (!empty($elementType)?$elementType:$this->element);
$sql = "UPDATE ".MAIN_DB_PREFIX.$elementType;
$sql.= " SET fk_statut = ".$statut;
$sql.= " WHERE rowid=".$elementId;
dol_syslog("CommonObject::setStatut sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if (!$resql)
{
return -1;
}
return 1;
}
} }
?> ?>

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

@ -157,24 +157,18 @@ class Expedition extends CommonObject
if ($conf->commande->enabled) if ($conf->commande->enabled)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."commande SET fk_statut = 2 WHERE rowid=".$this->origin_id; $ret = $this->setStatut(2,$this->origin_id,$this->origin);
dol_syslog("Expedition::create sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
}
} }
else else
{ {
// TODO definir un statut // TODO definir un statut
$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 9 WHERE rowid=".$this->origin_id; $ret = $this->setStatut(9,$this->origin_id,$this->origin);
dol_syslog("Expedition::create sql=".$sql, LOG_DEBUG); }
if (! $this->db->query($sql)) if (! $ret)
{ {
$error++; $error++;
} }
} }
}
if (! $error) if (! $error)
{ {

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

@ -168,25 +168,19 @@ class Livraison extends CommonObject
{ {
if ($conf->commande->enabled) if ($conf->commande->enabled)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."commande SET fk_statut = 2 WHERE rowid=".$this->origin_id; $ret = $this->setStatut(2,$this->origin_id,$this->origin);
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
}
} }
else else
{ {
// TODO definir un statut // TODO definir un statut
$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 9 WHERE rowid=".$this->origin_id; $ret = $this->setStatut(9,$this->origin_id,$this->origin);
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG); }
if (! $this->db->query($sql)) if (! $ret)
{ {
$error++; $error++;
} }
} }
} }
}
if (! $error) if (! $error)
{ {