From 1dc0dfc065579cc377ba2c2e15779892f1454d70 Mon Sep 17 00:00:00 2001 From: phf Date: Tue, 25 Oct 2016 12:07:34 +0200 Subject: [PATCH 1/2] Fix fetch multicurrency object from code must be filter by entity --- htdocs/multicurrency/class/multicurrency.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php index c2c6ba1bc99..ce29f8e14c5 100644 --- a/htdocs/multicurrency/class/multicurrency.class.php +++ b/htdocs/multicurrency/class/multicurrency.class.php @@ -181,11 +181,13 @@ class MultiCurrency extends CommonObject public function fetch($id, $code = null) { dol_syslog('Currency::fetch', LOG_DEBUG); + + global $conf; $sql = 'SELECT'; $sql .= ' c.rowid, c.name, c.code, c.entity, c.date_create, c.fk_user'; $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' AS c'; - if (!empty($code)) $sql .= ' WHERE c.code = \''.$this->db->escape($code).'\''; + if (!empty($code)) $sql .= ' WHERE c.code = \''.$this->db->escape($code).'\' AND c.entity = '.$conf->entity; else $sql .= ' WHERE c.rowid = ' . $id; dol_syslog(__METHOD__,LOG_DEBUG); From a947ac55f9f2b4269ebddd5f70eb9e21dd565b4d Mon Sep 17 00:00:00 2001 From: phf Date: Tue, 25 Oct 2016 12:45:23 +0200 Subject: [PATCH 2/2] Fix get multicurrency rowid from code must be filtered by entity --- htdocs/multicurrency/class/multicurrency.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php index ce29f8e14c5..e3570c5285e 100644 --- a/htdocs/multicurrency/class/multicurrency.class.php +++ b/htdocs/multicurrency/class/multicurrency.class.php @@ -501,7 +501,9 @@ class MultiCurrency extends CommonObject */ public static function getIdFromCode(&$db, $code) { - $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = \''.$db->escape($code).'\''; + global $conf; + + $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = \''.$db->escape($code).'\' AND entity = '.$conf->entity; dol_syslog(__METHOD__,LOG_DEBUG); $resql = $db->query($sql);