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

Merge pull request #6141 from atm-ph/fix_develop_multicurrency_historisation_rate

Browse Source 
Fix no historisation of rate
This commit is contained in:
Laurent Destailleur 2016-12-11 13:18:35 +01:00 committed by GitHub
commit 6fa84206aa
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/multicurrency/class/multicurrency.class.php
View File

@ -451,7 +451,7 @@ class MultiCurrency extends CommonObject
} }
/** /**
* Update rate in database * Add new entry into llx_multicurrency_rate to historise
* *
* @param double $rate rate value * @param double $rate rate value
* *
@ -459,15 +459,7 @@ class MultiCurrency extends CommonObject
*/ */
public function updateRate($rate) public function updateRate($rate)
{ {
if (is_object($this->rate)) return $this->addRate($rate);
{
$this->rate->rate = $rate;
return $this->rate->update();
}
else
{
return $this->addRate($rate);
}
} }
/** /**
@ -480,7 +472,7 @@ class MultiCurrency extends CommonObject
$sql = 'SELECT cr.rowid'; $sql = 'SELECT cr.rowid';
$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr'; $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
$sql.= ' WHERE cr.fk_multicurrency = '.$this->id; $sql.= ' WHERE cr.fk_multicurrency = '.$this->id;
$sql.= ' AND cr.date_sync >= ALL (SELECT cr2.date_sync FROM '.MAIN_DB_PREFIX.$this->table_element_line.' AS cr2 WHERE cr.rowid = cr2.rowid)'; $sql.= ' AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM '.MAIN_DB_PREFIX.$this->table_element_line.' AS cr2 WHERE cr2.fk_multicurrency = '.$this->id.')';
dol_syslog(__METHOD__,LOG_DEBUG); dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);