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

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

Browse Source 
Conflicts:
	htdocs/fourn/paiement/list.php
This commit is contained in:
Laurent Destailleur 2021-04-02 01:43:39 +02:00
commit 32d1bce677
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -29,7 +29,6 @@
"ckeditor/ckeditor" : "4.12.1",
"mike42/escpos-php" : "2.2",
"mobiledetect/mobiledetectlib" : "2.8.34",
"phpoffice/phpexcel" : "1.8.1",
"restler/framework" : "3.0.0-RC6",
"tecnickcom/tcpdf" : "6.3.2",
"nnnick/chartjs" : "^2.9",

4
htdocs/fourn/paiement/list.php
View File

@ -11,6 +11,7 @@
* Copyright (C) 2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018-2021 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
* Copyright (C) 2021 Ferran Marcet <fmarcet@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -200,9 +201,8 @@ if ($search_amount) {
$sql .= natural_search('p.amount', $search_amount, 1);
}
if ($search_bank_account > 0) {
$sql .= ' AND b.fk_account='.$search_bank_account."'";
$sql .= ' AND b.fk_account = '.((int) $search_bank_account);
}
if ($search_all) {
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
}