Fix: Do not show warning for event finished
This commit is contained in:
parent
13a62bab8c
commit
b35e2e825e
@ -22,7 +22,7 @@
|
|||||||
* \file htdocs/includes/boxes/box_actions.php
|
* \file htdocs/includes/boxes/box_actions.php
|
||||||
* \ingroup actions
|
* \ingroup actions
|
||||||
* \brief Module to build boxe for events
|
* \brief Module to build boxe for events
|
||||||
* \version $Id: box_actions.php,v 1.47 2011/07/03 12:53:37 eldy Exp $
|
* \version $Id: box_actions.php,v 1.48 2011/07/03 12:55:33 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
|
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
|
||||||
@ -79,7 +79,7 @@ class box_actions extends ModeleBoxes {
|
|||||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid AND s.entity IN (0, ".$conf->entity.")";
|
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid AND s.entity IN (0, ".$conf->entity.")";
|
||||||
$sql.= " WHERE a.fk_action = ta.id";
|
$sql.= " WHERE a.fk_action = ta.id";
|
||||||
$sql.= " AND a.entity = ".$conf->entity;
|
$sql.= " AND a.entity = ".$conf->entity;
|
||||||
$sql.= " AND a.percent <> 100";
|
$sql.= " AND a.percent >= 0 AND a.percent < 100";
|
||||||
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
|
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
|
||||||
if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
|
if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
|
||||||
$sql.= " ORDER BY a.datec DESC";
|
$sql.= " ORDER BY a.datec DESC";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user