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

FIX missing entity filter

Browse Source
This commit is contained in:
Regis Houssin 2018-10-29 11:01:02 +01:00
parent 04f80f0925
commit 31497e867f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/projet/class/project.class.php
View File

@ -529,11 +529,11 @@ class Project extends CommonObject
if ($type == 'agenda') if ($type == 'agenda')
{ {
$sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project IN (". $ids .")"; $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project IN (". $ids .") AND entity IN (".getEntity('agenda').")";
} }
elseif ($type == 'expensereport') elseif ($type == 'expensereport')
{ {
$sql = "SELECT ed.rowid FROM " . MAIN_DB_PREFIX . "expensereport as e, " . MAIN_DB_PREFIX . "expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet IN (". $ids .")"; $sql = "SELECT ed.rowid FROM " . MAIN_DB_PREFIX . "expensereport as e, " . MAIN_DB_PREFIX . "expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND ed.fk_projet IN (". $ids .") AND entity IN (".getEntity('expensereport').")";
} }
elseif ($type == 'project_task') elseif ($type == 'project_task')
{ {
@ -549,7 +549,7 @@ class Project extends CommonObject
} }
else else
{ {
$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet IN (". $ids .")"; $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet IN (". $ids .") AND entity IN (".getEntity($type).")";
} }
if ($dates > 0) if ($dates > 0)