From 2f701f4889888247a5ad42ff8f2f937f230d768c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2020 23:24:13 +0100 Subject: [PATCH 1/4] Update mod_codecompta_aquarium.php --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 9d8d4346efd..b2f3f294926 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -85,8 +85,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $s1 = $form->textwithpicto('', $tooltip, 1, 1); $s2 = $form->textwithpicto('', $tooltip, 1, 1); $texte .= ''; - $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2)."
\n"; - $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1)."
\n"; + $texte .= $s2.' '.$langs->trans("ModuleCompanyCodeCustomer".$this->name)."
\n"; + $texte .= $s1.' '.$langs->trans("ModuleCompanyCodeSupplier".$this->name)."
\n"; $texte .= "
\n"; if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."
\n"; //if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."
\n"; From f9ef0f4d69e1af8c0caf4585948f69e3f07d19c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2020 23:33:58 +0100 Subject: [PATCH 2/4] Update mod_codecompta_digitaria.php --- htdocs/core/modules/societe/mod_codecompta_digitaria.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php index 6752a01a906..961fa1a4e73 100644 --- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php +++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php @@ -99,8 +99,10 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode $s3 = $form->textwithpicto('', $tooltip, 1, 1); $s4 = $form->textwithpicto('', $tooltip, 1, 1); $texte .= ''; - $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2, $s4)."
\n"; - $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1, $s3)."
\n"; + // trans remove html entities + $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}', '{s4}')."
\n"; + $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, '{s1}', '{s3}')."
\n"; + $texte = str_replace(array('{s1}', '{s2}', '{s3}', '{s4}'), array($s1, $s2, $s3, $s4), $texte); $texte .= "
\n"; // Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default) if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."
\n"; From eea9382b5735ea6034608fb38270a18fc5149e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2020 23:35:27 +0100 Subject: [PATCH 3/4] Update mod_codecompta_aquarium.php --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index b2f3f294926..119064cf62e 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -85,8 +85,10 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $s1 = $form->textwithpicto('', $tooltip, 1, 1); $s2 = $form->textwithpicto('', $tooltip, 1, 1); $texte .= ''; - $texte .= $s2.' '.$langs->trans("ModuleCompanyCodeCustomer".$this->name)."
\n"; - $texte .= $s1.' '.$langs->trans("ModuleCompanyCodeSupplier".$this->name)."
\n"; + // trans remove html entities + $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}')."
\n"; + $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name '{s1}')."
\n"; + $texte = str_replace(array('{s1}', '{s2}'), array($s1, $s2), $texte); $texte .= "
\n"; if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."
\n"; //if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."
\n"; From 83c60d725a187d74a2a3c758d981d45e075e6d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2020 23:45:32 +0100 Subject: [PATCH 4/4] Update mod_codecompta_aquarium.php --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 119064cf62e..13cc8a4948c 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -87,7 +87,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode $texte .= ''; // trans remove html entities $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}')."
\n"; - $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name '{s1}')."
\n"; + $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, '{s1}')."
\n"; $texte = str_replace(array('{s1}', '{s2}'), array($s1, $s2), $texte); $texte .= "
\n"; if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."
\n";