|
@@ -331,7 +331,7 @@ class BookKeeping extends CommonObject
|
|
|
if (empty($this->piece_num)) {
|
|
|
$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
|
|
|
$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
|
|
|
- $sqlnum .= " WHERE entity = ".$conf->entity; // Do not use getEntity for accounting features
|
|
|
+ $sqlnum .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
$resqlnum = $this->db->query($sqlnum);
|
|
|
if ($resqlnum) {
|
|
@@ -736,7 +736,7 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= " t.date_validated as date_validation";
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.$mode.' as t';
|
|
|
$sql .= ' WHERE 1 = 1';
|
|
|
- $sql .= " AND entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
if (null !== $ref) {
|
|
|
$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
|
|
|
} else {
|
|
@@ -881,7 +881,7 @@ class BookKeeping extends CommonObject
|
|
|
}
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
|
|
|
$sql .= ' WHERE 1 = 1';
|
|
|
- $sql .= " AND entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
if (count($sqlwhere) > 0) {
|
|
|
$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
|
|
|
}
|
|
@@ -1037,7 +1037,7 @@ class BookKeeping extends CommonObject
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $sql .= ' WHERE t.entity IN ('.getEntity('accountancy').')';
|
|
|
+ $sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
if ($showAlreadyExportMovements == 0) {
|
|
|
$sql .= " AND t.date_export IS NULL";
|
|
|
}
|
|
@@ -1157,7 +1157,7 @@ class BookKeeping extends CommonObject
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $sql .= ' WHERE entity IN ('.getEntity('accountancy').')';
|
|
|
+ $sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
if (count($sqlwhere) > 0) {
|
|
|
$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
|
|
|
}
|
|
@@ -1455,7 +1455,7 @@ class BookKeeping extends CommonObject
|
|
|
*/
|
|
|
public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
|
|
|
{
|
|
|
- global $langs;
|
|
|
+ global $conf, $langs;
|
|
|
|
|
|
if (empty($delyear) && empty($journal)) {
|
|
|
$this->error = 'ErrorOneFieldRequired';
|
|
@@ -1476,7 +1476,7 @@ class BookKeeping extends CommonObject
|
|
|
if (!empty($journal)) {
|
|
|
$sql .= " AND code_journal = '".$this->db->escape($journal)."'";
|
|
|
}
|
|
|
- $sql .= " AND entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
// Exclusion of validated entries at the time of deletion
|
|
|
$sql .= " AND date_validated IS NULL";
|
|
|
|
|
@@ -1515,7 +1515,7 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
|
|
|
$sql .= " WHERE piece_num = ".(int) $piecenum;
|
|
|
$sql .= " AND date_validated IS NULL"; // For security, exclusion of validated entries at the time of deletion
|
|
|
- $sql .= " AND entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
$resql = $this->db->query($sql);
|
|
|
|
|
@@ -1637,7 +1637,7 @@ class BookKeeping extends CommonObject
|
|
|
}
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
|
|
|
$sql .= " WHERE piece_num = ".((int) $piecenum);
|
|
|
- $sql .= " AND entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
dol_syslog(__METHOD__, LOG_DEBUG);
|
|
|
$result = $this->db->query($sql);
|
|
@@ -1675,9 +1675,10 @@ class BookKeeping extends CommonObject
|
|
|
global $conf;
|
|
|
|
|
|
$sql = "SELECT MAX(piece_num)+1 as max FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
|
|
|
- $sql .= " WHERE entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
+
|
|
|
+ dol_syslog(get_class($this)."::getNextNumMvt", LOG_DEBUG);
|
|
|
|
|
|
- dol_syslog(get_class($this)."getNextNumMvt", LOG_DEBUG);
|
|
|
$result = $this->db->query($sql);
|
|
|
|
|
|
if ($result) {
|
|
@@ -1718,7 +1719,7 @@ class BookKeeping extends CommonObject
|
|
|
}
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
|
|
|
$sql .= " WHERE piece_num = ".((int) $piecenum);
|
|
|
- $sql .= " AND entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
dol_syslog(__METHOD__, LOG_DEBUG);
|
|
|
$result = $this->db->query($sql);
|
|
@@ -1781,7 +1782,7 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= " montant as amount, sens, fk_user_author, import_key, code_journal, piece_num,";
|
|
|
$sql .= " date_validated as date_validation";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
|
|
|
- $sql .= " WHERE entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
dol_syslog(get_class($this)."::export_bookkeeping", LOG_DEBUG);
|
|
|
|
|
@@ -1837,6 +1838,8 @@ class BookKeeping extends CommonObject
|
|
|
*/
|
|
|
public function transformTransaction($direction = 0, $piece_num = '')
|
|
|
{
|
|
|
+ global $conf;
|
|
|
+
|
|
|
$error = 0;
|
|
|
|
|
|
$this->db->begin();
|
|
@@ -1856,14 +1859,14 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
|
|
|
$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
|
|
|
$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.((int) $next_piecenum).", '".$this->db->idate($now)."'";
|
|
|
- $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
|
|
|
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if (!$resql) {
|
|
|
$error++;
|
|
|
$this->errors[] = 'Error '.$this->db->lasterror();
|
|
|
dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
|
|
|
}
|
|
|
- $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
|
|
|
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if (!$resql) {
|
|
|
$error++;
|
|
@@ -1871,7 +1874,7 @@ class BookKeeping extends CommonObject
|
|
|
dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
|
|
|
}
|
|
|
} elseif ($direction == 1) {
|
|
|
- $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
|
|
|
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if (!$resql) {
|
|
|
$error++;
|
|
@@ -1886,14 +1889,14 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
|
|
|
$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
|
|
|
$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
|
|
|
- $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.((int) $piece_num);
|
|
|
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if (!$resql) {
|
|
|
$error++;
|
|
|
$this->errors[] = 'Error '.$this->db->lasterror();
|
|
|
dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
|
|
|
}
|
|
|
- $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
|
|
|
+ $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if (!$resql) {
|
|
|
$error++;
|
|
@@ -1948,7 +1951,7 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= " AND aa.active = 1";
|
|
|
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
|
|
|
$sql .= " AND asy.rowid = ".((int) $pcgver);
|
|
|
- $sql .= " AND ab.entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND ab.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
$sql .= " ORDER BY account_number ASC";
|
|
|
|
|
|
dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
|
|
@@ -2012,7 +2015,7 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid AND parent.active = 1";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid AND root.active = 1";
|
|
|
$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
|
|
|
- $sql .= " AND aa.entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " AND aa.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
|
|
|
$resql = $this->db->query($sql);
|
|
@@ -2052,7 +2055,7 @@ class BookKeeping extends CommonObject
|
|
|
$sql .= " AND asy.rowid = ".((int) $pcgver);
|
|
|
$sql .= " AND aa.active = 1";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
|
|
|
- $sql .= " WHERE aa.entity IN (".getEntity('accountancy').")";
|
|
|
+ $sql .= " WHERE aa.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
|
|
|
|
|
|
dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
|
|
|
$resql = $this->db->query($sql);
|