From e9e5163789085544c9ae71cf4fb9e3be4d7f71bf Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Fri, 5 Aug 2022 17:43:33 +0200
Subject: [PATCH 1/2] yesno

---
 htdocs/core/class/html.formsetup.class.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 3ff36b356da..a6b4c96e7ad 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -835,7 +835,11 @@ class FormSetupItem
 		} elseif ($this->type== 'color') {
 			$out.=  $this->generateInputFieldColor();
 		} elseif ($this->type == 'yesno') {
-			$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+			if (!empty($conf->use_javascript_ajax)) {
+				$out.= ajax_constantonoff($this->confKey);
+			} else {
+				$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
 			$out.= $this->generateInputFieldEmailTemplate();
 		} elseif (preg_match('/category:/', $this->type)) {
@@ -1057,7 +1061,15 @@ class FormSetupItem
 		} elseif ($this->type== 'color') {
 			$out.=  $this->generateOutputFieldColor();
 		} elseif ($this->type == 'yesno') {
-			$out.= ajax_constantonoff($this->confKey);
+			if (!empty($conf->use_javascript_ajax)) {
+				$out.= ajax_constantonoff($this->confKey);
+			} else {
+				if ($this->confKey == 1) {
+					$out.= $this->langs('yes');
+				} else {
+					$out.= $this->langs('no');
+				}
+			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 			$formmail = new FormMail($this->db);

From 93fd5c9e7db2fb05ce7688b24dd7dc48d110da0d Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Fri, 5 Aug 2022 17:55:39 +0200
Subject: [PATCH 2/2] corection lang

---
 htdocs/core/class/html.formsetup.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index a6b4c96e7ad..87fc937429c 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1036,7 +1036,7 @@ class FormSetupItem
 	 */
 	public function generateOutputField()
 	{
-		global $conf, $user;
+		global $conf, $user, $langs;
 
 		if (!empty($this->fieldOverride)) {
 			return $this->fieldOverride;
@@ -1064,10 +1064,10 @@ class FormSetupItem
 			if (!empty($conf->use_javascript_ajax)) {
 				$out.= ajax_constantonoff($this->confKey);
 			} else {
-				if ($this->confKey == 1) {
-					$out.= $this->langs('yes');
+				if ($this->fieldValue == 1) {
+					$out.= $langs->trans('yes');
 				} else {
-					$out.= $this->langs('no');
+					$out.= $langs->trans('no');
 				}
 			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {