Skip to content
Snippets Groups Projects
Commit a1297203 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Start to fix some bugs

parent 7c826dc3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/core/boxes/box_activity.php
+ 5
− 5
View file @ a1297203
...@@ -154,9 +154,9 @@ class box_activity extends ModeleBoxes ...@@ -154,9 +154,9 @@ class box_activity extends ModeleBoxes
$sql.= " AND c.fk_soc = s.rowid"; $sql.= " AND c.fk_soc = s.rowid";
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.= " AND c.datec between '".$db->idate(dol_get_first_day(date("Y"),1,1))."' AND '".$db->idate(dol_get_last_day(date("Y"),12,1))."'"; $sql.= " AND c.date_commande between '".$db->idate(dol_get_first_day(date("Y"),1,1))."' AND '".$db->idate(dol_get_last_day(date("Y"),12,1))."'";
$sql.= " AND c.facture=0"; $sql.= " AND c.facture=0";
$sql.= " GROUP BY c.fk_statut"; $sql.= " GROUP BY c.fk_statut,c.facture";
$sql.= " ORDER BY c.fk_statut DESC"; $sql.= " ORDER BY c.fk_statut DESC";
$result = $db->query($sql); $result = $db->query($sql);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment