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 949eb2858c8..57de2c1d7ab 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -95,9 +95,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition //Verification de la configuration if ($conf->expedition->dir_output."/sending") { - //Creation du Client - $soc = new Societe($this->db); - $soc->fetch($object->commande->socid); + $object->fetch_client(); //Creation de l expediteur $this->expediteur = $mysoc; @@ -363,7 +361,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition { if (is_readable($logo)) { - $pdf->Image($logo,10, 5, 0, 24); + $pdf->Image($logo,10, 5, 0, 22); } else { @@ -388,7 +386,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition //Num Expedition $Yoff = $Yoff+7; $Xoff = 142; - // $pdf->rect($Xoff, $Yoff, 85, 8); + //$pdf->rect($Xoff, $Yoff, 85, 8); $pdf->SetXY($Xoff,$Yoff); $pdf->SetFont('Arial','',8); $pdf->SetTextColor(0,0,0); @@ -444,17 +442,28 @@ Class pdf_expedition_merou extends ModelePdfExpedition $pdf->SetXY($blSocX,$blSocY+3); $pdf->MultiCell(80, 2, $carac_emetteur); + + + if ($object->client->code_client) + { + $Yoff+=7; + $posy=$Yoff; + $pdf->SetXY(100,$posy); + $pdf->SetTextColor(0,0,60); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); + } + //Date Expedition $Yoff = $Yoff+7; $pdf->SetXY($blSocX-80,$blSocY+20); $pdf->SetFont('Arial','B',8); $pdf->SetTextColor(0,0,0); - $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true), '' , 'L'); - //Date Expedition - $pdf->SetXY($blSocX2,$blSocY+20); - $pdf->SetFont('Arial','B',8); - $pdf->SetTextColor(0,0,0); + $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '' , 'L'); + // Deliverer + $pdf->SetXY($blSocX-80,$blSocY+23); + $pdf->SetFont('Arial','',8); + $pdf->SetTextColor(0,0,0); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '' , 'L'); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index ab12a23a7e1..c3306acb41f 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -168,14 +168,15 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref") ." : ".$object->ref, '', 'R'); + $pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSending") ." : ".$object->ref, '', 'R'); + //Date Expedition $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R'); + $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery,"%d %b %Y",false,$outputlangs,true), '', 'R'); - if ($object->client->code_client) + if (! empty($object->client->code_client)) { $posy+=5; $pdf->SetXY(100,$posy); @@ -229,6 +230,8 @@ Class pdf_expedition_rouget extends ModelePdfExpedition { global $user,$conf,$langs; + $object->fetch_client(); + if (! is_object($outputlangs)) $outputlangs=$langs; // Force output charset to ISO, because, FPDF expect text encoded in ISO $outputlangs->charset_output='ISO-8859-1'; @@ -341,7 +344,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition // Description de la ligne produit $libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs); - $pdf->SetFont('Arial','', 9); // Dans boucle pour g�rer multi-page + $pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page $pdf->writeHTMLCell(150, 3, $this->posxdesc, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1); $pdf->SetFont('Arial','', 9); // On repositionne la police par defaut