From 92f01ac6be7f57c1a881f4f8b4c69a0ba30f7c43 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 23 Mar 2023 17:01:50 +0100 Subject: [PATCH] FIX Invoice - Better situation invoice title --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 7 ++++--- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 174648dfa8c..50b22f1b439 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1876,7 +1876,8 @@ class pdf_crabe extends ModelePDFFactures $title = $outputlangs->transnoentities("InvoiceProForma"); } if ($this->situationinvoice) { - $title = $outputlangs->transnoentities("PDFInvoiceSituation"); + $langs->loadLangs(array("other")); + $title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -"; } if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) { $title .= ' - '; @@ -1919,11 +1920,11 @@ class pdf_crabe extends ModelePDFFactures $posy += 3; $pdf->SetFont('', '', $default_font_size - 2); - if ($object->ref_client) { + if ($object->ref_customer) { $posy += 4; $pdf->SetXY($posx, $posy); $pdf->SetTextColor(0, 0, 60); - $pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R'); + $pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_customer), '', 'R'); } if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) { diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 312115bb0c1..cbdb1608beb 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -2126,7 +2126,8 @@ class pdf_sponge extends ModelePDFFactures $title = $outputlangs->transnoentities("InvoiceProForma"); } if ($this->situationinvoice) { - $title = $outputlangs->transnoentities("PDFInvoiceSituation"); + $langs->loadLangs(array("other")); + $title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -"; } if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) { $title .= ' - '; @@ -2169,11 +2170,11 @@ class pdf_sponge extends ModelePDFFactures $posy += 3; $pdf->SetFont('', '', $default_font_size - 2); - if ($object->ref_client) { + if ($object->ref_customer) { $posy += 4; $pdf->SetXY($posx, $posy); $pdf->SetTextColor(0, 0, 60); - $pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R'); + $pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_customer), 65), '', 'R'); } if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {