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

Merge pull request #8052 from hregis/develop_multicompany

Browse Source 
Fix: regression and broken feature
This commit is contained in:
Laurent Destailleur 2018-01-15 11:31:07 +01:00 committed by GitHub
commit 64fd5154c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/class/contact.class.php
View File

@ -177,7 +177,7 @@ class Contact extends CommonObject
if (empty($this->priv)) $this->priv = 0;
if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
$entity = isset($this->entity)?$this->entity:$conf->entity;
$entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
$sql.= " datec";

2
htdocs/societe/class/societe.class.php
View File

@ -471,7 +471,7 @@ class Societe extends CommonObject
if ($result >= 0)
{
$entity = isset($this->entity)?$this->entity:$conf->entity;
$entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$entity.", '".$this->db->idate($now)."'";