From fccaae8b477602771cb6e258641a830bc7b8d1ec Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sat, 23 Dec 2006 14:34:13 +0000
Subject: [PATCH] Deplacement des rapports de paiements

---
 htdocs/compta/paiement/rapport.php                     |  3 +--
 htdocs/document.php                                    |  2 +-
 htdocs/includes/modules/rapport/pdf_paiement.class.php | 10 +---------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 4ee4c5d58a0..c12a4ac4d64 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -37,7 +37,7 @@ $user->getrights("facture");
 if (! $user->rights->facture->lire)
   accessforbidden();
 
-$dir = $conf->compta->dir_output;
+$dir = $conf->compta->dir_output.'/payments';
 
 $socid=0;
 if ($user->societe_id > 0) 
@@ -109,7 +109,6 @@ print '<br>';
 
 clearstatcache();
 
-
 // Affiche lien sur autres années
 $found=0;
 if (is_dir($dir))
diff --git a/htdocs/document.php b/htdocs/document.php
index 167f607ab6b..ab12cae3174 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -145,7 +145,7 @@ if ($modulepart)
             $accessallowed=1;
         }
         if ($user->societe_id > 0) $original_file=DOL_DATA_ROOT.'/private/'.$user->id.'/compta/'.$original_file;
-        else $original_file=$conf->compta->dir_output.'/'.$original_file;
+        else $original_file=$conf->compta->dir_output.'/payments/'.$original_file;
     }
 
     // Wrapping pour les exports de compta
diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php
index d31e9acfa0f..f3da30f8354 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -75,7 +75,6 @@ class pdf_paiement
     
     $pdf->SetFont('Arial','',12);
     $pdf->Text(11, 22, $langs->transnoentities("Page")." : ".$page);
-    //      $pdf->Text(11, 22, "Page " . $page . " sur " . $pages);
     
     $pdf->SetFont('Arial','',12);
     
@@ -149,13 +148,7 @@ class pdf_paiement
 	if ($oldprowid <> $lines[$j][7])
 	  {
 	    $oldprowid = $lines[$j][7];
-	  }
-	
-	//	  if ($i < $this->line_per_page - 1)
-	//	    {
-	//	      $pdf->line(10, $this->tab_top + 10 + (($i+1) * $this->line_height), 200, $this->tab_top + 10 + (($i+1) * $this->line_height));
-	//	    }
-	
+	  }	
       }
   }
   /**
@@ -203,7 +196,6 @@ class pdf_paiement
     $sql .= " AND date_format(p.datep, '%Y%m') = " . sprintf("%04d%02d",$year,$month);
     $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
     $result = $this->db->query($sql);
-    //      print $sql ;
     
     if ($result)
       {