From 33164bcb3ec423b747c92d814245cd1808c32724 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 21 Feb 2019 14:25:09 +0100 Subject: [PATCH 1/3] fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator. --- htdocs/accountancy/customer/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 873018cf6c9..6a7d59a46ce 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -456,7 +456,7 @@ if ($result) { if ($objp->country_sell == '1') { $objp->code_sell_p = $objp->code_sell; $objp->aarowid_suggest = $objp->aarowid; - } elseif ($isinEEC == true) { + } elseif ($isinEEC === true) { $objp->code_sell_p = $objp->code_sell_intra; $objp->aarowid_suggest = $objp->aarowid_intra; } else { From 5a889300624a82a8a68365fca064e8f4a2c0cf7e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 21 Feb 2019 14:38:12 +0100 Subject: [PATCH 2/3] fix : The property total_vat does not exist on Reception --- .../modules/reception/doc/doc_generic_reception_odt.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php index fb93998ef84..bcae2c990af 100644 --- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php +++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php @@ -300,7 +300,7 @@ class doc_generic_reception_odt extends ModelePdfReception '__FROM_EMAIL__' => $this->emetteur->email, '__TOTAL_TTC__' => $object->total_ttc, '__TOTAL_HT__' => $object->total_ht, - '__TOTAL_VAT__' => $object->total_vat + '__TOTAL_VAT__' => $object->total_tva ); complete_substitutions_array($substitutionarray, $langs, $object); // Call the ODTSubstitution hook From 54da44b5065c81b92ba8dbf7f817e480f9535e9a Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 21 Feb 2019 19:50:03 +0100 Subject: [PATCH 3/3] Translation --- htdocs/core/class/html.formcompany.class.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index c60b6675a1d..f92bee4519f 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -188,11 +188,10 @@ class FormCompany // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps /** - * Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne. - * Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays. - * La cle de la liste est le code (il peut y avoir plusieurs entree pour - * un code donnee mais dans ce cas, le champ pays differe). - * Ainsi les liens avec les departements se font sur un departement independemment de son nom. + * Returns the drop-down list of departments/provinces/cantons for all countries or for a given country. + * In the case of an all-country list, the display breaks on the country. + * The key of the list is the code (there can be several entries for a given code but in this case, the country field differs). + * Thus the links with the departments are done on a department independently of its name. * * @param string $selected Code state preselected * @param int $country_codeid 0=list for all countries, otherwise country code or country rowid to show @@ -207,11 +206,10 @@ class FormCompany // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps /** - * Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne. - * Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays. - * La cle de la liste est le code (il peut y avoir plusieurs entree pour - * un code donnee mais dans ce cas, le champ pays differe). - * Ainsi les liens avec les departements se font sur un departement independemment de son nom. + * Returns the drop-down list of departments/provinces/cantons for all countries or for a given country. + * In the case of an all-country list, the display breaks on the country. + * The key of the list is the code (there can be several entries for a given code but in this case, the country field differs). + * Thus the links with the departments are done on a department independently of its name. * * @param string $selected Code state preselected (mus be state id) * @param integer $country_codeid Country code or id: 0=list for all countries, otherwise country code or country rowid to show