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

Fix: renomme fk_user_create en fk_user_creat

Browse Source
This commit is contained in:
Regis Houssin 2007-05-31 06:25:56 +00:00
parent 1ced39861a
commit f6edee7115
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/contact.class.php
View File

@ -96,7 +96,7 @@ 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_create)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user_creat)";
$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,";
@ -580,7 +580,7 @@ class Contact
*/ */
function info($id) function info($id)
{ {
$sql = "SELECT c.idp, ".$this->db->pdate("c.datec")." as datec, c.fk_user_create"; $sql = "SELECT c.idp, ".$this->db->pdate("c.datec")." as datec, c.fk_user_creat";
$sql .= ", ".$this->db->pdate("c.tms")." as tms, c.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;
@ -594,8 +594,8 @@ class Contact
$this->id = $obj->idp; $this->id = $obj->idp;
if ($obj->fk_user_create) { if ($obj->fk_user_creat) {
$cuser = new User($this->db, $obj->fk_user_create); $cuser = new User($this->db, $obj->fk_user_creat);
$cuser->fetch(); $cuser->fetch();
$this->user_creation = $cuser; $this->user_creation = $cuser;
} }

2
htdocs/user.class.php
View File

@ -607,7 +607,7 @@ class User
// Si contact, supprime lien // Si contact, supprime lien
if ($this->contact_id) if ($this->contact_id)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user = null WHERE idp = $this->contact_id"; $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE idp = $this->contact_id";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {

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

@ -534,4 +534,5 @@ ALTER TABLE llx_product ADD COLUMN volume_units tinyint DEFAULT NULL after volum
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'; ALTER TABLE `llx_socpeople` CHANGE `fk_user` `fk_user_creat` INT( 11 ) NULL DEFAULT '0';
ALTER TABLE `llx_socpeople` CHANGE `fk_user_create` `fk_user_creat` 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_create integer DEFAULT 0, -- user qui a créé l'enregistrement fk_user_creat 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;