From dc3eb8bf7810cc916b49455fcd0235c0d39acaf5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 2 Sep 2010 20:57:17 +0000
Subject: [PATCH] Qual: Remove useless cleartype param to make code easier.

---
 htdocs/core/class/html.form.class.php         |  2 +-
 .../societe/canvas/default/tpl/create.tpl.php |  1 -
 .../canvas/individual/tpl/create.tpl.php      |  1 -
 htdocs/societe/class/societe.class.php        |  2 -
 htdocs/societe/soc.php                        | 39 ++++++++++++-------
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6f349127643..8009691437c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2878,7 +2878,7 @@ class Form
 
         $out='';
 
-        $out.='<select '.($disabled?'disabled="true"':'').' class="flat" name="'.$htmlname.'" '.($option != ''?$option:'').'>';
+        $out.='<select id="'.$htmlname.'" '.($disabled?'disabled="true" ':'').'class="flat" name="'.$htmlname.'" '.($option != ''?$option:'').'>';
 
         if ($show_empty)
         {
diff --git a/htdocs/societe/canvas/default/tpl/create.tpl.php b/htdocs/societe/canvas/default/tpl/create.tpl.php
index 31cab78c792..1026cdd0eba 100644
--- a/htdocs/societe/canvas/default/tpl/create.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/create.tpl.php
@@ -29,7 +29,6 @@
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
 <input type="hidden" name="action" value="add">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="cleartype" value="0">
 <input type="hidden" name="private" value="<?php echo $this->object->tpl['particulier']; ?>">
 <?php if ($this->object->tpl['auto_customercode'] || $this->object->tpl['auto_suppliercode']) { ?>
 <input type="hidden" name="code_auto" value="1">
diff --git a/htdocs/societe/canvas/individual/tpl/create.tpl.php b/htdocs/societe/canvas/individual/tpl/create.tpl.php
index ce47dbee724..e583f337ef1 100644
--- a/htdocs/societe/canvas/individual/tpl/create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/create.tpl.php
@@ -29,7 +29,6 @@
 <input type="hidden" name="action" value="add">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
-<input type="hidden" name="cleartype" value="0">
 <input type="hidden" name="private" value="<?php echo $this->object->tpl['particulier']; ?>">
 <?php if ($this->object->tpl['auto_customercode'] || $this->object->tpl['auto_suppliercode']) { ?>
 <input type="hidden" name="code_auto" value="1">
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8c335135ee0..e9344cdf97d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2460,14 +2460,12 @@ class Societe extends CommonObject
                             document.formsoc.action.value="create";
                             document.formsoc.canvas.value="'.$canvas.'";
                             document.formsoc.private.value=0;
-                            document.formsoc.cleartype.value=1;
                             document.formsoc.submit();
 		              });
 		               jQuery("#radioprivate").click(function() {
                             document.formsoc.action.value="create";
                             document.formsoc.canvas.value="'.$canvas.'";
                             document.formsoc.private.value=1;
-                            document.formsoc.cleartype.value=1;
                             document.formsoc.submit();
                       });
 		          });';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 9517a6d5278..f47b74c7182 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -416,8 +416,8 @@ if (! GETPOST("canvas"))
             $soc->siret=$_POST["idprof2"];
             $soc->ape=$_POST["idprof3"];
             $soc->idprof4=$_POST["idprof4"];
-            $soc->typent_id=($_POST["typent_id"]&&!$_POST["cleartype"])?$_POST["typent_id"]:($_REQUEST["private"]?'TE_PRIVATE':'');
-            $soc->effectif_id=($_POST["effectif_id"]&&!$_POST["cleartype"])?$_POST["effectif_id_id"]:($_REQUEST["private"]?'EF1-5':'');
+            $soc->typent_id=$_POST["typent_id"];
+            $soc->effectif_id=$_POST["effectif_id"];
 
             $soc->tva_assuj = $_POST["assujtva_value"];
 
@@ -450,23 +450,29 @@ if (! GETPOST("canvas"))
                 $soc->pays=$obj->libelle;
             }
 
+
+            /* Show create form */
+
             print_fiche_titre($langs->trans("NewCompany"));
 
             if ($conf->use_javascript_ajax)
             {
                 print "\n".'<script type="text/javascript" language="javascript">';
                 print 'jQuery(document).ready(function () {
+                          id_te_private=8;
+                          id_ef15=1;
+                          jQuery("#individualline").hide();
                           jQuery("#radiocompany").click(function() {
-                                document.formsoc.action.value="create";
+                                jQuery("#individualline").hide();
+                                jQuery("#typent_id").val(0);
+                                jQuery("#effectif_id").val(0);
                                 document.formsoc.private.value=0;
-                                document.formsoc.cleartype.value=1;
-                                document.formsoc.submit();
                           });
                            jQuery("#radioprivate").click(function() {
-                                document.formsoc.action.value="create";
+                                jQuery("#individualline").show();
+                                jQuery("#typent_id").val(id_te_private);
+                                jQuery("#effectif_id").val(id_ef15);
                                 document.formsoc.private.value=1;
-                                document.formsoc.cleartype.value=1;
-                                document.formsoc.submit();
                           });
                           jQuery("#selectpays_id").change(function() {
                             document.formsoc.action.value="create";
@@ -487,13 +493,13 @@ if (! GETPOST("canvas"))
                 print "<br>\n";
             }
 
+
             dol_htmloutput_errors($soc->error,$soc->errors);
 
             print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';
 
             print '<input type="hidden" name="action" value="add">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="cleartype" value="0">';
             print '<input type="hidden" name="private" value='.$soc->particulier.'>';
             if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
@@ -504,17 +510,21 @@ if (! GETPOST("canvas"))
             {
                 print '<tr><td><span class="fieldrequired">'.$langs->trans('LastName').'</span></td><td><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
                 print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
-                print '<tr><td>'.$langs->trans('FirstName').'</td><td><input type="text" size="30" name="prenom" value="'.$soc->firstname.'"></td>';
-                print '<td colspan=2>&nbsp;</td></tr>';
-                print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-                print $formcompany->select_civilite($contact->civilite_id).'</td>';
-                print '<td colspan=2>&nbsp;</td></tr>';
             }
             else
             {
                 print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
                 print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
             }
+            // If javascript on, we show option individual
+            if ($conf->use_javascript_ajax)
+            {
+                print '<tr id="individualline"><td>'.$langs->trans('FirstName').'</td><td><input type="text" size="30" name="prenom" value="'.$soc->firstname.'"></td>';
+                print '<td colspan=2>&nbsp;</td></tr>';
+                print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
+                print $formcompany->select_civilite($contact->civilite_id).'</td>';
+                print '<td colspan=2>&nbsp;</td></tr>';
+            }
 
             // Prospect/Customer
             print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
@@ -670,6 +680,7 @@ if (! GETPOST("canvas"))
             }
             print '</td></tr>';
 
+            // Type
             print '<tr><td>'.$langs->trans("Type").'</td><td>'."\n";
             print $form->selectarray("typent_id",$formcompany->typent_array(0), $soc->typent_id);
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);