From 9a0f9477a6378d719e448cacfc4d5422519a60e6 Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 25 Apr 2013 00:01:38 +0200 Subject: [PATCH] Fix multicompany problem with extrafield list from table --- htdocs/core/class/extrafields.class.php | 4 +++- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index d261af08416..6b21283c2f7 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -703,6 +703,7 @@ class ExtraFields $sql = 'SELECT '.$keyList.', '.$InfoFieldList[1]; $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0]; + $sql.= ' WHERE entity = '.$conf->entity; dol_syslog(get_class($this).':showInputField:$type=sellist sql='.$sql); $resql = $this->db->query($sql); @@ -839,7 +840,8 @@ class ExtraFields $sql = 'SELECT '.$InfoFieldList[1]; $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0]; - $sql.= ' where '.$keyList.'="'.$this->db->escape($value).'"'; + $sql.= ' WHERE '.$keyList.'="'.$this->db->escape($value).'"'; + $sql.= ' AND entity = '.$conf->entity; dol_syslog(get_class($this).':showOutputField:$type=sellist sql='.$sql); $resql = $this->db->query($sql); if ($resql) diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 18ea7623d66..25c8ede2227 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -67,7 +67,8 @@ if((($type == 'select') || ($type == 'checkbox') ||(($type == 'radio'))) && is_a } } }elseif ($type== 'sellist') { - $param_chain = array_keys($param['options'])[0]; + $paramlist=array_keys($param['options']); + $param_chain = $paramlist[0]; } ?>