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

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-18 22:01:14 +02:00
commit 0c342284f0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4173,7 +4173,9 @@ abstract class CommonObject
$object = new $InfoFieldList[0]($this->db); $object = new $InfoFieldList[0]($this->db);
if ($value) if ($value)
{ {
$res=$object->fetch(0,$value); if (is_numeric($value)) $res=$object->fetch($value);
else $res=$object->fetch('',$value);
if ($res > 0) $this->array_options[$key]=$object->id; if ($res > 0) $this->array_options[$key]=$object->id;
else else
{ {

2
htdocs/core/class/utils.class.php
View File

@ -168,7 +168,7 @@ class Utils
// Check type parameter // Check type parameter
if ($type == 'auto') $type = $db->type; if ($type == 'auto') $type = $db->type;
if (! in_array($type, array('pgsql', 'mysql', 'mysqli'))) if (! in_array($type, array('pgsql', 'mysql', 'mysqli','mysqlnobin')))
{ {
$langs->load("errors"); $langs->load("errors");
$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype"); $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");

4
htdocs/install/mysql/tables/llx_multicurrency_rate.sql
View File

@ -23,5 +23,5 @@ CREATE TABLE llx_multicurrency_rate
date_sync datetime DEFAULT NULL, date_sync datetime DEFAULT NULL,
rate double NOT NULL DEFAULT 0, rate double NOT NULL DEFAULT 0,
fk_multicurrency integer NOT NULL, fk_multicurrency integer NOT NULL,
entity integer DEFAULT 1, entity integer DEFAULT 1
) ENGINE=innodb; ) ENGINE=innodb;