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

Merge pull request #8305 from atm-florian/7.0_fix

Browse Source 
fix warning and sql error
This commit is contained in:
Laurent Destailleur 2018-03-09 19:44:57 +01:00 committed by GitHub
commit 8f7122cf52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -103,6 +103,7 @@ class BlockedLog
public $ref_object = '';
public $object_data = null;
public $user_fullname='';
/**
* Array of tracked event codes

6
htdocs/core/modules/modFournisseur.class.php
View File

@ -531,7 +531,11 @@ class modFournisseur extends DolibarrModules
case 'sellist':
$tmp='';
$tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options']));
if ($tmpparam['options'] && is_array($tmpparam['options'])) {
$tmpparam_param_key=array_keys($tmpparam['options']);
$tmp=array_shift($tmpparam_param_key);
}
if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
break;
}

5
htdocs/holiday/define_holiday.php
View File

@ -216,8 +216,9 @@ if (empty($user->rights->holiday->read_all))
$userchilds=$user->getAllChildIds(1);
$filters.=' AND u.rowid IN ('.join(', ',$userchilds).')';
}
$filters.=natural_search(array('u.firstname','u.lastname'), $search_name);
if (!empty($search_name)) {
$filters.=natural_search(array('u.firstname','u.lastname'), $search_name);
}
if ($search_supervisor > 0) $filters.=natural_search(array('u.fk_user'), $search_supervisor, 2);
$listUsers = $holiday->fetchUsers(false, true, $filters);