diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 0babb24352e..7ab25dd2f20 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -378,7 +378,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
 
 	if ($conf->use_javascript_ajax)
 	{
-        print '<script type="text/javascript" language="javascript">';
+        print "\n".'<script type="text/javascript" language="javascript">';
         print 'jQuery(document).ready(function () {
                     jQuery(".bankswitchclass").'.($bankdirect||$bankviainvoice?'show()':'hide()').';
                     jQuery("#none").click(function() {
@@ -394,7 +394,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
                         jQuery(".bankswitchclass").show();
                     });
 	       });';
-    	print '</script>';
+    	print '</script>'."\n";
 	}
 
 	print '<form name="cotisation" method="post" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index b704c3d3c09..5736dfa240a 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -665,6 +665,20 @@ if ($action == 'create')
     }
     if ($mesg) print '<div class="ok">'.$mesg.'</div>';
 
+
+    if ($conf->use_javascript_ajax)
+    {
+        print "\n".'<script type="text/javascript" language="javascript">';
+        print 'jQuery(document).ready(function () {
+                    jQuery("#selectpays_id").change(function() {
+                        document.formsoc.action.value="create";
+                        document.formsoc.submit();
+                    });
+               })';
+        print '</script>'."\n";
+    }
+
+
     print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
@@ -733,7 +747,7 @@ if ($action == 'create')
     // Country
     $adh->pays_id=$adh->pays_id?$adh->pays_id:$mysoc->pays_id;
     print '<tr><td>'.$langs->trans("Country").'</td><td>';
-    $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':'');
+    $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$adh->pays_id,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
     print '</td></tr>';
 
@@ -850,6 +864,18 @@ if ($action == 'edit')
 	if ($mesg) print '<div class="ok">'.$mesg.'</div>';
 
 
+	if ($conf->use_javascript_ajax)
+	{
+        print "\n".'<script type="text/javascript" language="javascript">';
+        print 'jQuery(document).ready(function () {
+                    jQuery("#selectpays").change(function() {
+	               	    document.formsoc.action.value="edit";
+                        document.formsoc.submit();
+                    });
+               })';
+        print '</script>'."\n";
+	}
+
 	$rowspan=17;
 	$rowspan+=sizeof($adho->attribute_label);
 	if ($conf->societe->enabled) $rowspan++;
@@ -929,7 +955,7 @@ if ($action == 'edit')
 
 	// Country
 	print '<tr><td>'.$langs->trans("Country").'</td><td>';
-	$html->select_pays(isset($_POST["pays"])?$_POST["pays"]:$adh->pays_id,'pays',$conf->use_javascript_ajax?' onChange="company_save_refresh_edit()"':'');
+	$html->select_pays(isset($_POST["pays"])?$_POST["pays"]:$adh->pays_id,'pays');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
 	print '</td></tr>';
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 02c1c272bd0..3a35c59f42d 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -267,6 +267,14 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
     /**
      * Edition des parametres
      */
+    print "\n".'<script type="text/javascript" language="javascript">';
+    print 'jQuery(document).ready(function () {
+              jQuery("#selectpays_id").change(function() {
+                document.form_index.action.value="updateedit";
+                document.form_index.submit();
+              });
+          });';
+    print '</script>'."\n";
 
     print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -292,11 +300,12 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
     print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyTown").'</td><td>';
     print '<input name="ville" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_VILLE?$conf->global->MAIN_INFO_SOCIETE_VILLE:$_POST["ville"]) . '"></td></tr>'."\n";
 
+    // Country
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Country").'</td><td>';
     $pays_selected=$pays_id;
     //if (empty($pays_selected)) $pays_selected=substr($langs->defaultlang,-2);    // Par defaut, pays de la localisation
-    $form->select_pays($pays_selected,'pays_id',($conf->use_javascript_ajax?' onChange="company_save_refresh()"':''));
+    $form->select_pays($pays_selected,'pays_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
     print '</td></tr>'."\n";
 
@@ -362,8 +371,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
     print '</td></tr></table>';
     print '</td></tr>';
 
-
-
+    // Note
     $var=!$var;
     print '<tr '.$bc[$var].'><td valign="top">'.$langs->trans("Note").'</td><td>';
     print '<textarea class="flat" name="note" cols="80" rows="'.ROWS_5.'">'.$conf->global->MAIN_INFO_SOCIETE_NOTE.'</textarea></td></tr>';
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index a6daa794784..37e14695111 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -181,6 +181,18 @@ if ($_REQUEST["action"] == 'create')
 
 	if ($message) { print "$message<br>\n"; }
 
+    if ($conf->use_javascript_ajax)
+    {
+        print "\n".'<script type="text/javascript" language="javascript">';
+        print 'jQuery(document).ready(function () {
+                    jQuery("#selectaccount_country_id").change(function() {
+                        document.formsoc.action.value="create";
+                        document.formsoc.submit();
+                    });
+               })';
+        print '</script>'."\n";
+    }
+
 	print '<form action="'.$_SERVER["PHP_SELF"].'" name="formsoc" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -238,7 +250,7 @@ if ($_REQUEST["action"] == 'create')
 		$selectedcode=$_POST["account_country_id"]?$_POST["account_country_id"]:$account->pays_code;
 	}
 	else if (empty($selectedcode)) $selectedcode=$mysoc->pays_code;
-	$form->select_pays($selectedcode,'account_country_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':'');
+	$form->select_pays($selectedcode,'account_country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
 	print '</td></tr>';
 
@@ -448,6 +460,18 @@ else
 
         if ($message) { print "$message<br>\n"; }
 
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#selectaccount_country_id").change(function() {
+                            document.formsoc.action.value="edit";
+                            document.formsoc.submit();
+                        });
+                   })';
+            print '</script>'."\n";
+        }
+
         print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post" name="formsoc">';
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="update">';
@@ -494,7 +518,7 @@ else
 		$selectedcode=$account->pays_code;
 		if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
 		else if (empty($selectedcode)) $selectedcode=$mysoc->pays_code;
-		$form->select_pays($selectedcode,'account_country_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_edit()"':'');
+		$form->select_pays($selectedcode,'account_country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
 		print '</td></tr>';
 
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 2ddc89814bd..87e2958602b 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -300,6 +300,18 @@ if ($user->rights->societe->contact->creer)
 		// Affiche les erreurs
 		dol_htmloutput_errors($mesg,$errors);
 
+	    if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#selectpays_id").change(function() {
+                            document.formsoc.action.value="create";
+                            document.formsoc.submit();
+                        });
+                   })';
+            print '</script>'."\n";
+        }
+
 		print '<br>';
 		print '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -346,7 +358,7 @@ if ($user->rights->societe->contact->creer)
 		// Country
 		if (dol_strlen(trim($contact->fk_pays)) == 0) $contact->fk_pays = $objsoc->pays_id;	// Predefined with third party
 		print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
-		$form->select_pays((isset($_POST["pays_id"])?$_POST["pays_id"]:$contact->fk_pays),'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':'');
+		$form->select_pays((isset($_POST["pays_id"])?$_POST["pays_id"]:$contact->fk_pays),'pays_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
 		print '</td></tr>';
 
@@ -418,6 +430,18 @@ if ($user->rights->societe->contact->creer)
 		// Affiche les erreurs
 		dol_htmloutput_errors($mesg,$errors);
 
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#selectpays_id").change(function() {
+                            document.formsoc.action.value="edit";
+                            document.formsoc.submit();
+                        });
+                   })';
+            print '</script>'."\n";
+        }
+
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$_REQUEST["id"].'" name="formsoc">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">';
@@ -459,7 +483,7 @@ if ($user->rights->societe->contact->creer)
 
 		// Country
 		print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
-		$form->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$contact->fk_pays,'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_edit()"':'');
+		$form->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$contact->fk_pays,'pays_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
 		print '</td></tr>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 379e117df8b..d54837f8ff8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -274,7 +274,7 @@ class Form
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>';
+            print '<select id="select'.$htmlname.'" class="flat selectpays" name="'.$htmlname.'" '.$htmloption.'>';
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num)
@@ -1569,7 +1569,7 @@ class Form
 
         $this->load_cache_types_paiements();
 
-        print '<select id="selectpaymenttypes" class="flat" name="'.$htmlname.'">';
+        print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes" name="'.$htmlname.'">';
         if ($empty) print '<option value="">&nbsp;</option>';
         foreach($this->cache_types_paiements as $id => $arraytypes)
         {
@@ -1710,7 +1710,7 @@ class Form
             $i = 0;
             if ($num)
             {
-                print '<select id="selectbankaccount" class="flat" name="'.$htmlname.'">';
+                print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'">';
                 if ($useempty)
                 {
                     print '<option value="'.$obj->rowid.'">&nbsp;</option>';
diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php
index 8f2fe10f0e8..5ff233d6b41 100644
--- a/htdocs/includes/barcode/html.formbarcode.class.php
+++ b/htdocs/includes/barcode/html.formbarcode.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2009 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,17 +20,16 @@
  */
 
 /**
-        \file       htdocs/core/class/html.form.class.php
-        \brief      Fichier de la classe des fonctions pr�d�finie de composants html
+        \file       htdocs/includes/barcode/html.formbarcode.class.php
+        \brief      Fichier de la classe des fonctions predefinie de composants html
         \version    $Revision$
 */
 
 
 /**
         \class      Form
-        \brief      Classe permettant la g�n�ration de composants html
+        \brief      Classe permettant la generation de composants html
 */
-
 class FormBarCode
 {
 	var $db;
@@ -63,6 +62,20 @@ class FormBarCode
 
 		$disable = '';
 
+		if ($conf->use_javascript_ajax)
+		{
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#select'.$idForm.'").change(function() {
+                            var formName = document.getElementById("form'.$idForm.'");
+                            formName.action.value="setcoder";
+                            formName.submit();
+                        });
+               });';
+            print '</script>'."\n";
+    		 //onChange="barcode_coder_save(\''.$idForm.'\')
+		}
+
 		// We check if barcode is already selected by default
 		if ((($conf->product->enabled || $conf->service->enabled) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
 		    ($conf->societe->enabled && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
@@ -70,11 +83,11 @@ class FormBarCode
 			$disable = 'disabled="disabled"';
 		}
 
-		$select_encoder = '<form action="barcode.php" method="post" id="'.$idForm.'">';
+		$select_encoder = '<form action="'.DOL_URL_ROOT.'/includes/modules/barcode/admin/barcode.php" method="post" id="form'.$idForm.'">';
 		$select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		$select_encoder.= '<input type="hidden" name="action" value="update">';
 		$select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-		$select_encoder.= '<select class="flat" name="coder" onChange="barcode_coder_save(\''.$idForm.'\')">';
+		$select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
 		$select_encoder.= '<option value="0"'.($selected==0?' selected="true"':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
 		$select_encoder.= '<option value="-1" disabled="disabled">--------------------</option>';
 		foreach($barcodelist as $key => $value)
@@ -100,7 +113,7 @@ class FormBarCode
         $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
         $sql.= " WHERE coder <> '0'";
         $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY rowid";
+        $sql.= " ORDER BY code";
 
         $result = $this->db->query($sql);
         if ($result)
diff --git a/htdocs/includes/modules/barcode/admin/barcode.php b/htdocs/includes/modules/barcode/admin/barcode.php
index c417d60b92b..47e095b2cb8 100644
--- a/htdocs/includes/modules/barcode/admin/barcode.php
+++ b/htdocs/includes/modules/barcode/admin/barcode.php
@@ -140,6 +140,7 @@ print "</tr>\n";
 $sql = "SELECT rowid, code as encoding, libelle, coder, example";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 $sql.= " WHERE entity = ".$conf->entity;
+$sql.= " ORDER BY code";
 
 dol_syslog("admin/barcode.php sql=".$sql);
 $resql=$db->query($sql);
diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js
index c5e5b6b6aef..0b9eb29f52e 100644
--- a/htdocs/lib/lib_head.js
+++ b/htdocs/lib/lib_head.js
@@ -11,20 +11,6 @@
 //
 
 
-/*=================================================================
-	Purpose:  Resubmit page when barcode choice is changed (admin page)
-	Input:    formNameID
-	Author:   Laurent Destailleur
-	Licence:  GPL
-==================================================================*/
-function barcode_coder_save(formNameID)
-{
-    var formName = document.getElementById(formNameID);
-    formName.action.value='setcoder';
-    formName.submit();
-}
-
-
 /*=================================================================
 	Purpose:  Pour la fonction de saisie auto des villes
 	Input:    postalcode,objecttown,objectcountry,objectstate
@@ -43,32 +29,6 @@ function autofilltownfromzip_PopupPostalCode(url_root, postalcode,objecttown,obj
 }
 
 
-/*=================================================================
-Purpose:  To resubmit pages when country is changed
-Input:    postalcode,objecttown,objectcountry,objectstate
-Author:   Eric Seigne
-Licence:  GPL
-==================================================================*/
-function company_save_refresh_edit()
-{
-    document.formsoc.action.value="edit";
-    document.formsoc.submit();
-}
-
-function company_save_refresh_create()
-{
-    document.formsoc.action.value="create";
-    document.formsoc.submit();
-}
-
-function company_save_refresh()
-{
-    document.form_index.action.value="updateedit";
-    document.form_index.submit();
-}
-
-
-
 /*=================================================================
 	Purpose:  Pour la saisie des dates par calendrier
 	Input:    base			   "/theme/eldy"
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 92d7fc4e48f..66a4dd61449 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -59,236 +59,236 @@ $soc = new Societe($db);
 
 if ($_POST["getcustomercode"])
 {
-	// We defined value code_client
-	$_POST["code_client"]="Acompleter";
+    // We defined value code_client
+    $_POST["code_client"]="Acompleter";
 }
 
 if ($_POST["getsuppliercode"])
 {
-	// We defined value code_fournisseur
-	$_POST["code_fournisseur"]="Acompleter";
+    // We defined value code_fournisseur
+    $_POST["code_fournisseur"]="Acompleter";
 }
 
 // Add new third party
 if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
 && ($_POST["action"] == 'add' || $_POST["action"] == 'update') && $user->rights->societe->creer)
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
-	$error=0;
+    require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
+    $error=0;
 
-	if ($_POST["action"] == 'update')
-	{
-		// Load properties of company
-		$soc->fetch($socid);
-	}
+    if ($_POST["action"] == 'update')
+    {
+        // Load properties of company
+        $soc->fetch($socid);
+    }
 
-	if ($_REQUEST["private"] == 1)
-	{
-		$soc->particulier           = $_REQUEST["private"];
+    if ($_REQUEST["private"] == 1)
+    {
+        $soc->particulier           = $_REQUEST["private"];
 
-		$soc->nom                   = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]);
-		$soc->nom_particulier       = $_POST["nom"];
-		$soc->prenom                = $_POST["prenom"];
-		$soc->civilite_id           = $_POST["civilite_id"];
-	}
-	else
-	{
-		$soc->nom                   = $_POST["nom"];
-	}
-	$soc->address               = $_POST["adresse"];
-	$soc->adresse               = $_POST["adresse"]; // TODO obsolete
-	$soc->cp                    = $_POST["cp"];
-	$soc->ville                 = $_POST["ville"];
-	$soc->pays_id               = $_POST["pays_id"];
-	$soc->departement_id        = $_POST["departement_id"];
-	$soc->tel                   = $_POST["tel"];
-	$soc->fax                   = $_POST["fax"];
-	$soc->email                 = trim($_POST["email"]);
-	$soc->url                   = $_POST["url"];
-	$soc->siren                 = $_POST["idprof1"];
-	$soc->siret                 = $_POST["idprof2"];
-	$soc->ape                   = $_POST["idprof3"];
-	$soc->idprof4               = $_POST["idprof4"];
-	$soc->prefix_comm           = $_POST["prefix_comm"];
-	$soc->code_client           = $_POST["code_client"];
-	$soc->code_fournisseur      = $_POST["code_fournisseur"];
-	$soc->capital               = $_POST["capital"];
-	$soc->gencod                = $_POST["gencod"];
+        $soc->nom                   = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?trim($_POST["prenom"].' '.$_POST["nom"]):trim($_POST["nom"].' '.$_POST["prenom"]);
+        $soc->nom_particulier       = $_POST["nom"];
+        $soc->prenom                = $_POST["prenom"];
+        $soc->civilite_id           = $_POST["civilite_id"];
+    }
+    else
+    {
+        $soc->nom                   = $_POST["nom"];
+    }
+    $soc->address               = $_POST["adresse"];
+    $soc->adresse               = $_POST["adresse"]; // TODO obsolete
+    $soc->cp                    = $_POST["cp"];
+    $soc->ville                 = $_POST["ville"];
+    $soc->pays_id               = $_POST["pays_id"];
+    $soc->departement_id        = $_POST["departement_id"];
+    $soc->tel                   = $_POST["tel"];
+    $soc->fax                   = $_POST["fax"];
+    $soc->email                 = trim($_POST["email"]);
+    $soc->url                   = $_POST["url"];
+    $soc->siren                 = $_POST["idprof1"];
+    $soc->siret                 = $_POST["idprof2"];
+    $soc->ape                   = $_POST["idprof3"];
+    $soc->idprof4               = $_POST["idprof4"];
+    $soc->prefix_comm           = $_POST["prefix_comm"];
+    $soc->code_client           = $_POST["code_client"];
+    $soc->code_fournisseur      = $_POST["code_fournisseur"];
+    $soc->capital               = $_POST["capital"];
+    $soc->gencod                = $_POST["gencod"];
 
-	$soc->tva_assuj             = $_POST["assujtva_value"];
+    $soc->tva_assuj             = $_POST["assujtva_value"];
 
-	// Local Taxes
-	$soc->localtax1_assuj		= $_POST["localtax1assuj_value"];
-	$soc->localtax2_assuj		= $_POST["localtax2assuj_value"];
+    // Local Taxes
+    $soc->localtax1_assuj		= $_POST["localtax1assuj_value"];
+    $soc->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
-	$soc->tva_intra             = $_POST["tva_intra"];
+    $soc->tva_intra             = $_POST["tva_intra"];
 
-	$soc->forme_juridique_code  = $_POST["forme_juridique_code"];
-	$soc->effectif_id           = $_POST["effectif_id"];
-	if ($_REQUEST["private"] == 1)
-	{
-		$soc->typent_id             = 8; // TODO predict another method if the field "special" change of rowid
-	}
-	else
-	{
-		$soc->typent_id             = $_POST["typent_id"];
-	}
-	$soc->client                = $_POST["client"];
-	$soc->fournisseur           = $_POST["fournisseur"];
-	$soc->fournisseur_categorie = $_POST["fournisseur_categorie"];
+    $soc->forme_juridique_code  = $_POST["forme_juridique_code"];
+    $soc->effectif_id           = $_POST["effectif_id"];
+    if ($_REQUEST["private"] == 1)
+    {
+        $soc->typent_id             = 8; // TODO predict another method if the field "special" change of rowid
+    }
+    else
+    {
+        $soc->typent_id             = $_POST["typent_id"];
+    }
+    $soc->client                = $_POST["client"];
+    $soc->fournisseur           = $_POST["fournisseur"];
+    $soc->fournisseur_categorie = $_POST["fournisseur_categorie"];
 
-	$soc->commercial_id         = $_POST["commercial_id"];
-	$soc->default_lang          = $_POST["default_lang"];
+    $soc->commercial_id         = $_POST["commercial_id"];
+    $soc->default_lang          = $_POST["default_lang"];
 
-	// Check parameters
-	if (empty($_POST["cancel"]))
-	{
-		if (! empty($soc->email) && ! isValidEMail($soc->email))
-		{
-			$error = 1;
-			$langs->load("errors");
-			$soc->error = $langs->trans("ErrorBadEMail",$soc->email);
-			$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
-		}
-		if (! empty($soc->url) && ! isValidUrl($soc->url))
-		{
-			$error = 1;
-			$langs->load("errors");
-			$soc->error = $langs->trans("ErrorBadUrl",$soc->url);
-			$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
-		}
-		if ($soc->fournisseur && ! $conf->fournisseur->enabled)
-		{
-			$error = 1;
-			$langs->load("errors");
-			$soc->error = $langs->trans("ErrorSupplierModuleNotEnabled");
-			$_GET["action"] = $_POST["action"]=='add'?'create':'edit';
-		}
-	}
+    // Check parameters
+    if (empty($_POST["cancel"]))
+    {
+        if (! empty($soc->email) && ! isValidEMail($soc->email))
+        {
+            $error = 1;
+            $langs->load("errors");
+            $soc->error = $langs->trans("ErrorBadEMail",$soc->email);
+            $_GET["action"] = $_POST["action"]=='add'?'create':'edit';
+        }
+        if (! empty($soc->url) && ! isValidUrl($soc->url))
+        {
+            $error = 1;
+            $langs->load("errors");
+            $soc->error = $langs->trans("ErrorBadUrl",$soc->url);
+            $_GET["action"] = $_POST["action"]=='add'?'create':'edit';
+        }
+        if ($soc->fournisseur && ! $conf->fournisseur->enabled)
+        {
+            $error = 1;
+            $langs->load("errors");
+            $soc->error = $langs->trans("ErrorSupplierModuleNotEnabled");
+            $_GET["action"] = $_POST["action"]=='add'?'create':'edit';
+        }
+    }
 
-	if (! $error)
-	{
-		if ($_POST["action"] == 'add')
-		{
-			$db->begin();
+    if (! $error)
+    {
+        if ($_POST["action"] == 'add')
+        {
+            $db->begin();
 
-			if (empty($soc->client))      $soc->code_client='';
-			if (empty($soc->fournisseur)) $soc->code_fournisseur='';
+            if (empty($soc->client))      $soc->code_client='';
+            if (empty($soc->fournisseur)) $soc->code_fournisseur='';
 
-			$result = $soc->create($user);
-			if ($result >= 0)
-			{
-				if ($soc->particulier)
-				{
-					dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
-					$contact=new Contact($db);
+            $result = $soc->create($user);
+            if ($result >= 0)
+            {
+                if ($soc->particulier)
+                {
+                    dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
+                    $contact=new Contact($db);
 
-					$contact->civilite_id = $soc->civilite_id;
-					$contact->name=$soc->nom_particulier;
-					$contact->firstname=$soc->prenom;
-					$contact->address=$soc->address;
-					$contact->cp=$soc->cp;
-					$contact->ville=$soc->ville;
-					$contact->fk_pays=$soc->fk_pays;
-					$contact->socid=$soc->id;					// fk_soc
-					$contact->status=1;
-					$contact->email=$soc->email;
-					$contact->priv=0;
+                    $contact->civilite_id = $soc->civilite_id;
+                    $contact->name=$soc->nom_particulier;
+                    $contact->firstname=$soc->prenom;
+                    $contact->address=$soc->address;
+                    $contact->cp=$soc->cp;
+                    $contact->ville=$soc->ville;
+                    $contact->fk_pays=$soc->fk_pays;
+                    $contact->socid=$soc->id;					// fk_soc
+                    $contact->status=1;
+                    $contact->email=$soc->email;
+                    $contact->priv=0;
 
-					$result=$contact->create($user);
-				}
-			}
-			else
-			{
-				$mesg=$soc->error;
-			}
+                    $result=$contact->create($user);
+                }
+            }
+            else
+            {
+                $mesg=$soc->error;
+            }
 
-			if ($result >= 0)
-			{
-				$db->commit();
+            if ($result >= 0)
+            {
+                $db->commit();
 
-				if ( $soc->client == 1 )
-				{
-					Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$soc->id);
-					return;
-				}
-				else
-				{
-					if (  $soc->fournisseur == 1 )
-					{
-						Header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$soc->id);
-						return;
-					}
-					else
-					{
-						Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$soc->id);
-						return;
-					}
-				}
-				exit;
-			}
-			else
-			{
-				$db->rollback();
+                if ( $soc->client == 1 )
+                {
+                    Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$soc->id);
+                    return;
+                }
+                else
+                {
+                    if (  $soc->fournisseur == 1 )
+                    {
+                        Header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$soc->id);
+                        return;
+                    }
+                    else
+                    {
+                        Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$soc->id);
+                        return;
+                    }
+                }
+                exit;
+            }
+            else
+            {
+                $db->rollback();
 
-				$langs->load("errors");
-				$mesg=$langs->trans($soc->error);
-				$_GET["action"]='create';
-			}
-		}
+                $langs->load("errors");
+                $mesg=$langs->trans($soc->error);
+                $_GET["action"]='create';
+            }
+        }
 
-		if ($_POST["action"] == 'update')
-		{
-			if ($_POST["cancel"])
-			{
-				Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-				exit;
-			}
+        if ($_POST["action"] == 'update')
+        {
+            if ($_POST["cancel"])
+            {
+                Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+                exit;
+            }
 
-			$oldsoc=new Societe($db);
-			$result=$oldsoc->fetch($socid);
+            $oldsoc=new Societe($db);
+            $result=$oldsoc->fetch($socid);
 
-			// To not set code if third party is not concerned. But if it had values, we keep them.
-			if (empty($soc->client) && empty($oldsoc->code_client))          $soc->code_client='';
-			if (empty($soc->fournisseur)&& empty($oldsoc->code_fournisseur)) $soc->code_fournisseur='';
-			//var_dump($soc);exit;
+            // To not set code if third party is not concerned. But if it had values, we keep them.
+            if (empty($soc->client) && empty($oldsoc->code_client))          $soc->code_client='';
+            if (empty($soc->fournisseur)&& empty($oldsoc->code_fournisseur)) $soc->code_fournisseur='';
+            //var_dump($soc);exit;
 
-			$result = $soc->update($socid,$user,1,$oldsoc->codeclient_modifiable(),$oldsoc->codefournisseur_modifiable());
-			if ($result >= 0)
-			{
-				Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-				exit;
-			}
-			else
-			{
-				$soc->id = $socid;
-				$reload = 0;
+            $result = $soc->update($socid,$user,1,$oldsoc->codeclient_modifiable(),$oldsoc->codefournisseur_modifiable());
+            if ($result >= 0)
+            {
+                Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+                exit;
+            }
+            else
+            {
+                $soc->id = $socid;
+                $reload = 0;
 
-				$mesg = $soc->error;
-				$_GET["action"]= "edit";
-			}
-		}
-	}
+                $mesg = $soc->error;
+                $_GET["action"]= "edit";
+            }
+        }
+    }
 }
 
 if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->societe->supprimer)
 {
-	$soc = new Societe($db);
-	$soc->fetch($socid);
-	$result = $soc->delete($socid);
+    $soc = new Societe($db);
+    $soc->fetch($socid);
+    $result = $soc->delete($socid);
 
-	if ($result >= 0)
-	{
-		Header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$soc->nom."");
-		exit;
-	}
-	else
-	{
-		$reload = 0;
-		$langs->load("errors");
-		$mesg=$langs->trans($soc->error);
-		$_GET["action"]='';
-	}
+    if ($result >= 0)
+    {
+        Header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$soc->nom."");
+        exit;
+    }
+    else
+    {
+        $reload = 0;
+        $langs->load("errors");
+        $mesg=$langs->trans($soc->error);
+        $_GET["action"]='';
+    }
 }
 
 
@@ -297,46 +297,46 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' &&
  */
 if ($_REQUEST['action'] == 'builddoc')	// En get ou en post
 {
-	if (is_numeric($_REQUEST['model']))
-	{
-		$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
-	}
-	else
-	{
-		require_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php');
+    if (is_numeric($_REQUEST['model']))
+    {
+        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
+    }
+    else
+    {
+        require_once(DOL_DOCUMENT_ROOT.'/includes/modules/societe/modules_societe.class.php');
 
-		$soc = new Societe($db);
-		$soc->fetch($socid);
-		$soc->fetch_thirdparty();
+        $soc = new Societe($db);
+        $soc->fetch($socid);
+        $soc->fetch_thirdparty();
 
-		/*if ($_REQUEST['model'])
-		{
-			$fac->setDocModel($user, $_REQUEST['model']);
-		}
-		*/
+        /*if ($_REQUEST['model'])
+         {
+         $fac->setDocModel($user, $_REQUEST['model']);
+         }
+         */
 
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$fac->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		$result=thirdparty_doc_create($db, $soc->id, '', $_REQUEST['model'], $outputlangs);
-		if ($result <= 0)
-		{
-			dol_print_error($db,$result);
-			exit;
-		}
-		else
-		{
-			Header ('Location: '.$_SERVER["PHP_SELF"].'?socid='.$soc->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
-			exit;
-		}
-	}
+        // Define output language
+        $outputlangs = $langs;
+        $newlang='';
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$fac->client->default_lang;
+        if (! empty($newlang))
+        {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+        $result=thirdparty_doc_create($db, $soc->id, '', $_REQUEST['model'], $outputlangs);
+        if ($result <= 0)
+        {
+            dol_print_error($db,$result);
+            exit;
+        }
+        else
+        {
+            Header ('Location: '.$_SERVER["PHP_SELF"].'?socid='.$soc->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
+            exit;
+        }
+    }
 }
 
 
@@ -358,101 +358,100 @@ $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("Se
 if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
 $_GET["action"] == 'create' || $_POST["action"] == 'create')
 {
-	/*
-	 *	Sheet mode creation
-	 */
-	if ($user->rights->societe->creer)
-	{
-		// Load object modCodeTiers
-		$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-		if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
-		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-		{
-			$module = substr($module, 0, dol_strlen($module)-4);
-		}
-		require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
-		$modCodeClient = new $module;
-		$module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
-		if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-		{
-			$module = substr($module, 0, dol_strlen($module)-4);
-		}
-		require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
-		$modCodeFournisseur = new $module;
+    /*
+     *	Sheet mode creation
+     */
+    if ($user->rights->societe->creer)
+    {
+        // Load object modCodeTiers
+        $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
+        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+        {
+            $module = substr($module, 0, dol_strlen($module)-4);
+        }
+        require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
+        $modCodeClient = new $module;
+        $module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
+        if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+        {
+            $module = substr($module, 0, dol_strlen($module)-4);
+        }
+        require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
+        $modCodeFournisseur = new $module;
 
-		/*
-		 * Company Fact creation mode
-		 */
-		if ($_GET["type"]=='f')  { $soc->fournisseur=1; }
-		if ($_GET["type"]=='c')  { $soc->client=1; }
-		if ($_GET["type"]=='p')  { $soc->client=2; }
-		if ($_GET["type"]=='cp') { $soc->client=3; }
-		if ($_REQUEST["private"]==1) { $soc->particulier=1;	}
+        /*
+         * Company Fact creation mode
+         */
+        if ($_GET["type"]=='f')  { $soc->fournisseur=1; }
+        if ($_GET["type"]=='c')  { $soc->client=1; }
+        if ($_GET["type"]=='p')  { $soc->client=2; }
+        if ($_GET["type"]=='cp') { $soc->client=3; }
+        if ($_REQUEST["private"]==1) { $soc->particulier=1;	}
 
-		$soc->nom=$_POST["nom"];
-		$soc->prenom=$_POST["prenom"];
-		$soc->particulier=$_REQUEST["private"];
-		$soc->prefix_comm=$_POST["prefix_comm"];
-		$soc->client=$_POST["client"]?$_POST["client"]:$soc->client;
-		$soc->code_client=$_POST["code_client"];
-		$soc->fournisseur=$_POST["fournisseur"]?$_POST["fournisseur"]:$soc->fournisseur;
-		$soc->code_fournisseur=$_POST["code_fournisseur"];
-		$soc->adresse=$_POST["adresse"];
-		$soc->address=$_POST["adresse"]; // TODO obsolete
-		$soc->cp=$_POST["cp"];
-		$soc->ville=$_POST["ville"];
-		$soc->departement_id=$_POST["departement_id"];
-		$soc->tel=$_POST["tel"];
-		$soc->fax=$_POST["fax"];
-		$soc->email=$_POST["email"];
-		$soc->url=$_POST["url"];
-		$soc->capital=$_POST["capital"];
-		$soc->gencod=$_POST["gencod"];
-		$soc->siren=$_POST["idprof1"];
-		$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->nom=$_POST["nom"];
+        $soc->prenom=$_POST["prenom"];
+        $soc->particulier=$_REQUEST["private"];
+        $soc->prefix_comm=$_POST["prefix_comm"];
+        $soc->client=$_POST["client"]?$_POST["client"]:$soc->client;
+        $soc->code_client=$_POST["code_client"];
+        $soc->fournisseur=$_POST["fournisseur"]?$_POST["fournisseur"]:$soc->fournisseur;
+        $soc->code_fournisseur=$_POST["code_fournisseur"];
+        $soc->adresse=$_POST["adresse"];
+        $soc->address=$_POST["adresse"]; // TODO obsolete
+        $soc->cp=$_POST["cp"];
+        $soc->ville=$_POST["ville"];
+        $soc->departement_id=$_POST["departement_id"];
+        $soc->tel=$_POST["tel"];
+        $soc->fax=$_POST["fax"];
+        $soc->email=$_POST["email"];
+        $soc->url=$_POST["url"];
+        $soc->capital=$_POST["capital"];
+        $soc->gencod=$_POST["gencod"];
+        $soc->siren=$_POST["idprof1"];
+        $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->tva_assuj = $_POST["assujtva_value"];
+        $soc->tva_assuj = $_POST["assujtva_value"];
 
-		//Local Taxes
-		$soc->localtax1_assuj		= $_POST["localtax1assuj_value"];
-		$soc->localtax2_assuj		= $_POST["localtax2assuj_value"];
+        //Local Taxes
+        $soc->localtax1_assuj		= $_POST["localtax1assuj_value"];
+        $soc->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
-		$soc->tva_intra=$_POST["tva_intra"];
+        $soc->tva_intra=$_POST["tva_intra"];
 
-		$soc->commercial_id=$_POST["commercial_id"];
-		$soc->default_lang=$_POST["default_lang"];
+        $soc->commercial_id=$_POST["commercial_id"];
+        $soc->default_lang=$_POST["default_lang"];
 
-		// We set pays_id, pays_code and label for the selected country
-		$soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
-		if ($soc->pays_id)
-		{
-			$sql = "SELECT code, libelle";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
-			$sql.= " WHERE rowid = ".$soc->pays_id;
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			$soc->pays_code=$obj->code;
-			$soc->pays=$obj->libelle;
-		}
+        // We set pays_id, pays_code and label for the selected country
+        $soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
+        if ($soc->pays_id)
+        {
+            $sql = "SELECT code, libelle";
+            $sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+            $sql.= " WHERE rowid = ".$soc->pays_id;
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $obj = $db->fetch_object($resql);
+            }
+            else
+            {
+                dol_print_error($db);
+            }
+            $soc->pays_code=$obj->code;
+            $soc->pays=$obj->libelle;
+        }
 
-		print_fiche_titre($langs->trans("NewCompany"));
+        print_fiche_titre($langs->trans("NewCompany"));
 
-		if ($conf->use_javascript_ajax)
-		{
-		    print "\n";
-            print '<script type="text/javascript" language="javascript">';
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
             print 'jQuery(document).ready(function () {
 		              jQuery("#radiocompany").click(function() {
                             document.formsoc.action.value="create";
@@ -466,766 +465,782 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
                             document.formsoc.cleartype.value=1;
                             document.formsoc.submit();
                       });
-		      });';
-		    print '</script>'."\n";
+                      jQuery("#selectpays_id").change(function() {
+                        document.formsoc.action.value="create";
+                        document.formsoc.submit();
+                      });
+		          });';
+            print '</script>'."\n";
 
-			print "<br>\n";
-			print $langs->trans("ThirdPartyType").': &nbsp; ';
-			print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"'.(! $_REQUEST["private"]?' checked="true"':'');
-			print '> '.$langs->trans("Company/Fundation");
-			print ' &nbsp; &nbsp; ';
-			print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.(! $_REQUEST["private"]?'':' checked="true"');
-			print '> '.$langs->trans("Individual");
-			print ' ('.$langs->trans("ToCreateContactWithSameName").')';
-			print "<br>\n";
-			print "<br>\n";
-		}
+            print "<br>\n";
+            print $langs->trans("ThirdPartyType").': &nbsp; ';
+            print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"'.(! $_REQUEST["private"]?' checked="true"':'');
+            print '> '.$langs->trans("Company/Fundation");
+            print ' &nbsp; &nbsp; ';
+            print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.(! $_REQUEST["private"]?'':' checked="true"');
+            print '> '.$langs->trans("Individual");
+            print ' ('.$langs->trans("ToCreateContactWithSameName").')';
+            print "<br>\n";
+            print "<br>\n";
+        }
 
-		dol_htmloutput_errors($soc->error,$soc->errors);
+        dol_htmloutput_errors($soc->error,$soc->errors);
 
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';
+        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">';
+        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">';
 
-		print '<table class="border" width="100%">';
+        print '<table class="border" width="100%">';
 
-		// Name, firstname
-		if ($soc->particulier)
-		{
-			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>';
-		}
+        // Name, firstname
+        if ($soc->particulier)
+        {
+            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>';
+        }
 
-		// Prospect/Customer
-		print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
-		print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-		print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-		print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
-		print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
-		print '</select></td>';
+        // Prospect/Customer
+        print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
+        print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
+        print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+        print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
+        print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+        print '</select></td>';
 
-		print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
-		print '<table class="nobordernopadding"><tr><td>';
-		$tmpcode=$soc->code_client;
-		if ($modCodeClient->code_auto) $tmpcode=$modCodeClient->getNextValue($soc,0);
-		print '<input type="text" name="code_client" size="16" value="'.$tmpcode.'" maxlength="15">';
-		print '</td><td>';
-		$s=$modCodeClient->getToolTip($langs,$soc,0);
-		print $form->textwithpicto('',$s,1);
-		print '</td></tr></table>';
+        print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
+        print '<table class="nobordernopadding"><tr><td>';
+        $tmpcode=$soc->code_client;
+        if ($modCodeClient->code_auto) $tmpcode=$modCodeClient->getNextValue($soc,0);
+        print '<input type="text" name="code_client" size="16" value="'.$tmpcode.'" maxlength="15">';
+        print '</td><td>';
+        $s=$modCodeClient->getToolTip($langs,$soc,0);
+        print $form->textwithpicto('',$s,1);
+        print '</td></tr></table>';
 
-		print '</td></tr>';
+        print '</td></tr>';
 
-		// Supplier
-		print '<tr>';
-		print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
-		print $form->selectyesno("fournisseur",$soc->fournisseur,1);
-		print '</td>';
-		print '<td>'.$langs->trans('SupplierCode').'</td><td>';
-		print '<table class="nobordernopadding"><tr><td>';
-		$tmpcode=$soc->code_fournisseur;
-		if ($modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1);
-		print '<input type="text" name="code_fournisseur" size="16" value="'.$tmpcode.'" maxlength="15">';
-		print '</td><td>';
-		$s=$modCodeFournisseur->getToolTip($langs,$soc,1);
-		print $form->textwithpicto('',$s,1);
-		print '</td></tr></table>';
+        // Supplier
+        print '<tr>';
+        print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
+        print $form->selectyesno("fournisseur",$soc->fournisseur,1);
+        print '</td>';
+        print '<td>'.$langs->trans('SupplierCode').'</td><td>';
+        print '<table class="nobordernopadding"><tr><td>';
+        $tmpcode=$soc->code_fournisseur;
+        if ($modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1);
+        print '<input type="text" name="code_fournisseur" size="16" value="'.$tmpcode.'" maxlength="15">';
+        print '</td><td>';
+        $s=$modCodeFournisseur->getToolTip($langs,$soc,1);
+        print $form->textwithpicto('',$s,1);
+        print '</td></tr></table>';
 
-		print '</td></tr>';
+        print '</td></tr>';
 
-		// Category
-		if ($soc->fournisseur)
-		{
-			$load = $soc->LoadSupplierCateg();
-			if ( $load == 0)
-			{
-				if (sizeof($soc->SupplierCategories) > 0)
-				{
-					print '<tr>';
-					print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
-					print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,$_POST["fournisseur_categorie"],1);
-					print '</td></tr>';
-				}
-			}
-		}
+        // Category
+        if ($soc->fournisseur)
+        {
+            $load = $soc->LoadSupplierCateg();
+            if ( $load == 0)
+            {
+                if (sizeof($soc->SupplierCategories) > 0)
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
+                    print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,$_POST["fournisseur_categorie"],1);
+                    print '</td></tr>';
+                }
+            }
+        }
 
-		// Barcode
-		if ($conf->global->MAIN_MODULE_BARCODE)
-		{
-			print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="gencod">';
-			print $soc->gencod;
-			print '</textarea></td></tr>';
-		}
+        // Barcode
+        if ($conf->global->MAIN_MODULE_BARCODE)
+        {
+            print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="gencod">';
+            print $soc->gencod;
+            print '</textarea></td></tr>';
+        }
 
-		// Address
-		print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
-		print $soc->address;
-		print '</textarea></td></tr>';
+        // Address
+        print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
+        print $soc->address;
+        print '</textarea></td></tr>';
 
-		// Zip / Town
-		print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'">';
-		if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
-		print '</td>';
-		print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
+        // Zip / Town
+        print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'">';
+        if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
+        print '</td>';
+        print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
 
-		// Country
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
-		$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_create()"':'');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
-		print '</td></tr>';
+        // Country
+        print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
+        $form->select_pays($soc->pays_id,'pays_id');
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+        print '</td></tr>';
 
-		// State
-		print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
-		if ($soc->pays_id)
-		{
-			$formcompany->select_departement($soc->departement_id,$soc->pays_code);
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
+        // State
+        print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+        if ($soc->pays_id)
+        {
+            $formcompany->select_departement($soc->departement_id,$soc->pays_code);
+        }
+        else
+        {
+            print $countrynotdefined;
+        }
+        print '</td></tr>';
 
-		// Phone / Fax
-		print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>';
-		print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$soc->fax.'"></td></tr>';
+        // Phone / Fax
+        print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>';
+        print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$soc->fax.'"></td></tr>';
 
-		print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$soc->email.'"></td>';
-		print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$soc->url.'"></td></tr>';
+        print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$soc->email.'"></td>';
+        print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$soc->url.'"></td></tr>';
 
-		print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+        print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
 
 
-		print '<tr>';
-		// IdProf1 (SIREN for France)
-		$idprof=$langs->transcountry('ProfId1',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(1,'idprof1',$soc->siren);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		// IdProf2 (SIRET for France)
-		$idprof=$langs->transcountry('ProfId2',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(2,'idprof2',$soc->siret);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		print '</tr>';
-		print '<tr>';
-		// IdProf3 (APE for France)
-		$idprof=$langs->transcountry('ProfId3',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(3,'idprof3',$soc->ape);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		// IdProf4 (NU for France)
-		$idprof=$langs->transcountry('ProfId4',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(4,'idprof4',$soc->idprof4);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		print '</tr>';
+        print '<tr>';
+        // IdProf1 (SIREN for France)
+        $idprof=$langs->transcountry('ProfId1',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(1,'idprof1',$soc->siren);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        // IdProf2 (SIRET for France)
+        $idprof=$langs->transcountry('ProfId2',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(2,'idprof2',$soc->siret);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        print '</tr>';
+        print '<tr>';
+        // IdProf3 (APE for France)
+        $idprof=$langs->transcountry('ProfId3',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(3,'idprof3',$soc->ape);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        // IdProf4 (NU for France)
+        $idprof=$langs->transcountry('ProfId4',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(4,'idprof4',$soc->idprof4);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        print '</tr>';
 
-		// Legal Form
-		print '<tr><td>'.$langs->trans('JuridicalStatus').'</td>';
-		print '<td colspan="3">';
-		if ($soc->pays_id)
-		{
-			$formcompany->select_forme_juridique($soc->forme_juridique_code,$soc->pays_code);
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
+        // Legal Form
+        print '<tr><td>'.$langs->trans('JuridicalStatus').'</td>';
+        print '<td colspan="3">';
+        if ($soc->pays_id)
+        {
+            $formcompany->select_forme_juridique($soc->forme_juridique_code,$soc->pays_code);
+        }
+        else
+        {
+            print $countrynotdefined;
+        }
+        print '</td></tr>';
 
-		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);
-		print '</td>';
-		print '<td>'.$langs->trans("Staff").'</td><td>';
-		print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $soc->effectif_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
-		print '</td></tr>';
+        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);
+        print '</td>';
+        print '<td>'.$langs->trans("Staff").'</td><td>';
+        print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $soc->effectif_id);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+        print '</td></tr>';
 
-		if ($conf->global->MAIN_MULTILANGS)
-		{
-			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
-	    	$formadmin->select_lang(($soc->default_lang?$soc->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
-			print '</td>';
-			print '</tr>';
-		}
+        if ($conf->global->MAIN_MULTILANGS)
+        {
+            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
+            $formadmin->select_lang(($soc->default_lang?$soc->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            print '</td>';
+            print '</tr>';
+        }
 
-		// Assujeti TVA
-		$html = new Form($db);
-		print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
-		print '<td>';
-		print $html->selectyesno('assujtva_value',1,1);		// Assujeti par defaut en creation
-		print '</td>';
-		print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
-		print '<td nowrap="nowrap">';
-		$s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
-		$s.=' ';
-		if ($conf->use_javascript_ajax)
-		{
-			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-			print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-		}
-		else
-		{
-			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-		}
-		print '</td>';
+        // Assujeti TVA
+        $html = new Form($db);
+        print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
+        print '<td>';
+        print $html->selectyesno('assujtva_value',1,1);		// Assujeti par defaut en creation
+        print '</td>';
+        print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
+        print '<td nowrap="nowrap">';
+        $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
+        $s.=' ';
+        if ($conf->use_javascript_ajax)
+        {
+            $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+            print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+        }
+        else
+        {
+            print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+        }
+        print '</td>';
 
-		print '</tr>';
+        print '</tr>';
 
-		// Code TVA
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n";
-			print '<script language="JavaScript" type="text/javascript">';
-			print "function CheckVAT(a) {\n";
-			print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-			print "}\n";
-			print '</script>';
-			print "\n";
-		}
+        // Code TVA
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n";
+            print '<script language="JavaScript" type="text/javascript">';
+            print "function CheckVAT(a) {\n";
+            print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+            print "}\n";
+            print '</script>';
+            print "\n";
+        }
 
-		// Local Taxes
-		if($mysoc->pays_code=='ES')
-		{
-			if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-			{
-				print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-				print $html->selectyesno('localtax1assuj_value',0,1);
-				print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-				print $html->selectyesno('localtax2assuj_value',0,1);
-				print '</td></tr>';
+        // Local Taxes
+        if($mysoc->pays_code=='ES')
+        {
+            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+                print $html->selectyesno('localtax1assuj_value',0,1);
+                print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+                print $html->selectyesno('localtax2assuj_value',0,1);
+                print '</td></tr>';
 
-			}
-			elseif($mysoc->localtax1_assuj=="1")
-			{
-				print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-				print $html->selectyesno('localtax1assuj_value',0,1);
-				print '</td><tr>';
-			}
-			elseif($mysoc->localtax2_assuj=="1")
-			{
-				print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-				print $html->selectyesno('localtax2assuj_value',0,1);
-				print '</td><tr>';
-			}
-		}
+            }
+            elseif($mysoc->localtax1_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+                print $html->selectyesno('localtax1assuj_value',0,1);
+                print '</td><tr>';
+            }
+            elseif($mysoc->localtax2_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+                print $html->selectyesno('localtax2assuj_value',0,1);
+                print '</td><tr>';
+            }
+        }
 
-		if ($user->rights->societe->client->voir)
-		{
-			// Assign a Name
-			print '<tr>';
-			print '<td>'.$langs->trans("AllocateCommercial").'</td>';
-			print '<td colspan="3">';
-			$form->select_users($soc->commercial_id,'commercial_id',1);
-			print '</td></tr>';
-		}
+        if ($user->rights->societe->client->voir)
+        {
+            // Assign a Name
+            print '<tr>';
+            print '<td>'.$langs->trans("AllocateCommercial").'</td>';
+            print '<td colspan="3">';
+            $form->select_users($soc->commercial_id,'commercial_id',1);
+            print '</td></tr>';
+        }
 
 
 
-		print '<tr><td colspan="4" align="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans('AddThirdParty').'">';
-		print '</td></tr>'."\n";
+        print '<tr><td colspan="4" align="center">';
+        print '<input type="submit" class="button" value="'.$langs->trans('AddThirdParty').'">';
+        print '</td></tr>'."\n";
 
-		print '</table>'."\n";
-		print '</form>'."\n";
+        print '</table>'."\n";
+        print '</form>'."\n";
 
-	}
+    }
 }
 elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
 {
-	/*
-	 * Company Fact Mode edition
-	 */
-	print_fiche_titre($langs->trans("EditCompany"));
+    /*
+     * Company Fact Mode edition
+     */
+    print_fiche_titre($langs->trans("EditCompany"));
 
-	if ($socid)
-	{
-		// Load object modCodeTiers
-		$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-		if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
-		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-		{
-			$module = substr($module, 0, dol_strlen($module)-4);
-		}
-		require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
-		$modCodeClient = new $module;
-		// We verified if the tag prefix is used
-		if ($modCodeClient->code_auto)
-		{
-			$prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
-		}
-		$module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
-		if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-		{
-			$module = substr($module, 0, dol_strlen($module)-4);
-		}
-		require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
-		$modCodeFournisseur = new $module;
-		// On verifie si la balise prefix est utilisee
-		if ($modCodeFournisseur->code_auto)
-		{
-			$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
-		}
+    if ($socid)
+    {
+        // Load object modCodeTiers
+        $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
+        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+        {
+            $module = substr($module, 0, dol_strlen($module)-4);
+        }
+        require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
+        $modCodeClient = new $module;
+        // We verified if the tag prefix is used
+        if ($modCodeClient->code_auto)
+        {
+            $prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
+        }
+        $module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
+        if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+        {
+            $module = substr($module, 0, dol_strlen($module)-4);
+        }
+        require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
+        $modCodeFournisseur = new $module;
+        // On verifie si la balise prefix est utilisee
+        if ($modCodeFournisseur->code_auto)
+        {
+            $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
+        }
 
-		if ($reload || ! $_POST["nom"])
-		{
-			$soc = new Societe($db);
-			$soc->id = $socid;
-			$soc->fetch($socid);
-		}
-		else
-		{
-			$soc->id=$_POST["socid"];
-			$soc->nom=$_POST["nom"];
-			$soc->prefix_comm=$_POST["prefix_comm"];
-			$soc->client=$_POST["client"];
-			$soc->code_client=$_POST["code_client"];
-			$soc->fournisseur=$_POST["fournisseur"];
-			$soc->code_fournisseur=$_POST["code_fournisseur"];
-			$soc->adresse=$_POST["adresse"]; // TODO obsolete
-			$soc->address=$_POST["adresse"];
-			$soc->cp=$_POST["cp"];
-			$soc->ville=$_POST["ville"];
-			$soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
-			$soc->departement_id=$_POST["departement_id"];
-			$soc->tel=$_POST["tel"];
-			$soc->fax=$_POST["fax"];
-			$soc->email=$_POST["email"];
-			$soc->url=$_POST["url"];
-			$soc->capital=$_POST["capital"];
-			$soc->siren=$_POST["idprof1"];
-			$soc->siret=$_POST["idprof2"];
-			$soc->ape=$_POST["idprof3"];
-			$soc->idprof4=$_POST["idprof4"];
-			$soc->typent_id=$_POST["typent_id"];
-			$soc->effectif_id=$_POST["effectif_id"];
-			$soc->gencod=$_POST["gencod"];
-			$soc->forme_juridique_code=$_POST["forme_juridique_code"];
-			$soc->default_lang=$_POST["default_lang"];
+        if ($reload || ! $_POST["nom"])
+        {
+            $soc = new Societe($db);
+            $soc->id = $socid;
+            $soc->fetch($socid);
+        }
+        else
+        {
+            $soc->id=$_POST["socid"];
+            $soc->nom=$_POST["nom"];
+            $soc->prefix_comm=$_POST["prefix_comm"];
+            $soc->client=$_POST["client"];
+            $soc->code_client=$_POST["code_client"];
+            $soc->fournisseur=$_POST["fournisseur"];
+            $soc->code_fournisseur=$_POST["code_fournisseur"];
+            $soc->adresse=$_POST["adresse"]; // TODO obsolete
+            $soc->address=$_POST["adresse"];
+            $soc->cp=$_POST["cp"];
+            $soc->ville=$_POST["ville"];
+            $soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
+            $soc->departement_id=$_POST["departement_id"];
+            $soc->tel=$_POST["tel"];
+            $soc->fax=$_POST["fax"];
+            $soc->email=$_POST["email"];
+            $soc->url=$_POST["url"];
+            $soc->capital=$_POST["capital"];
+            $soc->siren=$_POST["idprof1"];
+            $soc->siret=$_POST["idprof2"];
+            $soc->ape=$_POST["idprof3"];
+            $soc->idprof4=$_POST["idprof4"];
+            $soc->typent_id=$_POST["typent_id"];
+            $soc->effectif_id=$_POST["effectif_id"];
+            $soc->gencod=$_POST["gencod"];
+            $soc->forme_juridique_code=$_POST["forme_juridique_code"];
+            $soc->default_lang=$_POST["default_lang"];
 
-			$soc->tva_assuj = $_POST["assujtva_value"];
-			$soc->tva_intra=$_POST["tva_intra"];
+            $soc->tva_assuj = $_POST["assujtva_value"];
+            $soc->tva_intra=$_POST["tva_intra"];
 
-			//Local Taxes
-			$soc->localtax1_assuj		= $_POST["localtax1assuj_value"];
-			$soc->localtax2_assuj		= $_POST["localtax2assuj_value"];
+            //Local Taxes
+            $soc->localtax1_assuj		= $_POST["localtax1assuj_value"];
+            $soc->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
-			// We set pays_id, and pays_code label of the chosen country
-			if ($soc->pays_id)
-			{
-				$sql = "SELECT code, libelle from ".MAIN_DB_PREFIX."c_pays where rowid = ".$soc->pays_id;
-				$resql=$db->query($sql);
-				if ($resql)
-				{
-					$obj = $db->fetch_object($resql);
-				}
-				else
-				{
-					dol_print_error($db);
-				}
-				$soc->pays_code=$obj->code;
-				$soc->pays=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
-			}
-		}
+            // We set pays_id, and pays_code label of the chosen country
+            if ($soc->pays_id)
+            {
+                $sql = "SELECT code, libelle from ".MAIN_DB_PREFIX."c_pays where rowid = ".$soc->pays_id;
+                $resql=$db->query($sql);
+                if ($resql)
+                {
+                    $obj = $db->fetch_object($resql);
+                }
+                else
+                {
+                    dol_print_error($db);
+                }
+                $soc->pays_code=$obj->code;
+                $soc->pays=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
+            }
+        }
 
-		dol_htmloutput_errors($soc->error,$soc->errors);
+        dol_htmloutput_errors($soc->error,$soc->errors);
 
-		print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'" method="post" name="formsoc">';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#selectpays_id").change(function() {
+                            document.formsoc.action.value="edit";
+                            document.formsoc.submit();
+                        });
+                   })';
+            print '</script>'."\n";
+        }
 
-		print '<table class="border" width="100%">';
+        print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'" method="post" name="formsoc">';
+        print '<input type="hidden" name="action" value="update">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="socid" value="'.$soc->id.'">';
+        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
-		// Name
-		print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.$soc->nom.'"></td></tr>';
+        print '<table class="border" width="100%">';
 
-		// Prefix
-		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-		// It does not change the prefix mode using the auto numbering prefix
-		if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $soc->prefix_comm)
-		{
-			print '<input type="hidden" name="prefix_comm" value="'.$soc->prefix_comm.'">';
-			print $soc->prefix_comm;
-		}
-		else
-		{
-			print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'">';
-		}
-		print '</td>';
+        // Name
+        print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.$soc->nom.'"></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">';
-		print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
-		print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-		print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
-		print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
-		print '</select></td>';
-		print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
+        // Prefix
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+        // It does not change the prefix mode using the auto numbering prefix
+        if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $soc->prefix_comm)
+        {
+            print '<input type="hidden" name="prefix_comm" value="'.$soc->prefix_comm.'">';
+            print $soc->prefix_comm;
+        }
+        else
+        {
+            print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'">';
+        }
+        print '</td>';
 
-		print '<table class="nobordernopadding"><tr><td>';
-		if ((!$soc->code_client || $soc->code_client == -1) && $modCodeClient->code_auto)
-		{
-			$tmpcode=$soc->code_client;
-			if (empty($tmpcode) && $modCodeClient->code_auto) $tmpcode=$modCodeClient->getNextValue($soc,0);
-			print '<input type="text" name="code_client" size="16" value="'.$tmpcode.'" maxlength="15">';
-		}
-		else if ($soc->codeclient_modifiable())
-		{
-			print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">';
-		}
-		else
-		{
-			print $soc->code_client;
-			print '<input type="hidden" name="code_client" value="'.$soc->code_client.'">';
-		}
-		print '</td><td>';
-		$s=$modCodeClient->getToolTip($langs,$soc,0);
-		print $form->textwithpicto('',$s,1);
-		print '</td></tr></table>';
+        // Prospect/Customer
+        print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
+        print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
+        print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+        print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
+        print '<option value="0"'.($soc->client==0?' selected="true"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+        print '</select></td>';
+        print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
 
-		print '</td></tr>';
+        print '<table class="nobordernopadding"><tr><td>';
+        if ((!$soc->code_client || $soc->code_client == -1) && $modCodeClient->code_auto)
+        {
+            $tmpcode=$soc->code_client;
+            if (empty($tmpcode) && $modCodeClient->code_auto) $tmpcode=$modCodeClient->getNextValue($soc,0);
+            print '<input type="text" name="code_client" size="16" value="'.$tmpcode.'" maxlength="15">';
+        }
+        else if ($soc->codeclient_modifiable())
+        {
+            print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">';
+        }
+        else
+        {
+            print $soc->code_client;
+            print '<input type="hidden" name="code_client" value="'.$soc->code_client.'">';
+        }
+        print '</td><td>';
+        $s=$modCodeClient->getToolTip($langs,$soc,0);
+        print $form->textwithpicto('',$s,1);
+        print '</td></tr></table>';
 
-		// Supplier
-		print '<tr>';
-		print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
-		print $form->selectyesno("fournisseur",$soc->fournisseur,1);
-		print '</td>';
-		print '<td>'.$langs->trans('SupplierCode').'</td><td>';
+        print '</td></tr>';
 
-		print '<table class="nobordernopadding"><tr><td>';
-		if ((!$soc->code_fournisseur || $soc->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
-		{
-			$tmpcode=$soc->code_fournisseur;
-			if (empty($tmpcode) && $modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1);
-			print '<input type="text" name="code_fournisseur" size="16" value="'.$tmpcode.'" maxlength="15">';
-		}
-		else if ($soc->codefournisseur_modifiable())
-		{
-			print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">';
-		}
-		else
-		{
-			print $soc->code_fournisseur;
-			print '<input type="hidden" name="code_fournisseur" value="'.$soc->code_fournisseur.'">';
-		}
-		print '</td><td>';
-		$s=$modCodeFournisseur->getToolTip($langs,$soc,1);
-		print $form->textwithpicto('',$s,1);
-		print '</td></tr></table>';
+        // Supplier
+        print '<tr>';
+        print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
+        print $form->selectyesno("fournisseur",$soc->fournisseur,1);
+        print '</td>';
+        print '<td>'.$langs->trans('SupplierCode').'</td><td>';
 
-		print '</td></tr>';
+        print '<table class="nobordernopadding"><tr><td>';
+        if ((!$soc->code_fournisseur || $soc->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
+        {
+            $tmpcode=$soc->code_fournisseur;
+            if (empty($tmpcode) && $modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1);
+            print '<input type="text" name="code_fournisseur" size="16" value="'.$tmpcode.'" maxlength="15">';
+        }
+        else if ($soc->codefournisseur_modifiable())
+        {
+            print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">';
+        }
+        else
+        {
+            print $soc->code_fournisseur;
+            print '<input type="hidden" name="code_fournisseur" value="'.$soc->code_fournisseur.'">';
+        }
+        print '</td><td>';
+        $s=$modCodeFournisseur->getToolTip($langs,$soc,1);
+        print $form->textwithpicto('',$s,1);
+        print '</td></tr></table>';
 
-		// Category
-		if ($soc->fournisseur)
-		{
-			$load = $soc->LoadSupplierCateg();
-			if ( $load == 0)
-			{
-				if (sizeof($soc->SupplierCategories) > 0)
-				{
-					print '<tr>';
-					print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
-					print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,'',1);
-					print '</td></tr>';
-				}
-			}
-		}
+        print '</td></tr>';
 
-		if ($conf->global->MAIN_MODULE_BARCODE)
-		{
-			print '<tr><td valign="top">'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="gencod" value="'.$soc->gencod.'">';
-			print '</td></tr>';
-		}
+        // Category
+        if ($soc->fournisseur)
+        {
+            $load = $soc->LoadSupplierCateg();
+            if ( $load == 0)
+            {
+                if (sizeof($soc->SupplierCategories) > 0)
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
+                    print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,'',1);
+                    print '</td></tr>';
+                }
+            }
+        }
 
-		// Address
-		print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
-		print $soc->address;
-		print '</textarea></td></tr>';
+        if ($conf->global->MAIN_MODULE_BARCODE)
+        {
+            print '<tr><td valign="top">'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="gencod" value="'.$soc->gencod.'">';
+            print '</td></tr>';
+        }
 
-		// Zip / Town
-		print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'">';
-		if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
-		print '</td>';
-		print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
+        // Address
+        print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
+        print $soc->address;
+        print '</textarea></td></tr>';
 
-		// Country
-		print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-		$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript_ajax?' onChange="company_save_refresh_edit()"':'');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
-		print '</td></tr>';
+        // Zip / Town
+        print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'">';
+        if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
+        print '</td>';
+        print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
 
-		// Department
-		print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
-		$formcompany->select_departement($soc->departement_id,$soc->pays_code);
-		print '</td></tr>';
+        // Country
+        print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
+        $form->select_pays($soc->pays_id,'pays_id');
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+        print '</td></tr>';
 
-		// Phone / Fax
-		print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>';
-		print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$soc->fax.'"></td></tr>';
+        // Department
+        print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+        $formcompany->select_departement($soc->departement_id,$soc->pays_code);
+        print '</td></tr>';
 
-		// EMail / Web
-		print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$soc->email.'"></td>';
-		print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$soc->url.'"></td></tr>';
+        // Phone / Fax
+        print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>';
+        print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$soc->fax.'"></td></tr>';
 
-		print '<tr>';
-		// IdProf1 (SIREN for France)
-		$idprof=$langs->transcountry('ProfId1',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(1,'idprof1',$soc->siren);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		// IdProf2 (SIRET for France)
-		$idprof=$langs->transcountry('ProfId2',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(2,'idprof2',$soc->siret);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		print '</tr>';
-		print '<tr>';
-		// IdProf3 (APE for France)
-		$idprof=$langs->transcountry('ProfId3',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(3,'idprof3',$soc->ape);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		// IdProf4 (NU for France)
-		$idprof=$langs->transcountry('ProfId4',$soc->pays_code);
-		if ($idprof!='-')
-		{
-			print '<td>'.$idprof.'</td><td>';
-			$soc->show_input_id_prof(4,'idprof4',$soc->idprof4);
-			print '</td>';
-		}
-		else print '<td>&nbsp;</td><td>&nbsp;</td>';
-		print '</tr>';
+        // EMail / Web
+        print '<tr><td>'.$langs->trans('EMail').($conf->global->SOCIETE_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="32" value="'.$soc->email.'"></td>';
+        print '<td>'.$langs->trans('Web').'</td><td><input type="text" name="url" size="32" value="'.$soc->url.'"></td></tr>';
 
-		// VAT payers
-		print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>';
-		print $form->selectyesno('assujtva_value',$soc->tva_assuj,1);
-		print '</td>';
+        print '<tr>';
+        // IdProf1 (SIREN for France)
+        $idprof=$langs->transcountry('ProfId1',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(1,'idprof1',$soc->siren);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        // IdProf2 (SIRET for France)
+        $idprof=$langs->transcountry('ProfId2',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(2,'idprof2',$soc->siret);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        print '</tr>';
+        print '<tr>';
+        // IdProf3 (APE for France)
+        $idprof=$langs->transcountry('ProfId3',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(3,'idprof3',$soc->ape);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        // IdProf4 (NU for France)
+        $idprof=$langs->transcountry('ProfId4',$soc->pays_code);
+        if ($idprof!='-')
+        {
+            print '<td>'.$idprof.'</td><td>';
+            $soc->show_input_id_prof(4,'idprof4',$soc->idprof4);
+            print '</td>';
+        }
+        else print '<td>&nbsp;</td><td>&nbsp;</td>';
+        print '</tr>';
 
-		// VAT Code
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n";
-			print '<script language="JavaScript" type="text/javascript">';
-			print "function CheckVAT(a) {\n";
-			print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
-			print "}\n";
-			print '</script>';
-			print "\n";
-		}
-		print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
-		print '<td nowrap="nowrap">';
-		$s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
-		$s.=' ';
-		if ($conf->use_javascript_ajax)
-		{
-			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-			print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-		}
-		else
-		{
-			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-		}
-		print '</td>';
-		print '</tr>';
+        // VAT payers
+        print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>';
+        print $form->selectyesno('assujtva_value',$soc->tva_assuj,1);
+        print '</td>';
 
-		// Local Taxes
-		if($mysoc->pays_code=='ES')
-		{
-			if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-			{
-				print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-				print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
-				print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-				print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
-				print '</td></tr>';
+        // VAT Code
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n";
+            print '<script language="JavaScript" type="text/javascript">';
+            print "function CheckVAT(a) {\n";
+            print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
+            print "}\n";
+            print '</script>';
+            print "\n";
+        }
+        print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
+        print '<td nowrap="nowrap">';
+        $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
+        $s.=' ';
+        if ($conf->use_javascript_ajax)
+        {
+            $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+            print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+        }
+        else
+        {
+            print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+        }
+        print '</td>';
+        print '</tr>';
 
-			}
-			elseif($mysoc->localtax1_assuj=="1")
-			{
-				print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-				print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
-				print '</td></tr>';
+        // Local Taxes
+        if($mysoc->pays_code=='ES')
+        {
+            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+                print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
+                print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+                print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
+                print '</td></tr>';
 
-			}
-			elseif($mysoc->localtax2_assuj=="1")
-			{
-				print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-				print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
-				print '</td></tr>';
-			}
-		}
+            }
+            elseif($mysoc->localtax1_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+                print $form->selectyesno('localtax1assuj_value',$soc->localtax1_assuj,1);
+                print '</td></tr>';
 
-		print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+            }
+            elseif($mysoc->localtax2_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+                print $form->selectyesno('localtax2assuj_value',$soc->localtax2_assuj,1);
+                print '</td></tr>';
+            }
+        }
 
-		print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">';
-		$formcompany->select_forme_juridique($soc->forme_juridique_code,$soc->pays_code);
-		print '</td></tr>';
+        print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
 
-		print '<tr><td>'.$langs->trans("Type").'</td><td>';
-		print $form->selectarray("typent_id",$formcompany->typent_array(0), $soc->typent_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
-		print '</td>';
-		print '<td>'.$langs->trans("Staff").'</td><td>';
-		print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $soc->effectif_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
-		print '</td></tr>';
+        print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">';
+        $formcompany->select_forme_juridique($soc->forme_juridique_code,$soc->pays_code);
+        print '</td></tr>';
 
-		if ($conf->global->MAIN_MULTILANGS)
-		{
-			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
-	    	$formadmin->select_lang($soc->default_lang,'default_lang',0,0,1);
-			print '</td>';
-			print '</tr>';
-		}
+        print '<tr><td>'.$langs->trans("Type").'</td><td>';
+        print $form->selectarray("typent_id",$formcompany->typent_array(0), $soc->typent_id);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+        print '</td>';
+        print '<td>'.$langs->trans("Staff").'</td><td>';
+        print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $soc->effectif_id);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+        print '</td></tr>';
 
-		print '</table>';
-		print '<br>';
+        if ($conf->global->MAIN_MULTILANGS)
+        {
+            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
+            $formadmin->select_lang($soc->default_lang,'default_lang',0,0,1);
+            print '</td>';
+            print '</tr>';
+        }
 
-		print '<center>';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</center>';
+        print '</table>';
+        print '<br>';
 
-		print '</form>';
-	}
+        print '<center>';
+        print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+        print ' &nbsp; &nbsp; ';
+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+        print '</center>';
+
+        print '</form>';
+    }
 }
 else
 {
-	/*
-	 * Company Fact Sheet mode visu
-	 */
-	$soc = new Societe($db);
-	$soc->id = $socid;
-	$result=$soc->fetch($socid);
-	if ($result < 0)
-	{
-		dol_print_error($db,$soc->error);
-		exit;
-	}
+    /*
+     * Company Fact Sheet mode visu
+     */
+    $soc = new Societe($db);
+    $soc->id = $socid;
+    $result=$soc->fetch($socid);
+    if ($result < 0)
+    {
+        dol_print_error($db,$soc->error);
+        exit;
+    }
 
-	$head = societe_prepare_head($soc);
+    $head = societe_prepare_head($soc);
 
-	dol_fiche_head($head, 'company', $langs->trans("ThirdParty"),0,'company');
+    dol_fiche_head($head, 'company', $langs->trans("ThirdParty"),0,'company');
 
-	$html = new Form($db);
+    $html = new Form($db);
 
 
-	// Confirm delete third party
-	if ($_GET["action"] == 'delete')
-	{
-		$html = new Form($db);
-		$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,2);
-		if ($ret == 'html') print '<br>';
-	}
+    // Confirm delete third party
+    if ($_GET["action"] == 'delete')
+    {
+        $html = new Form($db);
+        $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,2);
+        if ($ret == 'html') print '<br>';
+    }
 
-	// Template
-	// TODO utiliser la classe canvas
-	include(DOL_DOCUMENT_ROOT."/societe/canvas/default/tpl/view.tpl.php");
+    // Template
+    // TODO utiliser la classe canvas
+    include(DOL_DOCUMENT_ROOT."/societe/canvas/default/tpl/view.tpl.php");
 
-	/*
-	 *	Actions
-	 */
-	if ($_GET["action"] == '')
-	{
-		print '<div class="tabsAction">';
+    /*
+     *	Actions
+     */
+    if ($_GET["action"] == '')
+    {
+        print '<div class="tabsAction">';
 
-		if ($user->rights->societe->creer)
-		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-		}
+        if ($user->rights->societe->creer)
+        {
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+        }
 
-		if ($user->rights->societe->contact->creer)
-		{
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$soc->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
-		}
+        if ($user->rights->societe->contact->creer)
+        {
+            print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$soc->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
+        }
 
-		if ($user->rights->societe->supprimer)
-		{
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
+        if ($user->rights->societe->supprimer)
+        {
+            print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+        }
 
-		print '</div>';
-		print '<br>';
-	}
+        print '</div>';
+        print '<br>';
+    }
 
 
 
-	print '<table width="100%"><tr><td valign="top" width="50%">';
-	print '<a name="builddoc"></a>'; // ancre
+    print '<table width="100%"><tr><td valign="top" width="50%">';
+    print '<a name="builddoc"></a>'; // ancre
 
-	/*
-	 * Documents generes
-	 */
-	$filedir=$conf->societe->dir_output.'/'.$soc->id;
-	$urlsource=$_SERVER["PHP_SELF"]."?socid=".$soc->id;
-	$genallowed=$user->rights->societe->creer;
-	$delallowed=$user->rights->societe->supprimer;
+    /*
+     * Documents generes
+     */
+    $filedir=$conf->societe->dir_output.'/'.$soc->id;
+    $urlsource=$_SERVER["PHP_SELF"]."?socid=".$soc->id;
+    $genallowed=$user->rights->societe->creer;
+    $delallowed=$user->rights->societe->supprimer;
 
-	$var=true;
+    $var=true;
 
-	$somethingshown=$formfile->show_documents('company',$soc->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$soc->default_lang);
+    $somethingshown=$formfile->show_documents('company',$soc->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$soc->default_lang);
 
-	print '</td>';
-	print '<td>';
-	print '</td>';
-	print '</tr>';
-	print '</table>';
+    print '</td>';
+    print '<td>';
+    print '</td>';
+    print '</tr>';
+    print '</table>';
 
-	print '<br>';
+    print '<br>';
 
-	// Contacts list
-	$result=show_contacts($conf,$langs,$db,$soc);
+    // Contacts list
+    $result=show_contacts($conf,$langs,$db,$soc);
 
-	// Projects list
-	$result=show_projects($conf,$langs,$db,$soc);
+    // Projects list
+    $result=show_projects($conf,$langs,$db,$soc);
 }
 
 $db->close();