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

Conflicts:
	htdocs/core/modules/modSyslog.class.php
This commit is contained in:
Laurent Destailleur
2018-10-30 15:32:09 +01:00
6 changed files with 35 additions and 22 deletions

View File

@@ -1824,7 +1824,7 @@ abstract class CommonObject
$this->multicurrency_code = $code;
list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
if ($rate) $this->setMulticurrencyRate($rate);
if ($rate) $this->setMulticurrencyRate($rate,2);
return 1;
}