diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index b8bcf030729..27f34bef269 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -128,7 +128,7 @@ if (is_dir($dir))
 asort($linkforyear);
 foreach($linkforyear as $cursoryear)
 {
-    print '<a href="rapport.php?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index 68b444b8e51..1d9f2333300 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -118,7 +118,7 @@ class pdf_paiement_fourn
 
 		$month = sprintf("%02d",$month);
 		$year = sprintf("%04d",$year);
-		$file = $dir . "/payments-".$year."-".$month.".pdf";
+		$file = $dir . "/supplier_payments-".$year."-".$month.".pdf";
 
 		// Add pdfgeneration hook
 		if (! is_object($hookmanager))
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index e685421af19..b0b0436af1b 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -128,7 +128,7 @@ if (is_dir($dir))
 asort($linkforyear);
 foreach($linkforyear as $cursoryear)
 {
-    print '<a href="rapport.php?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
@@ -150,7 +150,7 @@ if ($year)
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/^payment/i',$file))
+                if (preg_match('/^supplier_payment/i',$file))
                 {
                     $var=!$var;
                     $tfile = $dir . '/'.$year.'/'.$file;