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

Fix: renommage du champ fk_user de llx_socpeople en fk_user_create

Browse Source
This commit is contained in:
Regis Houssin 2007-05-30 07:23:11 +00:00
parent 176309ca06
commit 246c5f5bd5
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/contact.class.php
View File

@ -96,14 +96,15 @@ class Contact
$this->name=trim($this->name); $this->name=trim($this->name);
if (! $this->socid) $this->socid = 0; if (! $this->socid) $this->socid = 0;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user_create)";
$sql.= " VALUES (now(),"; $sql.= " VALUES (now(),";
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;
$sql.= ")"; $sql.= ")";
dolibarr_syslog("Contact.class::create sql=".$sql);
dolibarr_syslog("Contact.class::create sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -578,10 +579,10 @@ class Contact
*/ */
function info($id) function info($id)
{ {
$sql = "SELECT c.idp, ".$this->db->pdate("datec")." as datec, fk_user"; $sql = "SELECT c.idp, ".$this->db->pdate("c.datec")." as datec, c.fk_user_create";
$sql .= ", ".$this->db->pdate("tms")." as tms, fk_user_modif"; $sql .= ", ".$this->db->pdate("c.tms")." as tms, c.fk_user_modif";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c"; $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
$sql .= " WHERE c.idp = $id"; $sql .= " WHERE c.idp = ".$id;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -592,8 +593,8 @@ class Contact
$this->id = $obj->idp; $this->id = $obj->idp;
if ($obj->fk_user) { if ($obj->fk_user_create) {
$cuser = new User($this->db, $obj->fk_user); $cuser = new User($this->db, $obj->fk_user_create);
$cuser->fetch(); $cuser->fetch();
$this->user_creation = $cuser; $this->user_creation = $cuser;
} }

2
htdocs/user.class.php
View File

@ -762,7 +762,7 @@ class User
if ($resql) if ($resql)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople"; $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople";
$sql.= " SET fk_user = ".$this->id; $sql.= " SET fk_user_create = ".$this->id;
$sql.= " WHERE idp = ".$contact->id; $sql.= " WHERE idp = ".$contact->id;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

2
mysql/migration/2.1.0-2.2.0.sql
View File

@ -533,3 +533,5 @@ ALTER TABLE llx_product ADD COLUMN volume float DEFAULT NULL after weight_units;
ALTER TABLE llx_product ADD COLUMN volume_units tinyint DEFAULT NULL after volume; ALTER TABLE llx_product ADD COLUMN volume_units tinyint DEFAULT NULL after volume;
ALTER TABLE llx_product modify ref varchar(32) NOT NULL; ALTER TABLE llx_product modify ref varchar(32) NOT NULL;
ALTER TABLE `llx_socpeople` CHANGE `fk_user` `fk_user_create` INT( 11 ) NULL DEFAULT '0';

2
mysql/tables/llx_socpeople.sql
View File

@ -41,7 +41,7 @@ create table llx_socpeople
fax varchar(30), fax varchar(30),
email varchar(255), email varchar(255),
jabberid varchar(255), jabberid varchar(255),
fk_user integer DEFAULT 0, -- user qui a créé l'enregistrement fk_user_create integer DEFAULT 0, -- user qui a créé l'enregistrement
fk_user_modif integer, fk_user_modif integer,
note text note text
)type=innodb; )type=innodb;

2
mysql/tables/llx_user.sql
View File

@ -48,6 +48,6 @@ create table llx_user
datepreviouslogin datetime, datepreviouslogin datetime,
egroupware_id integer, egroupware_id integer,
ldap_sid varchar(255) DEFAULT NULL, ldap_sid varchar(255) DEFAULT NULL,
statut tinyint DEFAULT 1, statut tinyint DEFAULT 1,
lang varchar(6) lang varchar(6)
)type=innodb; )type=innodb;