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

Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation

Browse Source 
new: add PDFInvoiceSituation translation key for PDF title
This commit is contained in:
Laurent Destailleur 2020-10-22 15:49:25 +02:00 committed by GitHub
commit a83131276d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1656,7 +1656,7 @@ class pdf_crabe extends ModelePDFFactures
if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir"); if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit"); if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma"); 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->MultiCell($w, 3, $title, '', 'R');
$pdf->SetFont('', 'B', $default_font_size); $pdf->SetFont('', 'B', $default_font_size);

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

@ -1899,11 +1899,11 @@ class pdf_sponge extends ModelePDFFactures
if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir"); if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit"); if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma"); 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)) { if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
$title .= ' - '; $title .= ' - ';
if ($object->type == 0) { if ($object->type == 0) {
if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("InvoiceSituation"); if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("PDFInvoiceSituation");
$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle"); $title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
} elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement"); } elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir"); elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir");

1
htdocs/langs/en_US/bills.lang
View File

@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
InvoiceFirstSituationAsk=First situation invoice InvoiceFirstSituationAsk=First situation invoice
InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. InvoiceFirstSituationDesc=The <b>situation invoices</b> 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 InvoiceSituation=Situation invoice
PDFInvoiceSituation=Situation invoice
InvoiceSituationAsk=Invoice following the situation InvoiceSituationAsk=Invoice following the situation
InvoiceSituationDesc=Create a new situation following an already existing one InvoiceSituationDesc=Create a new situation following an already existing one
SituationAmount=Situation invoice amount(net) SituationAmount=Situation invoice amount(net)