Merge pull request #1995 from atm-maxime/3.4

Fix : actioncomme report was not filtering by entity...
Dolibarr · Nov 4, 2014 · 45d57b0 · 45d57b0
2 parents 0b2a81f + ccddf0d
commit 45d57b0
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
@@ -182,6 +182,7 @@ function _pages(&$pdf, $outputlangs)
 		$sql.= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
 		$sql.= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year,$this->month,false))."'";
 		$sql.= " AND '".$this->db->idate(dol_get_last_day($this->year,$this->month,false))."'";
+		$sql.= " AND a.entity = ".$conf->entity;
 		$sql.= " ORDER BY a.datep DESC";
 
 		dol_syslog(get_class($this)."::_page sql=".$sql);