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

Fix: missing company logo and invert from to !

Browse Source
This commit is contained in:
Regis Houssin 2012-04-10 12:04:14 +02:00
parent 98f7186d03
commit f5097dd605
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -902,7 +902,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
/*
$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
if ($mysoc->logo)
{
@ -920,10 +919,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
}
}
else
{*/
{
$text=$this->emetteur->name;
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
//}
}
$pdf->SetFont('', 'B', $default_font_size + 3);
$pdf->SetXY($posx,$posy);
@ -959,7 +958,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
if ($showaddress)
{
// Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$carac_emetteur = pdf_build_address($outputlangs,$mysoc);
// Show sender
$posy=42;
@ -980,10 +979,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Show sender name
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($mysoc->name), 0, 'L');
// Show sender information
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($this->emetteur->name,44)*4));
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($mysoc->name,44)*4));
$pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
@ -991,7 +990,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// If BILLING contact defined on order, we use it
$usecontact=false;
$arrayidcontact=$object->getIdContact('internal','BILLING');
$arrayidcontact=$object->getIdContact('external','BILLING');
if (count($arrayidcontact) > 0)
{
$usecontact=true;
@ -1003,15 +1002,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{
// On peut utiliser le nom de la societe du contact
if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname;
else $socname = $mysoc->nom;
else $socname = $this->emetteur->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
$carac_client_name=$outputlangs->convToOutputCharset($mysoc->nom);
$carac_client_name=$outputlangs->convToOutputCharset($this->emetteur->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,$object->contact,$usecontact,'target');
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
// Show recipient
$posy=42;