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

Fixed implementation for #18373

Browse Source
This commit is contained in:
Laurent Destailleur 2021-08-28 21:09:52 +02:00
parent fc42c37e87
commit c188ef0438
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1702,10 +1702,17 @@ class pdf_crabe extends ModelePDFFactures
$title .= $outputlangsbis->transnoentities("InvoiceProForma"); $title .= $outputlangsbis->transnoentities("InvoiceProForma");
} }
} }
$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
if ($object->statut == $object::STATUS_DRAFT) {
$pdf->SetTextColor(128, 0, 0);
$title .= ' - '.$outputlangs->transnoentities("NotValidated");
}
$pdf->MultiCell($w, 3, $title, '', 'R'); $pdf->MultiCell($w, 3, $title, '', 'R');
$pdf->SetFont('', 'B', $default_font_size); $pdf->SetFont('', 'B', $default_font_size);
/*
$posy += 5; $posy += 5;
$pdf->SetXY($posx, $posy); $pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60); $pdf->SetTextColor(0, 0, 60);
@ -1714,9 +1721,9 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetTextColor(128, 0, 0); $pdf->SetTextColor(128, 0, 0);
$textref .= ' - '.$outputlangs->transnoentities("NotValidated"); $textref .= ' - '.$outputlangs->transnoentities("NotValidated");
} }
$pdf->MultiCell($w, 4, $textref, '', 'R'); $pdf->MultiCell($w, 4, $textref, '', 'R');*/
$posy += 1; $posy += 3;
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
if ($object->ref_client) { if ($object->ref_client) {

11
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -1939,10 +1939,17 @@ class pdf_sponge extends ModelePDFFactures
$title .= $outputlangsbis->transnoentities("InvoiceProForma"); $title .= $outputlangsbis->transnoentities("InvoiceProForma");
} }
} }
$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
if ($object->statut == $object::STATUS_DRAFT) {
$pdf->SetTextColor(128, 0, 0);
$title .= ' - '.$outputlangs->transnoentities("NotValidated");
}
$pdf->MultiCell($w, 3, $title, '', 'R'); $pdf->MultiCell($w, 3, $title, '', 'R');
$pdf->SetFont('', 'B', $default_font_size); $pdf->SetFont('', 'B', $default_font_size);
/*
$posy += 5; $posy += 5;
$pdf->SetXY($posx, $posy); $pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60); $pdf->SetTextColor(0, 0, 60);
@ -1951,9 +1958,9 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetTextColor(128, 0, 0); $pdf->SetTextColor(128, 0, 0);
$textref .= ' - '.$outputlangs->transnoentities("NotValidated"); $textref .= ' - '.$outputlangs->transnoentities("NotValidated");
} }
$pdf->MultiCell($w, 4, $textref, '', 'R'); $pdf->MultiCell($w, 4, $textref, '', 'R');*/
$posy += 1; $posy += 3;
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
if ($object->ref_client) { if ($object->ref_client) {