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

Fix: Reduce logo size.

Browse Source 
Fix: Customer code was not visible
This commit is contained in:
Laurent Destailleur 2010-07-29 16:06:30 +00:00
parent 39e4c69fc6
commit 2bc4209019
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -95,9 +95,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//Verification de la configuration //Verification de la configuration
if ($conf->expedition->dir_output."/sending") if ($conf->expedition->dir_output."/sending")
{ {
//Creation du Client $object->fetch_client();
$soc = new Societe($this->db);
$soc->fetch($object->commande->socid);
//Creation de l expediteur //Creation de l expediteur
$this->expediteur = $mysoc; $this->expediteur = $mysoc;
@ -363,7 +361,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
{ {
if (is_readable($logo)) if (is_readable($logo))
{ {
$pdf->Image($logo,10, 5, 0, 24); $pdf->Image($logo,10, 5, 0, 22);
} }
else else
{ {
@ -388,7 +386,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//Num Expedition //Num Expedition
$Yoff = $Yoff+7; $Yoff = $Yoff+7;
$Xoff = 142; $Xoff = 142;
// $pdf->rect($Xoff, $Yoff, 85, 8); //$pdf->rect($Xoff, $Yoff, 85, 8);
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('Arial','',8); $pdf->SetFont('Arial','',8);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -444,17 +442,28 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->SetXY($blSocX,$blSocY+3); $pdf->SetXY($blSocX,$blSocY+3);
$pdf->MultiCell(80, 2, $carac_emetteur); $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 //Date Expedition
$Yoff = $Yoff+7; $Yoff = $Yoff+7;
$pdf->SetXY($blSocX-80,$blSocY+20); $pdf->SetXY($blSocX-80,$blSocY+20);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('Arial','B',8);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true), '' , 'L'); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '' , 'L');
//Date Expedition
$pdf->SetXY($blSocX2,$blSocY+20);
$pdf->SetFont('Arial','B',8);
$pdf->SetTextColor(0,0,0);
// 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'); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '' , 'L');

11
htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
View File

@ -168,14 +168,15 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$posy+=5; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $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; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $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; $posy+=5;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
@ -229,6 +230,8 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
{ {
global $user,$conf,$langs; global $user,$conf,$langs;
$object->fetch_client();
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// Force output charset to ISO, because, FPDF expect text encoded in ISO // Force output charset to ISO, because, FPDF expect text encoded in ISO
$outputlangs->charset_output='ISO-8859-1'; $outputlangs->charset_output='ISO-8859-1';
@ -341,7 +344,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
// Description de la ligne produit // Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs); $libelleproduitservice=pdf_getlinedesc($object->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<EFBFBD>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->writeHTMLCell(150, 3, $this->posxdesc, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('Arial','', 9); // On repositionne la police par defaut $pdf->SetFont('Arial','', 9); // On repositionne la police par defaut