Fix: limit to current entity
This commit is contained in:
parent
808cd3b77d
commit
f7daa88752
@ -2,7 +2,7 @@
|
||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
|
||||
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -255,6 +255,7 @@ $sql.= ', '.MAIN_DB_PREFIX.'user as u';
|
||||
$sql.= ' WHERE a.fk_action = ca.id';
|
||||
$sql.= ' AND a.fk_user_author = u.rowid';
|
||||
$sql.= ' AND u.entity in (0,'.$conf->entity.')'; // To limit to entity
|
||||
$sql.= ' AND a.entity = '.$conf->entity;
|
||||
if ($user->societe_id) $sql.= ' AND a.fk_soc = '.$user->societe_id; // To limit to external user company
|
||||
if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
|
||||
if ($action == 'show_day')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user