From 1211763d534c76d909dacf5727d89a4a53b9b642 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Apr 2009 20:18:45 +0000 Subject: [PATCH] Qual: Uniformize PDF --- .../modules/commande/pdf_edison.modules.php | 27 +++++++++---------- .../modules/commande/pdf_einstein.modules.php | 8 +++--- .../pdf/pdf_expedition_merou.modules.php | 6 ++--- .../modules/facture/pdf_crabe.modules.php | 6 ++--- .../modules/facture/pdf_oursin.modules.php | 10 +++---- .../modules/fichinter/pdf_soleil.modules.php | 15 +++++------ .../livraison/pdf/pdf_sirocco.modules.php | 4 +-- .../livraison/pdf/pdf_typhon.modules.php | 4 +-- .../propale/pdf_propale_azur.modules.php | 18 ++++++------- .../propale/pdf_propale_jaune.modules.php | 2 +- .../pdf/pdf_muscadet.modules.php | 6 ++--- 11 files changed, 51 insertions(+), 55 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 9972dd6a721..711d333893e 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -112,6 +112,7 @@ class pdf_edison extends ModelePDFCommandes $outputlangs->load("companies"); $outputlangs->load("bills"); $outputlangs->load("products"); + $outputlangs->load("orders"); $outputlangs->setPhpLang(); @@ -194,7 +195,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetFillColor(220,220,220); $pdf->SetTextColor(0,0,0); - $pdf->SetFont('Arial','', 10); + $pdf->SetFont('Arial','', 9); $pdf->SetXY (10, $tab_top + 10 ); @@ -212,20 +213,20 @@ class pdf_edison extends ModelePDFCommandes $nexY = $pdf->GetY(); $pdf->SetXY (10, $curY); - $pdf->MultiCell(20, 5, $outputlangs->convToOutputCharset($com->lignes[$i]->ref), 0, 'C'); + $pdf->MultiCell(20, 3, $outputlangs->convToOutputCharset($com->lignes[$i]->ref), 0, 'C'); $pdf->SetXY (133, $curY); - $pdf->MultiCell(10, 5, vatrate($com->lignes[$i]->tva_tx), 0, 'C'); + $pdf->MultiCell(10, 3, vatrate($com->lignes[$i]->tva_tx), 0, 'C'); $pdf->SetXY (145, $curY); - $pdf->MultiCell(10, 5, price2num($com->lignes[$i]->qty), 0, 'C'); + $pdf->MultiCell(10, 3, price2num($com->lignes[$i]->qty), 0, 'C'); $pdf->SetXY (156, $curY); - $pdf->MultiCell(18, 5, price($com->lignes[$i]->price), 0, 'R', 0); + $pdf->MultiCell(18, 3, price($com->lignes[$i]->price), 0, 'R', 0); $pdf->SetXY (174, $curY); $total = price($com->lignes[$i]->total_ht); - $pdf->MultiCell(26, 5, $total, 0, 'R', 0); + $pdf->MultiCell(26, 3, $total, 0, 'R', 0); $nexY+=2; // Passe espace entre les lignes @@ -407,7 +408,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetFont('Arial','B',12); $posy+=20; - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -423,21 +424,19 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetFont('Arial','',9); $pdf->SetXY(10,$posy); - $pdf->MultiCell(80,4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); - /* - * Adresse Client - */ + // Client destinataire $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','B',12); $client = new Societe($this->db); $client->fetch($com->socid); $com->client = $client; $pdf->SetXY(102,42); - $pdf->MultiCell(96,5, $outputlangs->convToOutputCharset($com->client->nom)); - $pdf->SetFont('Arial','B',11); + $pdf->MultiCell(96, 5, $outputlangs->convToOutputCharset($com->client->nom)); + $pdf->SetFont('Arial','',11); $pdf->SetXY(102,$pdf->GetY()); - $pdf->MultiCell(96,5, $outputlangs->convToOutputCharset($com->client->adresse) . "\n" . $outputlangs->convToOutputCharset($com->client->cp) . " " . $outputlangs->convToOutputCharset($com->client->ville)); + $pdf->MultiCell(96, 5, $outputlangs->convToOutputCharset($com->client->adresse) . "\n" . $outputlangs->convToOutputCharset($com->client->cp) . " " . $outputlangs->convToOutputCharset($com->client->ville)); $pdf->rect(100, 40, 100, 40); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 2cd7f53bf08..38fd95335d3 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -797,12 +797,12 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetXY($this->marge_gauche+2,$posy+3); - // Nom emetteur + // Sender name $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',11); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -818,14 +818,14 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetFont('Arial','',9); $pdf->SetXY(12,$posy+7); - $pdf->MultiCell(80,4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); // Client destinataire $posy=42; $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $pdf->SetXY(102,$posy-5); - $pdf->MultiCell(80,4, $outputlangs->transnoentities("BillTo").":"); + $pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":"); $object->fetch_client(); // Cadre client destinataire diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 312c064c0ff..f0d435cbab1 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -392,13 +392,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition $blSocW=50; $blSocX2=$blSocW+$blSocXs; - // Nom emetteur + // Sender name $pdf->SetTextColor(0,0,60); $pdf->SetXY($blSocX,$blSocY); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->SetTextColor(0,0,0); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -414,7 +414,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetFont('Arial','',7); $pdf->SetXY($blSocX,$blSocY+4); - $pdf->MultiCell(80,2, $carac_emetteur); + $pdf->MultiCell(80, 2, $carac_emetteur); //Date Expedition $Yoff = $Yoff+7; diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 38d5ebd6f00..53b529c1181 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -1028,12 +1028,12 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetXY($this->marge_gauche+2,$posy+3); - // Nom emetteur + // Sender name $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',11); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -1049,7 +1049,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+8); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); // Client destinataire $posy=42; diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 8bb72e1c64f..449d0f7e920 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -857,12 +857,12 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetXY($this->marges['g'],$posy+4); - // Nom emetteur + // Sender name $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',12); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -878,12 +878,10 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche,$posy+9); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); - /* - * Client - */ + // Client destinataire $posy=45; $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 9c451027822..cf317ca339e 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -205,11 +205,12 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetXY($this->marge_gauche+2,$posy+3); + // Sende name $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',11); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -225,12 +226,10 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+9); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); - /* - * Adresse Client - */ + // Client destinataire $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','B',12); $fichinter->fetch_client(); @@ -269,7 +268,7 @@ class pdf_soleil extends ModelePDFFicheinter $tab_top=$nexY; $pdf->line(10, $nexY, 200, $nexY); - $pdf->MultiCell(0, 4, '', 0, 'J'); // Set interline to 4 + $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3. Then writeMultiCell must use 3 also. //dol_syslog("desc=".dol_htmlentitiesbr($fichinter->description)); $num = sizeof($fichinter->lignes); @@ -285,12 +284,12 @@ class pdf_soleil extends ModelePDFFicheinter if ($valide>0) { $pdf->SetXY (10, $tab_top + $j * $height); - $pdf->writeHTMLCell(0, 4, $this->marge_gauche, $tab_top + $j * $height, + $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + $j * $height, dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($fichinterligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration),1,$outputlangs->charset_output), 0, 1, 0); $tab_height+=4; $pdf->SetXY (10, $tab_top + 4 + $j * $height); - $pdf->writeHTMLCell(0, 4, $this->marge_gauche, $tab_top + 4 + $j * $height, + $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + 4 + $j * $height, dol_htmlentitiesbr($outputlangs->convToOutputCharset($fichinterligne->desc),1), 0, 1, 0); $tab_height+=dol_nboflines_bis($fichinterligne->desc,52)*4; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index ab5d99e25b7..1add4b3946f 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -364,7 +364,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->MultiCell(76, 4, $outputlangs->convToOutputCharset(MAIN_INFO_SOCIETE_NOM), 0, 'L'); } - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -380,7 +380,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche,$posy+4); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 3, $carac_emetteur); /* * Adresse Client diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 57bc3f7c40f..0001133f44e 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -510,7 +510,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('Arial','B',11); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -526,7 +526,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+9); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 3, $carac_emetteur); // Client destinataire $posy=42; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 76b08b50d60..29243c1b1f8 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -382,12 +382,12 @@ class pdf_propale_azur extends ModelePDFPropales @chmod($file, octdec($conf->global->MAIN_UMASK)); // Add external file - //$pdfConcat =& new concat_pdf(); - //$pdfConcat->setFiles(array($file, DOL_DOCUMENT_ROOT."/includes/modules/propale/morefile.pdf")); - //$pdfConcat->concat(); - //$pdf->AliasNbPages(); - //$pdfConcat->Output($file); - + //$pdfConcat =& new concat_pdf(); + //$pdfConcat->setFiles(array($file, DOL_DOCUMENT_ROOT."/includes/modules/propale/morefile.pdf")); + //$pdfConcat->concat(); + //$pdf->AliasNbPages(); + //$pdfConcat->Output($file); + $outputlangs->charset_output=$sav_charset_output; $langs->setPhpLang(); // On restaure langue session return 1; // Pas d'erreur @@ -850,7 +850,7 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetFont('Arial','B',11); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); - // Sended properties + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville); @@ -873,14 +873,14 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+8); - $pdf->MultiCell(80,4, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); // Client destinataire $posy=42; $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $pdf->SetXY(102,$posy-5); - $pdf->MultiCell(80,4, $outputlangs->transnoentities("BillTo").":"); + $pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":"); // Cadre client destinataire $pdf->rect(100, $posy, 100, $hautcadre); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 944cdad49f7..a802d262d96 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -399,7 +399,7 @@ class pdf_propale_jaune extends ModelePDFPropales $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+4); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); $pdf->rect(10, 40, 80, 40); diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 7a2cdf23958..80b9db6b5e2 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -650,7 +650,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetXY($this->marge_gauche+2,$posy+3); $pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L'); - // Caracteristiques emetteur + // Sender properties $carac_emetteur = ''; $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($mysoc->adresse); $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($mysoc->cp).' '.$outputlangs->convToOutputCharset($mysoc->ville); @@ -666,14 +666,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('Arial','',9); $pdf->SetXY($this->marge_gauche+2,$posy+8); - $pdf->MultiCell(80,3, $carac_emetteur); + $pdf->MultiCell(80, 4, $carac_emetteur); // Client destinataire $posy=42; $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $pdf->SetXY(100,$posy-5); - $pdf->MultiCell(96,5, $outputlangs->transnoentities("BillTo").":"); + $pdf->MultiCell(96, 4, $outputlangs->transnoentities("BillTo").":"); // $client = new Societe($this->db); $client->fetch($object->socid);