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

Fix: Action shown late when not

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-07 00:43:41 +00:00
parent 65d7d4f546
commit aa6394de85
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/actioncomm.class.php
View File

@ -374,7 +374,7 @@ class ActionComm
global $conf, $user; global $conf, $user;
$this->nbtodo=$this->nbtodolate=0; $this->nbtodo=$this->nbtodolate=0;
$sql = "SELECT a.id,".$this->db->pdate("a.datea")." as da"; $sql = "SELECT a.id,".$this->db->pdate("a.datep")." as dp";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -387,7 +387,7 @@ class ActionComm
while ($obj=$this->db->fetch_object($resql)) while ($obj=$this->db->fetch_object($resql))
{ {
$this->nbtodo++; $this->nbtodo++;
if ($obj->da < (time() - $conf->actions->warning_delay)) $this->nbtodolate++; if ($obj->dp < (time() - $conf->actions->warning_delay)) $this->nbtodolate++;
} }
return 1; return 1;
} }

3
htdocs/index.php
View File

@ -254,12 +254,13 @@ print '</tr>';
$nboflate=0; $nboflate=0;
$var=true; $var=true;
// //
// Ne pas inclure de sections sans gestion de permissions // Ne pas inclure de sections sans gestion de permissions
// //
// Nbre actions à faire (en retard) // Nbre actions à faire (en retard)
if ($conf->commercial->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled) if ($conf->agenda->enabled && $user->rights->agenda->myactions->read)
{ {
include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
$board=new ActionComm($db); $board=new ActionComm($db);