From 800de88c6965a5298cfed6a0fff654bf0e605f15 Mon Sep 17 00:00:00 2001 From: DATUC Date: Wed, 12 Jan 2022 12:26:06 +0100 Subject: [PATCH 1/4] Update companies.lang --- htdocs/langs/en_US/companies.lang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index a3105a1eecd..3e85f1b35f7 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -157,15 +157,15 @@ ProfId3CL=- ProfId4CL=- ProfId5CL=- ProfId6CL=- -ProfId1CM=Id. prof. 1 (Registre de Commerce) -ProfId2CM=Id. prof. 2 (N° Contribuable) -ProfId3CM=Id. prof. 3 (N° Arrêté de création) +ProfId1CM=Id. prof. 1 (Trade Register) +ProfId2CM=Id. prof. 2 (Taxpayer No.) +ProfId3CM=Id. prof. 3 (Decree of creation) ProfId4CM=- ProfId5CM=- ProfId6CM=- -ProfId1ShortCM=Registre de Commerce -ProfId2ShortCM=N° Contribuable -ProfId3ShortCM=N° Arrêté de création +ProfId1ShortCM=Trade Register +ProfId2ShortCM=Taxpayer No. +ProfId3ShortCM=Decree of creation ProfId4ShortCM=- ProfId5ShortCM=- ProfId6ShortCM=- From e53d9d4320599db356887235440b168e427ff3d0 Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Fri, 14 Jan 2022 08:52:04 +0100 Subject: [PATCH 2/4] Update extrafields.class.php fix #19739 --- htdocs/core/class/extrafields.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 184b97a3c98..0e23863f1a9 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1947,10 +1947,6 @@ class ExtraFields if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) { continue; } - if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && $this->attributes[$object->table_element]['type'][$key] != 'boolean') { - //when unticking boolean field, it's not set in POST - continue; - } $key_type = $this->attributes[$object->table_element]['type'][$key]; if ($key_type == 'separate') { From 5b3fcc5e43979b1b0789bf81fb8f1b2b59c93056 Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Fri, 14 Jan 2022 10:10:10 +0100 Subject: [PATCH 3/4] Update extrafields.class.php --- htdocs/core/class/extrafields.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 0e23863f1a9..cb5d60d3066 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1947,6 +1947,10 @@ class ExtraFields if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) { continue; } + + if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) { + continue; + } $key_type = $this->attributes[$object->table_element]['type'][$key]; if ($key_type == 'separate') { From 2b64f69def6ae515346c4df2b32495c18433578b Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 14 Jan 2022 09:12:30 +0000 Subject: [PATCH 4/4] Fixing style errors. --- htdocs/core/class/extrafields.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index cb5d60d3066..4c0ec1ff5a5 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1947,7 +1947,7 @@ class ExtraFields if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) { continue; } - + if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) { continue; }