From 298fafd7d2f59cb53c8665c7ab59175ce87a8622 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Sat, 3 Oct 2015 15:10:53 +0200 Subject: [PATCH] fix : internationalization --- htdocs/admin/facture.php | 10 +++++----- .../facture/doc/doc_generic_invoice_odt.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index b77df2a7f12..07b00e5133f 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -226,11 +226,11 @@ if ($action == 'set_FACTURE_DRAFT_WATERMARK') } } -if ($action == 'set_FACTURE_FREE_TEXT') +if ($action == 'set_INVOICE_FREE_TEXT') { - $freetext = GETPOST('FACTURE_FREE_TEXT'); // No alpha here, we want exact string + $freetext = GETPOST('INVOICE_FREE_TEXT'); // No alpha here, we want exact string - $res = dolibarr_set_const($db, "FACTURE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "INVOICE_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -753,10 +753,10 @@ print ''; $var=! $var; print '
'; print ''; -print ''; +print ''; print ''; print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')
'; -$variablename='FACTURE_FREE_TEXT'; +$variablename='INVOICE_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { print ''; diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 2ca90b13ace..12ea7aa7b08 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -298,7 +298,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures // Line of free text $newfreetext=''; - $paramfreetext='FACTURE_FREE_TEXT'; + $paramfreetext='INVOICE_FREE_TEXT'; if (! empty($conf->global->$paramfreetext)) { $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index ecedfd2092a..a0514c001e9 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1637,7 +1637,7 @@ class pdf_crabe extends ModelePDFFactures function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) { $showdetails=0; - return pdf_pagefoot($pdf,$outputlangs,'FACTURE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); + return pdf_pagefoot($pdf,$outputlangs,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } }