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

FIX Filter on debit/credit

Browse Source 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
This commit is contained in:
Laurent Destailleur 2021-03-16 18:56:10 +01:00
parent 59174315ae
commit 26dc3ef1b0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/compta/bank/bankentries_list.php
View File

@ -515,13 +515,17 @@ if ($search_description)
} }
$sql .= natural_search("b.label", $search_description_to_use); // Warning some text are just translation keys, not translated strings $sql .= natural_search("b.label", $search_description_to_use); // Warning some text are just translation keys, not translated strings
} }
if ($search_bid > 0) $sql .= " AND b.rowid=l.lineid AND l.fk_categ=".$search_bid; if ($search_bid > 0) $sql .= " AND b.rowid=l.lineid AND l.fk_categ=".((int) $search_bid);
if (!empty($search_type)) $sql .= " AND b.fk_type = '".$db->escape($search_type)."'"; if (!empty($search_type)) $sql .= " AND b.fk_type = '".$db->escape($search_type)."'";
// Search criteria amount // Search criteria amount
$search_debit = price2num(str_replace('-', '', $search_debit)); if ($search_debit) {
$search_credit = price2num(str_replace('-', '', $search_credit)); $sql .= natural_search('ABS(b.amount)', $search_debit, 1);
if ($search_debit) $sql .= natural_search('- b.amount', $search_debit, 1); $sql .= ' AND b.amount <= 0';
if ($search_credit) $sql .= natural_search('b.amount', $search_credit, 1); }
if ($search_credit) {
$sql .= natural_search('b.amount', $search_credit, 1);
$sql .= ' AND b.amount >= 0';
}
// Add where from extra fields // Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';