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

Fix: select_comptes was always making a filter on field clos making

Browse Source 
other filter field not working in some case.
This commit is contained in:
Laurent Destailleur 2014-02-26 15:29:40 +01:00
parent 0918fd21b0
commit 855dac45ea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/html.form.class.php
View File

@ -2364,7 +2364,7 @@ class Form
* *
* @param string $selected Id account pre-selected * @param string $selected Id account pre-selected
* @param string $htmlname Name of select zone * @param string $htmlname Name of select zone
* @param int $statut Status of searched accounts (0=open, 1=closed) * @param int $statut Status of searched accounts (0=open, 1=closed, 2=both)
* @param string $filtre To filter list * @param string $filtre To filter list
* @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries. * @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
* @param string $moreattrib To add more attribute on select * @param string $moreattrib To add more attribute on select
@ -2376,10 +2376,10 @@ class Form
$langs->load("admin"); $langs->load("admin");
$sql = "SELECT rowid, label, bank"; $sql = "SELECT rowid, label, bank, clos as status";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " WHERE clos = '".$statut."'"; $sql.= " WHERE entity IN (".getEntity('bank_account', 1).")";
$sql.= " AND entity IN (".getEntity('bank_account', 1).")"; if ($statut != 2) $sql.= " AND clos = '".$statut."'";
if ($filtre) $sql.=" AND ".$filtre; if ($filtre) $sql.=" AND ".$filtre;
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";
@ -2409,6 +2409,7 @@ class Form
print '<option value="'.$obj->rowid.'">'; print '<option value="'.$obj->rowid.'">';
} }
print $obj->label; print $obj->label;
if ($statut == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
print '</option>'; print '</option>';
$i++; $i++;
} }