lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deplacement des rapports de paiements

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-12-23 14:34:13 +00:00
parent 6c1958f7ba
commit fccaae8b47
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/paiement/rapport.php
View File

@ -37,7 +37,7 @@ $user->getrights("facture");
if (! $user->rights->facture->lire) if (! $user->rights->facture->lire)
accessforbidden(); accessforbidden();
$dir = $conf->compta->dir_output; $dir = $conf->compta->dir_output.'/payments';
$socid=0; $socid=0;
if ($user->societe_id > 0) if ($user->societe_id > 0)
@ -109,7 +109,6 @@ print '<br>';
clearstatcache(); clearstatcache();
// Affiche lien sur autres années // Affiche lien sur autres années
$found=0; $found=0;
if (is_dir($dir)) if (is_dir($dir))

2
htdocs/document.php
View File

@ -145,7 +145,7 @@ if ($modulepart)
$accessallowed=1; $accessallowed=1;
} }
if ($user->societe_id > 0) $original_file=DOL_DATA_ROOT.'/private/'.$user->id.'/compta/'.$original_file; 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 // Wrapping pour les exports de compta

10
htdocs/includes/modules/rapport/pdf_paiement.class.php
View File

@ -75,7 +75,6 @@ class pdf_paiement
$pdf->SetFont('Arial','',12); $pdf->SetFont('Arial','',12);
$pdf->Text(11, 22, $langs->transnoentities("Page")." : ".$page); $pdf->Text(11, 22, $langs->transnoentities("Page")." : ".$page);
// $pdf->Text(11, 22, "Page " . $page . " sur " . $pages);
$pdf->SetFont('Arial','',12); $pdf->SetFont('Arial','',12);
@ -149,13 +148,7 @@ class pdf_paiement
if ($oldprowid <> $lines[$j][7]) if ($oldprowid <> $lines[$j][7])
{ {
$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 .= " AND date_format(p.datep, '%Y%m') = " . sprintf("%04d%02d",$year,$month);
$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC"; $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
$result = $this->db->query($sql); $result = $this->db->query($sql);
// print $sql ;
if ($result) if ($result)
{ {