Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Position of address

Browse Source
This commit is contained in:
Laurent Destailleur
2012-01-29 21:46:55 +01:00
parent 06f41166e1
commit d7f7ec2372
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
View File

@@ -442,8 +442,9 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$blSocX2=$blSocW+$blSocX; $blSocX2=$blSocW+$blSocX;
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,0);
$pdf->SetXY($blSocX,$blSocY); $pdf->SetFont('','B', $default_font_size - 3);
$pdf->SetXY($blSocX,$blSocY+1);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@@ -451,7 +452,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur); $carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
$pdf->SetFont('','', $default_font_size - 3); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY($blSocX,$blSocY+3); $pdf->SetXY($blSocX,$blSocY+4);
$pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L'); $pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L');
@@ -504,12 +505,11 @@ Class pdf_expedition_merou extends ModelePdfExpedition
/**********************************/ /**********************************/
//Emplacement Informations Expediteur (My Company) //Emplacement Informations Expediteur (My Company)
/**********************************/ /**********************************/
$Yoff = $blSocY;
$blExpX=$Xoff-20; $blExpX=$Xoff-20;
$blW=52; $blW=52;
$Yoff = $Yoff+5;
$Ydef = $Yoff; $Ydef = $Yoff;
$blSocY = 1; $pdf->Rect($blExpX, $Yoff, $blW, 26);
$pdf->Rect($blExpX, $Yoff, $blW, 20);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
@@ -542,7 +542,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$blW=50; $blW=50;
$Yoff = $Ydef +1; $Yoff = $Ydef +1;
$pdf->Rect($blDestX, $Yoff-1, $blW, 20); $pdf->Rect($blDestX, $Yoff-1, $blW, 26);
//Titre //Titre
$pdf->SetFont('','B', $default_font_size - 3); $pdf->SetFont('','B', $default_font_size - 3);

4
htdocs/expedition/fiche.php
View File

@@ -850,7 +850,7 @@ else
$head=shipping_prepare_head($object); $head=shipping_prepare_head($object);
dol_fiche_head($head, 'shipping', $langs->trans("Sending"), 0, 'sending'); dol_fiche_head($head, 'shipping', $langs->trans("Sending"), 0, 'sending');
if ($mesg) print $mesg; dol_htmloutput_mesg($mesg);
/* /*
* Confirmation de la suppression * Confirmation de la suppression
@@ -970,7 +970,7 @@ else
// Date creation // Date creation
print '<tr><td>'.$langs->trans("DateCreation").'</td>'; print '<tr><td>'.$langs->trans("DateCreation").'</td>';
print '<td colspan="3">'.dol_print_date($object->date_creation,"daytext")."</td>\n"; print '<td colspan="3">'.dol_print_date($object->date_creation,"day")."</td>\n";
print '</tr>'; print '</tr>';
// Delivery date planed // Delivery date planed