diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 6802adca09e..659901ae069 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1044,16 +1044,16 @@ class pdf_crabe extends ModelePDFFactures if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir"); if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit"); if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat"); - $pdf->MultiCell(100, 4, $title, '', 'R'); + $pdf->MultiCell(100, 3, $title, '', 'R'); - $pdf->SetFont('','B', $default_font_size + 2); + $pdf->SetFont('','B', $default_font_size); - $posy+=6; + $posy+=5; $pdf->SetXY($posx,$posy); $pdf->SetTextColor(0,0,60); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R'); - $posy+=2; + $posy+=1; $pdf->SetFont('','', $default_font_size - 1); $objectidnext=$object->getIdReplacingInvoice('validated'); @@ -1109,6 +1109,8 @@ class pdf_crabe extends ModelePDFFactures $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); } + $posy+=2; + // Add list of linked orders and proposals // TODO mutualiser $object->fetchObjectLinked(); @@ -1121,10 +1123,13 @@ class pdf_crabe extends ModelePDFFactures $num=count($objects); for ($i=0;$i<$num;$i++) { - $posy+=4; + $posy+=3; $pdf->SetXY($posx,$posy); - $pdf->SetFont('','', $default_font_size - 1); + $pdf->SetFont('','', $default_font_size - 2); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefProposal")." : ".$outputlangs->transnoentities($objects[$i]->ref), '', 'R'); + $posy+=3; + $pdf->SetXY($posx,$posy); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DatePropal")." : ".dol_print_date($objects[$i]->date,'day','',$outputlangs), '', 'R'); } } else if ($objecttype == 'commande') @@ -1133,12 +1138,15 @@ class pdf_crabe extends ModelePDFFactures $num=count($objects); for ($i=0;$i<$num;$i++) { - $posy+=4; + $posy+=3; $pdf->SetXY($posx,$posy); - $pdf->SetFont('','', $default_font_size - 1); + $pdf->SetFont('','', $default_font_size - 2); $text=$objects[$i]->ref; if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')'; $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R'); + $posy+=3; + $pdf->SetXY($posx,$posy); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($objects[$i]->date,'day','',$outputlangs), '', 'R'); } } } diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index 0cbb903cfda..7e4d8a5260d 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -913,7 +913,7 @@ class pdf_oursin extends ModelePDFFactures * ref facture */ $posy=78; - $pdf->SetFont('','B', $default_font_size + 3); + $pdf->SetFont('','B', $default_font_size + 2); $pdf->SetXY($this->marges['g'],$posy-5); $pdf->SetTextColor(0,0,0); $title=$outputlangs->transnoentities("Invoice"); @@ -922,12 +922,11 @@ class pdf_oursin extends ModelePDFFactures if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit"); if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma"); $pdf->MultiCell(100, 10, $title.' '.$outputlangs->transnoentities("Of").' '.dol_print_date($object->date,"day",false,$outputlangs,true), '', 'L'); - $pdf->SetFont('','B', $default_font_size + 1); + $pdf->SetFont('','B', $default_font_size); $pdf->SetXY($this->marges['g'],$posy); $pdf->SetTextColor(22,137,210); $pdf->MultiCell(100, 10, $outputlangs->transnoentities("RefBill")." : " . $outputlangs->transnoentities($object->ref), '', 'L'); $pdf->SetTextColor(0,0,0); - $posy+=4; $objectidnext=$object->getIdReplacingInvoice('validated'); if ($object->type == 0 && $objectidnext) @@ -961,22 +960,26 @@ class pdf_oursin extends ModelePDFFactures $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'L'); } + $posy+=1; + if ($object->type != 2) { - $posy+=5; + $posy+=3; $pdf->SetXY($this->marges['g'],$posy); - $pdf->SetFont('','', $default_font_size - 1); + $pdf->SetFont('','', $default_font_size - 2); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'L'); } if ($object->client->code_client) { - $posy+=4; + $posy+=3; $pdf->SetXY($this->marges['g'],$posy); - $pdf->SetFont('','', $default_font_size - 1); + $pdf->SetFont('','', $default_font_size - 2); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'L'); } + $posy+=1; + // Add list of linked orders and proposals // TODO mutualiser $object->fetchObjectLinked(); @@ -989,10 +992,13 @@ class pdf_oursin extends ModelePDFFactures $num=count($objects); for ($i=0;$i<$num;$i++) { - $posy+=4; + $posy+=3; $pdf->SetXY($this->marges['g'],$posy); - $pdf->SetFont('','', $default_font_size - 1); - $pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefProposal")." : ".$outputlangs->transnoentities($objects[$i]->ref)); + $pdf->SetFont('','', $default_font_size - 2); + $pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefProposal")." : ".$outputlangs->transnoentities($objects[$i]->ref), '', 'L'); + $posy+=3; + $pdf->SetXY($this->marges['g'],$posy); + $pdf->MultiCell(60, 3, $outputlangs->transnoentities("DatePropal")." : ".dol_print_date($objects[$i]->date,'day','',$outputlangs), '', 'L'); } } else if ($objecttype == 'commande') @@ -1000,12 +1006,15 @@ class pdf_oursin extends ModelePDFFactures $num=count($objects); for ($i=0;$i<$num;$i++) { - $posy+=4; + $posy+=3; $pdf->SetXY($this->marges['g'],$posy); - $pdf->SetFont('','', $default_font_size - 1); + $pdf->SetFont('','', $default_font_size - 2); $text=$objects[$i]->ref; if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')'; - $pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text)); + $pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'L'); + $posy+=3; + $pdf->SetXY($this->marges['g'],$posy); + $pdf->MultiCell(60, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($objects[$i]->date,'day','',$outputlangs), '', 'L'); } } }