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 bdf8ddb3a18..e8680b9eb2b 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -419,8 +419,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition //$this->Code39($Xoff+43, $Yoff+1, $object->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); //Definition Emplacement du bloc Societe $Xoff = 110; - $blSocX=11; - $blSocY=21; + $blSocX=90; + $blSocY=24; $blSocW=50; $blSocX2=$blSocW+$blSocXs; @@ -450,12 +450,12 @@ Class pdf_expedition_merou extends ModelePdfExpedition //Date Expedition $Yoff = $Yoff+7; - $pdf->SetXY($blSocX,$blSocY+24); + $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+24); + $pdf->SetXY($blSocX2,$blSocY+20); $pdf->SetFont('Arial','B',8); $pdf->SetTextColor(0,0,0); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($livreur->fullname), '' , 'L'); diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js index 0556beffe43..8ea5bf9ba96 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/lib/lib_head.js @@ -67,7 +67,7 @@ function company_save_refresh() Purpose: Pour la saisie des dates par calendrier Input: base "/theme/eldy" dateFieldID "dateo" Nom du champ - format "dd/MM/yyyy" Format issu de Dolibarr de SimpleDateFormat � utiliser pour retour + format "dd/MM/yyyy" Format issu de Dolibarr de SimpleDateFormat a utiliser pour retour ==================================================================*/ function showDP(base,dateFieldID,format)