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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-01 03:51:45 +02:00
commit 45767b9b6b
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -406,7 +406,7 @@ class ActionComm extends CommonObject
*/ */
public function add(User $user, $notrigger = 0) public function add(User $user, $notrigger = 0)
{ {
$this->create($user, $notrigger); return $this->create($user, $notrigger);
} }
/** /**

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

@ -140,6 +140,7 @@ class MultiCurrency extends CommonObject
$this->db->begin(); $this->db->begin();
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$error ++; $error ++;
@ -184,9 +185,10 @@ class MultiCurrency extends CommonObject
$sql = 'SELECT'; $sql = 'SELECT';
$sql .= ' c.rowid, c.name, c.code, c.entity, c.date_create, c.fk_user'; $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'; $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).'\'';
else $sql .= ' WHERE c.rowid = ' . $id; else $sql .= ' WHERE c.rowid = ' . $id;
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
@ -226,8 +228,6 @@ class MultiCurrency extends CommonObject
*/ */
public function fetchAllCurrencyRate() public function fetchAllCurrencyRate()
{ {
dol_syslog('Currency::fetchAllCurrencyRate', LOG_DEBUG);
$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;
@ -235,6 +235,7 @@ class MultiCurrency extends CommonObject
$this->rates = array(); $this->rates = array();
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -284,10 +285,11 @@ class MultiCurrency extends CommonObject
// Update request // Update request
$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET'; $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
$sql .= ' name="'.$this->db->escape($this->name).'"'; $sql .= ' name=\''.$this->db->escape($this->name).'\'';
$sql .= ' code="'.$this->db->escape($this->code).'"'; $sql .= ' code=\''.$this->db->escape($this->code).'\'';
$sql .= ' WHERE rowid=' . $this->id; $sql .= ' WHERE rowid=' . $this->id;
dol_syslog(__METHOD__,LOG_DEBUG);
$this->db->begin(); $this->db->begin();
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@ -347,6 +349,7 @@ class MultiCurrency extends CommonObject
$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element; $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
$sql .= ' WHERE rowid=' . $this->id; $sql .= ' WHERE rowid=' . $this->id;
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$error ++; $error ++;
@ -425,7 +428,9 @@ class MultiCurrency extends CommonObject
$currency->code = $code; $currency->code = $code;
$currency->name = $code; $currency->name = $code;
$sql = 'SELECT label FROM '.MAIN_DB_PREFIX.'c_currencies WHERE code_iso = "'.$db->escape($code).'"'; $sql = 'SELECT label FROM '.MAIN_DB_PREFIX.'c_currencies WHERE code_iso = \''.$db->escape($code).'\'';
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql && ($line = $db->fetch_object($resql))) if ($resql && ($line = $db->fetch_object($resql)))
{ {
@ -475,6 +480,7 @@ class MultiCurrency extends CommonObject
$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 >= ALL (SELECT cr2.date_sync FROM '.MAIN_DB_PREFIX.$this->table_element_line.' AS cr2 WHERE cr.rowid = cr2.rowid)';
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql && ($obj = $this->db->fetch_object($resql))) { if ($resql && ($obj = $this->db->fetch_object($resql))) {
$this->rate = new CurrencyRate($this->db); $this->rate = new CurrencyRate($this->db);
@ -493,7 +499,9 @@ class MultiCurrency extends CommonObject
*/ */
public static function getIdFromCode(&$db, $code) public static function getIdFromCode(&$db, $code)
{ {
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = "'.$db->escape($code).'"'; $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = \''.$db->escape($code).'\'';
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql && $obj = $db->fetch_object($resql)) return $obj->rowid; if ($resql && $obj = $db->fetch_object($resql)) return $obj->rowid;
else return 0; else return 0;
@ -512,10 +520,11 @@ class MultiCurrency extends CommonObject
{ {
$sql = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m'; $sql = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
$sql.= ' WHERE m.code = "'.$db->escape($code).'"'; $sql.= ' WHERE m.code = \''.$db->escape($code).'\'';
$sql.= " AND m.entity IN (".getEntity('multicurrency', 1).")"; $sql.= " AND m.entity IN (".getEntity('multicurrency', 1).")";
$sql.= ' ORDER BY mc.date_sync DESC LIMIT 1'; $sql.= ' ORDER BY mc.date_sync DESC LIMIT 1';
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate); if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
else return array(0, 1); else return array(0, 1);
@ -556,6 +565,8 @@ class MultiCurrency extends CommonObject
global $db; global $db;
$sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture; $sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture;
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql && ($line = $db->fetch_object($resql))) if ($resql && ($line = $db->fetch_object($resql)))
{ {
@ -721,6 +732,7 @@ class CurrencyRate extends CommonObjectLine
$this->db->begin(); $this->db->begin();
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$error ++; $error ++;
@ -765,6 +777,7 @@ class CurrencyRate extends CommonObjectLine
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' AS cr'; $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' AS cr';
$sql .= ' WHERE cr.rowid = ' . $id; $sql .= ' WHERE cr.rowid = ' . $id;
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$numrows = $this->db->num_rows($resql); $numrows = $this->db->num_rows($resql);
@ -816,6 +829,7 @@ class CurrencyRate extends CommonObjectLine
$this->db->begin(); $this->db->begin();
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$error ++; $error ++;
@ -866,6 +880,7 @@ class CurrencyRate extends CommonObjectLine
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element; $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
$sql .= ' WHERE rowid='.$this->id; $sql .= ' WHERE rowid='.$this->id;
dol_syslog(__METHOD__,LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$error ++; $error ++;