Skip to content

Commit

Permalink
Fixed Project counter showing total amount of projects instead of jus…
Browse files Browse the repository at this point in the history
…t the projects current user can see
  • Loading branch information
marcosgdf committed Mar 12, 2017
1 parent f15c6da commit e9d5b44
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions htdocs/projet/class/project.class.php
Expand Up @@ -3,7 +3,7 @@
* Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014-2017 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -1689,17 +1689,21 @@ public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
*/
function load_state_board()
{
global $conf;
global $user;

$this->nb=array();

$sql = "SELECT count(u.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as u";
$sql.= " WHERE";
//$sql.= " WHERE u.fk_statut > 0";
//$sql.= " AND employee != 0";
$sql.= " u.entity IN (".getEntity('projet', 1).")";


$sql = "SELECT DISTINCT
count(p.rowid) as nb
FROM ".MAIN_DB_PREFIX."projet AS p LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON p.fk_soc = s.rowid
LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status AS cls ON p.fk_opp_status = cls.rowid
WHERE p.entity IN (".getEntity('projet', 1).")";

if (! $user->rights->projet->all->lire) {
$projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
$sql .= "AND p.rowid IN (".$projectsListId.")";
}

$resql=$this->db->query($sql);
if ($resql)
{
Expand Down

0 comments on commit e9d5b44

Please sign in to comment.