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

Merge pull request #12634 from frederic34/patch-7

Browse Source 
The variable $out does not seem to be defined for all execution paths
This commit is contained in:
Laurent Destailleur 2019-12-09 17:44:06 +01:00 committed by GitHub
commit 67401d717a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7665,7 +7665,8 @@ class Form
{
global $db, $conf, $langs, $user;
$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
$out = '';
$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
if (!empty($excludeid)) $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
$sql .= ' ORDER BY label';
@ -7754,6 +7755,7 @@ class Form
{
global $db, $conf, $langs;
$out = '';
$sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
$sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';
@ -7791,6 +7793,7 @@ class Form
{
global $db, $langs;
$out = '';
$sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
$sql .= ' WHERE active = 1';