From 6409ef34674364c2ed3e4994e866244b448a202e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Feb 2009 17:50:04 +0000 Subject: [PATCH] Fix: Action on a contact should not show action of company --- htdocs/lib/company.lib.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 37ccc6f71f0..36c46302c4c 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -364,8 +364,9 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') $sql.= " sp.name, sp.firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; - $sql.= " WHERE a.fk_soc = ".$objsoc->id; - $sql.= " AND u.rowid = a.fk_user_author"; + $sql.= " WHERE u.rowid = a.fk_user_author"; + if ($objsoc->id) $sql.= " AND a.fk_soc = ".$objsoc->id; + if (is_object($objcon) && $objcon->id) $sql.= " AND a.fk_contact = ".$objcon->id; $sql.= " AND c.id=a.fk_action AND a.percent < 100"; $sql.= " ORDER BY a.datep DESC, a.id DESC"; @@ -485,8 +486,8 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; $sql.= " WHERE u.rowid = a.fk_user_author"; - if ($objsoc->id) $sql.= " AND a.fk_soc = ".$objsoc->id; - if ($objcon->id) $sql.= " AND a.fk_contact = ".$objcon->id; + if ($objsoc->id) $sql.= " AND a.fk_soc = ".$objsoc->id; + if (is_object($objcon) && $objcon->id) $sql.= " AND a.fk_contact = ".$objcon->id; $sql.= " AND c.id=a.fk_action"; $sql.= " AND a.percent = 100"; $sql.= " ORDER BY a.datea DESC, a.id DESC";