Merge pull request #1995 from atm-maxime/3.4

Fix : actioncomme report was not filtering by entity...
2014-11-04 17:41:40 +01:00 · 2014-10-31 16:56:14 +01:00 · 2014-08-14 00:09:55 +02:00 · 2014-08-12 11:45:11 +02:00
2 changed files with 2 additions and 1 deletions
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -182,6 +182,7 @@ class CommActionRapport
 		$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);
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -249,7 +249,7 @@ AddCreditNote=Créer facture avoir
 Deposit=Acompte
 Deposits=Acomptes
 DiscountFromCreditNote=Remise issue de l'avoir %s
-DiscountFromDeposit=Paiements issue de l'acompte %s
+DiscountFromDeposit=Paiement issu de l'acompte %s
 AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée
 CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit
 NewGlobalDiscount=Nouvelle ligne de déduction
Author	SHA1	Message	Date
Laurent Destailleur	45d57b0492	Merge pull request #1995 from atm-maxime/3.4 Fix : actioncomme report was not filtering by entity...	2014-11-04 17:41:40 +01:00
Maxime Kohlhaas	ccddf0d1be	Fix : actioncomme report was not filtering by entity...	2014-10-31 16:56:14 +01:00
Laurent Destailleur	0b2a81f4b8	Merge pull request #1821 from astebert/patch-1 Update bills.lang	2014-08-14 00:09:55 +02:00
astebert	9c7647a7ae	Update bills.lang Ligne 252 : Changement grammatical - de "Paiements issue de l'acompte" - en "Paiement issu de l'acompte"	2014-08-12 11:45:11 +02:00