From 17b6cb2724ae6afa81b61ec67d974891ab806e1b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 Jan 2023 13:23:08 +0100 Subject: [PATCH 1/4] Fix warning --- htdocs/core/modules/mailings/contacts1.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 09595b61376..eee3ee68e6c 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -309,7 +309,7 @@ class mailing_contacts1 extends MailingTargets // Choose language if multilangue active - if (@$conf->global->MAIN_MULTILANGS==1) { + if (getDolGlobalInt('MAIN_MULTILANGS') == 1) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $formadmin = new FormAdmin($this->db); $s .= ''.$langs->trans("DefaultLang").': '; From d3b5fa2983470940d9cf75d2e7d09dfa9b2b5cd5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Jan 2023 13:42:13 +0100 Subject: [PATCH 2/4] Debug v17 --- htdocs/admin/fckeditor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index b6ce3d8b9a5..5a5c2f25c0e 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -165,14 +165,14 @@ if (empty($conf->use_javascript_ajax)) { $constante = 'FCKEDITOR_ENABLE_'.$const; print ''."\n"; print ''; - print ''.img_object("", $picto[$const]).''; + print ''.img_object("", $picto[$const]).''; print ''; print $langs->trans($desc); if ($const == 'DETAILS') { print '
'.$langs->trans("FCKeditorForProductDetails2").''; } print ''; - print ''; + print ''; $value = (isset($conf->global->$constante) ? $conf->global->$constante : 0); if ($value == 0) { print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; From 210410775982614150ee25f26c0d4e1e22c8d353 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Jan 2023 17:38:47 +0100 Subject: [PATCH 3/4] Fix warnings --- htdocs/societe/class/societe.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 12a82c44180..01a72c6c7f3 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -784,6 +784,10 @@ class Societe extends CommonObject */ public $multicurrency_code; + /** + * @var string Set if company email found into unsubscribe of emailing list table + */ + public $no_email; // Fields loaded by fetchPartnerships() From 56f0efa2fc3142ee59eba51ceb8dfef0fddf25fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Jan 2023 19:09:56 +0100 Subject: [PATCH 4/4] Fix greek language --- htdocs/langs/el_GR/main.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index 605ee14d77a..68583623c45 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -7,10 +7,10 @@ DIRECTION=ltr # To read Chinese pdf with Linux: sudo apt-get install poppler-data # cid0jp is for Japanish # cid0kr is for Korean -# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages +# DejaVuSans is for some Eastern languages, greek, some Asian languages and some Arabic languages # freemono is for ru_RU or uk_UA, uz_UZ # freeserif is for Tamil -FONTFORPDF=helvetica +FONTFORPDF=DejaVuSans FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=.