From e644ba74544eb39b4190115c88da1de0368179bb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 4 May 2007 08:26:01 +0000
Subject: [PATCH] Fix: suppression de la fonction select_YesNo qui faisait
 doublon avec selectyesno

---
 htdocs/adherents/fiche.php     |  4 ++--
 htdocs/html.form.class.php     | 30 ------------------------------
 htdocs/html.formmail.class.php |  2 +-
 htdocs/soc.php                 |  4 ++--
 4 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 632b192faba..9063c5130ed 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -643,7 +643,7 @@ if ($action == 'edit')
 
 	// Profil public
     print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-    print $htmls->select_YesNo($adh->public,"public");
+    print $htmls->selectyesno("public",$adh->public,1);
     print "</td></tr>\n";
 
 	// Attributs supplémentaires
@@ -768,7 +768,7 @@ if ($action == 'create')
 
 	// Profil public
     print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-    print $htmls->select_YesNo($adh->public,"public");
+    print $htmls->selectyesno("public",$adh->public,1);
     print "</td></tr>\n";
 
 
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index c9f6ceadc6e..7bef029ef88 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1193,36 +1193,6 @@ class Form
         print '</select>';
     }
     
-	/**
-     *      \brief      Selection oui ou non
-     *      \param      selected        Id présélectionné
-     *      \param      htmlname        Nom de la zone select
-     */
-    function select_YesNo($selected='',$htmlname='yesno')
-    {
-        global $langs;
-        $resultyesno = '<select class="flat" name="'.$htmlname.'">';
-		$options = array(
-					'-1'=>'&nbsp;',
-					'0'=>$langs->trans("No"),
-					'1'=>$langs->trans("Yes")
-					);
-        foreach($options as $id => $value)
-        {
-            if ($selected == $id)
-            {
-                $resultyesno .= '<option value="'.$id.'" selected="true">'.$value;
-            }
-            else
-            {
-                $resultyesno .= '<option value="'.$id.'">'.$value;
-            }
-            $resultyesno .= '</option>';
-        }
-        $resultyesno .= '</select>';
-        return $resultyesno;
-    }
-    
     /**
      *      \brief      Selection HT ou TTC
      *      \param      selected        Id présélectionné
diff --git a/htdocs/html.formmail.class.php b/htdocs/html.formmail.class.php
index f92ecefc529..68ea71e7d9b 100644
--- a/htdocs/html.formmail.class.php
+++ b/htdocs/html.formmail.class.php
@@ -203,7 +203,7 @@ class FormMail
 			}
 			else
 			{
-				print $form->select_YesNo(0,'deliveryreceipt');
+				print $form->selectyesno('deliveryreceipt',0,1);
 			}
 
 			print "</td></tr>\n";
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 235df37b979..62e52c27b47 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -527,7 +527,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
 		$html = new Form($db);
 		print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
 		print '<td>';
-		print $html->select_YesNo("1",'assujtva_value');		// Assujeti par défaut en creation
+		print $html->selectyesno('assujtva_value',1,1);		// Assujeti par défaut en creation
 		print '</td>';
 
 		// Code TVA intra
@@ -818,7 +818,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
 
 		// Assujeti TVA
 		print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>';
-		print $form->select_YesNo($soc->tva_assuj,'assujtva_value');
+		print $form->selectyesno('assujtva_value',$soc->tva_assuj,1);
 		print '</td>';
 
 		// Code TVA intra