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

Fix: travis error

Browse Source
This commit is contained in:
Regis Houssin 2017-07-12 16:45:32 +02:00
parent ceeb9d7f1b
commit 44a44ab0a2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/class/commonobject.class.php
View File

@ -599,7 +599,7 @@ abstract class CommonObject
} }
$datecreate = dol_now(); $datecreate = dol_now();
// Socpeople must have already been added by some a trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error // Socpeople must have already been added by some a trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
$TListeContacts=$this->liste_contact(-1, $source); $TListeContacts=$this->liste_contact(-1, $source);
$already_added=false; $already_added=false;
@ -611,11 +611,11 @@ abstract class CommonObject
} }
} }
} }
if(!$already_added) { if(!$already_added) {
$this->db->begin(); $this->db->begin();
// Insertion dans la base // Insertion dans la base
$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) "; $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
@ -623,7 +623,7 @@ abstract class CommonObject
$sql.= "'".$this->db->idate($datecreate)."'"; $sql.= "'".$this->db->idate($datecreate)."'";
$sql.= ", 4, ". $id_type_contact; $sql.= ", 4, ". $id_type_contact;
$sql.= ")"; $sql.= ")";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -636,7 +636,7 @@ abstract class CommonObject
return -1; return -1;
} }
} }
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }
@ -4226,7 +4226,10 @@ abstract class CommonObject
{ {
$this->db->begin(); $this->db->begin();
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; $table_element = $this->table_element;
if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG); dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
$resql=$this->db->query($sql_del); $resql=$this->db->query($sql_del);
if (! $resql) if (! $resql)