Dolibarr / dolibarr

htdocs/core/class/commondocgenerator.class.php

Indentation +367 added lines, -367 removed lines

@@ -41,181 +41,181 @@ 
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
+	 */
 	public function __construct($db) {
 		$this->db = $db;
 		return 1;
 	}
 
 
-    /**
-     * Define array with couple subtitution key => subtitution value
-     *
-     * @param   User		$user           User
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    function get_substitutionarray_user($user,$outputlangs)
-    {
-        global $conf;
-
-        $logotouse=$conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
-
-        return array(
-            'myuser_lastname'=>$user->lastname,
-            'myuser_firstname'=>$user->firstname,
-            'myuser_fullname'=>$user->getFullName($outputlangs,1),
-            'myuser_login'=>$user->login,
-            'myuser_phone'=>$user->office_phone,
-       		'myuser_address'=>$user->address,
-       		'myuser_zip'=>$user->zip,
-       		'myuser_town'=>$user->town,
-       		'myuser_country'=>$user->country,
-        	'myuser_country_code'=>$user->country_code,
-       		'myuser_state'=>$user->state,
-        	'myuser_state_code'=>$user->state_code,
-        	'myuser_fax'=>$user->office_fax,
-            'myuser_mobile'=>$user->user_mobile,
-            'myuser_email'=>$user->email,
-        	'myuser_logo'=>$logotouse,
-        	'myuser_job'=>$user->job,
-            'myuser_web'=>''	// url not exist in $user object
-        );
-    }
-
-
-    /**
-     * Define array with couple subtitution key => subtitution value
-     *
-     * @param   Societe		$mysoc			Object thirdparty
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    function get_substitutionarray_mysoc($mysoc,$outputlangs)
-    {
-        global $conf;
-
-        if (empty($mysoc->forme_juridique) && ! empty($mysoc->forme_juridique_code))
-        {
-            $mysoc->forme_juridique=getFormeJuridiqueLabel($mysoc->forme_juridique_code);
-        }
-        if (empty($mysoc->country) && ! empty($mysoc->country_code))
-        {
-        	$mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
-        }
-        if (empty($mysoc->state) && ! empty($mysoc->state_code))
-        {
-        	$mysoc->state=getState($mysoc->state_code,0);
-        }
-
-        $logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-
-        return array(
-            'mycompany_logo'=>$logotouse,
-            'mycompany_name'=>$mysoc->name,
-            'mycompany_email'=>$mysoc->email,
-            'mycompany_phone'=>$mysoc->phone,
-            'mycompany_fax'=>$mysoc->fax,
-            'mycompany_address'=>$mysoc->address,
-            'mycompany_zip'=>$mysoc->zip,
-            'mycompany_town'=>$mysoc->town,
-            'mycompany_country'=>$mysoc->country,
-            'mycompany_country_code'=>$mysoc->country_code,
-            'mycompany_state'=>$mysoc->state,
-            'mycompany_state_code'=>$mysoc->state_code,
-        	'mycompany_web'=>$mysoc->url,
-            'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
-            'mycompany_managers'=>$mysoc->managers,
-            'mycompany_capital'=>$mysoc->capital,
-            'mycompany_barcode'=>$mysoc->barcode,
-            'mycompany_idprof1'=>$mysoc->idprof1,
-            'mycompany_idprof2'=>$mysoc->idprof2,
-            'mycompany_idprof3'=>$mysoc->idprof3,
-            'mycompany_idprof4'=>$mysoc->idprof4,
-            'mycompany_idprof5'=>$mysoc->idprof5,
-            'mycompany_idprof6'=>$mysoc->idprof6,
-        	'mycompany_vatnumber'=>$mysoc->tva_intra,
+	/**
+	 * Define array with couple subtitution key => subtitution value
+	 *
+	 * @param   User		$user           User
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	function get_substitutionarray_user($user,$outputlangs)
+	{
+		global $conf;
+
+		$logotouse=$conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+
+		return array(
+			'myuser_lastname'=>$user->lastname,
+			'myuser_firstname'=>$user->firstname,
+			'myuser_fullname'=>$user->getFullName($outputlangs,1),
+			'myuser_login'=>$user->login,
+			'myuser_phone'=>$user->office_phone,
+	   		'myuser_address'=>$user->address,
+	   		'myuser_zip'=>$user->zip,
+	   		'myuser_town'=>$user->town,
+	   		'myuser_country'=>$user->country,
+			'myuser_country_code'=>$user->country_code,
+	   		'myuser_state'=>$user->state,
+			'myuser_state_code'=>$user->state_code,
+			'myuser_fax'=>$user->office_fax,
+			'myuser_mobile'=>$user->user_mobile,
+			'myuser_email'=>$user->email,
+			'myuser_logo'=>$logotouse,
+			'myuser_job'=>$user->job,
+			'myuser_web'=>''	// url not exist in $user object
+		);
+	}
+
+
+	/**
+	 * Define array with couple subtitution key => subtitution value
+	 *
+	 * @param   Societe		$mysoc			Object thirdparty
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	function get_substitutionarray_mysoc($mysoc,$outputlangs)
+	{
+		global $conf;
+
+		if (empty($mysoc->forme_juridique) && ! empty($mysoc->forme_juridique_code))
+		{
+			$mysoc->forme_juridique=getFormeJuridiqueLabel($mysoc->forme_juridique_code);
+		}
+		if (empty($mysoc->country) && ! empty($mysoc->country_code))
+		{
+			$mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+		}
+		if (empty($mysoc->state) && ! empty($mysoc->state_code))
+		{
+			$mysoc->state=getState($mysoc->state_code,0);
+		}
+
+		$logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+
+		return array(
+			'mycompany_logo'=>$logotouse,
+			'mycompany_name'=>$mysoc->name,
+			'mycompany_email'=>$mysoc->email,
+			'mycompany_phone'=>$mysoc->phone,
+			'mycompany_fax'=>$mysoc->fax,
+			'mycompany_address'=>$mysoc->address,
+			'mycompany_zip'=>$mysoc->zip,
+			'mycompany_town'=>$mysoc->town,
+			'mycompany_country'=>$mysoc->country,
+			'mycompany_country_code'=>$mysoc->country_code,
+			'mycompany_state'=>$mysoc->state,
+			'mycompany_state_code'=>$mysoc->state_code,
+			'mycompany_web'=>$mysoc->url,
+			'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
+			'mycompany_managers'=>$mysoc->managers,
+			'mycompany_capital'=>$mysoc->capital,
+			'mycompany_barcode'=>$mysoc->barcode,
+			'mycompany_idprof1'=>$mysoc->idprof1,
+			'mycompany_idprof2'=>$mysoc->idprof2,
+			'mycompany_idprof3'=>$mysoc->idprof3,
+			'mycompany_idprof4'=>$mysoc->idprof4,
+			'mycompany_idprof5'=>$mysoc->idprof5,
+			'mycompany_idprof6'=>$mysoc->idprof6,
+			'mycompany_vatnumber'=>$mysoc->tva_intra,
 			'mycompany_object'=>$mysoc->object,
-            'mycompany_note_private'=>$mysoc->note_private,
-            //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
-        );
-    }
-
-
-    /**
-     * Define array with couple subtitution key => subtitution value
-     *
-     * @param	Object		$object			Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    function get_substitutionarray_thirdparty($object,$outputlangs)
-    {
-        global $conf;
-
-        if (empty($object->country) && ! empty($object->country_code))
-        {
-        	$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
-        }
-        if (empty($object->state) && ! empty($object->state_code))
-        {
-        	$object->state=getState($object->state_code,0);
-        }
-
-        $array_thirdparty = array(
-            'company_name'=>$object->name,
-	        'company_name_alias' => $object->name_alias,
-            'company_email'=>$object->email,
-            'company_phone'=>$object->phone,
-            'company_fax'=>$object->fax,
-            'company_address'=>$object->address,
-            'company_zip'=>$object->zip,
-            'company_town'=>$object->town,
-            'company_country'=>$object->country,
-        	'company_country_code'=>$object->country_code,
-            'company_state'=>$object->state,
-        	'company_state_code'=>$object->state_code,
-        	'company_web'=>$object->url,
-            'company_barcode'=>$object->barcode,
-            'company_vatnumber'=>$object->tva_intra,
-            'company_customercode'=>$object->code_client,
-            'company_suppliercode'=>$object->code_fournisseur,
-            'company_customeraccountancycode'=>$object->code_compta,
-            'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
-            'company_juridicalstatus'=>$object->forme_juridique,
-            'company_outstanding_limit'=>$object->outstanding_limit,
-            'company_capital'=>$object->capital,
-            'company_idprof1'=>$object->idprof1,
-            'company_idprof2'=>$object->idprof2,
-            'company_idprof3'=>$object->idprof3,
-            'company_idprof4'=>$object->idprof4,
-            'company_idprof5'=>$object->idprof5,
-            'company_idprof6'=>$object->idprof6,
-            'company_note_public'=>$object->note_public,
-            'company_note_private'=>$object->note_private,
-            'company_default_bank_iban'=>$object->bank_account->iban,
-            'company_default_bank_bic'=>$object->bank_account->bic
-        );
-
-        // Retrieve extrafields
-        if(is_array($object->array_options) && count($object->array_options))
-        {
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        	$extrafields = new ExtraFields($this->db);
-        	$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
-        	$object->fetch_optionals();
-
-        	foreach($extrafields->attribute_label as $key=>$label)
-        	{
-        		if($extrafields->attribute_type[$key] == 'price')
-        		{
-        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-        		{
-        			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-        		}
-        		$array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
+			'mycompany_note_private'=>$mysoc->note_private,
+			//'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
+		);
+	}
+
+
+	/**
+	 * Define array with couple subtitution key => subtitution value
+	 *
+	 * @param	Object		$object			Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	function get_substitutionarray_thirdparty($object,$outputlangs)
+	{
+		global $conf;
+
+		if (empty($object->country) && ! empty($object->country_code))
+		{
+			$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+		}
+		if (empty($object->state) && ! empty($object->state_code))
+		{
+			$object->state=getState($object->state_code,0);
+		}
+
+		$array_thirdparty = array(
+			'company_name'=>$object->name,
+			'company_name_alias' => $object->name_alias,
+			'company_email'=>$object->email,
+			'company_phone'=>$object->phone,
+			'company_fax'=>$object->fax,
+			'company_address'=>$object->address,
+			'company_zip'=>$object->zip,
+			'company_town'=>$object->town,
+			'company_country'=>$object->country,
+			'company_country_code'=>$object->country_code,
+			'company_state'=>$object->state,
+			'company_state_code'=>$object->state_code,
+			'company_web'=>$object->url,
+			'company_barcode'=>$object->barcode,
+			'company_vatnumber'=>$object->tva_intra,
+			'company_customercode'=>$object->code_client,
+			'company_suppliercode'=>$object->code_fournisseur,
+			'company_customeraccountancycode'=>$object->code_compta,
+			'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
+			'company_juridicalstatus'=>$object->forme_juridique,
+			'company_outstanding_limit'=>$object->outstanding_limit,
+			'company_capital'=>$object->capital,
+			'company_idprof1'=>$object->idprof1,
+			'company_idprof2'=>$object->idprof2,
+			'company_idprof3'=>$object->idprof3,
+			'company_idprof4'=>$object->idprof4,
+			'company_idprof5'=>$object->idprof5,
+			'company_idprof6'=>$object->idprof6,
+			'company_note_public'=>$object->note_public,
+			'company_note_private'=>$object->note_private,
+			'company_default_bank_iban'=>$object->bank_account->iban,
+			'company_default_bank_bic'=>$object->bank_account->bic
+		);
+
+		// Retrieve extrafields
+		if(is_array($object->array_options) && count($object->array_options))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields = new ExtraFields($this->db);
+			$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
+			$object->fetch_optionals();
+
+			foreach($extrafields->attribute_label as $key=>$label)
+			{
+				if($extrafields->attribute_type[$key] == 'price')
+				{
+					$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+				}
+				else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+				{
+					$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
+				}
+				$array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
 			}
 		}
 		return $array_thirdparty;
@@ -242,32 +242,32 @@ 
 		}
 
 		$array_contact = array (
-		    $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
-            $array_key . '_lastname' => $object->lastname,
-            $array_key . '_firstname' => $object->firstname,
-            $array_key . '_address' => $object->address,
-            $array_key . '_zip' => $object->zip,
-            $array_key . '_town' => $object->town,
-            $array_key . '_state_id' => $object->state_id,
-            $array_key . '_state_code' => $object->state_code,
-            $array_key . '_state' => $object->state,
-            $array_key . '_country_id' => $object->country_id,
-            $array_key . '_country_code' => $object->country_code,
-            $array_key . '_country' => $object->country,
-            $array_key . '_poste' => $object->poste,
-            $array_key . '_socid' => $object->socid,
-            $array_key . '_statut' => $object->statut,
-            $array_key . '_code' => $object->code,
-            $array_key . '_email' => $object->email,
-            $array_key . '_jabberid' => $object->jabberid,
-            $array_key . '_phone_pro' => $object->phone_pro,
-            $array_key . '_phone_perso' => $object->phone_perso,
-            $array_key . '_phone_mobile' => $object->phone_mobile,
-            $array_key . '_fax' => $object->fax,
-            $array_key . '_birthday' => $object->birthday,
-            $array_key . '_default_lang' => $object->default_lang,
-            $array_key . '_note_public' => $object->note_public,
-            $array_key . '_note_private' => $object->note_private
+			$array_key . '_fullname' => $object->getFullName($outputlangs, 1),
+			$array_key . '_lastname' => $object->lastname,
+			$array_key . '_firstname' => $object->firstname,
+			$array_key . '_address' => $object->address,
+			$array_key . '_zip' => $object->zip,
+			$array_key . '_town' => $object->town,
+			$array_key . '_state_id' => $object->state_id,
+			$array_key . '_state_code' => $object->state_code,
+			$array_key . '_state' => $object->state,
+			$array_key . '_country_id' => $object->country_id,
+			$array_key . '_country_code' => $object->country_code,
+			$array_key . '_country' => $object->country,
+			$array_key . '_poste' => $object->poste,
+			$array_key . '_socid' => $object->socid,
+			$array_key . '_statut' => $object->statut,
+			$array_key . '_code' => $object->code,
+			$array_key . '_email' => $object->email,
+			$array_key . '_jabberid' => $object->jabberid,
+			$array_key . '_phone_pro' => $object->phone_pro,
+			$array_key . '_phone_perso' => $object->phone_perso,
+			$array_key . '_phone_mobile' => $object->phone_mobile,
+			$array_key . '_fax' => $object->fax,
+			$array_key . '_birthday' => $object->birthday,
+			$array_key . '_default_lang' => $object->default_lang,
+			$array_key . '_note_public' => $object->note_public,
+			$array_key . '_note_private' => $object->note_private
 		);
 
 		// Retrieve extrafields
@@ -292,40 +292,40 @@ 
 	}
 
 
-    /**
-     * Define array with couple subtitution key => subtitution value
-     *
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    function get_substitutionarray_other($outputlangs)
-    {
-    	global $conf;
-
-    	$now=dol_now('gmt');	// gmt
-    	$array_other = array(
-    	    // Date in default language
-    	    'current_date'=>dol_print_date($now,'day','tzuser'),
-    	    'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
+	/**
+	 * Define array with couple subtitution key => subtitution value
+	 *
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	function get_substitutionarray_other($outputlangs)
+	{
+		global $conf;
+
+		$now=dol_now('gmt');	// gmt
+		$array_other = array(
+			// Date in default language
+			'current_date'=>dol_print_date($now,'day','tzuser'),
+			'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
    			'current_server_date'=>dol_print_date($now,'day','tzserver'),
    			'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
-    	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
+			// Date in requested output language
+			'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
    			'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
    			'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
    			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
-    	);
+		);
 
 
-    	foreach($conf->global as $key => $val)
-    	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
-    		else $newval = $val;
-    		$array_other['__['.$key.']__'] = $newval;
-    	}
+		foreach($conf->global as $key => $val)
+		{
+			if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+			else $newval = $val;
+			$array_other['__['.$key.']__'] = $newval;
+		}
 
-    	return $array_other;
-    }
+		return $array_other;
+	}
 
 
 	/**
@@ -333,7 +333,7 @@ 
 	 *
 	 * @param   Object			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
@@ -363,11 +363,11 @@ 
 		$array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
 		// Dates
-        $array_key.'_hour'=>dol_print_date($date,'hour'),
+		$array_key.'_hour'=>dol_print_date($date,'hour'),
 		$array_key.'_date'=>dol_print_date($date,'day'),
 		$array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
 		$array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
-	    $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
+		$array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
 		$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
 		$array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
 		$array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
@@ -393,8 +393,8 @@ 
 
 		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
 		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
-	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
-	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
+		$array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
+		$array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
 		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
 		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
 		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
@@ -448,11 +448,11 @@ 
 		{
 			foreach ($object->lines as $line)
 			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
+				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
 				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
-			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated=vatrate($line->tva_tx);
 				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
 				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
@@ -502,30 +502,30 @@ 
 			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
 			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
 			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
-		    // Dates
+			// Dates
 			'line_date_start'=>dol_print_date($line->date_start, 'day', 'tzuser'),
 			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzuser', $outputlangs),
-		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc', 'tzuser'),
-		    'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'),
-		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs),
-		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'),
-
-		    'line_multicurrency_code' => price2num($line->multicurrency_code),
-		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
-		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
-		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
-		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
-		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
-		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
-		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
-		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
+			'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc', 'tzuser'),
+			'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'),
+			'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs),
+			'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'),
+
+			'line_multicurrency_code' => price2num($line->multicurrency_code),
+			'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
+			'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
+			'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
+			'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
+			'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
+			'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
+			'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
+			'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
 		);
 
-		    // Units
+			// Units
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-		      $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
+			  $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
+			  $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
 		}
 
 		// Retrieve extrafields
@@ -550,54 +550,54 @@ 
 		return $resarray;
 	}
 
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Expedition			$object             Main object to use as data source
-     * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   array_key		$array_key	        Name of the key for return array
-     * @return	array								Array of substitution
-     */
-    function get_substitutionarray_shipment($object,$outputlangs,$array_key='object')
-    {
-    	global $conf;
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Expedition			$object             Main object to use as data source
+	 * @param   Translate		$outputlangs        Lang object to use for output
+	 * @param   array_key		$array_key	        Name of the key for return array
+	 * @return	array								Array of substitution
+	 */
+	function get_substitutionarray_shipment($object,$outputlangs,$array_key='object')
+	{
+		global $conf;
 		dol_include_once('/core/lib/product.lib.php');
 		$object->list_delivery_methods($object->shipping_method_id);
 		$calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
-    	$array_shipment=array(
-	    	$array_key.'_id'=>$object->id,
-	    	$array_key.'_ref'=>$object->ref,
-	    	$array_key.'_ref_ext'=>$object->ref_ext,
-	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-	    	$array_key.'_total_ht'=>price($object->total_ht),
-	    	$array_key.'_total_vat'=>price($object->total_tva),
-	    	$array_key.'_total_ttc'=>price($object->total_ttc),
-	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-	    	$array_key.'_note_private'=>$object->note_private,
-	    	$array_key.'_note'=>$object->note_public,
-	    	$array_key.'_tracking_number'=>$object->tracking_number,
-	    	$array_key.'_tracking_url'=>$object->tracking_url,
-	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-	    	$array_key.'_weight'=>$object->trueWeight.' '.measuring_units_string($object->weight_units, 'weight'),
-	    	$array_key.'_width'=>$object->trueWidth.' '.measuring_units_string($object->width_units, 'size'),
-	    	$array_key.'_height'=>$object->trueHeight.' '.measuring_units_string($object->height_units, 'size'),
-	    	$array_key.'_depth'=>$object->trueDepth.' '.measuring_units_string($object->depth_units, 'size'),
-	    	$array_key.'_size'=>$calculatedVolume.' '.measuring_units_string(0, 'volume'),
-    	);
-
-    	// Add vat by rates
-    	foreach ($object->lines as $line)
-    	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-    	}
+		$array_shipment=array(
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_ref_ext'=>$object->ref_ext,
+			$array_key.'_ref_customer'=>$object->ref_customer,
+			$array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
+			$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
+			$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+			$array_key.'_total_ht'=>price($object->total_ht),
+			$array_key.'_total_vat'=>price($object->total_tva),
+			$array_key.'_total_ttc'=>price($object->total_ttc),
+			$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note'=>$object->note_public,
+			$array_key.'_tracking_number'=>$object->tracking_number,
+			$array_key.'_tracking_url'=>$object->tracking_url,
+			$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
+			$array_key.'_weight'=>$object->trueWeight.' '.measuring_units_string($object->weight_units, 'weight'),
+			$array_key.'_width'=>$object->trueWidth.' '.measuring_units_string($object->width_units, 'size'),
+			$array_key.'_height'=>$object->trueHeight.' '.measuring_units_string($object->height_units, 'size'),
+			$array_key.'_depth'=>$object->trueDepth.' '.measuring_units_string($object->depth_units, 'size'),
+			$array_key.'_size'=>$calculatedVolume.' '.measuring_units_string(0, 'volume'),
+		);
+
+		// Add vat by rates
+		foreach ($object->lines as $line)
+		{
+			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+		}
 
-    	// Retrieve extrafields
-    	/*if(is_array($object->array_options) && count($object->array_options))
+		// Retrieve extrafields
+		/*if(is_array($object->array_options) && count($object->array_options))
     	{
     		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
     		$extrafields = new ExtraFields($this->db);
@@ -606,80 +606,80 @@ 
 
     		$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
     	}*/
-    	return $array_shipment;
-    }
-
-
-    /**
-     *	Define array with couple substitution key => substitution value
-     *
-     *	@param  array			$line				Array of lines
-     *	@param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    function get_substitutionarray_shipment_lines($line,$outputlangs)
-    {
-    	global $conf;
+		return $array_shipment;
+	}
+
+
+	/**
+	 *	Define array with couple substitution key => substitution value
+	 *
+	 *	@param  array			$line				Array of lines
+	 *	@param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	function get_substitutionarray_shipment_lines($line,$outputlangs)
+	{
+		global $conf;
 		dol_include_once('/core/lib/product.lib.php');
 
-    	return array(
-	    	'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
-	    	'line_product_ref'=>$line->product_ref,
-	    	'line_product_label'=>$line->product_label,
-	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
-	    	'line_up'=>price($line->subprice),
-	    	'line_qty'=>$line->qty,
-	    	'line_qty_shipped'=>$line->qty_shipped,
-	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
-	    	'line_price_ht'=>price($line->total_ht),
-	    	'line_price_ttc'=>price($line->total_ttc),
-	    	'line_price_vat'=>price($line->total_tva),
-	    	'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
-	    	'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
-	    	'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
-	    	'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
-    	);
-    }
-
-
-    /**
-     * Define array with couple subtitution key => subtitution value
-     *
-     * @param   Object		$object    		Dolibarr Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   boolean		$recursive    	Want to fetch child array or child object
-     * @return	array						Array of substitution key->code
-     */
-    function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) {
-        $array_other = array();
-        if(!empty($object)) {
-            foreach($object as $key => $value) {
-                if(!empty($value)) {
-                    if(!is_array($value) && !is_object($value)) {
-                        $array_other['object_'.$key] = $value;
-                    }
-                    if(is_array($value) && $recursive){
-                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false);
-                    }
-                }
-            }
-        }
-        return $array_other;
-    }
-
-
-    /**
-     *	Fill array with couple extrafield key => extrafield value
-     *
-     *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
-     *	@param  array			$array_to_fill      Substitution array
-     *  @param  Extrafields		$extrafields        Extrafields object
-     *  @param  string			$array_key	        Prefix for name of the keys into returned array
-     *  @param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
+		return array(
+			'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+			'line_product_ref'=>$line->product_ref,
+			'line_product_label'=>$line->product_label,
+			'line_desc'=>$line->desc,
+			'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+			'line_up'=>price($line->subprice),
+			'line_qty'=>$line->qty,
+			'line_qty_shipped'=>$line->qty_shipped,
+			'line_qty_asked'=>$line->qty_asked,
+			'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+			'line_price_ht'=>price($line->total_ht),
+			'line_price_ttc'=>price($line->total_ttc),
+			'line_price_vat'=>price($line->total_tva),
+			'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
+			'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
+			'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
+			'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
+		);
+	}
+
+
+	/**
+	 * Define array with couple subtitution key => subtitution value
+	 *
+	 * @param   Object		$object    		Dolibarr Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   boolean		$recursive    	Want to fetch child array or child object
+	 * @return	array						Array of substitution key->code
+	 */
+	function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) {
+		$array_other = array();
+		if(!empty($object)) {
+			foreach($object as $key => $value) {
+				if(!empty($value)) {
+					if(!is_array($value) && !is_object($value)) {
+						$array_other['object_'.$key] = $value;
+					}
+					if(is_array($value) && $recursive){
+						$array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false);
+					}
+				}
+			}
+		}
+		return $array_other;
+	}
+
+
+	/**
+	 *	Fill array with couple extrafield key => extrafield value
+	 *
+	 *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
+	 *	@param  array			$array_to_fill      Substitution array
+	 *  @param  Extrafields		$extrafields        Extrafields object
+	 *  @param  string			$array_key	        Prefix for name of the keys into returned array
+	 *  @param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
 	function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs)
 	{
 		global $conf;
@@ -743,12 +743,12 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
-    {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-	    $pdf->line($x, $y+$h, $x, $y);
-    }
+	function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+	{
+		if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+		$pdf->line($x+$l, $y, $x+$l, $y+$h);
+		if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+		$pdf->line($x, $y+$h, $x, $y);
+	}
 }
 

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

Indentation +7 added lines, -7 removed lines

@@ -158,7 +158,7 @@ 
    			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
    			foreach($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+				$texte.=$file['name'].'<br>';
    			}
    			$texte.='<div id="div_'.get_class($this).'">';
 		}
@@ -258,8 +258,8 @@ 
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$format=$conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format='%Y%m%d%H%M%S';
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
@@ -291,10 +291,10 @@ 
 					// On peut utiliser le nom de la societe du contact
 					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-			                        $socobject = $object->thirdparty;
-                        			// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
+									$socobject = $object->thirdparty;
+									// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
+									$contactobject = $object->contact;
+								}
 				}
 				else
 				{

htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

Indentation +18 added lines, -18 removed lines

@@ -108,7 +108,7 @@ 
 	 *
 	 * @param   Project			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
@@ -116,18 +116,18 @@ 
 		global $conf;
 
 		$resarray=array(
-		    $array_key.'_id'=>$object->id,
-            $array_key.'_ref'=>$object->ref,
-            $array_key.'_title'=>$object->title,
-            $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c,'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m,'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start,'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end,'day'),
-            $array_key.'_note_private'=>$object->note_private,
-            $array_key.'_note_public'=>$object->note_public,
-            $array_key.'_public'=>$object->public,
-            $array_key.'_statut'=>$object->getLibStatut()
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_title'=>$object->title,
+			$array_key.'_description'=>$object->description,
+			$array_key.'_date_creation'=>dol_print_date($object->date_c,'day'),
+			$array_key.'_date_modification'=>dol_print_date($object->date_m,'day'),
+			$array_key.'_date_start'=>dol_print_date($object->date_start,'day'),
+			$array_key.'_date_end'=>dol_print_date($object->date_end,'day'),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note_public'=>$object->note_public,
+			$array_key.'_public'=>$object->public,
+			$array_key.'_statut'=>$object->getLibStatut()
 		);
 
 		// Retrieve extrafields
@@ -404,7 +404,7 @@ 
    			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
    			foreach($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+				$texte.=$file['name'].'<br>';
    			}
    			$texte.='<div id="div_'.get_class($this).'">';
 		}
@@ -500,8 +500,8 @@ 
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$format=$conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format='%Y%m%d%H%M%S';
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
@@ -528,8 +528,8 @@ 
 				// Recipient name
 				if (! empty($usecontact))
 				{
-        			// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
-        			$contactobject = $object->contact;
+					// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
+					$contactobject = $object->contact;
 				}
 
 				$socobject=$object->thirdparty;

htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php

Indentation +7 added lines, -7 removed lines

@@ -152,7 +152,7 @@ 
 		$texte.= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte.= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte.= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte.= '</div>';
+		$texte.= '</div>';
 
 		$texte.= '</td>';
 
@@ -249,8 +249,8 @@ 
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$format=$conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format='%Y%m%d%H%M%S';
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
@@ -281,10 +281,10 @@ 
 					// On peut utiliser le nom de la societe du contact
 					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        			$socobject = $object->thirdparty;
-                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
+									$socobject = $object->thirdparty;
+									// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+									$contactobject = $object->contact;
+								}
 				}
 				else
 				{

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

Indentation +7 added lines, -7 removed lines

@@ -159,7 +159,7 @@ 
    			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
    			foreach($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+				$texte.=$file['name'].'<br>';
    			}
    			$texte.='<div id="div_'.get_class($this).'">';
 		}
@@ -258,8 +258,8 @@ 
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$format=$conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format='%Y%m%d%H%M%S';
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
@@ -290,10 +290,10 @@ 
 					// On peut utiliser le nom de la societe du contact
 					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				}
 				else
 				{

htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

Indentation +7 added lines, -7 removed lines

@@ -164,7 +164,7 @@ 
    			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
    			foreach($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+				$texte.=$file['name'].'<br>';
    			}
    			$texte.='<div id="div_'.get_class($this).'">';
 
@@ -289,8 +289,8 @@ 
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$format=$conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format='%Y%m%d%H%M%S';
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
@@ -321,10 +321,10 @@ 
 					// On peut utiliser le nom de la societe du contact
 					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        			$socobject = $object->thirdparty;
-                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
+									$socobject = $object->thirdparty;
+									// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+									$contactobject = $object->contact;
+								}
 				}
 				else
 				{

htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php

Indentation +6 added lines, -6 removed lines

@@ -275,8 +275,8 @@ 
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$format=$conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format='%Y%m%d%H%M%S';
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
@@ -307,10 +307,10 @@ 
 					// On peut utiliser le nom de la societe du contact
 					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        			$socobject = $object->thirdparty;
-                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
+									$socobject = $object->thirdparty;
+									// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+									$contactobject = $object->contact;
+								}
 				}
 				else
 				{

htdocs/install/step1.php

Indentation +696 added lines, -696 removed lines

@@ -145,9 +145,9 @@ 
 // Test if we can run a first install process
 if (! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
-    pFooter(1,$setuplang,'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
+	pFooter(1,$setuplang,'jscheckparam');
+	exit;
 }
 
 
@@ -155,30 +155,30 @@ 
 $is_sqlite = false;
 if (empty($db_type))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseType")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseType")).'</div>';
+	$error++;
 } else {
 	$is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3' );
 }
 if (empty($db_host) && ! $is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Server")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Server")).'</div>';
+	$error++;
 }
 if (empty($db_name))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'</div>';
+	$error++;
 }
 if (empty($db_user)  && ! $is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'</div>';
+	$error++;
 }
 if (! empty($db_port) && ! is_numeric($db_port))
 {
-    print '<div class="error">'.$langs->trans("ErrorBadValueForParameter",$db_port,$langs->transnoentities("Port")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter",$db_port,$langs->transnoentities("Port")).'</div>';
+	$error++;
 }
 if (! empty($db_prefix) && ! preg_match('/^[a-z0-9]+_$/i', $db_prefix))
 {
@@ -190,596 +190,596 @@ 
 // Remove last / into dans main_dir
 if (substr($main_dir, dol_strlen($main_dir) -1) == "/")
 {
-    $main_dir = substr($main_dir, 0, dol_strlen($main_dir)-1);
+	$main_dir = substr($main_dir, 0, dol_strlen($main_dir)-1);
 }
 
 // Remove last / into dans main_url
 if (! empty($main_url) && substr($main_url, dol_strlen($main_url) -1) == "/")
 {
-    $main_url = substr($main_url, 0, dol_strlen($main_url)-1);
+	$main_url = substr($main_url, 0, dol_strlen($main_url)-1);
 }
 
 // Test database connection
 if (! $error) {
-    $result=@include_once $main_dir."/core/db/".$db_type.'.class.php';
-    if ($result)
-    {
-        // If we ask database or user creation we need to connect as root, so we need root login
-        if (!empty($db_create_database) && !$userroot) {
-            print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$db_name).'</div>';
-            print '<br>';
-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-        if (!empty($db_create_user) && !$userroot) {
-            print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect",$db_user).'</div>';
-            print '<br>';
-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-
-        // If we need root access
-        if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
-            $databasefortest=$db_name;
-            if (!empty($db_create_database)) {
-                if ($db_type == 'mysql' || $db_type == 'mysqli')
-                {
-                    $databasefortest='mysql';
-                }
-                elseif ($db_type == 'pgsql')
-                {
-                    $databasefortest='postgres';
-                }
-                else
-                {
-                    $databasefortest='master';
-                }
-            }
-            //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
-
-            $db=getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
-
-            dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
-            //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
+	$result=@include_once $main_dir."/core/db/".$db_type.'.class.php';
+	if ($result)
+	{
+		// If we ask database or user creation we need to connect as root, so we need root login
+		if (!empty($db_create_database) && !$userroot) {
+			print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$db_name).'</div>';
+			print '<br>';
+			print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+		if (!empty($db_create_user) && !$userroot) {
+			print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect",$db_user).'</div>';
+			print '<br>';
+			print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+
+		// If we need root access
+		if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
+			$databasefortest=$db_name;
+			if (!empty($db_create_database)) {
+				if ($db_type == 'mysql' || $db_type == 'mysqli')
+				{
+					$databasefortest='mysql';
+				}
+				elseif ($db_type == 'pgsql')
+				{
+					$databasefortest='postgres';
+				}
+				else
+				{
+					$databasefortest='master';
+				}
+			}
+			//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
+
+			$db=getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
+
+			dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
+			//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
 
 			if (empty($db_create_database) && $db->connected && !$db->database_selected) {
-                print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound",$db_name).'</div>';
-                print '<br>';
-                if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                $error++;
-            } elseif ($db->error && ! (! empty($db_create_database) && $db->connected)) {
-            	// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
-                if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
-                else print '<div class="error">'.$db->error.'</div>';
-                if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                //print '<a href="#" onClick="javascript: history.back();">';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                //print '</a>';
-                $error++;
-            }
-        }
-        // If we need simple access
-        if (!$error && (empty($db_create_database) && empty($db_create_user))) {
-            $db=getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
-
-            if ($db->error)
-            {
-                print '<div class="error">'.$db->error.'</div>';
-                if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                //print '<a href="#" onClick="javascript: history.back();">';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                //print '</a>';
-                $error++;
-            }
-        }
-    }
-    else
-    {
-        print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
-        print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'</div>';
-        //print '<a href="#" onClick="javascript: history.back();">';
-        print $langs->trans("ErrorGoBackAndCorrectParameters");
-        //print '</a>';
-        $error++;
-    }
+				print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound",$db_name).'</div>';
+				print '<br>';
+				if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				$error++;
+			} elseif ($db->error && ! (! empty($db_create_database) && $db->connected)) {
+				// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
+				if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
+				else print '<div class="error">'.$db->error.'</div>';
+				if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				//print '<a href="#" onClick="javascript: history.back();">';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				//print '</a>';
+				$error++;
+			}
+		}
+		// If we need simple access
+		if (!$error && (empty($db_create_database) && empty($db_create_user))) {
+			$db=getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
+
+			if ($db->error)
+			{
+				print '<div class="error">'.$db->error.'</div>';
+				if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				//print '<a href="#" onClick="javascript: history.back();">';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				//print '</a>';
+				$error++;
+			}
+		}
+	}
+	else
+	{
+		print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
+		print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'</div>';
+		//print '<a href="#" onClick="javascript: history.back();">';
+		print $langs->trans("ErrorGoBackAndCorrectParameters");
+		//print '</a>';
+		$error++;
+	}
 }
 
 else
 {
-    if (isset($db)) print $db->lasterror();
-    if (isset($db) && ! $db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-    print $langs->trans("ErrorGoBackAndCorrectParameters");
-    $error++;
+	if (isset($db)) print $db->lasterror();
+	if (isset($db) && ! $db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+	print $langs->trans("ErrorGoBackAndCorrectParameters");
+	$error++;
 }
 
 if (! $error && $db->connected)
 {
-    if (! empty($db_create_database)) {
-        $result=$db->select_db($db_name);
-        if ($result)
-        {
-            print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
-            print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-    }
+	if (! empty($db_create_database)) {
+		$result=$db->select_db($db_name);
+		if ($result)
+		{
+			print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
+			print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+	}
 }
 
 // Define $defaultCharacterSet and $defaultDBSortingCollation
 if (! $error && $db->connected)
 {
-    if (!empty($db_create_database))    // If we create database, we force default value
-    {
-        // Default values come from the database handler
-
-        $defaultCharacterSet=$db->forcecharset;
-    	$defaultDBSortingCollation=$db->forcecollate;
-    }
-    else	// If already created, we take current value
-    {
-        $defaultCharacterSet=$db->getDefaultCharacterSetDatabase();
-        $defaultDBSortingCollation=$db->getDefaultCollationDatabase();
-    }
-
-    // Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
-    // TODO Remove this when utf8mb4 is supported
-    if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
-    {
-        $defaultCharacterSet = 'utf8';
-        $defaultDBSortingCollation = 'utf8_unicode_ci';
-    }
-
-    print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
-    print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
-    $db_character_set=$defaultCharacterSet;
-    $db_collation=$defaultDBSortingCollation;
-    dolibarr_install_syslog("step1: db_character_set=" . $db_character_set . " db_collation=" . $db_collation);
+	if (!empty($db_create_database))    // If we create database, we force default value
+	{
+		// Default values come from the database handler
+
+		$defaultCharacterSet=$db->forcecharset;
+		$defaultDBSortingCollation=$db->forcecollate;
+	}
+	else	// If already created, we take current value
+	{
+		$defaultCharacterSet=$db->getDefaultCharacterSetDatabase();
+		$defaultDBSortingCollation=$db->getDefaultCollationDatabase();
+	}
+
+	// Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
+	// TODO Remove this when utf8mb4 is supported
+	if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
+	{
+		$defaultCharacterSet = 'utf8';
+		$defaultDBSortingCollation = 'utf8_unicode_ci';
+	}
+
+	print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
+	print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
+	$db_character_set=$defaultCharacterSet;
+	$db_collation=$defaultDBSortingCollation;
+	dolibarr_install_syslog("step1: db_character_set=" . $db_character_set . " db_collation=" . $db_collation);
 }
 
 
 // Create config file
 if (! $error && $db->connected && $action == "set")
 {
-    umask(0);
-    if (is_array($_POST))
-    {
-        foreach($_POST as $key => $value)
-        {
-            if (! preg_match('/^db_pass/i', $key)) {
-    			dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
-    		}
-        }
-    }
-
-    // Show title of step
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
-    print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
-
-    // Check parameter main_dir
-    if (! $error)
-    {
-        if (! is_dir($main_dir))
-        {
-            dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");
-
-            print "<tr><td>";
-            print $langs->trans("ErrorDirDoesNotExists",$main_dir).'<br>';
-            print $langs->trans("ErrorWrongValueForParameter",$langs->trans("WebPagesDirectory")).'<br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-            print '</td><td>';
-            print $langs->trans("Error");
-            print "</td></tr>";
-            $error++;
-        }
-    }
-
-    if (! $error)
-    {
-        dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");
-    }
-
-
-    // Create subdirectory main_data_dir
-    if (! $error)
-    {
-        // Create directory for documents
-        if (! is_dir($main_data_dir))
-        {
-            dol_mkdir($main_data_dir);
-        }
-
-        if (! is_dir($main_data_dir))
-        {
-            print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$main_data_dir);
-            print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
-            print '</td><td>';
-            print '<font class="error">'.$langs->trans("Error").'</font>';
-            print "</td></tr>";
-            print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            $error++;
-        }
-        else
-        {
-            // Create .htaccess file in document directory
-            $pathhtaccess=$main_data_dir.'/.htaccess';
-            if (! file_exists($pathhtaccess))
-            {
-                dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'");
-                $handlehtaccess=@fopen($pathhtaccess,'w');
-                if ($handlehtaccess)
-                {
-                    fwrite($handlehtaccess,'Order allow,deny'."\n");
-                    fwrite($handlehtaccess,'Deny from all'."\n");
-
-                    fclose($handlehtaccess);
-                    dolibarr_install_syslog("step1: .htaccess file created");
-                }
-            }
-
-            // Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification
-            $dir=array();
-            $dir[] = $main_data_dir."/mycompany";
-            $dir[] = $main_data_dir."/medias";
-            $dir[] = $main_data_dir."/users";
-            $dir[] = $main_data_dir."/facture";
-            $dir[] = $main_data_dir."/propale";
-            $dir[] = $main_data_dir."/ficheinter";
-            $dir[] = $main_data_dir."/produit";
-            $dir[] = $main_data_dir."/doctemplates";
-
-            // Boucle sur chaque repertoire de dir[] pour les creer s'ils nexistent pas
-            $num=count($dir);
-            for ($i = 0; $i < $num; $i++)
-            {
-                if (is_dir($dir[$i]))
-                {
-                    dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
-                }
-                else
-                {
-                    if (dol_mkdir($dir[$i]) < 0)
-                    {
-                        print "<tr><td>";
-                        print "Failed to create directory: ".$dir[$i];
-                        print '</td><td>';
-                        print $langs->trans("Error");
-                        print "</td></tr>";
-                        $error++;
-                    }
-                    else
-                    {
-                        dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
-                    }
-                }
-            }
-
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-            // Copy directory medias
-            $srcroot=$main_dir.'/install/medias';
-            $destroot=$main_data_dir.'/medias';
-            dolCopyDir($srcroot, $destroot, 0, 0);
-
-            if ($error)
-            {
-                print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$main_data_dir);
-                print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
-                print '</td><td>';
-                print '<font class="error">'.$langs->trans("Error").'</font>';
-                print "</td></tr>";
-                print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            }
-            else
-            {
-            	//ODT templates
-            	$srcroot=$main_dir.'/install/doctemplates';
-            	$destroot=$main_data_dir.'/doctemplates';
-            	$docs=array(
-            		'contracts' => 'contract',
-            		'invoices' => 'invoice',
-            		'orders' => 'order',
-            		'products' => 'product',
-            		'projects' => 'project',
-            		'proposals' => 'proposal',
-            		'shipment' => 'shipment',
-            		'supplier_proposal' => 'supplier_proposal',
-            		'tasks' => 'task_summary',
-            		'thirdparties' => 'thirdparty',
-            		'usergroups' => 'usergroups',
-            		'users' => 'user',
-            		'usergroups' => 'usergroups',
-            	);
-            	foreach($docs as $cursordir => $cursorfile)
-            	{
-            		$src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
-            		$dirodt=$destroot.'/'.$cursordir;
-            		$dest=$dirodt.'/template_'.$cursorfile.'.odt';
-
-            		dol_mkdir($dirodt);
-            		$result=dol_copy($src,$dest,0,0);
-            		if ($result < 0)
-            		{
-            			print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile',$src,$dest).'</td></tr>';
-            		}
-            	}
-            }
-        }
-    }
-
-    // Table prefix
-    $main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
-
-    // Write conf file on disk
-    if (! $error)
-    {
-        // Save old conf file on disk
-        if (file_exists("$conffile"))
-        {
-            // We must ignore errors as an existing old file may already exists and not be replacable or
-            // the installer (like for ubuntu) may not have permission to create another file than conf.php.
-            // Also no other process must be able to read file or we expose the new file, so content with password.
-            @dol_copy($conffile, $conffile.'.old', '0400');
-        }
-
-        $error+=write_conf_file($conffile);
-    }
-
-    // Create database and admin user database
-    if (! $error)
-    {
-        // We reload configuration file
-        conf($dolibarr_main_document_root);
-
-        print '<tr><td>';
-        print $langs->trans("ConfFileReload");
-        print '</td>';
-        print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-
-        // Si creation utilisateur admin demandee, on le cree
-        if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
-            dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user);
-
-            //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
-            $databasefortest=$conf->db->name;
-            if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
-            {
-                $databasefortest='mysql';
-            }
-            else if ($conf->db->type == 'pgsql')
-            {
-                $databasefortest='postgres';
-            }
-            else if ($conf->db->type == 'mssql')
-            {
-                $databasefortest='master';
-            }
-
-            // Creation handler de base, verification du support et connexion
-
-            $db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port);
-
-            if ($db->error)
-            {
-                print '<div class="error">'.$db->error.'</div>';
-                $error++;
-            }
-
-            if (! $error)
-            {
-                if ($db->connected)
-                {
-                    $resultbis = 1;
-
-                    // Create user
-                    $result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
-                    // Create user bis
-                    if ($databasefortest == 'mysql')
-                    {
-                        if (! in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local')))
-                        {
-                            $resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
-                        }
-                    }
-
-                    if ($result > 0 && $resultbis > 0)
-                    {
-
-                        print '<tr><td>';
-                        print $langs->trans("UserCreation").' : ';
-                        print $dolibarr_main_db_user;
-                        print '</td>';
-                        print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                    }
-                    else
-                    {
-                        if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
-                        {
-                            dolibarr_install_syslog("step1: user already exists");
-                            print '<tr><td>';
-                            print $langs->trans("UserCreation").' : ';
-                            print $dolibarr_main_db_user;
-                            print '</td>';
-                            print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
-                        }
-                        else
-                        {
-                            dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
-                            print '<tr><td>';
-                            print $langs->trans("UserCreation").' : ';
-                            print $dolibarr_main_db_user;
-                            print '</td>';
-                            print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error()."</td></tr>";
-                        }
-                    }
-
-                    $db->close();
-                }
-                else
-                {
-                    print '<tr><td>';
-                    print $langs->trans("UserCreation").' : ';
-                    print $dolibarr_main_db_user;
-                    print '</td>';
-                    print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
-                    print '</tr>';
-
-                    // Affiche aide diagnostique
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot);
-                    print '<br>';
-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                    print '</td></tr>';
-
-                    $error++;
-                }
-            }
-        }   // Fin si "creation utilisateur"
-
-
-        // If database creation is asked, we create it
-        if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
-            dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
-        	$newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
-            //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
-
-            if ($newdb->connected)
-            {
-                $result=$newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
-
-                if ($result)
-                {
-                    print '<tr><td>';
-                    print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
-                    print $dolibarr_main_db_name;
-                    print '</td>';
-                    print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-
-                    $newdb->select_db($dolibarr_main_db_name);
-                    $check1=$newdb->getDefaultCharacterSetDatabase();
-                    $check2=$newdb->getDefaultCollationDatabase();
-                    dolibarr_install_syslog('step1: new database is using charset=' . $check1 . ' collation=' . $check2);
-
-                    // If values differs, we save conf file again
-                    //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
-                    //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
-                }
-                else
-                {
-                    // Affiche aide diagnostique
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans("ErrorFailedToCreateDatabase",$dolibarr_main_db_name).'<br>';
-                    print $newdb->lasterror().'<br>';
-                    print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");
-                    print '<br>';
-                    print '</td></tr>';
-
-                    dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);
-                    $error++;
-                }
-                $newdb->close();
-            }
-            else {
-                print '<tr><td>';
-                print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
-                print $dolibarr_main_db_name;
-                print '</td>';
-                print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
-                print '</tr>';
-
-                // Affiche aide diagnostique
-                print '<tr><td colspan="2"><br>';
-                print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot);
-                print '<br>';
-                print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                print '</td></tr>';
-
-                $error++;
-            }
-        }   // Fin si "creation database"
-
-
-        // We test access with dolibarr database user (not admin)
-        if (! $error)
-        {
-            dolibarr_install_syslog("step1: connection type=" . $conf->db->type . " on host=" . $conf->db->host . " port=" . $conf->db->port . " user=" . $conf->db->user . " name=" . $conf->db->name);
-            //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
-
-            $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
-
-            if ($db->connected)
-            {
-                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " ok");
-                print "<tr><td>";
-                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                print $dolibarr_main_db_host;
-                print "</td><td>";
-                print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
-                print "</td></tr>";
-
-                // si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root.
-                if ($db->database_selected)
-                {
-                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok");
-                    print "<tr><td>";
-                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                    print $dolibarr_main_db_name;
-                    print "</td><td>";
-                    print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
-                    print "</td></tr>";
-
-                    $error = 0;
-                }
-                else
-                {
-                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);
-                    print "<tr><td>";
-                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                    print $dolibarr_main_db_name;
-                    print '</td><td>';
-                    print '<img src="../theme/eldy/img/error.png" alt="Error">';
-                    print "</td></tr>";
-
-                    // Affiche aide diagnostique
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans('CheckThatDatabasenameIsCorrect',$dolibarr_main_db_name).'<br>';
-                    print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
-                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                    print '</td></tr>';
-
-                    $error++;
-                }
-            }
-            else
-            {
-                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);
-                print "<tr><td>";
-                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                print $dolibarr_main_db_host;
-                print '</td><td>';
-                print '<img src="../theme/eldy/img/error.png" alt="Error">';
-                print "</td></tr>";
-
-                // Affiche aide diagnostique
-                print '<tr><td colspan="2"><br>';
-                print $langs->trans("ErrorConnection",$conf->db->host,$conf->db->name,$conf->db->user);
-                print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                print '</td></tr>';
-
-                $error++;
-            }
-        }
-    }
-
-    print '</table>';
+	umask(0);
+	if (is_array($_POST))
+	{
+		foreach($_POST as $key => $value)
+		{
+			if (! preg_match('/^db_pass/i', $key)) {
+				dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
+			}
+		}
+	}
+
+	// Show title of step
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/lib/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
+	print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
+
+	// Check parameter main_dir
+	if (! $error)
+	{
+		if (! is_dir($main_dir))
+		{
+			dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");
+
+			print "<tr><td>";
+			print $langs->trans("ErrorDirDoesNotExists",$main_dir).'<br>';
+			print $langs->trans("ErrorWrongValueForParameter",$langs->trans("WebPagesDirectory")).'<br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+			print '</td><td>';
+			print $langs->trans("Error");
+			print "</td></tr>";
+			$error++;
+		}
+	}
+
+	if (! $error)
+	{
+		dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");
+	}
+
+
+	// Create subdirectory main_data_dir
+	if (! $error)
+	{
+		// Create directory for documents
+		if (! is_dir($main_data_dir))
+		{
+			dol_mkdir($main_data_dir);
+		}
+
+		if (! is_dir($main_data_dir))
+		{
+			print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$main_data_dir);
+			print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
+			print '</td><td>';
+			print '<font class="error">'.$langs->trans("Error").'</font>';
+			print "</td></tr>";
+			print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
+			$error++;
+		}
+		else
+		{
+			// Create .htaccess file in document directory
+			$pathhtaccess=$main_data_dir.'/.htaccess';
+			if (! file_exists($pathhtaccess))
+			{
+				dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'");
+				$handlehtaccess=@fopen($pathhtaccess,'w');
+				if ($handlehtaccess)
+				{
+					fwrite($handlehtaccess,'Order allow,deny'."\n");
+					fwrite($handlehtaccess,'Deny from all'."\n");
+
+					fclose($handlehtaccess);
+					dolibarr_install_syslog("step1: .htaccess file created");
+				}
+			}
+
+			// Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification
+			$dir=array();
+			$dir[] = $main_data_dir."/mycompany";
+			$dir[] = $main_data_dir."/medias";
+			$dir[] = $main_data_dir."/users";
+			$dir[] = $main_data_dir."/facture";
+			$dir[] = $main_data_dir."/propale";
+			$dir[] = $main_data_dir."/ficheinter";
+			$dir[] = $main_data_dir."/produit";
+			$dir[] = $main_data_dir."/doctemplates";
+
+			// Boucle sur chaque repertoire de dir[] pour les creer s'ils nexistent pas
+			$num=count($dir);
+			for ($i = 0; $i < $num; $i++)
+			{
+				if (is_dir($dir[$i]))
+				{
+					dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
+				}
+				else
+				{
+					if (dol_mkdir($dir[$i]) < 0)
+					{
+						print "<tr><td>";
+						print "Failed to create directory: ".$dir[$i];
+						print '</td><td>';
+						print $langs->trans("Error");
+						print "</td></tr>";
+						$error++;
+					}
+					else
+					{
+						dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
+					}
+				}
+			}
+
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+			// Copy directory medias
+			$srcroot=$main_dir.'/install/medias';
+			$destroot=$main_data_dir.'/medias';
+			dolCopyDir($srcroot, $destroot, 0, 0);
+
+			if ($error)
+			{
+				print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$main_data_dir);
+				print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
+				print '</td><td>';
+				print '<font class="error">'.$langs->trans("Error").'</font>';
+				print "</td></tr>";
+				print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
+			}
+			else
+			{
+				//ODT templates
+				$srcroot=$main_dir.'/install/doctemplates';
+				$destroot=$main_data_dir.'/doctemplates';
+				$docs=array(
+					'contracts' => 'contract',
+					'invoices' => 'invoice',
+					'orders' => 'order',
+					'products' => 'product',
+					'projects' => 'project',
+					'proposals' => 'proposal',
+					'shipment' => 'shipment',
+					'supplier_proposal' => 'supplier_proposal',
+					'tasks' => 'task_summary',
+					'thirdparties' => 'thirdparty',
+					'usergroups' => 'usergroups',
+					'users' => 'user',
+					'usergroups' => 'usergroups',
+				);
+				foreach($docs as $cursordir => $cursorfile)
+				{
+					$src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
+					$dirodt=$destroot.'/'.$cursordir;
+					$dest=$dirodt.'/template_'.$cursorfile.'.odt';
+
+					dol_mkdir($dirodt);
+					$result=dol_copy($src,$dest,0,0);
+					if ($result < 0)
+					{
+						print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile',$src,$dest).'</td></tr>';
+					}
+				}
+			}
+		}
+	}
+
+	// Table prefix
+	$main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
+
+	// Write conf file on disk
+	if (! $error)
+	{
+		// Save old conf file on disk
+		if (file_exists("$conffile"))
+		{
+			// We must ignore errors as an existing old file may already exists and not be replacable or
+			// the installer (like for ubuntu) may not have permission to create another file than conf.php.
+			// Also no other process must be able to read file or we expose the new file, so content with password.
+			@dol_copy($conffile, $conffile.'.old', '0400');
+		}
+
+		$error+=write_conf_file($conffile);
+	}
+
+	// Create database and admin user database
+	if (! $error)
+	{
+		// We reload configuration file
+		conf($dolibarr_main_document_root);
+
+		print '<tr><td>';
+		print $langs->trans("ConfFileReload");
+		print '</td>';
+		print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+
+		// Si creation utilisateur admin demandee, on le cree
+		if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
+			dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user);
+
+			//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
+			$databasefortest=$conf->db->name;
+			if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
+			{
+				$databasefortest='mysql';
+			}
+			else if ($conf->db->type == 'pgsql')
+			{
+				$databasefortest='postgres';
+			}
+			else if ($conf->db->type == 'mssql')
+			{
+				$databasefortest='master';
+			}
+
+			// Creation handler de base, verification du support et connexion
+
+			$db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port);
+
+			if ($db->error)
+			{
+				print '<div class="error">'.$db->error.'</div>';
+				$error++;
+			}
+
+			if (! $error)
+			{
+				if ($db->connected)
+				{
+					$resultbis = 1;
+
+					// Create user
+					$result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+					// Create user bis
+					if ($databasefortest == 'mysql')
+					{
+						if (! in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local')))
+						{
+							$resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+						}
+					}
+
+					if ($result > 0 && $resultbis > 0)
+					{
+
+						print '<tr><td>';
+						print $langs->trans("UserCreation").' : ';
+						print $dolibarr_main_db_user;
+						print '</td>';
+						print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+					}
+					else
+					{
+						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
+						{
+							dolibarr_install_syslog("step1: user already exists");
+							print '<tr><td>';
+							print $langs->trans("UserCreation").' : ';
+							print $dolibarr_main_db_user;
+							print '</td>';
+							print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
+						}
+						else
+						{
+							dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
+							print '<tr><td>';
+							print $langs->trans("UserCreation").' : ';
+							print $dolibarr_main_db_user;
+							print '</td>';
+							print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error()."</td></tr>";
+						}
+					}
+
+					$db->close();
+				}
+				else
+				{
+					print '<tr><td>';
+					print $langs->trans("UserCreation").' : ';
+					print $dolibarr_main_db_user;
+					print '</td>';
+					print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
+					print '</tr>';
+
+					// Affiche aide diagnostique
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot);
+					print '<br>';
+					print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+					print '</td></tr>';
+
+					$error++;
+				}
+			}
+		}   // Fin si "creation utilisateur"
+
+
+		// If database creation is asked, we create it
+		if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
+			dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
+			$newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
+			//print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
+
+			if ($newdb->connected)
+			{
+				$result=$newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
+
+				if ($result)
+				{
+					print '<tr><td>';
+					print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
+					print $dolibarr_main_db_name;
+					print '</td>';
+					print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+
+					$newdb->select_db($dolibarr_main_db_name);
+					$check1=$newdb->getDefaultCharacterSetDatabase();
+					$check2=$newdb->getDefaultCollationDatabase();
+					dolibarr_install_syslog('step1: new database is using charset=' . $check1 . ' collation=' . $check2);
+
+					// If values differs, we save conf file again
+					//if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
+					//if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
+				}
+				else
+				{
+					// Affiche aide diagnostique
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans("ErrorFailedToCreateDatabase",$dolibarr_main_db_name).'<br>';
+					print $newdb->lasterror().'<br>';
+					print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");
+					print '<br>';
+					print '</td></tr>';
+
+					dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);
+					$error++;
+				}
+				$newdb->close();
+			}
+			else {
+				print '<tr><td>';
+				print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
+				print $dolibarr_main_db_name;
+				print '</td>';
+				print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
+				print '</tr>';
+
+				// Affiche aide diagnostique
+				print '<tr><td colspan="2"><br>';
+				print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot);
+				print '<br>';
+				print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+				print '</td></tr>';
+
+				$error++;
+			}
+		}   // Fin si "creation database"
+
+
+		// We test access with dolibarr database user (not admin)
+		if (! $error)
+		{
+			dolibarr_install_syslog("step1: connection type=" . $conf->db->type . " on host=" . $conf->db->host . " port=" . $conf->db->port . " user=" . $conf->db->user . " name=" . $conf->db->name);
+			//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
+
+			$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
+
+			if ($db->connected)
+			{
+				dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " ok");
+				print "<tr><td>";
+				print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+				print $dolibarr_main_db_host;
+				print "</td><td>";
+				print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
+				print "</td></tr>";
+
+				// si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root.
+				if ($db->database_selected)
+				{
+					dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok");
+					print "<tr><td>";
+					print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+					print $dolibarr_main_db_name;
+					print "</td><td>";
+					print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
+					print "</td></tr>";
+
+					$error = 0;
+				}
+				else
+				{
+					dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);
+					print "<tr><td>";
+					print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+					print $dolibarr_main_db_name;
+					print '</td><td>';
+					print '<img src="../theme/eldy/img/error.png" alt="Error">';
+					print "</td></tr>";
+
+					// Affiche aide diagnostique
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans('CheckThatDatabasenameIsCorrect',$dolibarr_main_db_name).'<br>';
+					print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+					print '</td></tr>';
+
+					$error++;
+				}
+			}
+			else
+			{
+				dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);
+				print "<tr><td>";
+				print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+				print $dolibarr_main_db_host;
+				print '</td><td>';
+				print '<img src="../theme/eldy/img/error.png" alt="Error">';
+				print "</td></tr>";
+
+				// Affiche aide diagnostique
+				print '<tr><td colspan="2"><br>';
+				print $langs->trans("ErrorConnection",$conf->db->host,$conf->db->name,$conf->db->user);
+				print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+				print '</td></tr>';
+
+				$error++;
+			}
+		}
+	}
+
+	print '</table>';
 }
 
 ?>
@@ -814,15 +814,15 @@ 
  */
 function write_main_file($mainfile,$main_dir)
 {
-    $fp = @fopen("$mainfile", "w");
-    if($fp)
-    {
-        clearstatcache();
-        fputs($fp, '<?php'."\n");
-        fputs($fp, "// Wrapper to include main into htdocs\n");
-        fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
-        fclose($fp);
-    }
+	$fp = @fopen("$mainfile", "w");
+	if($fp)
+	{
+		clearstatcache();
+		fputs($fp, '<?php'."\n");
+		fputs($fp, "// Wrapper to include main into htdocs\n");
+		fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
+		fclose($fp);
+	}
 }
 
 
@@ -835,15 +835,15 @@ 
  */
 function write_master_file($masterfile,$main_dir)
 {
-    $fp = @fopen("$masterfile", "w");
-    if($fp)
-    {
-        clearstatcache();
-        fputs($fp, '<?php'."\n");
-        fputs($fp, "// Wrapper to include master into htdocs\n");
-        fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
-        fclose($fp);
-    }
+	$fp = @fopen("$masterfile", "w");
+	if($fp)
+	{
+		clearstatcache();
+		fputs($fp, '<?php'."\n");
+		fputs($fp, "// Wrapper to include master into htdocs\n");
+		fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
+		fclose($fp);
+	}
 }
 
 
@@ -855,47 +855,47 @@ 
  */
 function write_conf_file($conffile)
 {
-    global $conf,$langs;
-    global $main_url,$main_dir,$main_data_dir,$main_force_https,$main_use_alt_dir,$main_alt_dir_name,$main_db_prefix;
-    global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
-    global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
-    global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
-    global $db_host,$db_port,$db_name,$db_user,$db_pass,$db_type,$db_character_set,$db_collation;
-    global $conffile,$conffiletoshow,$conffiletoshowshort;
-    global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
-    global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
-    global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH;
-    global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
-    global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI, $force_dolibarr_js_JQUERY_FLOT;
-    global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
-
-    $error=0;
-
-    $key = md5(uniqid(mt_rand(),TRUE)); // Generate random hash
-
-    $fp = fopen("$conffile", "w");
-    if($fp)
-    {
-        clearstatcache();
-
-        fputs($fp,'<?php'."\n");
-        fputs($fp,'//'."\n");
-        fputs($fp,'// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(),'')."\n");
-        fputs($fp,'//'."\n");
-        fputs($fp,'// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");
-        fputs($fp,'// and explanations for all possibles parameters.'."\n");
-        fputs($fp,'//'."\n");
-
-        fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'","\'",($main_url)).'\';');
-        fputs($fp,"\n");
-
-        fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'","\'",($main_dir)).'\';');
-        fputs($fp,"\n");
-
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'","\'",("/".$main_alt_dir_name)).'\';');
-        fputs($fp,"\n");
-
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'","\'",($main_dir."/".$main_alt_dir_name)).'\';');
+	global $conf,$langs;
+	global $main_url,$main_dir,$main_data_dir,$main_force_https,$main_use_alt_dir,$main_alt_dir_name,$main_db_prefix;
+	global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
+	global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
+	global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
+	global $db_host,$db_port,$db_name,$db_user,$db_pass,$db_type,$db_character_set,$db_collation;
+	global $conffile,$conffiletoshow,$conffiletoshowshort;
+	global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
+	global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
+	global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH;
+	global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
+	global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI, $force_dolibarr_js_JQUERY_FLOT;
+	global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
+
+	$error=0;
+
+	$key = md5(uniqid(mt_rand(),TRUE)); // Generate random hash
+
+	$fp = fopen("$conffile", "w");
+	if($fp)
+	{
+		clearstatcache();
+
+		fputs($fp,'<?php'."\n");
+		fputs($fp,'//'."\n");
+		fputs($fp,'// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(),'')."\n");
+		fputs($fp,'//'."\n");
+		fputs($fp,'// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");
+		fputs($fp,'// and explanations for all possibles parameters.'."\n");
+		fputs($fp,'//'."\n");
+
+		fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'","\'",($main_url)).'\';');
+		fputs($fp,"\n");
+
+		fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'","\'",($main_dir)).'\';');
+		fputs($fp,"\n");
+
+		fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'","\'",("/".$main_alt_dir_name)).'\';');
+		fputs($fp,"\n");
+
+		fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'","\'",($main_dir."/".$main_alt_dir_name)).'\';');
 		fputs($fp,"\n");
 
 		fputs($fp, '$dolibarr_main_data_root=\''.str_replace("'","\'",($main_data_dir)).'\';');
@@ -929,88 +929,88 @@ 
 
 		/* Authentication */
 		fputs($fp, '// Authentication settings');
-        fputs($fp,"\n");
+		fputs($fp,"\n");
 
 		fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
 		fputs($fp,"\n\n");
 
-        fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
-        fputs($fp,"\n");
+		fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
+		fputs($fp,"\n");
 
 		fputs($fp, '// Security settings');
-        fputs($fp,"\n");
+		fputs($fp,"\n");
 
-        fputs($fp, '$dolibarr_main_prod=\'0\';');
-        fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_prod=\'0\';');
+		fputs($fp,"\n");
 
-        fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
+		fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
 		fputs($fp,"\n");
 
-        fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
+		fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
 		fputs($fp,"\n");
 
-        fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
-        fputs($fp,"\n");
+		fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
+		fputs($fp,"\n");
 
 		fputs($fp, '$dolibarr_main_cookie_cryptkey=\''.$key.'\';');
 		fputs($fp,"\n");
 
 		fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
-        fputs($fp,"\n");
-
-        // Write params to overwrites default lib path
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH=''; }
-        fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH=''; }
-        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH=''; }
-        fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_TCPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH=''; }
-        fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH=''; }
-        fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH=''; }
-        fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH=''; }
-        fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH=''; }
-        fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH=''; }
-        fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; }
-        fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR=''; }
-        fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY=''; }
-        fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI=''; }
-        fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_js_JQUERY_FLOT)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_FLOT=''; }
-        fputs($fp, '$dolibarr_js_JQUERY_FLOT=\''.$force_dolibarr_js_JQUERY_FLOT.'\';');
-        fputs($fp,"\n");
-
-        // Write params to overwrites default font path
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF=''; }
+		fputs($fp,"\n");
+
+		// Write params to overwrites default lib path
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH=''; }
+		fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH=''; }
+		fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH=''; }
+		fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_TCPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH=''; }
+		fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH=''; }
+		fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH=''; }
+		fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH=''; }
+		fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH=''; }
+		fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH=''; }
+		fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; }
+		fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR=''; }
+		fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY=''; }
+		fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI=''; }
+		fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_js_JQUERY_FLOT)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_FLOT=''; }
+		fputs($fp, '$dolibarr_js_JQUERY_FLOT=\''.$force_dolibarr_js_JQUERY_FLOT.'\';');
+		fputs($fp,"\n");
+
+		// Write params to overwrites default font path
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF=''; }
    		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.$force_dolibarr_font_DOL_DEFAULT_TTF.'\';');
-        fputs($fp,"\n");
-        if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD=''; }
-        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
-        fputs($fp,"\n");
+		fputs($fp,"\n");
+		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD=''; }
+		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
+		fputs($fp,"\n");
 
 		fclose($fp);
 

htdocs/societe/card.php

Indentation +1858 added lines, -1858 removed lines

@@ -86,9 +86,9 @@ 
 $objcanvas=null;
 if (! empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
 // Security check
@@ -105,15 +105,15 @@ 
 
 if (empty($reshook))
 {
-    if ($cancel)
-    {
-        $action='';
-        if (! empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
+	if ($cancel)
+	{
+		$action='';
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
 	{
@@ -139,7 +139,7 @@ 
 
 			if (!$error)
 			{
-			    // TODO Move the merge function into class of object.
+				// TODO Move the merge function into class of object.
 
 				$db->begin();
 
@@ -161,11 +161,11 @@ 
 
 				// Concat some data
 				$listofproperties=array(
-				    'note_public', 'note_private'
+					'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
-				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+					$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
 
 				// Merge extrafields
@@ -173,7 +173,7 @@ 
 				{
 					foreach ($soc_origin->array_options as $key => $val)
 					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+						if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
 					}
 				}
 
@@ -289,7 +289,7 @@ 
 				}
 				else
 				{
-				    $langs->load("errors");
+					$langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
 				}
@@ -297,152 +297,152 @@ 
 		}
 	}
 
-    if (GETPOST('getcustomercode'))
-    {
-        // We defined value code_client
-        $_POST["code_client"]="Acompleter";
-    }
-
-    if (GETPOST('getsuppliercode'))
-    {
-        // We defined value code_fournisseur
-        $_POST["code_fournisseur"]="Acompleter";
-    }
-
-    if($action=='set_localtax1')
-    {
-    	//obtidre selected del combobox
-    	$value=GETPOST('lt1');
-    	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
-    if($action=='set_localtax2')
-    {
-    	//obtidre selected del combobox
-    	$value=GETPOST('lt2');
-    	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
-
-    if ($action == 'update_extras') {
-        $object->fetch($socid);
-
-        $object->oldcopy = dol_clone($object);
-
-        // Fill array 'array_options' with data from update form
-        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-        if ($ret < 0) $error++;
-
-        if (! $error)
-        {
-            $result = $object->insertExtraFields('COMPANY_MODIFY');
+	if (GETPOST('getcustomercode'))
+	{
+		// We defined value code_client
+		$_POST["code_client"]="Acompleter";
+	}
+
+	if (GETPOST('getsuppliercode'))
+	{
+		// We defined value code_fournisseur
+		$_POST["code_fournisseur"]="Acompleter";
+	}
+
+	if($action=='set_localtax1')
+	{
+		//obtidre selected del combobox
+		$value=GETPOST('lt1');
+		$object->fetch($socid);
+		$res=$object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
+	if($action=='set_localtax2')
+	{
+		//obtidre selected del combobox
+		$value=GETPOST('lt2');
+		$object->fetch($socid);
+		$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
+
+	if ($action == 'update_extras') {
+		$object->fetch($socid);
+
+		$object->oldcopy = dol_clone($object);
+
+		// Fill array 'array_options' with data from update form
+		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+		if ($ret < 0) $error++;
+
+		if (! $error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
    			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
-
-        if ($error) $action = 'edit_extras';
-    }
-
-    // Add new or update third party
-    if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
-    && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-        if (! GETPOST('name'))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('client') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('fournisseur') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
-            $error++;
-
-        }
-
-        if (! $error)
-        {
-        		if ($action == 'update')
-	        {
-	        		$ret=$object->fetch($socid);
+		}
+
+		if ($error) $action = 'edit_extras';
+	}
+
+	// Add new or update third party
+	if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
+	&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		if (! GETPOST('name'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('client') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('fournisseur') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
+			$error++;
+
+		}
+
+		if (! $error)
+		{
+				if ($action == 'update')
+			{
+					$ret=$object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
+			}
 			else $object->canvas=$canvas;
 
-	        if (GETPOST("private") == 1)	// Ask to create a contact
-	        {
-	            $object->particulier			= GETPOST("private");
-
-	            $object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
-	            $object->civility_id			= GETPOST('civility_id');	// Note: civility id is a code, not an int
-	            // Add non official properties
-	            $object->name_bis			= GETPOST('name','alpha');
-	            $object->firstname			= GETPOST('firstname','alpha');
-	        }
-	        else
-	        {
-	            $object->name				= GETPOST('name', 'alpha');
-	        }
-	        $object->entity					= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
-	        $object->name_alias				= GETPOST('name_alias');
-	        $object->address					= GETPOST('address');
-	        $object->zip						= GETPOST('zipcode', 'alpha');
-	        $object->town					= GETPOST('town', 'alpha');
-	        $object->country_id				= GETPOST('country_id', 'int');
-	        $object->state_id				= GETPOST('state_id', 'int');
-	        $object->skype					= GETPOST('skype', 'alpha');
-	        $object->phone					= GETPOST('phone', 'alpha');
-	        $object->fax						= GETPOST('fax','alpha');
-	        $object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-	        $object->url						= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
-	        $object->idprof1					= trim(GETPOST('idprof1', 'alpha'));
-	        $object->idprof2					= trim(GETPOST('idprof2', 'alpha'));
-	        $object->idprof3					= trim(GETPOST('idprof3', 'alpha'));
-	        $object->idprof4					= trim(GETPOST('idprof4', 'alpha'));
-	        $object->idprof5					= trim(GETPOST('idprof5', 'alpha'));
-	        $object->idprof6					= trim(GETPOST('idprof6', 'alpha'));
-	        $object->prefix_comm				= GETPOST('prefix_comm', 'alpha');
-	        $object->code_client				= GETPOST('code_client', 'alpha');
-	        $object->code_fournisseur		= GETPOST('code_fournisseur', 'alpha');
-	        $object->capital					= GETPOST('capital', 'alpha');
-	        $object->barcode					= GETPOST('barcode', 'alpha');
-
-	        $object->tva_intra				= GETPOST('tva_intra', 'alpha');
-	        $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-	        $object->status					= GETPOST('status', 'alpha');
-
-	        // Local Taxes
-	        $object->localtax1_assuj			= GETPOST('localtax1assuj_value', 'alpha');
-	        $object->localtax2_assuj			= GETPOST('localtax2assuj_value', 'alpha');
-
-	        $object->localtax1_value			= GETPOST('lt1', 'alpha');
-	        $object->localtax2_value			= GETPOST('lt2', 'alpha');
-
-	        $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
-	        $object->effectif_id				= GETPOST('effectif_id', 'int');
-	        $object->typent_id				= GETPOST('typent_id','int');
-
-	        $object->typent_code				= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
-
-	        $object->client					= GETPOST('client', 'int');
-	        $object->fournisseur				= GETPOST('fournisseur', 'int');
-
-	        $object->commercial_id			= GETPOST('commercial_id', 'int');
-	        $object->default_lang			= GETPOST('default_lang');
-
-	        // Webservices url/key
-	        $object->webservices_url			= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-	        $object->webservices_key			= GETPOST('webservices_key', 'san_alpha');
+			if (GETPOST("private") == 1)	// Ask to create a contact
+			{
+				$object->particulier			= GETPOST("private");
+
+				$object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
+				$object->civility_id			= GETPOST('civility_id');	// Note: civility id is a code, not an int
+				// Add non official properties
+				$object->name_bis			= GETPOST('name','alpha');
+				$object->firstname			= GETPOST('firstname','alpha');
+			}
+			else
+			{
+				$object->name				= GETPOST('name', 'alpha');
+			}
+			$object->entity					= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
+			$object->name_alias				= GETPOST('name_alias');
+			$object->address					= GETPOST('address');
+			$object->zip						= GETPOST('zipcode', 'alpha');
+			$object->town					= GETPOST('town', 'alpha');
+			$object->country_id				= GETPOST('country_id', 'int');
+			$object->state_id				= GETPOST('state_id', 'int');
+			$object->skype					= GETPOST('skype', 'alpha');
+			$object->phone					= GETPOST('phone', 'alpha');
+			$object->fax						= GETPOST('fax','alpha');
+			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+			$object->url						= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
+			$object->idprof1					= trim(GETPOST('idprof1', 'alpha'));
+			$object->idprof2					= trim(GETPOST('idprof2', 'alpha'));
+			$object->idprof3					= trim(GETPOST('idprof3', 'alpha'));
+			$object->idprof4					= trim(GETPOST('idprof4', 'alpha'));
+			$object->idprof5					= trim(GETPOST('idprof5', 'alpha'));
+			$object->idprof6					= trim(GETPOST('idprof6', 'alpha'));
+			$object->prefix_comm				= GETPOST('prefix_comm', 'alpha');
+			$object->code_client				= GETPOST('code_client', 'alpha');
+			$object->code_fournisseur		= GETPOST('code_fournisseur', 'alpha');
+			$object->capital					= GETPOST('capital', 'alpha');
+			$object->barcode					= GETPOST('barcode', 'alpha');
+
+			$object->tva_intra				= GETPOST('tva_intra', 'alpha');
+			$object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
+			$object->status					= GETPOST('status', 'alpha');
+
+			// Local Taxes
+			$object->localtax1_assuj			= GETPOST('localtax1assuj_value', 'alpha');
+			$object->localtax2_assuj			= GETPOST('localtax2assuj_value', 'alpha');
+
+			$object->localtax1_value			= GETPOST('lt1', 'alpha');
+			$object->localtax2_value			= GETPOST('lt2', 'alpha');
+
+			$object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+			$object->effectif_id				= GETPOST('effectif_id', 'int');
+			$object->typent_id				= GETPOST('typent_id','int');
+
+			$object->typent_code				= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code');	// Force typent_code too so check in verify() will be done on new type
+
+			$object->client					= GETPOST('client', 'int');
+			$object->fournisseur				= GETPOST('fournisseur', 'int');
+
+			$object->commercial_id			= GETPOST('commercial_id', 'int');
+			$object->default_lang			= GETPOST('default_lang');
+
+			// Webservices url/key
+			$object->webservices_url			= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+			$object->webservices_key			= GETPOST('webservices_key', 'san_alpha');
 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
@@ -457,70 +457,70 @@ 
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			}
 
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 			if ($ret < 0)
 			{
 				 $error++;
 			}
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
-
-	        // Check parameters
-	        if (! GETPOST('cancel','alpha'))
-	        {
-	            if (! empty($object->email) && ! isValidEMail($object->email))
-	            {
-	                $langs->load("errors");
-	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
-	            }
-	            if (! empty($object->url) && ! isValidUrl($object->url))
-	            {
-	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
-	            }
-	            if ($object->fournisseur && ! $conf->fournisseur->enabled)
-	            {
-	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorSupplierModuleNotEnabled"), 'errors');
-	            }
-	            if (! empty($object->webservices_url)) {
-	                //Check if has transport, without any the soap client will give error
-	                if (strpos($object->webservices_url, "http") === false)
-	                {
-	                    $object->webservices_url = "http://".$object->webservices_url;
-	                }
-	                if (! isValidUrl($object->webservices_url)) {
-	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
-	                }
-	            }
-
-	            // We set country_id, country_code and country for the selected country
-	            $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
-	            if ($object->country_id)
-	            {
-	            	$tmparray=getCountry($object->country_id,'all');
-	            	$object->country_code=$tmparray['code'];
-	            	$object->country=$tmparray['label'];
-	            }
-	        }
-        }
-
-        if (! $error)
-        {
-            if ($action == 'add')
-            {
-            	$error = 0;
-
-                $db->begin();
-
-                if (empty($object->client))      $object->code_client='';
-                if (empty($object->fournisseur)) $object->code_fournisseur='';
-
-                $result = $object->create($user);
+			if (GETPOST('deletephoto')) $object->logo = '';
+			else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+
+			// Check parameters
+			if (! GETPOST('cancel','alpha'))
+			{
+				if (! empty($object->email) && ! isValidEMail($object->email))
+				{
+					$langs->load("errors");
+					$error++;
+					setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
+				}
+				if (! empty($object->url) && ! isValidUrl($object->url))
+				{
+					$langs->load("errors");
+					setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
+				}
+				if ($object->fournisseur && ! $conf->fournisseur->enabled)
+				{
+					$langs->load("errors");
+					setEventMessages('', $langs->trans("ErrorSupplierModuleNotEnabled"), 'errors');
+				}
+				if (! empty($object->webservices_url)) {
+					//Check if has transport, without any the soap client will give error
+					if (strpos($object->webservices_url, "http") === false)
+					{
+						$object->webservices_url = "http://".$object->webservices_url;
+					}
+					if (! isValidUrl($object->webservices_url)) {
+						$langs->load("errors");
+						$error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
+					}
+				}
+
+				// We set country_id, country_code and country for the selected country
+				$object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
+				if ($object->country_id)
+				{
+					$tmparray=getCountry($object->country_id,'all');
+					$object->country_code=$tmparray['code'];
+					$object->country=$tmparray['label'];
+				}
+			}
+		}
+
+		if (! $error)
+		{
+			if ($action == 'add')
+			{
+				$error = 0;
+
+				$db->begin();
+
+				if (empty($object->client))      $object->code_client='';
+				if (empty($object->fournisseur)) $object->code_fournisseur='';
+
+				$result = $object->create($user);
 
 				if ($result >= 0)
 				{
@@ -553,116 +553,116 @@ 
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 
-                    // Logo/Photo save
-                    $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
-                    $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                    if ($file_OK)
-                    {
-                        if (image_format_supported($_FILES['photo']['name']))
-                        {
-                            dol_mkdir($dir);
-
-                            if (@is_dir($dir))
-                            {
-                                $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                                $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
-
-                                if (! $result > 0)
-                                {
-                                    $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else
-                                {
-                                    // Create thumbs
-                                    $object->addThumbs($newfile);
-                                }
-                            }
-                        }
-                    }
-                    else
+					// Logo/Photo save
+					$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
+					$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+					if ($file_OK)
+					{
+						if (image_format_supported($_FILES['photo']['name']))
+						{
+							dol_mkdir($dir);
+
+							if (@is_dir($dir))
+							{
+								$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+								$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+
+								if (! $result > 0)
+								{
+									$errors[] = "ErrorFailedToSaveFile";
+								}
+								else
+								{
+									// Create thumbs
+									$object->addThumbs($newfile);
+								}
+							}
+						}
+					}
+					else
 					{
 						switch($_FILES['photo']['error'])
 						{
-						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-						      $errors[] = "ErrorFileSizeTooLarge";
-						      break;
-	      					case 3: //uploaded file was only partially uploaded
-						      $errors[] = "ErrorFilePartiallyUploaded";
-						      break;
+							case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+							case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+							  $errors[] = "ErrorFileSizeTooLarge";
+							  break;
+		  					case 3: //uploaded file was only partially uploaded
+							  $errors[] = "ErrorFilePartiallyUploaded";
+							  break;
 						}
-	                }
-                    // Gestion du logo de la société
-                }
-                else
+					}
+					// Gestion du logo de la société
+				}
+				else
 				{
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
 
-                    setEventMessages($object->error, $object->errors, 'errors');
-                   	$error++;
-                }
-
-                if ($result >= 0 && ! $error)
-                {
-                    $db->commit();
-
-                	if (! empty($backtopage))
-                	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-                    	$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
-
-                		header("Location: ".$url);
-                    	exit;
-                	}
-                }
-                else
-                {
-                    $db->rollback();
-                    $action='create';
-                }
-            }
-
-            if ($action == 'update')
-            {
-            	$error = 0;
-
-                if (GETPOST('cancel','alpha'))
-                {
-                	if (! empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                }
-
-                // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client='';
-                if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur='';
-                //var_dump($object);exit;
-
-                $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
-                if ($result <=  0)
-                {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                  	$error++;
-                }
+					setEventMessages($object->error, $object->errors, 'errors');
+				   	$error++;
+				}
+
+				if ($result >= 0 && ! $error)
+				{
+					$db->commit();
+
+					if (! empty($backtopage))
+					{
+						if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+			   			header("Location: ".$backtopage);
+						exit;
+					}
+					else
+					{
+						$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+						else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+
+						header("Location: ".$url);
+						exit;
+					}
+				}
+				else
+				{
+					$db->rollback();
+					$action='create';
+				}
+			}
+
+			if ($action == 'update')
+			{
+				$error = 0;
+
+				if (GETPOST('cancel','alpha'))
+				{
+					if (! empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					}
+					else
+					{
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				}
+
+				// To not set code if third party is not concerned. But if it had values, we keep them.
+				if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client='';
+				if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur='';
+				//var_dump($object);exit;
+
+				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
+				if ($result <=  0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+				  	$error++;
+				}
 
 				// Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
 				if (! $error && !empty($user->rights->categorie->lire))
@@ -686,155 +686,155 @@ 
 					}
 				}
 
-                // Logo/Photo save
-                $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
-                $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                if (GETPOST('deletephoto') && $object->photo)
-                {
-                    $fileimg=$dir.'/'.$object->logo;
-                    $dirthumbs=$dir.'/thumbs';
-                    dol_delete_file($fileimg);
-                    dol_delete_dir_recursive($dirthumbs);
-                }
-                if ($file_OK)
-                {
-                    if (image_format_supported($_FILES['photo']['name']) > 0)
-                    {
-                        dol_mkdir($dir);
-
-                        if (@is_dir($dir))
-                        {
-                            $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                            $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
-
-                            if (! $result > 0)
-                            {
-                                $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else
-                            {
-                            	// Create thumbs
-                            	$object->addThumbs($newfile);
-
-                                // Index file in database
-                                if (! empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
-                                {
-                                	require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-                                	// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
-                                	deleteFilesIntoDatabaseIndex(dirname($newfile), '', '', 'uploaded', 1);
-                                	// now we index the uploaded logo file
-                                	addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
-                                }
-                            }
-                        }
-                    }
-                    else
+				// Logo/Photo save
+				$dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
+				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+				if (GETPOST('deletephoto') && $object->photo)
+				{
+					$fileimg=$dir.'/'.$object->logo;
+					$dirthumbs=$dir.'/thumbs';
+					dol_delete_file($fileimg);
+					dol_delete_dir_recursive($dirthumbs);
+				}
+				if ($file_OK)
+				{
+					if (image_format_supported($_FILES['photo']['name']) > 0)
+					{
+						dol_mkdir($dir);
+
+						if (@is_dir($dir))
+						{
+							$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+
+							if (! $result > 0)
+							{
+								$errors[] = "ErrorFailedToSaveFile";
+							}
+							else
+							{
+								// Create thumbs
+								$object->addThumbs($newfile);
+
+								// Index file in database
+								if (! empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
+								{
+									require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+									// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
+									deleteFilesIntoDatabaseIndex(dirname($newfile), '', '', 'uploaded', 1);
+									// now we index the uploaded logo file
+									addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
+								}
+							}
+						}
+					}
+					else
 					{
-                        $errors[] = "ErrorBadImageFormat";
-                    }
-                }
-                else
-                {
+						$errors[] = "ErrorBadImageFormat";
+					}
+				}
+				else
+				{
 					switch($_FILES['photo']['error'])
 					{
-					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-					    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-					      $errors[] = "ErrorFileSizeTooLarge";
-					      break;
-      					case 3: //uploaded file was only partially uploaded
-					      $errors[] = "ErrorFilePartiallyUploaded";
-					      break;
+						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+						  $errors[] = "ErrorFileSizeTooLarge";
+						  break;
+	  					case 3: //uploaded file was only partially uploaded
+						  $errors[] = "ErrorFilePartiallyUploaded";
+						  break;
+					}
+				}
+				// Gestion du logo de la société
+
+
+				// Update linked member
+				if (! $error && $object->fk_soc > 0)
+				{
+
+					$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+					$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
+					if (! $object->db->query($sql))
+					{
+						$error++;
+						$object->error .= $object->db->lasterror();
+					}
+				}
+
+				if (! $error && ! count($errors))
+				{
+					if (! empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					}
+					else
+					{
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
 					}
-                }
-                // Gestion du logo de la société
-
-
-                // Update linked member
-                if (! $error && $object->fk_soc > 0)
-                {
-
-                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                	if (! $object->db->query($sql))
-                	{
-                		$error++;
-                		$object->error .= $object->db->lasterror();
-                	}
-                }
-
-                if (! $error && ! count($errors))
-                {
-                	if (! empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                }
-                else
-                {
-                    $object->id = $socid;
-                    $action= "edit";
-                }
-            }
-        }
-        else
-        {
-        	$action = ($action=='add'?'create':'edit');
-        }
-    }
-
-    // Delete third party
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
-    {
-        $object->fetch($socid);
-        $result = $object->delete($socid, $user);
-
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".urlencode($object->name));
-            exit;
-        }
-        else
-        {
-            $langs->load("errors");
-           	setEventMessages($object->error, $object->errors, 'errors');
-           	$error++;
-            $action='';
-        }
-    }
-
-    // Set parent company
-    if ($action == 'set_thirdparty' && $user->rights->societe->creer)
-    {
-    	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany','int'));
-    }
-
-    // Set incoterm
-    if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-    {
-    	$object->fetch($socid);
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    }
-
-    // Actions to send emails
-    $id=$socid;
-    $trigger_name='COMPANY_SENTBYMAIL';
-    $paramname='socid';
-    $mode='emailfromthirdparty';
-    $trackid='thi'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
-    // Actions to build doc
-    $id = $socid;
-    $upload_dir = $conf->societe->dir_output;
-    $permissioncreate=$user->rights->societe->creer;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+				}
+				else
+				{
+					$object->id = $socid;
+					$action= "edit";
+				}
+			}
+		}
+		else
+		{
+			$action = ($action=='add'?'create':'edit');
+		}
+	}
+
+	// Delete third party
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
+	{
+		$object->fetch($socid);
+		$result = $object->delete($socid, $user);
+
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".urlencode($object->name));
+			exit;
+		}
+		else
+		{
+			$langs->load("errors");
+		   	setEventMessages($object->error, $object->errors, 'errors');
+		   	$error++;
+			$action='';
+		}
+	}
+
+	// Set parent company
+	if ($action == 'set_thirdparty' && $user->rights->societe->creer)
+	{
+		$object->fetch($socid);
+		$result = $object->set_parent(GETPOST('editparentcompany','int'));
+	}
+
+	// Set incoterm
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$object->fetch($socid);
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
+
+	// Actions to send emails
+	$id=$socid;
+	$trigger_name='COMPANY_SENTBYMAIL';
+	$paramname='socid';
+	$mode='emailfromthirdparty';
+	$trackid='thi'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+	// Actions to build doc
+	$id = $socid;
+	$upload_dir = $conf->societe->dir_output;
+	$permissioncreate=$user->rights->societe->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -849,7 +849,7 @@ 
 
 if ($socid > 0 && empty($object->id))
 {
-    $result=$object->fetch($socid);
+	$result=$object->fetch($socid);
 	if ($result <= 0) dol_print_error('',$object->error);
 }
 
@@ -862,161 +862,161 @@ 
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
-    $objcanvas->display_canvas($action);							// Show template
+	$objcanvas->display_canvas($action);							// Show template
 }
 else
 {
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-    if ($action == 'create')
-    {
-        /*
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+	if ($action == 'create')
+	{
+		/*
          *  Creation
          */
 		$private=GETPOST("private","int");
 		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
-    	if (empty($private)) $private=0;
-
-        // Load object modCodeTiers
-        $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module)-4);
-        }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeClient = new $module;
-        // Load object modCodeFournisseur
-        $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module)-4);
-        }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeFournisseur = new $module;
-
-        // Define if customer/prospect or supplier status is set or not
-        if (GETPOST("type")!='f')
-        {
-            $object->client=-1;
-            if (! empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT))  { $object->client=3; }
-        }
-        if (GETPOST("type")=='c')  { $object->client=3; }   // Prospect / Customer
-        if (GETPOST("type")=='p')  { $object->client=2; }
-        if (! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || (GETPOST("type")=='' && ! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT))))  { $object->fournisseur=1; }
-
-        $object->name				= GETPOST('name', 'alpha');
-        $object->firstname			= GETPOST('firstname', 'alpha');
-        $object->particulier		= $private;
-        $object->prefix_comm		= GETPOST('prefix_comm');
-        $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
-
-        if(empty($duplicate_code_error)) {
-	        $object->code_client		= GETPOST('code_client', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
-        }
+		if (empty($private)) $private=0;
+
+		// Load object modCodeTiers
+		$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module)-4);
+		}
+		$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res=dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeClient = new $module;
+		// Load object modCodeFournisseur
+		$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module)-4);
+		}
+		$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res=dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeFournisseur = new $module;
+
+		// Define if customer/prospect or supplier status is set or not
+		if (GETPOST("type")!='f')
+		{
+			$object->client=-1;
+			if (! empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT))  { $object->client=3; }
+		}
+		if (GETPOST("type")=='c')  { $object->client=3; }   // Prospect / Customer
+		if (GETPOST("type")=='p')  { $object->client=2; }
+		if (! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || (GETPOST("type")=='' && ! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT))))  { $object->fournisseur=1; }
+
+		$object->name				= GETPOST('name', 'alpha');
+		$object->firstname			= GETPOST('firstname', 'alpha');
+		$object->particulier		= $private;
+		$object->prefix_comm		= GETPOST('prefix_comm');
+		$object->client				= GETPOST('client')?GETPOST('client'):$object->client;
+
+		if(empty($duplicate_code_error)) {
+			$object->code_client		= GETPOST('code_client', 'alpha');
+			$object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
+		}
 		else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
 
-        $object->code_fournisseur	= GETPOST('code_fournisseur', 'alpha');
-        $object->address			= GETPOST('address', 'alpha');
-        $object->zip				= GETPOST('zipcode', 'alpha');
-        $object->town				= GETPOST('town', 'alpha');
-        $object->state_id			= GETPOST('state_id', 'int');
-        $object->skype				= GETPOST('skype', 'alpha');
-        $object->phone				= GETPOST('phone', 'alpha');
-        $object->fax				= GETPOST('fax', 'alpha');
-        $object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-        $object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-        $object->capital			= GETPOST('capital', 'alpha');
-        $object->barcode			= GETPOST('barcode', 'alpha');
-        $object->idprof1			= GETPOST('idprof1', 'alpha');
-        $object->idprof2			= GETPOST('idprof2', 'alpha');
-        $object->idprof3			= GETPOST('idprof3', 'alpha');
-        $object->idprof4			= GETPOST('idprof4', 'alpha');
-        $object->idprof5			= GETPOST('idprof5', 'alpha');
-        $object->idprof6			= GETPOST('idprof6', 'alpha');
-        $object->typent_id			= GETPOST('typent_id', 'int');
-        $object->effectif_id		= GETPOST('effectif_id', 'int');
-        $object->civility_id		= GETPOST('civility_id', 'int');
-
-        $object->tva_assuj			= GETPOST('assujtva_value', 'int');
-        $object->status				= GETPOST('status', 'int');
-
-        //Local Taxes
-        $object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
-        $object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
-
-        $object->localtax1_value	=GETPOST('lt1', 'int');
-        $object->localtax2_value	=GETPOST('lt2', 'int');
-
-        $object->tva_intra			= GETPOST('tva_intra', 'alpha');
-
-        $object->commercial_id		= GETPOST('commercial_id', 'int');
-        $object->default_lang		= GETPOST('default_lang');
-
-        $object->logo = (isset($_FILES['photo'])?dol_sanitizeFileName($_FILES['photo']['name']):'');
-
-        // Gestion du logo de la société
-        $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-        $file_OK = (isset($_FILES['photo'])?is_uploaded_file($_FILES['photo']['tmp_name']):false);
-        if ($file_OK)
-        {
-            if (image_format_supported($_FILES['photo']['name']))
-            {
-                dol_mkdir($dir);
-
-                if (@is_dir($dir))
-                {
-                    $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                    $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
-
-                    if (! $result > 0)
-                    {
-                        $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else
-                    {
-                        // Create thumbs
-                        $object->addThumbs($newfile);
-                    }
-                }
-            }
-        }
-
-        // We set country_id, country_code and country for the selected country
-        $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
-        if ($object->country_id)
-        {
-            $tmparray=getCountry($object->country_id,'all');
-            $object->country_code=$tmparray['code'];
-            $object->country=$tmparray['label'];
-        }
-        $object->forme_juridique_code=GETPOST('forme_juridique_code');
-        /* Show create form */
-
-        $linkback="";
-        print load_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png');
-
-        if (! empty($conf->use_javascript_ajax))
-        {
-            print "\n".'<script type="text/javascript">';
-            print '$(document).ready(function () {
+		$object->code_fournisseur	= GETPOST('code_fournisseur', 'alpha');
+		$object->address			= GETPOST('address', 'alpha');
+		$object->zip				= GETPOST('zipcode', 'alpha');
+		$object->town				= GETPOST('town', 'alpha');
+		$object->state_id			= GETPOST('state_id', 'int');
+		$object->skype				= GETPOST('skype', 'alpha');
+		$object->phone				= GETPOST('phone', 'alpha');
+		$object->fax				= GETPOST('fax', 'alpha');
+		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+		$object->capital			= GETPOST('capital', 'alpha');
+		$object->barcode			= GETPOST('barcode', 'alpha');
+		$object->idprof1			= GETPOST('idprof1', 'alpha');
+		$object->idprof2			= GETPOST('idprof2', 'alpha');
+		$object->idprof3			= GETPOST('idprof3', 'alpha');
+		$object->idprof4			= GETPOST('idprof4', 'alpha');
+		$object->idprof5			= GETPOST('idprof5', 'alpha');
+		$object->idprof6			= GETPOST('idprof6', 'alpha');
+		$object->typent_id			= GETPOST('typent_id', 'int');
+		$object->effectif_id		= GETPOST('effectif_id', 'int');
+		$object->civility_id		= GETPOST('civility_id', 'int');
+
+		$object->tva_assuj			= GETPOST('assujtva_value', 'int');
+		$object->status				= GETPOST('status', 'int');
+
+		//Local Taxes
+		$object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
+		$object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
+
+		$object->localtax1_value	=GETPOST('lt1', 'int');
+		$object->localtax2_value	=GETPOST('lt2', 'int');
+
+		$object->tva_intra			= GETPOST('tva_intra', 'alpha');
+
+		$object->commercial_id		= GETPOST('commercial_id', 'int');
+		$object->default_lang		= GETPOST('default_lang');
+
+		$object->logo = (isset($_FILES['photo'])?dol_sanitizeFileName($_FILES['photo']['name']):'');
+
+		// Gestion du logo de la société
+		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
+		$file_OK = (isset($_FILES['photo'])?is_uploaded_file($_FILES['photo']['tmp_name']):false);
+		if ($file_OK)
+		{
+			if (image_format_supported($_FILES['photo']['name']))
+			{
+				dol_mkdir($dir);
+
+				if (@is_dir($dir))
+				{
+					$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+					$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+
+					if (! $result > 0)
+					{
+						$errors[] = "ErrorFailedToSaveFile";
+					}
+					else
+					{
+						// Create thumbs
+						$object->addThumbs($newfile);
+					}
+				}
+			}
+		}
+
+		// We set country_id, country_code and country for the selected country
+		$object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
+		if ($object->country_id)
+		{
+			$tmparray=getCountry($object->country_id,'all');
+			$object->country_code=$tmparray['code'];
+			$object->country=$tmparray['label'];
+		}
+		$object->forme_juridique_code=GETPOST('forme_juridique_code');
+		/* Show create form */
+
+		$linkback="";
+		print load_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png');
+
+		if (! empty($conf->use_javascript_ajax))
+		{
+			print "\n".'<script type="text/javascript">';
+			print '$(document).ready(function () {
 						id_te_private=8;
                         id_ef15=1;
                         is_private='.$private.';
@@ -1044,494 +1044,494 @@ 
                         	document.formsoc.submit();
                         });
                      });';
-            print '</script>'."\n";
-
-            print '<div id="selectthirdpartytype">';
-            print '<div class="hideonsmartphone float">';
-            print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
-            print '</div>';
-	        print '<label for="radiocompany" class="radiocompany">';
-            print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked').'>';
-	        print '&nbsp;';
-            print $langs->trans("CreateThirdPartyOnly");
-	        print '</label>';
-            print ' &nbsp; &nbsp; ';
-	        print '<label for="radioprivate" class="radioprivate">';
-            $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked':'').'>';
-	        $text.='&nbsp;';
-	        $text.= $langs->trans("CreateThirdPartyAndContact");
-	        $htmltext=$langs->trans("ToCreateContactWithSameName");
-	        print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
-            print '</label>';
-            print '</div>';
-            print "<br>\n";
-        }
-
-        dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
-
-        print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">';		// Chrome ignor autocomplete
-
-        print '<input type="hidden" name="action" value="add">';
-        print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="private" value='.$object->particulier.'>';
-        print '<input type="hidden" name="type" value='.GETPOST("type",'alpha').'>';
-        print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
-        print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
-        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
-
-        dol_fiche_head(null, 'card', '', 0, '');
-
-        print '<table class="border" width="100%">';
-
-        // Name, firstname
-	    print '<tr><td class="titlefieldcreate">';
-        if ($object->particulier || $private)
-        {
-	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
-        }
-        else
+			print '</script>'."\n";
+
+			print '<div id="selectthirdpartytype">';
+			print '<div class="hideonsmartphone float">';
+			print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
+			print '</div>';
+			print '<label for="radiocompany" class="radiocompany">';
+			print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked').'>';
+			print '&nbsp;';
+			print $langs->trans("CreateThirdPartyOnly");
+			print '</label>';
+			print ' &nbsp; &nbsp; ';
+			print '<label for="radioprivate" class="radioprivate">';
+			$text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked':'').'>';
+			$text.='&nbsp;';
+			$text.= $langs->trans("CreateThirdPartyAndContact");
+			$htmltext=$langs->trans("ToCreateContactWithSameName");
+			print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
+			print '</label>';
+			print '</div>';
+			print "<br>\n";
+		}
+
+		dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+
+		print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">';		// Chrome ignor autocomplete
+
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="private" value='.$object->particulier.'>';
+		print '<input type="hidden" name="type" value='.GETPOST("type",'alpha').'>';
+		print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
+		print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
+		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+
+		dol_fiche_head(null, 'card', '', 0, '');
+
+		print '<table class="border" width="100%">';
+
+		// Name, firstname
+		print '<tr><td class="titlefieldcreate">';
+		if ($object->particulier || $private)
+		{
+			print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
+		}
+		else
 		{
 			print '<span id="TypeName" class="fieldrequired">'.fieldLabel('ThirdPartyName','name').'</span>';
-        }
-	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
-	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
-	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	    {
-		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
-	    }
-	    print '</tr>';
-
-        // If javascript on, we show option individual
-        if ($conf->use_javascript_ajax)
-        {
-            print '<tr class="individualline"><td>'.fieldLabel('FirstName','firstname').'</td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
-            print '</tr>';
-            // Title
-            print '<tr class="individualline"><td>'.fieldLabel('UserTitle','civility_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
-            print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
-            print '</tr>';
-        }
-
-        // Alias names (commercial, trademark or alias names)
-        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	    print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'"></td></tr>';
-
-        // Prospect/Customer
-        print '<tr><td class="titlefieldcreate">'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
-	    print '<td class="maxwidthonsmartphone">';
-	    $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
-        print '<select class="flat" name="client" id="customerprospect">';
-        if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
-        print '<option value="0"'.((string) $selected == '0'?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
-        print '</select></td>';
-
-        print '<td>'.fieldLabel('CustomerCode','customer_code').'</td><td>';
-        print '<table class="nobordernopadding"><tr><td>';
-		$tmpcode=$object->code_client;
-        if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
-        print '<input type="text" name="code_client" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-        print '</td><td>';
-        $s=$modCodeClient->getToolTip($langs,$object,0);
-        print $form->textwithpicto('',$s,1);
-        print '</td></tr></table>';
-        print '</td></tr>';
-
-        if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
-        {
-            // Supplier
-            print '<tr>';
-            print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td>';
-            $default = -1;
-            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
-            print $form->selectyesno("fournisseur", (GETPOST('fournisseur','int')!=''?GETPOST('fournisseur','int'):(GETPOST("type",'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type",'alpha') == '' ? 1 : 0));
-            print '</td>';
-            print '<td>'.fieldLabel('SupplierCode','supplier_code').'</td><td>';
-            print '<table class="nobordernopadding"><tr><td>';
-            $tmpcode=$object->code_fournisseur;
-            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
-            print '<input type="text" name="code_fournisseur" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            print '</td><td>';
-            $s=$modCodeFournisseur->getToolTip($langs,$object,1);
-            print $form->textwithpicto('',$s,1);
-            print '</td></tr></table>';
-            print '</td></tr>';
-        }
-
-        // Status
-        print '<tr><td>'.fieldLabel('Status','status').'</td><td colspan="3">';
-        print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1);
-        print '</td></tr>';
-
-        // Barcode
-        if (! empty($conf->barcode->enabled))
-        {
-            print '<tr><td>'.fieldLabel('Gencod','barcode').'</td>';
-	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
-            print '</td></tr>';
-        }
-
-        // Address
-        print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
-	    print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="'._ROWS_2.'" wrap="soft">';
-        print $object->address;
-        print '</textarea></td></tr>';
-
-        // Zip / Town
-        print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-        print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-        print '</td><td>'.fieldLabel('Town','town').'</td><td>';
-        print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-        print '</td></tr>';
-
-        // Country
-        print '<tr><td>'.fieldLabel('Country','selectcountry_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
-        print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-        print '</td></tr>';
-
-        // State
-        if (empty($conf->global->SOCIETE_DISABLE_STATE))
-        {
-            if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-            {
-                print '<tr><td>'.fieldLabel('Region-State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
-            else
-            {
-                print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
-
-            if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
-            else print $countrynotdefined;
-            print '</td></tr>';
-        }
-
-        // Email web
-        print '<tr><td>'.fieldLabel('EMail','email',$conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-	    print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
-        print '<tr><td>'.fieldLabel('Web','url').'</td>';
-	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
-
-        // Skype
-        if (! empty($conf->skype->enabled))
-        {
-            print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
-	        print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
-        }
-
-        // Phone / Fax
-        print '<tr><td>'.fieldLabel('Phone','phone').'</td>';
-	    print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
-        print '<td>'.fieldLabel('Fax','fax').'</td>';
-	    print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
-
-        // Prof ids
-        $i=1; $j=0;
-        while ($i <= 6)
-        {
-            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-            if ($idprof!='-')
-            {
-	            $key='idprof'.$i;
-
-                if (($j % 2) == 0) print '<tr>';
-
-                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-                print '<td>'.fieldLabel($idprof,$key, (empty($conf->global->$idprof_mandatory)?0:1)).'</td><td>';
-
-                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
-                print '</td>';
-                if (($j % 2) == 1) print '</tr>';
-                $j++;
-            }
-            $i++;
-        }
-        if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
-
-        // Vat is used
-        print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>';
-        print '<td>';
-        print $form->selectyesno('assujtva_value',(isset($conf->global->THIRDPARTY_DEFAULT_USEVAT)?$conf->global->THIRDPARTY_DEFAULT_USEVAT:1),1);     // Assujeti par defaut en creation
-        print '</td>';
-        print '<td class="nowrap">'.fieldLabel('VATIntra','intra_vat').'</td>';
-        print '<td class="nowrap">';
-        $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
-
-        if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-        {
-            $s.=' ';
-
-            if (! empty($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,300);\n";
-                print "}\n";
-                print '</script>';
-                print "\n";
-                $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-            }
-            else
-            {
-                $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-            }
-        }
-        print $s;
-        print '</td>';
-        print '</tr>';
-
-        // Local Taxes
-        //TODO: Place into a function to control showing by country or study better option
-        if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
-            print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
-            print '</td></tr>';
-
-        }
-        elseif($mysoc->localtax1_assuj=="1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
-            print '</td></tr>';
-        }
-        elseif($mysoc->localtax2_assuj=="1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
-            print '</td></tr>';
-        }
-
-        // Type - Size
-        print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">'."\n";
-        $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-        print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-        print '</td>';
-        print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
-        print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-        print '</td></tr>';
-
-        // Legal Form
-        print '<tr><td>'.fieldLabel('JuridicalStatus','forme_juridique_code').'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
-        if ($object->country_id)
-        {
-            print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else
-        {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
-
-        // Capital
-        print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
-	    print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> ';
-        print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
-
-        if (! empty($conf->global->MAIN_MULTILANGS))
-        {
-            print '<tr><td>'.fieldLabel('DefaultLang','default_lang').'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
-            print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1,0,0,'maxwidth200onsmartphone');
-            print '</td>';
-            print '</tr>';
-        }
-
-        if ($user->rights->societe->client->voir)
-        {
-            // Assign a Name
-            print '<tr>';
-            print '<td>'.fieldLabel('AllocateCommercial','commercial_id').'</td>';
-            print '<td colspan="3" class="maxwidthonsmartphone">';
-            print $form->select_dolusers((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
-            print '</td></tr>';
-        }
+		}
+		print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+		print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
+		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		{
+			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
+		}
+		print '</tr>';
 
-		// Incoterms
-		if (!empty($conf->incoterm->enabled))
+		// If javascript on, we show option individual
+		if ($conf->use_javascript_ajax)
+		{
+			print '<tr class="individualline"><td>'.fieldLabel('FirstName','firstname').'</td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
+			print '</tr>';
+			// Title
+			print '<tr class="individualline"><td>'.fieldLabel('UserTitle','civility_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
+			print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
+			print '</tr>';
+		}
+
+		// Alias names (commercial, trademark or alias names)
+		print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+		print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'"></td></tr>';
+
+		// Prospect/Customer
+		print '<tr><td class="titlefieldcreate">'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
+		print '<td class="maxwidthonsmartphone">';
+		$selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
+		print '<select class="flat" name="client" id="customerprospect">';
+		if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+		print '<option value="0"'.((string) $selected == '0'?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+		print '</select></td>';
+
+		print '<td>'.fieldLabel('CustomerCode','customer_code').'</td><td>';
+		print '<table class="nobordernopadding"><tr><td>';
+		$tmpcode=$object->code_client;
+		if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+		print '<input type="text" name="code_client" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+		print '</td><td>';
+		$s=$modCodeClient->getToolTip($langs,$object,0);
+		print $form->textwithpicto('',$s,1);
+		print '</td></tr></table>';
+		print '</td></tr>';
+
+		if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
 		{
+			// Supplier
 			print '<tr>';
-			print '<td>'.fieldLabel('IncotermLabel','incoterm_id').'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+			print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td>';
+			$default = -1;
+			if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
+			print $form->selectyesno("fournisseur", (GETPOST('fournisseur','int')!=''?GETPOST('fournisseur','int'):(GETPOST("type",'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type",'alpha') == '' ? 1 : 0));
+			print '</td>';
+			print '<td>'.fieldLabel('SupplierCode','supplier_code').'</td><td>';
+			print '<table class="nobordernopadding"><tr><td>';
+			$tmpcode=$object->code_fournisseur;
+			if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+			print '<input type="text" name="code_fournisseur" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+			print '</td><td>';
+			$s=$modCodeFournisseur->getToolTip($langs,$object,1);
+			print $form->textwithpicto('',$s,1);
+			print '</td></tr></table>';
 			print '</td></tr>';
 		}
 
-		// Categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		// Status
+		print '<tr><td>'.fieldLabel('Status','status').'</td><td colspan="3">';
+		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1);
+		print '</td></tr>';
+
+		// Barcode
+		if (! empty($conf->barcode->enabled))
 		{
-			$langs->load('categories');
+			print '<tr><td>'.fieldLabel('Gencod','barcode').'</td>';
+			print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
+			print '</td></tr>';
+		}
 
-			// Customer
-			if ($object->prospect || $object->client) {
-				print '<tr><td class="toptd">' . fieldLabel('CustomersCategoriesShort', 'custcats') . '</td><td colspan="3">';
-				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
-				print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null,
-					null, "90%");
-				print "</td></tr>";
+		// Address
+		print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
+		print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="'._ROWS_2.'" wrap="soft">';
+		print $object->address;
+		print '</textarea></td></tr>';
+
+		// Zip / Town
+		print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
+		print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+		print '</td><td>'.fieldLabel('Town','town').'</td><td>';
+		print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+		print '</td></tr>';
+
+		// Country
+		print '<tr><td>'.fieldLabel('Country','selectcountry_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
+		print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// State
+		if (empty($conf->global->SOCIETE_DISABLE_STATE))
+		{
+			if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+			{
+				print '<tr><td>'.fieldLabel('Region-State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
 			}
-
-			// Supplier
-			if ($object->fournisseur) {
-				print '<tr><td class="toptd">' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . '</td><td colspan="3">';
-				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
-				print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null,
-					null, "90%");
-				print "</td></tr>";
+			else
+			{
+				print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
 			}
-		}
 
-		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
-		{
-			print '<tr>';
-			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+			if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
+			else print $countrynotdefined;
 			print '</td></tr>';
 		}
 
-        // Other attributes
-        $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields,'edit');
-        }
-
-        // Ajout du logo
-        print '<tr class="hideonsmartphone">';
-        print '<td>'.fieldLabel('Logo','photoinput').'</td>';
-        print '<td colspan="3">';
-        print '<input class="flat" type="file" name="photo" id="photoinput" />';
-        print '</td>';
-        print '</tr>';
-
-        print '</table>'."\n";
-
-        dol_fiche_end();
-
-        print '<div class="center">';
-        print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-        if (! empty($backtopage))
-        {
-            print ' &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else
-        {
-            print ' &nbsp; &nbsp; ';
-            print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-        }
-        print '</div>'."\n";
-
-        print '</form>'."\n";
-    }
-    elseif ($action == 'edit')
-    {
-        /*
-         * Edition
-         */
+		// Email web
+		print '<tr><td>'.fieldLabel('EMail','email',$conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
+		print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
+		print '<tr><td>'.fieldLabel('Web','url').'</td>';
+		print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
+		// Skype
+		if (! empty($conf->skype->enabled))
+		{
+			print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
+			print '<td colspan="3"><input type="text" name="skype" id="skype" value="'.$object->skype.'"></td></tr>';
+		}
 
-        //print load_fiche_titre($langs->trans("EditCompany"));
-
-        if ($socid)
-        {
-        	$res=$object->fetch_optionals();
-            //if ($res < 0) { dol_print_error($db); exit; }
-
-	        $head = societe_prepare_head($object);
-
-            // Load object modCodeTiers
-            $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module)-4);
-            }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeClient = new $module($db);
-            // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto)
-            {
-                $prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
-            }
-            $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);
-            }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeFournisseur = new $module($db);
-            // On verifie si la balise prefix est utilisee
-            if ($modCodeFournisseur->code_auto)
-            {
-                $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
-            }
+		// Phone / Fax
+		print '<tr><td>'.fieldLabel('Phone','phone').'</td>';
+		print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
+		print '<td>'.fieldLabel('Fax','fax').'</td>';
+		print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
 
-			$object->oldcopy = clone $object;
+		// Prof ids
+		$i=1; $j=0;
+		while ($i <= 6)
+		{
+			$idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
+			if ($idprof!='-')
+			{
+				$key='idprof'.$i;
 
-            if (GETPOSTISSET('name'))
-            {
-                // We overwrite with values if posted
-                $object->name					= GETPOST('name', 'alpha');
-                $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
-                $object->client					= GETPOST('client', 'int');
-                $object->code_client			= GETPOST('code_client', 'alpha');
-                $object->fournisseur			= GETPOST('fournisseur', 'int');
-                $object->code_fournisseur		= GETPOST('code_fournisseur', 'alpha');
-                $object->address				= GETPOST('address', 'alpha');
-                $object->zip					= GETPOST('zipcode', 'alpha');
-                $object->town					= GETPOST('town', 'alpha');
-                $object->country_id				= GETPOST('country_id')?GETPOST('country_id', 'int'):$mysoc->country_id;
-                $object->state_id				= GETPOST('state_id', 'int');
-                $object->skype					= GETPOST('skype', 'alpha');
-                $object->phone					= GETPOST('phone', 'alpha');
-                $object->fax					= GETPOST('fax', 'alpha');
-                $object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-                $object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-                $object->capital				= GETPOST('capital', 'alpha');
-                $object->idprof1				= GETPOST('idprof1', 'alpha');
-                $object->idprof2				= GETPOST('idprof2', 'alpha');
-                $object->idprof3				= GETPOST('idprof3', 'alpha');
-                $object->idprof4				= GETPOST('idprof4', 'alpha');
-                $object->idprof5				= GETPOST('idprof5', 'alpha');
-                $object->idprof6				= GETPOST('idprof6', 'alpha');
-                $object->typent_id				= GETPOST('typent_id', 'int');
-                $object->effectif_id			= GETPOST('effectif_id', 'int');
-                $object->barcode				= GETPOST('barcode', 'alpha');
-                $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
-                $object->default_lang			= GETPOST('default_lang', 'alpha');
-
-                $object->tva_assuj				= GETPOST('assujtva_value', 'int');
-                $object->tva_intra				= GETPOST('tva_intra', 'alpha');
-                $object->status					= GETPOST('status', 'int');
-
-                // Webservices url/key
-                $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-                $object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
+				if (($j % 2) == 0) print '<tr>';
+
+				$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+				print '<td>'.fieldLabel($idprof,$key, (empty($conf->global->$idprof_mandatory)?0:1)).'</td><td>';
+
+				print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
+				print '</td>';
+				if (($j % 2) == 1) print '</tr>';
+				$j++;
+			}
+			$i++;
+		}
+		if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+
+		// Vat is used
+		print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>';
+		print '<td>';
+		print $form->selectyesno('assujtva_value',(isset($conf->global->THIRDPARTY_DEFAULT_USEVAT)?$conf->global->THIRDPARTY_DEFAULT_USEVAT:1),1);     // Assujeti par defaut en creation
+		print '</td>';
+		print '<td class="nowrap">'.fieldLabel('VATIntra','intra_vat').'</td>';
+		print '<td class="nowrap">';
+		$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+
+		if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+		{
+			$s.=' ';
+
+			if (! empty($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,300);\n";
+				print "}\n";
+				print '</script>';
+				print "\n";
+				$s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+				$s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+			}
+			else
+			{
+				$s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+			}
+		}
+		print $s;
+		print '</td>';
+		print '</tr>';
+
+		// Local Taxes
+		//TODO: Place into a function to control showing by country or study better option
+		if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+			print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
+			print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+			print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
+			print '</td></tr>';
+
+		}
+		elseif($mysoc->localtax1_assuj=="1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+			print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
+			print '</td></tr>';
+		}
+		elseif($mysoc->localtax2_assuj=="1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+			print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
+			print '</td></tr>';
+		}
+
+		// Type - Size
+		print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">'."\n";
+		$sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
+		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td>';
+		print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
+		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
+		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// Legal Form
+		print '<tr><td>'.fieldLabel('JuridicalStatus','forme_juridique_code').'</td>';
+		print '<td colspan="3" class="maxwidthonsmartphone">';
+		if ($object->country_id)
+		{
+			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+
+		// Capital
+		print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
+		print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> ';
+		print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+
+		if (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			print '<tr><td>'.fieldLabel('DefaultLang','default_lang').'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+			print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1,0,0,'maxwidth200onsmartphone');
+			print '</td>';
+			print '</tr>';
+		}
+
+		if ($user->rights->societe->client->voir)
+		{
+			// Assign a Name
+			print '<tr>';
+			print '<td>'.fieldLabel('AllocateCommercial','commercial_id').'</td>';
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->select_dolusers((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
+			print '</td></tr>';
+		}
+
+		// Incoterms
+		if (!empty($conf->incoterm->enabled))
+		{
+			print '<tr>';
+			print '<td>'.fieldLabel('IncotermLabel','incoterm_id').'</td>';
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+			print '</td></tr>';
+		}
+
+		// Categories
+		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		{
+			$langs->load('categories');
+
+			// Customer
+			if ($object->prospect || $object->client) {
+				print '<tr><td class="toptd">' . fieldLabel('CustomersCategoriesShort', 'custcats') . '</td><td colspan="3">';
+				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
+				print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null,
+					null, "90%");
+				print "</td></tr>";
+			}
+
+			// Supplier
+			if ($object->fournisseur) {
+				print '<tr><td class="toptd">' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . '</td><td colspan="3">';
+				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
+				print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null,
+					null, "90%");
+				print "</td></tr>";
+			}
+		}
+
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled))
+		{
+			print '<tr>';
+			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+			print '</td></tr>';
+		}
+
+		// Other attributes
+		$parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+		// Ajout du logo
+		print '<tr class="hideonsmartphone">';
+		print '<td>'.fieldLabel('Logo','photoinput').'</td>';
+		print '<td colspan="3">';
+		print '<input class="flat" type="file" name="photo" id="photoinput" />';
+		print '</td>';
+		print '</tr>';
+
+		print '</table>'."\n";
+
+		dol_fiche_end();
+
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
+		if (! empty($backtopage))
+		{
+			print ' &nbsp; &nbsp; ';
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+		}
+		else
+		{
+			print ' &nbsp; &nbsp; ';
+			print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+		}
+		print '</div>'."\n";
+
+		print '</form>'."\n";
+	}
+	elseif ($action == 'edit')
+	{
+		/*
+         * Edition
+         */
+
+
+		//print load_fiche_titre($langs->trans("EditCompany"));
+
+		if ($socid)
+		{
+			$res=$object->fetch_optionals();
+			//if ($res < 0) { dol_print_error($db); exit; }
+
+			$head = societe_prepare_head($object);
+
+			// Load object modCodeTiers
+			$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module)-4);
+			}
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeClient = new $module($db);
+			// We verified if the tag prefix is used
+			if ($modCodeClient->code_auto)
+			{
+				$prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
+			}
+			$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);
+			}
+			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res=dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeFournisseur = new $module($db);
+			// On verifie si la balise prefix est utilisee
+			if ($modCodeFournisseur->code_auto)
+			{
+				$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
+			}
+
+			$object->oldcopy = clone $object;
+
+			if (GETPOSTISSET('name'))
+			{
+				// We overwrite with values if posted
+				$object->name					= GETPOST('name', 'alpha');
+				$object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
+				$object->client					= GETPOST('client', 'int');
+				$object->code_client			= GETPOST('code_client', 'alpha');
+				$object->fournisseur			= GETPOST('fournisseur', 'int');
+				$object->code_fournisseur		= GETPOST('code_fournisseur', 'alpha');
+				$object->address				= GETPOST('address', 'alpha');
+				$object->zip					= GETPOST('zipcode', 'alpha');
+				$object->town					= GETPOST('town', 'alpha');
+				$object->country_id				= GETPOST('country_id')?GETPOST('country_id', 'int'):$mysoc->country_id;
+				$object->state_id				= GETPOST('state_id', 'int');
+				$object->skype					= GETPOST('skype', 'alpha');
+				$object->phone					= GETPOST('phone', 'alpha');
+				$object->fax					= GETPOST('fax', 'alpha');
+				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+				$object->capital				= GETPOST('capital', 'alpha');
+				$object->idprof1				= GETPOST('idprof1', 'alpha');
+				$object->idprof2				= GETPOST('idprof2', 'alpha');
+				$object->idprof3				= GETPOST('idprof3', 'alpha');
+				$object->idprof4				= GETPOST('idprof4', 'alpha');
+				$object->idprof5				= GETPOST('idprof5', 'alpha');
+				$object->idprof6				= GETPOST('idprof6', 'alpha');
+				$object->typent_id				= GETPOST('typent_id', 'int');
+				$object->effectif_id			= GETPOST('effectif_id', 'int');
+				$object->barcode				= GETPOST('barcode', 'alpha');
+				$object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+				$object->default_lang			= GETPOST('default_lang', 'alpha');
+
+				$object->tva_assuj				= GETPOST('assujtva_value', 'int');
+				$object->tva_intra				= GETPOST('tva_intra', 'alpha');
+				$object->status					= GETPOST('status', 'int');
+
+				// Webservices url/key
+				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
@@ -1540,31 +1540,31 @@ 
 					$object->location_incoterms		= GETPOST('lcoation_incoterms', 'alpha');
 				}
 
-                //Local Taxes
-                $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
-                $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
+				//Local Taxes
+				$object->localtax1_assuj		= GETPOST('localtax1assuj_value');
+				$object->localtax2_assuj		= GETPOST('localtax2assuj_value');
 
-                $object->localtax1_value		=GETPOST('lt1');
-                $object->localtax2_value		=GETPOST('lt2');
+				$object->localtax1_value		=GETPOST('lt1');
+				$object->localtax2_value		=GETPOST('lt2');
 
-                // We set country_id, and country_code label of the chosen country
-                if ($object->country_id > 0)
-                {
-                	$tmparray=getCountry($object->country_id,'all');
-                    $object->country_code	= $tmparray['code'];
-                    $object->country		= $tmparray['label'];
-                }
-            }
+				// We set country_id, and country_code label of the chosen country
+				if ($object->country_id > 0)
+				{
+					$tmparray=getCountry($object->country_id,'all');
+					$object->country_code	= $tmparray['code'];
+					$object->country		= $tmparray['label'];
+				}
+			}
 
-            if($object->localtax1_assuj==0){
-            	$sub=0;
-            }else{$sub=1;}
-            if($object->localtax2_assuj==0){
-            	$sub2=0;
-            }else{$sub2=1;}
+			if($object->localtax1_assuj==0){
+				$sub=0;
+			}else{$sub=1;}
+			if($object->localtax2_assuj==0){
+				$sub2=0;
+			}else{$sub2=1;}
 
-            print "\n".'<script type="text/javascript">';
-            print '$(document).ready(function () {
+			print "\n".'<script type="text/javascript">';
+			print '$(document).ready(function () {
     			var val='.$sub.';
     			var val2='.$sub2.';
     			if("#localtax1assuj_value".value==undefined){
@@ -1599,340 +1599,340 @@ 
     			});
 
                });';
-            print '</script>'."\n";
+			print '</script>'."\n";
 
 
-            if ($conf->use_javascript_ajax)
-            {
-                print "\n".'<script type="text/javascript" language="javascript">';
-                print '$(document).ready(function () {
+			if ($conf->use_javascript_ajax)
+			{
+				print "\n".'<script type="text/javascript" language="javascript">';
+				print '$(document).ready(function () {
                 			$("#selectcountry_id").change(function() {
                 				document.formsoc.action.value="edit";
                 				document.formsoc.submit();
                 			});
                        })';
-                print '</script>'."\n";
-            }
+				print '</script>'."\n";
+			}
 
-            print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->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="'.$object->id.'">';
-            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->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="'.$object->id.'">';
+			if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
 
-            dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
+			dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-            print '<div class="fichecenter2">';
-            print '<table class="border" width="100%">';
+			print '<div class="fichecenter2">';
+			print '<table class="border" width="100%">';
 
-            // Ref/ID
+			// Ref/ID
 			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
 			{
-		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
-            	print $object->ref;
-            	print '</td></tr>';
-			}
-
-            // Name
-            print '<tr><td class="titlefieldcreate">'.fieldLabel('ThirdPartyName','name',1).'</td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
-
-	        // Alias names (commercial, trademark or alias names)
-	        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
-
-            // Prefix
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-            {
-                print '<tr><td>'.fieldLabel('Prefix','prefix').'</td><td colspan="3">';
-                // It does not change the prefix mode using the auto numbering prefix
-                if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
-                {
-                    print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
-                    print $object->prefix_comm;
-                }
-                else
-                {
-                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
-                }
-                print '</td>';
-            }
-
-            // Prospect/Customer
-            print '<tr><td>'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
-	        print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
-            print '<option value="0"'.($object->client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
-            print '</select></td>';
-            print '<td>'.fieldLabel('CustomerCode','customer_code').'</td><td>';
-
-            print '<table class="nobordernopadding"><tr><td>';
-            if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
-            {
-                $tmpcode=$object->code_client;
-                if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) $tmpcode=$object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
-                print '<input type="text" name="code_client" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            }
-            else if ($object->codeclient_modifiable())
-            {
-                print '<input type="text" name="code_client" id="customer_code" size="16" value="'.$object->code_client.'" maxlength="15">';
-            }
-            else
-            {
-                print $object->code_client;
-                print '<input type="hidden" name="code_client" value="'.$object->code_client.'">';
-            }
-            print '</td><td>';
-            $s=$modCodeClient->getToolTip($langs,$object,0);
-            print $form->textwithpicto('',$s,1);
-            print '</td></tr></table>';
-
-            print '</td></tr>';
-
-            // Supplier
-            if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
-            {
-                print '<tr>';
-                print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td class="maxwidthonsmartphone">';
-                print $form->selectyesno("fournisseur",$object->fournisseur,1);
-                print '</td>';
-                print '<td>'.fieldLabel('SupplierCode','supplier_code').'</td><td>';
-
-                print '<table class="nobordernopadding"><tr><td>';
-                if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
-                {
-                    $tmpcode=$object->code_fournisseur;
-                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
-                    print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-                }
-                else if ($object->codefournisseur_modifiable())
-                {
-                    print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-                }
-                else
-              {
-                    print $object->code_fournisseur;
-                    print '<input type="hidden" name="code_fournisseur" value="'.$object->code_fournisseur.'">';
-                }
-                print '</td><td>';
-                $s=$modCodeFournisseur->getToolTip($langs,$object,1);
-                print $form->textwithpicto('',$s,1);
-                print '</td></tr></table>';
-
-                print '</td></tr>';
-            }
-
-            // Barcode
-            if (! empty($conf->barcode->enabled))
-            {
-                print '<tr><td class="tdtop">'.fieldLabel('Gencod','barcode').'</td>';
-	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
-                print '</td></tr>';
-            }
-
-            // Status
-            print '<tr><td>'.fieldLabel('Status','status').'</td><td colspan="3">';
-            print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$object->status);
-            print '</td></tr>';
-
-            // Address
-            print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
-	        print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-            print $object->address;
-            print '</textarea></td></tr>';
-
-            // Zip / Town
-            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-            print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
-            print '</td><td>'.fieldLabel('Town','town').'</td><td>';
-            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td colspan="3">';
-            print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td></tr>';
-
-            // State
-            if (empty($conf->global->SOCIETE_DISABLE_STATE))
-            {
-                if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-                {
-                    print '<tr><td>'.fieldLabel('Region-State','state_id').'</td><td colspan="3">';
-                }
-                else
-                {
-                    print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
-                }
-
-                print $formcompany->select_state($object->state_id,$object->country_code);
-                print '</td></tr>';
-            }
-
-            // EMail / Web
-            print '<tr><td>'.fieldLabel('EMail','email',(! empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-	        print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
-            print '<tr><td>'.fieldLabel('Web','url').'</td>';
-	        print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
-	            print '<td colspan="3"><input type="text" name="skype" id="skype" size="32" value="'.$object->skype.'"></td></tr>';
-            }
-
-            // Phone / Fax
-            print '<tr><td>'.fieldLabel('Phone','phone').'</td>';
-	        print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
-            print '<td>'.fieldLabel('Fax','fax').'</td>';
-	        print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
-
-            // Prof ids
-            $i=1; $j=0;
-            while ($i <= 6)
-            {
-                $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-                if ($idprof!='-')
-                {
-	                $key='idprof'.$i;
-
-	                if (($j % 2) == 0) print '<tr>';
-
-	                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-	                if (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())
-	                    print '<td>'.fieldLabel($idprof,$key).'</td><td>';
-                    else
-	                    print '<td><span class="fieldrequired">'.fieldLabel($idprof,$key).'</td><td>';
-
-	                print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
-                    print '</td>';
-                    if (($j % 2) == 1) print '</tr>';
-                    $j++;
-                }
-                $i++;
-            }
-            if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
-
-            // VAT is used
-            print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td><td colspan="3">';
-            print $form->selectyesno('assujtva_value',$object->tva_assuj,1);
-            print '</td></tr>';
-
-            // Local Taxes
-            //TODO: Place into a function to control showing by country or study better option
-            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-            {
-                print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td>';
-                print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                if(! isOnlyOneLocalTax(1))
-                {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
-                    print '</span>';
-                }
-                print '</td>';
-
-                print '<td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
-                print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
-                if  (! isOnlyOneLocalTax(2))
-                {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
-                    print '</span>';
-                }
-                print '</td></tr>';
-
-            }
-            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
-            {
-                print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td colspan="3">';
-                print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                if(! isOnlyOneLocalTax(1))
-                {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
-                    print '</span>';
-                }
-                print '</td></tr>';
-
-            }
-            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
-            {
-                print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td colspan="3">';
-                print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
-                if(! isOnlyOneLocalTax(2))
-                {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
-                    $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            }
-
-            // VAT Code
-            print '<tr><td>'.fieldLabel('VATIntra','intra_vat').'</td>';
-            print '<td colspan="3">';
-            $s ='<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
-
-            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-            {
-                $s.=' &nbsp; ';
-
-                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,285);\n";
-                    print "}\n";
-                    print '</script>';
-                    print "\n";
-                    $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-                }
-                else
-                {
-                    $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-                }
-            }
-            print $s;
-            print '</td>';
-            print '</tr>';
-
-            // Type - Size
-            print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td>';
-            print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td></tr>';
-
-            // Juridical type
-            print '<tr><td>'.fieldLabel('JuridicalStatus','forme_juridique_code').'</td><td class="maxwidthonsmartphone" colspan="3">';
-            print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-            print '</td></tr>';
-
-            // Capital
-            print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
-	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
-
-            // Default language
-            if (! empty($conf->global->MAIN_MULTILANGS))
-            {
-                print '<tr><td>'.fieldLabel('DefaultLang','default_lang').'</td><td colspan="3">'."\n";
-                print $formadmin->select_language($object->default_lang,'default_lang',0,0,1);
-                print '</td>';
-                print '</tr>';
-            }
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
+				print $object->ref;
+				print '</td></tr>';
+			}
+
+			// Name
+			print '<tr><td class="titlefieldcreate">'.fieldLabel('ThirdPartyName','name',1).'</td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
+
+			// Alias names (commercial, trademark or alias names)
+			print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
+
+			// Prefix
+			if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+			{
+				print '<tr><td>'.fieldLabel('Prefix','prefix').'</td><td colspan="3">';
+				// It does not change the prefix mode using the auto numbering prefix
+				if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
+				{
+					print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+					print $object->prefix_comm;
+				}
+				else
+				{
+					print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+				}
+				print '</td>';
+			}
+
+			// Prospect/Customer
+			print '<tr><td>'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
+			print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+			print '<option value="0"'.($object->client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+			print '</select></td>';
+			print '<td>'.fieldLabel('CustomerCode','customer_code').'</td><td>';
+
+			print '<table class="nobordernopadding"><tr><td>';
+			if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
+			{
+				$tmpcode=$object->code_client;
+				if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) $tmpcode=$object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+				if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+				print '<input type="text" name="code_client" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+			}
+			else if ($object->codeclient_modifiable())
+			{
+				print '<input type="text" name="code_client" id="customer_code" size="16" value="'.$object->code_client.'" maxlength="15">';
+			}
+			else
+			{
+				print $object->code_client;
+				print '<input type="hidden" name="code_client" value="'.$object->code_client.'">';
+			}
+			print '</td><td>';
+			$s=$modCodeClient->getToolTip($langs,$object,0);
+			print $form->textwithpicto('',$s,1);
+			print '</td></tr></table>';
+
+			print '</td></tr>';
+
+			// Supplier
+			if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
+			{
+				print '<tr>';
+				print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td class="maxwidthonsmartphone">';
+				print $form->selectyesno("fournisseur",$object->fournisseur,1);
+				print '</td>';
+				print '<td>'.fieldLabel('SupplierCode','supplier_code').'</td><td>';
+
+				print '<table class="nobordernopadding"><tr><td>';
+				if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
+				{
+					$tmpcode=$object->code_fournisseur;
+					if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+					if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+					print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+				}
+				else if ($object->codefournisseur_modifiable())
+				{
+					print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
+				}
+				else
+			  {
+					print $object->code_fournisseur;
+					print '<input type="hidden" name="code_fournisseur" value="'.$object->code_fournisseur.'">';
+				}
+				print '</td><td>';
+				$s=$modCodeFournisseur->getToolTip($langs,$object,1);
+				print $form->textwithpicto('',$s,1);
+				print '</td></tr></table>';
+
+				print '</td></tr>';
+			}
+
+			// Barcode
+			if (! empty($conf->barcode->enabled))
+			{
+				print '<tr><td class="tdtop">'.fieldLabel('Gencod','barcode').'</td>';
+				print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
+				print '</td></tr>';
+			}
+
+			// Status
+			print '<tr><td>'.fieldLabel('Status','status').'</td><td colspan="3">';
+			print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$object->status);
+			print '</td></tr>';
+
+			// Address
+			print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
+			print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="3" wrap="soft">';
+			print $object->address;
+			print '</textarea></td></tr>';
+
+			// Zip / Town
+			print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
+			print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
+			print '</td><td>'.fieldLabel('Town','town').'</td><td>';
+			print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			print '</td></tr>';
+
+			// Country
+			print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td colspan="3">';
+			print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '</td></tr>';
+
+			// State
+			if (empty($conf->global->SOCIETE_DISABLE_STATE))
+			{
+				if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+				{
+					print '<tr><td>'.fieldLabel('Region-State','state_id').'</td><td colspan="3">';
+				}
+				else
+				{
+					print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
+				}
+
+				print $formcompany->select_state($object->state_id,$object->country_code);
+				print '</td></tr>';
+			}
+
+			// EMail / Web
+			print '<tr><td>'.fieldLabel('EMail','email',(! empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+			print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
+			print '<tr><td>'.fieldLabel('Web','url').'</td>';
+			print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
+
+			// Skype
+			if (! empty($conf->skype->enabled))
+			{
+				print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
+				print '<td colspan="3"><input type="text" name="skype" id="skype" size="32" value="'.$object->skype.'"></td></tr>';
+			}
+
+			// Phone / Fax
+			print '<tr><td>'.fieldLabel('Phone','phone').'</td>';
+			print '<td><input type="text" name="phone" id="phone" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->phone.'"></td>';
+			print '<td>'.fieldLabel('Fax','fax').'</td>';
+			print '<td><input type="text" name="fax" id="fax" class="maxwidth100onsmartphone quatrevingtpercent" value="'.$object->fax.'"></td></tr>';
+
+			// Prof ids
+			$i=1; $j=0;
+			while ($i <= 6)
+			{
+				$idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
+				if ($idprof!='-')
+				{
+					$key='idprof'.$i;
+
+					if (($j % 2) == 0) print '<tr>';
+
+					$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+					if (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())
+						print '<td>'.fieldLabel($idprof,$key).'</td><td>';
+					else
+						print '<td><span class="fieldrequired">'.fieldLabel($idprof,$key).'</td><td>';
+
+					print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
+					print '</td>';
+					if (($j % 2) == 1) print '</tr>';
+					$j++;
+				}
+				$i++;
+			}
+			if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+
+			// VAT is used
+			print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td><td colspan="3">';
+			print $form->selectyesno('assujtva_value',$object->tva_assuj,1);
+			print '</td></tr>';
+
+			// Local Taxes
+			//TODO: Place into a function to control showing by country or study better option
+			if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+			{
+				print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td>';
+				print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
+				if(! isOnlyOneLocalTax(1))
+				{
+					print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+					$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+					print '</span>';
+				}
+				print '</td>';
+
+				print '<td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td>';
+				print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
+				if  (! isOnlyOneLocalTax(2))
+				{
+					print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+					$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+					print '</span>';
+				}
+				print '</td></tr>';
+
+			}
+			elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+			{
+				print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td colspan="3">';
+				print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
+				if(! isOnlyOneLocalTax(1))
+				{
+					print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+					$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+					print '</span>';
+				}
+				print '</td></tr>';
+
+			}
+			elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+			{
+				print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td colspan="3">';
+				print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
+				if(! isOnlyOneLocalTax(2))
+				{
+					print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+					$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+					print '</span>';
+				}
+				print '</td></tr>';
+			}
+
+			// VAT Code
+			print '<tr><td>'.fieldLabel('VATIntra','intra_vat').'</td>';
+			print '<td colspan="3">';
+			$s ='<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+			{
+				$s.=' &nbsp; ';
+
+				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,285);\n";
+					print "}\n";
+					print '</script>';
+					print "\n";
+					$s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+					$s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+				}
+				else
+				{
+					$s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+				}
+			}
+			print $s;
+			print '</td>';
+			print '</tr>';
+
+			// Type - Size
+			print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">';
+			print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '</td>';
+			print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
+			print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '</td></tr>';
+
+			// Juridical type
+			print '<tr><td>'.fieldLabel('JuridicalStatus','forme_juridique_code').'</td><td class="maxwidthonsmartphone" colspan="3">';
+			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
+			print '</td></tr>';
+
+			// Capital
+			print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
+			print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+
+			// Default language
+			if (! empty($conf->global->MAIN_MULTILANGS))
+			{
+				print '<tr><td>'.fieldLabel('DefaultLang','default_lang').'</td><td colspan="3">'."\n";
+				print $formadmin->select_language($object->default_lang,'default_lang',0,0,1);
+				print '</td>';
+				print '</tr>';
+			}
 
 			// Categories
 			if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
@@ -1973,296 +1973,296 @@ 
 			{
 				print '<tr>';
 				print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
 				print '</td></tr>';
 			}
 
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields,'edit');
-            }
+			// Other attributes
+			$parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			{
+				print $object->showOptionals($extrafields,'edit');
+			}
 
-            // Webservices url/key
-            if (!empty($conf->syncsupplierwebservices->enabled)) {
-                print '<tr><td>'.fieldLabel('WebServiceURL','webservices_url').'</td>';
-                print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
-                print '<td>'.fieldLabel('WebServiceKey','webservices_key').'</td>';
-                print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
-            }
+			// Webservices url/key
+			if (!empty($conf->syncsupplierwebservices->enabled)) {
+				print '<tr><td>'.fieldLabel('WebServiceURL','webservices_url').'</td>';
+				print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
+				print '<td>'.fieldLabel('WebServiceKey','webservices_key').'</td>';
+				print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
+			}
 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr>';
 				print '<td>'.fieldLabel('IncotermLabel','incoterm_id').'</td>';
-	            print '<td colspan="3" class="maxwidthonsmartphone">';
-	            print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
 				print '</td></tr>';
 			}
 
-            // Logo
-            print '<tr class="hideonsmartphone">';
-            print '<td>'.fieldLabel('Logo','photoinput').'</td>';
-            print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe',$object);
-            $caneditfield=1;
-            if ($caneditfield)
-            {
-                if ($object->logo) print "<br>\n";
-                print '<table class="nobordernopadding">';
-                if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                //print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-                print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-                print '</table>';
-            }
-            print '</td>';
-            print '</tr>';
-
-            print '</table>';
-            print '</div>';
-
-	        dol_fiche_end();
-
-            print '<div align="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 '</div>';
-
-            print '</form>';
-        }
-    }
-    else
-    {
-    	/*
+			// Logo
+			print '<tr class="hideonsmartphone">';
+			print '<td>'.fieldLabel('Logo','photoinput').'</td>';
+			print '<td colspan="3">';
+			if ($object->logo) print $form->showphoto('societe',$object);
+			$caneditfield=1;
+			if ($caneditfield)
+			{
+				if ($object->logo) print "<br>\n";
+				print '<table class="nobordernopadding">';
+				if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+				print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+				print '</table>';
+			}
+			print '</td>';
+			print '</tr>';
+
+			print '</table>';
+			print '</div>';
+
+			dol_fiche_end();
+
+			print '<div align="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 '</div>';
+
+			print '</form>';
+		}
+	}
+	else
+	{
+		/*
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals();
-        //if ($res < 0) { dol_print_error($db); exit; }
-
-
-        $head = societe_prepare_head($object);
-
-        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
-
-        // Confirm delete third party
-        if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
-        }
-
-	    if ($action == 'merge')
-	    {
-		    $formquestion = array(
-			    array(
-				    'name' => 'soc_origin',
-			    	'label' => $langs->trans('MergeOriginThirdparty'),
-				    'type' => 'other',
-				    'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
-			    )
-		    );
-
-		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
-	    }
-
-        dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
-
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-
-
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
-
-    	// Prospect/Customer
-    	print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-    	print $object->getLibCustProspStatut();
-    	print '</td></tr>';
-
-    	// Supplier
-    	if (! empty($conf->fournisseur->enabled))
-    	{
-    		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-    		print yn($object->fournisseur);
-    		print '</td></tr>';
-    	}
-
-    	// Prefix
-        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-        {
-            print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
-            print $htmllogobar; $htmllogobar='';
-            print '</tr>';
-        }
-
-        // Customer code
-        if ($object->client)
-        {
-            print '<tr><td>';
-            print $langs->trans('CustomerCode').'</td><td>';
-            print $object->code_client;
-            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-            print '</td>';
-            print $htmllogobar; $htmllogobar='';
-            print '</tr>';
-        }
-
-        // Supplier code
-        if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
-        {
-            print '<tr><td>';
-            print $langs->trans('SupplierCode').'</td><td>';
-            print $object->code_fournisseur;
-            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-            print '</td>';
-            print $htmllogobar; $htmllogobar='';
-            print '</tr>';
-        }
-
-        // Barcode
-        if (! empty($conf->barcode->enabled))
-        {
-            print '<tr><td>';
-            print $langs->trans('Gencod').'</td><td>'.$object->barcode;
-            print '</td>';
+		if (!empty($object->id)) $res=$object->fetch_optionals();
+		//if ($res < 0) { dol_print_error($db); exit; }
+
+
+		$head = societe_prepare_head($object);
+
+		dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
+
+		// Confirm delete third party
+		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
+		}
+
+		if ($action == 'merge')
+		{
+			$formquestion = array(
+				array(
+					'name' => 'soc_origin',
+					'label' => $langs->trans('MergeOriginThirdparty'),
+					'type' => 'other',
+					'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
+				)
+			);
+
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
+		}
+
+		dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+		dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+
+
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
+
+		// Prospect/Customer
+		print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+		print $object->getLibCustProspStatut();
+		print '</td></tr>';
+
+		// Supplier
+		if (! empty($conf->fournisseur->enabled))
+		{
+			print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
+			print yn($object->fournisseur);
+			print '</td></tr>';
+		}
+
+		// Prefix
+		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		{
+			print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
+			print $htmllogobar; $htmllogobar='';
+			print '</tr>';
+		}
+
+		// Customer code
+		if ($object->client)
+		{
+			print '<tr><td>';
+			print $langs->trans('CustomerCode').'</td><td>';
+			print $object->code_client;
+			if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print '</td>';
+			print $htmllogobar; $htmllogobar='';
+			print '</tr>';
+		}
+
+		// Supplier code
+		if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+		{
+			print '<tr><td>';
+			print $langs->trans('SupplierCode').'</td><td>';
+			print $object->code_fournisseur;
+			if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print '</td>';
+			print $htmllogobar; $htmllogobar='';
+			print '</tr>';
+		}
+
+		// Barcode
+		if (! empty($conf->barcode->enabled))
+		{
+			print '<tr><td>';
+			print $langs->trans('Gencod').'</td><td>'.$object->barcode;
+			print '</td>';
 			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
-            print $htmllogobar;
+			print $htmllogobar;
 			$htmllogobar='';
-            print '</tr>';
-        }
-
-        // Prof ids
-        $i=1; $j=0;
-        while ($i <= 6)
-        {
-            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-            if ($idprof!='-')
-            {
-                //if (($j % 2) == 0) print '<tr>';
-                print '<tr>';
-            	print '<td>'.$idprof.'</td><td>';
-                $key='idprof'.$i;
-                print $object->$key;
-                if ($object->$key)
-                {
-                    if ($object->id_prof_check($i,$object) > 0) print ' &nbsp; '.$object->id_prof_url($i,$object);
-                    else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
-                }
-                print '</td>';
-                //if (($j % 2) == 1) print '</tr>';
-                print '</tr>';
-                $j++;
-            }
-            $i++;
-        }
-        //if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
-
-        // VAT is used
-        print '<tr><td>';
-        print $langs->trans('VATIsUsed');
-        print '</td><td>';
-        print yn($object->tva_assuj);
-        print '</td>';
+			print '</tr>';
+		}
+
+		// Prof ids
+		$i=1; $j=0;
+		while ($i <= 6)
+		{
+			$idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
+			if ($idprof!='-')
+			{
+				//if (($j % 2) == 0) print '<tr>';
+				print '<tr>';
+				print '<td>'.$idprof.'</td><td>';
+				$key='idprof'.$i;
+				print $object->$key;
+				if ($object->$key)
+				{
+					if ($object->id_prof_check($i,$object) > 0) print ' &nbsp; '.$object->id_prof_url($i,$object);
+					else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+				}
+				print '</td>';
+				//if (($j % 2) == 1) print '</tr>';
+				print '</tr>';
+				$j++;
+			}
+			$i++;
+		}
+		//if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
+
+		// VAT is used
+		print '<tr><td>';
+		print $langs->trans('VATIsUsed');
+		print '</td><td>';
+		print yn($object->tva_assuj);
+		print '</td>';
 		print '</tr>';
 
 		// Local Taxes
 		//TODO: Place into a function to control showing by country or study better option
 		if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
 		{
-		    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
-		    print yn($object->localtax1_assuj);
-		    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
-		    print yn($object->localtax2_assuj);
-		    print '</td></tr>';
-
-		    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
-		    {
-		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="set_localtax1">';
-		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		        print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-		        if($action == 'editRE')
-		        {
-		            print '<td align="left">';
-		            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
-		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }
-		        else
-		        {
-		            print '<td>'.$object->localtax1_value.'</td>';
-		        }
-		        print '</tr></form>';
-		    }
-		    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
-		    {
-		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="set_localtax2">';
-		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		        print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-		        if($action == 'editIRPF'){
-		            print '<td align="left">';
-		            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
-		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
-		            print '<td>'.$object->localtax2_value.'</td>';
-		        }
-		        print '</tr></form>';
-		    }
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+			print yn($object->localtax1_assuj);
+			print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+			print yn($object->localtax2_assuj);
+			print '</td></tr>';
+
+			if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+			{
+				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="set_localtax1">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+				if($action == 'editRE')
+				{
+					print '<td align="left">';
+					$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+					print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				}
+				else
+				{
+					print '<td>'.$object->localtax1_value.'</td>';
+				}
+				print '</tr></form>';
+			}
+			if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+			{
+				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="set_localtax2">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+				if($action == 'editIRPF'){
+					print '<td align="left">';
+					$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+					print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				}else{
+					print '<td>'.$object->localtax2_value.'</td>';
+				}
+				print '</tr></form>';
+			}
 		}
 		elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
 		{
-		    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
-		    print yn($object->localtax1_assuj);
-		    print '</td></tr>';
-		    if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
-		    {
-		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="set_localtax1">';
-		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		        print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-		        if($action == 'editRE'){
-		            print '<td align="left">';
-		            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
-		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
-		            print '<td>'.$object->localtax1_value.'</td>';
-		        }
-		        print '</tr></form>';
-
-		    }
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+			print yn($object->localtax1_assuj);
+			print '</td></tr>';
+			if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+			{
+				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="set_localtax1">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+				if($action == 'editRE'){
+					print '<td align="left">';
+					$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+					print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				}else{
+					print '<td>'.$object->localtax1_value.'</td>';
+				}
+				print '</tr></form>';
+
+			}
 		}
 		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
 		{
-		    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
-		    print yn($object->localtax2_assuj);
-		    print '</td></tr>';
-		    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
-		    {
-
-		        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="set_localtax2">';
-		        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		        print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
-		        if($action == 'editIRPF'){
-		            print '<td align="left">';
-		            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
-		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
-		            print '<td>'.$object->localtax2_value.'</td>';
-		        }
-		        print '</tr></form>';
-
-		    }
+			print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+			print yn($object->localtax2_assuj);
+			print '</td></tr>';
+			if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+			{
+
+				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="set_localtax2">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+				if($action == 'editIRPF'){
+					print '<td align="left">';
+					$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+					print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				}else{
+					print '<td>'.$object->localtax2_value.'</td>';
+				}
+				print '</tr></form>';
+
+			}
 		}
 		/*
 		 if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1)
@@ -2273,60 +2273,60 @@ 
 		 }
 		 */
 
-        // VAT Code
-        print '<tr>';
+		// VAT Code
+		print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-        if ($object->tva_intra)
-        {
-            $s='';
-            $s.=$object->tva_intra;
-            $s.='<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
-
-            if (empty($conf->global->MAIN_DISABLEVATCHECK))
-            {
-                $s.=' &nbsp; ';
-
-                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,285);\n";
-                    print "}\n";
-                    print '</script>';
-                    print "\n";
-                    $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-                }
-                else
-                {
-                    $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-                }
-            }
-            print $s;
-        }
-        else
-        {
-            print '&nbsp;';
-        }
-        print '</td>';
-        print '</tr>';
-
-        // Type + Staff
-        $arr = $formcompany->typent_array(1);
-        $object->typent= $arr[$object->typent_code];
-        print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
-        print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
-
-        print '</table>';
-
-        print '</div>';
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
-
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
-
-    	// Tags / categories
+		if ($object->tva_intra)
+		{
+			$s='';
+			$s.=$object->tva_intra;
+			$s.='<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
+
+			if (empty($conf->global->MAIN_DISABLEVATCHECK))
+			{
+				$s.=' &nbsp; ';
+
+				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,285);\n";
+					print "}\n";
+					print '</script>';
+					print "\n";
+					$s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
+					$s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+				}
+				else
+				{
+					$s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+				}
+			}
+			print $s;
+		}
+		else
+		{
+			print '&nbsp;';
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Type + Staff
+		$arr = $formcompany->typent_array(1);
+		$object->typent= $arr[$object->typent_code];
+		print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
+		print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
+
+		print '</table>';
+
+		print '</div>';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
+
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
+
+		// Tags / categories
 		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
 		{
 			// Customer
@@ -2346,40 +2346,40 @@ 
 			}
 		}
 
-        // Legal
-        print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
+		// Legal
+		print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
 
-        // Capital
-        print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
-        else print '&nbsp;';
-        print '</td></tr>';
+		// Capital
+		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
+		if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
+		else print '&nbsp;';
+		print '</td></tr>';
 
-        // Default language
-        if (! empty($conf->global->MAIN_MULTILANGS))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
-            //$s=picto_from_langcode($object->default_lang);
-            //print ($s?$s.' ':'');
-            $langs->load("languages");
-            $labellang = ($object->default_lang?$langs->trans('Language_'.$object->default_lang):'');
-            print $labellang;
-            print '</td></tr>';
-        }
+		// Default language
+		if (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+			//$s=picto_from_langcode($object->default_lang);
+			//print ($s?$s.' ':'');
+			$langs->load("languages");
+			$labellang = ($object->default_lang?$langs->trans('Language_'.$object->default_lang):'');
+			print $labellang;
+			print '</td></tr>';
+		}
 
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr><td>';
-            print '<table width="100%" class="nobordernopadding"><tr><td>';
-            print $langs->trans('IncotermLabel');
-            print '<td><td align="right">';
-            if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
-            else print '&nbsp;';
-            print '</td></tr></table>';
-            print '</td>';
-            print '<td colspan="3">';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td align="right">';
+			if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -2388,7 +2388,7 @@ 
 			{
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
 			}
-            print '</td></tr>';
+			print '</td></tr>';
 		}
 
 		// Multicurrency
@@ -2396,8 +2396,8 @@ 
 		{
 			print '<tr>';
 			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
-	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
+			print '<td>';
+			print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
 			print '</td></tr>';
 		}
 
@@ -2405,74 +2405,74 @@ 
 		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-        // Parent company
-        if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
-        {
-        	// Payment term
-        	print '<tr><td>';
-        	print '<table class="nobordernopadding" width="100%"><tr><td>';
-        	print $langs->trans('ParentCompany');
-        	print '</td>';
-        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
-        	print '</tr></table>';
-        	print '</td><td colspan="3">';
-        	if ($action == 'editparentcompany')
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
-        	}
-        	else
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
-        	}
-        	print '</td>';
-        	print '</tr>';
-        }
-
-        // Sales representative
-        include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
-
-        // Module Adherent
-        if (! empty($conf->adherent->enabled))
-        {
-            $langs->load("members");
-            print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
-            print '<td colspan="3">';
-            $adh=new Adherent($db);
-            $result=$adh->fetch('','',$object->id);
-            if ($result > 0)
-            {
-                $adh->ref=$adh->getFullName($langs);
-                print $adh->getNomUrl(1);
-            }
-            else
-            {
-                print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-            }
-            print '</td>';
-            print "</tr>\n";
-        }
-
-        // Webservices url/key
-        if (!empty($conf->syncsupplierwebservices->enabled)) {
-            print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
-            print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
-        }
-
-        print '</table>';
+		// Parent company
+		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
+		{
+			// Payment term
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('ParentCompany');
+			print '</td>';
+			if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="3">';
+			if ($action == 'editparentcompany')
+			{
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
+			}
+			else
+			{
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
+			}
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Sales representative
+		include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
+
+		// Module Adherent
+		if (! empty($conf->adherent->enabled))
+		{
+			$langs->load("members");
+			print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+			print '<td colspan="3">';
+			$adh=new Adherent($db);
+			$result=$adh->fetch('','',$object->id);
+			if ($result > 0)
+			{
+				$adh->ref=$adh->getFullName($langs);
+				print $adh->getNomUrl(1);
+			}
+			else
+			{
+				print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+			}
+			print '</td>';
+			print "</tr>\n";
+		}
+
+		// Webservices url/key
+		if (!empty($conf->syncsupplierwebservices->enabled)) {
+			print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
+			print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
+		}
+
+		print '</table>';
 		print '</div>';
 
-        print '</div></div>';
-        print '<div style="clear:both"></div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
 
-        /*
+		/*
          *  Actions
          */
-        if ($action != 'presend')
-        {
-	        print '<div class="tabsAction">'."\n";
+		if ($action != 'presend')
+		{
+			print '<div class="tabsAction">'."\n";
 
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -2489,44 +2489,44 @@ 
 					}
 				}
 
-		        if (! empty($object->email) || $at_least_one_email_contact)
-		        {
-		        	$langs->load("mails");
-		        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-		        }
-		        else
+				if (! empty($object->email) || $at_least_one_email_contact)
+				{
+					$langs->load("mails");
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+				}
+				else
+				{
+					$langs->load("mails");
+			   		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
+				}
+
+				if ($user->rights->societe->creer)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+				}
+
+				if ($user->rights->societe->supprimer)
+				{
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
+				}
+
+				if ($user->rights->societe->supprimer)
 				{
-		        	$langs->load("mails");
-		       		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
-		        }
-
-		        if ($user->rights->societe->creer)
-		        {
-		            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		        }
-
-		        if ($user->rights->societe->supprimer)
-		        {
-		        	print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a></div>';
-		        }
-
-		        if ($user->rights->societe->supprimer)
-		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-		            {
-		                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-		            }
-		            else
+					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+					{
+						print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+					}
+					else
 					{
-		                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-		            }
-		        }
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+					}
+				}
 			}
 
-	        print '</div>'."\n";
-        }
+			print '</div>'."\n";
+		}
 
-        //Select mail models is same action as presend
+		//Select mail models is same action as presend
 		if (GETPOST('modelselected')) {
 			$action = 'presend';
 		}
@@ -2535,20 +2535,20 @@ 
 		{
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	        {
+			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+			{
 				print '<a name="builddoc"></a>'; // ancre
 
-	            /*
+				/*
 	             * Documents generes
 	             */
-	            $filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
-	            $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-	            $genallowed=$user->rights->societe->lire;
-	            $delallowed=$user->rights->societe->creer;
+				$filedir=$conf->societe->multidir_output[$object->entity].'/'.$object->id;
+				$urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+				$genallowed=$user->rights->societe->lire;
+				$delallowed=$user->rights->societe->creer;
 
-	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-	        }
+				print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+			}
 
 			// Subsidiaries list
 			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
@@ -2595,7 +2595,7 @@ 
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 
-    }
+	}
 }