From d347af385b11be83a3e0d4f1e8e28153bcdb8882 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 21 Oct 2020 13:47:40 +0200 Subject: [PATCH] new: add PDFInvoiceSituation translation key for PDF title --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 4 ++-- htdocs/langs/en_US/bills.lang | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 2af8fcc9bfb..a75d437ab21 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1656,7 +1656,7 @@ 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("InvoiceProForma"); - if ($this->situationinvoice) $title = $outputlangs->transnoentities("InvoiceSituation"); + if ($this->situationinvoice) $title = $outputlangs->transnoentities("PDFInvoiceSituation"); $pdf->MultiCell($w, 3, $title, '', 'R'); $pdf->SetFont('', 'B', $default_font_size); diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 7e730fabbc5..61e5007e6c8 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -1899,11 +1899,11 @@ class pdf_sponge 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("InvoiceProForma"); - if ($this->situationinvoice) $title = $outputlangs->transnoentities("InvoiceSituation"); + if ($this->situationinvoice) $title = $outputlangs->transnoentities("PDFInvoiceSituation"); if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) { $title .= ' - '; if ($object->type == 0) { - if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("InvoiceSituation"); + if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("PDFInvoiceSituation"); $title .= $outputlangsbis->transnoentities("PdfInvoiceTitle"); } elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement"); elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir"); diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 9c918bd0a15..7336f2b1e57 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact InvoiceFirstSituationAsk=First situation invoice InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. InvoiceSituation=Situation invoice +PDFInvoiceSituation=Situation invoice InvoiceSituationAsk=Invoice following the situation InvoiceSituationDesc=Create a new situation following an already existing one SituationAmount=Situation invoice amount(net)