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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-29 23:06:21 +01:00
commit af61c19ffd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -171,6 +171,7 @@ class AccountingAccount extends CommonObject
$sql .= " a.rowid = " . (int) $rowid; $sql .= " a.rowid = " . (int) $rowid;
} elseif ($account_number) { } elseif ($account_number) {
$sql .= " a.account_number = '" . $this->db->escape($account_number) . "'"; $sql .= " a.account_number = '" . $this->db->escape($account_number) . "'";
$sql .= " AND a.entity = ".$conf->entity;
} }
if (! empty($limittocurrentchart)) { if (! empty($limittocurrentchart)) {
$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $this->db->escape($conf->global->CHARTOFACCOUNTS) . ')'; $sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $this->db->escape($conf->global->CHARTOFACCOUNTS) . ')';

7
htdocs/core/class/html.formadmin.class.php
View File

@ -96,12 +96,9 @@ class FormAdmin
if ($showcode == 1) $valuetoshow=$key.' - '.$value; if ($showcode == 1) $valuetoshow=$key.' - '.$value;
if ($showcode == 2) $valuetoshow=$value.' ('.$key.')'; if ($showcode == 2) $valuetoshow=$value.' ('.$key.')';
if ($filter && is_array($filter)) if ($filter && is_array($filter) && array_key_exists($key, $filter))
{ {
if ( ! array_key_exists($key, $filter)) continue;
{
$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
}
} }
elseif ($selected == $key) elseif ($selected == $key)
{ {