From fbcb6da4e7dec929fc4dbdff3dc83fe05e4b96bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jul 2023 22:34:25 +0200 Subject: [PATCH] Fix typo --- htdocs/admin/pdf_other.php | 10 +++++----- htdocs/langs/en_US/errors.lang | 2 +- htdocs/langs/fr_FR/errors.lang | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php index 543155e0016..58f3eff765c 100644 --- a/htdocs/admin/pdf_other.php +++ b/htdocs/admin/pdf_other.php @@ -163,22 +163,22 @@ if (isModEnabled('facture')) { print ajax_constantonoff('INVOICE_ADD_ZATCA_QR_CODE'); } else { $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("INVOICE_ADD_ZATCA_QR_CODE", $arrval, $conf->global->INVOICE_ADD_ZATCA_QR_CODE); + print $form->selectarray("INVOICE_ADD_ZATCA_QR_CODE", $arrval, getDolGlobalString('INVOICE_ADD_ZATCA_QR_CODE')); } print ''; print ''; - if (getDolGlobalString('INVOICE_ADD_ZATCA_QR_CODE') == 'bottom') { + if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') { print $form->textwithpicto($langs->trans("INVOICE_ADD_SWISS_QR_CODE"), $langs->trans("INVOICE_ADD_SWISS_QR_CODEMore")); } else { print $langs->trans("INVOICE_ADD_SWISS_QR_CODE"); } print ''; $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - if (getDolGlobalString('MAIN_FEATURE_LEVEL') >= 1) { - $arrval['bottom'] = $langs->trans("AtBottomOfPage").' ('.$langs->trans("Experimental").' - Need PHP 8.1+)'; + if (getDolGlobalString('MAIN_FEATURES_LEVEL') >= 1) { + $arrval['bottom'] = $langs->trans("AtBottomOfPage").' ('.$langs->trans("Experimental").' - Need PHP 8.1+ and some PHP libs)'; } - print $form->selectarray("INVOICE_ADD_SWISS_QR_CODE", $arrval, $conf->global->INVOICE_ADD_SWISS_QR_CODE); + print $form->selectarray("INVOICE_ADD_SWISS_QR_CODE", $arrval, getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE')); print ''; // Mention category of operations diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 1ea4d9ac8fa..2bbab8cda50 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -359,7 +359,7 @@ WarningModuleNeedRefrech = Module %s has been disabled. Don't forget to e WarningPermissionAlreadyExist=Existing permissions for this object WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account. -SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with direct debit payments. +SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments. SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s) SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s SwissQrIbanNotImplementedYet = QR-IBAN not implemented yet diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 2ab780bf472..f3f2ae02b4f 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -358,7 +358,7 @@ WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validation automati WarningModuleNeedRefrech = Le module %s a été désactivé. N'oubliez pas de le réactiver WarningPermissionAlreadyExist=Autorisations existantes pour cet objet -SwissQrOnlyVIR = La facture SwissQR ne peut être ajoutée que sur les factures configurées pour être payées par prélèvement automatique. +SwissQrOnlyVIR = La facture SwissQR ne peut être ajoutée que sur les factures configurées pour être payées par virement. SwissQrCreditorAddressInvalid = L'adresse du créancier n'est pas valide (le code postal et la ville sont-ils définis ? (%s) SwissQrCreditorInformationInvalid = Les informations sur le créancier ne sont pas valides pour l'IBAN (%s) : %s SwissQrIbanNotImplementedYet = QR-IBAN pas encore implémenté