Utilisation de transnoentities au lieu de trans

This commit is contained in:
Rodolphe Quiedeville 2006-12-17 13:50:20 +00:00
parent c4fd3fba34
commit e899bfb636

View File

@ -47,7 +47,7 @@ class pdf_paiement
$langs->load("bills"); $langs->load("bills");
$this->db = $db; $this->db = $db;
$this->description = $langs->trans("ListOfCustomerPayments"); $this->description = $langs->transnoentities("ListOfCustomerPayments");
$this->tab_top = 30; $this->tab_top = 30;
@ -71,10 +71,10 @@ class pdf_paiement
$pdf->Text(76, 10, $title); $pdf->Text(76, 10, $title);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',12);
$pdf->Text(11, 16, $langs->trans("Date")." : ".dolibarr_print_date(time(),"%d %b %Y")); $pdf->Text(11, 16, $langs->transnoentities("Date")." : ".dolibarr_print_date(time(),"%d %b %Y"));
$pdf->SetFont('Arial','',12); $pdf->SetFont('Arial','',12);
$pdf->Text(11, 22, $langs->trans("Page")." : ".$page); $pdf->Text(11, 22, $langs->transnoentities("Page")." : ".$page);
// $pdf->Text(11, 22, "Page " . $page . " sur " . $pages); // $pdf->Text(11, 22, "Page " . $page . " sur " . $pages);
$pdf->SetFont('Arial','',12); $pdf->SetFont('Arial','',12);
@ -82,18 +82,18 @@ class pdf_paiement
$pdf->Text(11,$this->tab_top + 6,'Date'); $pdf->Text(11,$this->tab_top + 6,'Date');
$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10); $pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
$pdf->Text(42, $this->tab_top + 6, $langs->trans("PaymentMode")); $pdf->Text(42, $this->tab_top + 6, $langs->transnoentities("PaymentMode"));
$pdf->line(80, $this->tab_top, 80, $this->tab_top + $this->tab_height + 10); $pdf->line(80, $this->tab_top, 80, $this->tab_top + $this->tab_height + 10);
$pdf->Text(82, $this->tab_top + 6, $langs->trans("Invoice")); $pdf->Text(82, $this->tab_top + 6, $langs->transnoentities("Invoice"));
$pdf->line(120, $this->tab_top, 120, $this->tab_top + $this->tab_height + 10); $pdf->line(120, $this->tab_top, 120, $this->tab_top + $this->tab_height + 10);
$pdf->Text(122, $this->tab_top + 6, $langs->trans("AmountInvoice")); $pdf->Text(122, $this->tab_top + 6, $langs->transnoentities("AmountInvoice"));
$pdf->line(160, $this->tab_top, 160, $this->tab_top + $this->tab_height + 10); $pdf->line(160, $this->tab_top, 160, $this->tab_top + $this->tab_height + 10);
$pdf->SetXY (160, $this->tab_top); $pdf->SetXY (160, $this->tab_top);
$pdf->MultiCell(40, 10, $langs->trans("AmountPayment"), 0, 'R'); $pdf->MultiCell(40, 10, $langs->transnoentities("AmountPayment"), 0, 'R');
$pdf->line(10, $this->tab_top + 10, 200, $this->tab_top + 10 ); $pdf->line(10, $this->tab_top + 10, 200, $this->tab_top + 10 );
@ -178,7 +178,7 @@ class pdf_paiement
$result=create_exdir($dir); $result=create_exdir($dir);
if ($result < 0) if ($result < 0)
{ {
$this->error=$langs->trans("ErrorCanNotCreateDir",$dir); $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
return -1; return -1;
} }
} }
@ -198,9 +198,7 @@ class pdf_paiement
$sql .= ", p.rowid as prowid"; $sql .= ", p.rowid as prowid";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f, "; $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f, ";
$sql .= MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf"; $sql .= MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf";
$sql .= " WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid"; $sql .= " WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid";
$sql .= " AND p.fk_paiement = c.id "; $sql .= " AND p.fk_paiement = c.id ";
$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";
@ -221,7 +219,7 @@ class pdf_paiement
$lines[$i][0] = $objp->facnumber; $lines[$i][0] = $objp->facnumber;
$lines[$i][1] = dolibarr_print_date($objp->dp,"%d %B %Y"); $lines[$i][1] = dolibarr_print_date($objp->dp,"%d %B %Y");
//$lines[$i][2] = $objp->paiement_type ; //$lines[$i][2] = $objp->paiement_type ;
$lines[$i][2] = $langs->trans("PaymentTypeShort".$objp->paiement_code); $lines[$i][2] = $langs->transnoentities("PaymentTypeShort".$objp->paiement_code);
$lines[$i][3] = $objp->num_paiement; $lines[$i][3] = $objp->num_paiement;
$lines[$i][4] = price($objp->paiement_amount); $lines[$i][4] = price($objp->paiement_amount);
$lines[$i][5] = price($objp->facture_amount); $lines[$i][5] = price($objp->facture_amount);
@ -260,7 +258,6 @@ class pdf_paiement
$pdf->Output($_file); $pdf->Output($_file);
} }
} }
?> ?>