User creation not correctly managed if not defined
This commit is contained in:
parent
f582d6004d
commit
db953b2606
@ -88,7 +88,7 @@ class ActionComm
|
|||||||
* \brief Ajout d'une action en base
|
* \brief Ajout d'une action en base
|
||||||
* \param user auteur de la creation de l'action
|
* \param user auteur de la creation de l'action
|
||||||
* \param notrigger 1 ne declenche pas les triggers, 0 sinon
|
* \param notrigger 1 ne declenche pas les triggers, 0 sinon
|
||||||
* \return int id de l'action cr<EFBFBD><EFBFBD>e, < 0 si erreur
|
* \return int id de l'action creee, < 0 si erreur
|
||||||
*/
|
*/
|
||||||
function add($user,$notrigger=0)
|
function add($user,$notrigger=0)
|
||||||
{
|
{
|
||||||
@ -159,7 +159,7 @@ class ActionComm
|
|||||||
$sql.= ($this->durationa >= 0?"'".$this->durationa."'":"null").",";
|
$sql.= ($this->durationa >= 0?"'".$this->durationa."'":"null").",";
|
||||||
$sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
|
$sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
|
||||||
$sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").",";
|
$sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").",";
|
||||||
$sql.= "'".$user->id."',";
|
$sql.= ($user->id > 0 ? "'".$user->id."'":"null").",";
|
||||||
$sql.= ($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
|
$sql.= ($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
|
||||||
$sql.= ($this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
|
$sql.= ($this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
|
||||||
$sql.= "'".addslashes($this->label)."','".$this->percentage."','".$this->priority."','".$this->punctual."',";
|
$sql.= "'".addslashes($this->label)."','".$this->percentage."','".$this->priority."','".$this->punctual."',";
|
||||||
|
|||||||
@ -741,7 +741,8 @@ if ($_GET["id"])
|
|||||||
|
|
||||||
// Input by
|
// Input by
|
||||||
print '<tr><td width="30%" nowrap>'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
|
print '<tr><td width="30%" nowrap>'.$langs->trans("ActionAskedBy").'</td><td colspan="3">';
|
||||||
print $act->author->getNomUrl(1);
|
if ($act->author->id > 0) print $act->author->getNomUrl(1);
|
||||||
|
else print ' ';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Affecte a
|
// Affecte a
|
||||||
|
|||||||
@ -80,9 +80,9 @@ class Contact extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Ajout d'un contact en base
|
* \brief Add a contact in database
|
||||||
* \param user Utilisateur qui effectue l'ajout
|
* \param user Object user that create
|
||||||
* \return int <0 si ko, >0 si ok
|
* \return int <0 if KO, >0 if OK
|
||||||
*/
|
*/
|
||||||
function create($user)
|
function create($user)
|
||||||
{
|
{
|
||||||
@ -98,7 +98,7 @@ class Contact extends CommonObject
|
|||||||
if ($this->socid > 0) $sql.= " ".$this->socid.",";
|
if ($this->socid > 0) $sql.= " ".$this->socid.",";
|
||||||
else $sql.= "null,";
|
else $sql.= "null,";
|
||||||
$sql.= "'".addslashes($this->name)."',";
|
$sql.= "'".addslashes($this->name)."',";
|
||||||
$sql.= $user->id.",";
|
$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
|
||||||
$sql.= $this->priv;
|
$sql.= $this->priv;
|
||||||
$sql.= ")";
|
$sql.= ")";
|
||||||
|
|
||||||
@ -178,7 +178,7 @@ class Contact extends CommonObject
|
|||||||
$sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
|
$sql .= ", phone_mobile = '".addslashes($this->phone_mobile)."'";
|
||||||
$sql .= ", jabberid = '".addslashes($this->jabberid)."'";
|
$sql .= ", jabberid = '".addslashes($this->jabberid)."'";
|
||||||
$sql .= ", priv = '".$this->priv."'";
|
$sql .= ", priv = '".$this->priv."'";
|
||||||
if ($user) $sql .= ", fk_user_modif=".$user->id;
|
$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null");
|
||||||
$sql .= " WHERE rowid=".$id;
|
$sql .= " WHERE rowid=".$id;
|
||||||
|
|
||||||
dolibarr_syslog("Contact::update sql=".$sql,LOG_DEBUG);
|
dolibarr_syslog("Contact::update sql=".$sql,LOG_DEBUG);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user