Dolibarr / dolibarr

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
 				{

Spacing +139 added lines, -139 removed lines

@@ -36,9 +36,9 @@ 
  */
 class doc_generic_product_odt extends ModelePDFProduct
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 
-	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $phpmin = array(5, 2, 0); // Minimum version of PHP required by module
 	var $version = 'dolibarr';
 
 
@@ -49,7 +49,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
 		$langs->load("companies");
@@ -57,32 +57,32 @@ 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PRODUCT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'PRODUCT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva PRODUCT_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva PRODUCT_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -94,7 +94,7 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("companies");
 		$langs->load("errors");
@@ -102,55 +102,55 @@ 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PRODUCT_ADDON_PDF_ODT_PATH">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="PRODUCT_ADDON_PDF_ODT_PATH">';
 		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 		{
-			$texte.= '<input type="hidden" name="param2" value="PRODUCT_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="PRODUCT_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="PRODUCT_ADDON_PDF_ODT_CLOSED">';
+			$texte .= '<input type="hidden" name="param2" value="PRODUCT_ADDON_PDF_ODT_DEFAULT">';
+			$texte .= '<input type="hidden" name="param3" value="PRODUCT_ADDON_PDF_ODT_TOBILL">';
+			$texte .= '<input type="hidden" name="param4" value="PRODUCT_ADDON_PDF_ODT_CLOSED">';
 		}
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PRODUCT_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PRODUCT_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PRODUCT_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->PRODUCT_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
 		if (count($listofdir))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
 			/*if ($conf->global->MAIN_PRODUCT_CHOOSE_ODT_DOCUMENT > 0)
 			{
@@ -178,15 +178,15 @@ 
 			}*/
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -202,9 +202,9 @@ 
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $product,$langs,$conf,$mysoc,$hookmanager,$user;
+		global $product, $langs, $conf, $mysoc, $hookmanager, $user;
 
 		if (empty($srctemplatepath))
 		{
@@ -213,17 +213,17 @@ 
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -232,14 +232,14 @@ 
 		if ($conf->produit->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Product($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
@@ -249,14 +249,14 @@ 
 
 			$dir = $conf->produit->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -264,26 +264,26 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$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';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $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
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -293,19 +293,19 @@ 
 
 
 				// If CUSTOMER contact defined on product, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (! empty($usecontact))
+				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->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
@@ -314,10 +314,10 @@ 
 				}
 				else
 				{
-					$socobject=$object->thirdparty;
+					$socobject = $object->thirdparty;
 				}
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
@@ -326,15 +326,15 @@ 
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Line of free text
-				$newfreetext='';
-				$paramfreetext='product_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'product_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext))
 				{
-					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
 				// Open and load template
@@ -344,15 +344,15 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->produit->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					return -1;
 				}
 				// After construction $odfHandler->contentXml contains content and
@@ -367,7 +367,7 @@ 
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
 				}
 
@@ -375,25 +375,25 @@ 
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
 				//$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in product as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
 
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -403,7 +403,7 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
@@ -411,24 +411,24 @@ 
 				try
 				{
 					$listlines = $odfHandler->setSegment('supplierprices');
-					if(!empty($object->supplierprices)){
+					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
 						{
 							$array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs);
 							complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
-							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$array_lines,'line'=>$supplierprice);
-							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-							foreach($array_lines as $key => $val)
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$array_lines, 'line'=>$supplierprice);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							foreach ($array_lines as $key => $val)
 							{
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 								}
 							}
@@ -437,61 +437,61 @@ 
 					}
 					$odfHandler->mergeSegment($listlines);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				}
 				else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				}
 
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +47 added lines, -40 removed lines

@@ -82,7 +82,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -126,11 +129,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+				$texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -221,7 +227,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -249,7 +257,9 @@ 
 
 			$dir = $conf->produit->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+				$dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -276,10 +286,11 @@ 
 				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';
+				    if ($format == '1') {
+				    	$format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -305,14 +316,14 @@ 
 				if (! empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					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;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -349,8 +360,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -366,8 +376,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -381,7 +390,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in product as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -393,17 +404,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+							// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -424,11 +436,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -436,8 +446,7 @@ 
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -450,8 +459,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -464,15 +472,14 @@ 
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
@@ -480,16 +487,16 @@ 
 
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

Spacing +163 added lines, -163 removed lines

@@ -37,9 +37,9 @@ 
  */
 class doc_generic_usergroup_odt extends ModelePDFUserGroup
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 
-	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $phpmin = array(5, 2, 0); // Minimum version of PHP required by module
 	var $version = 'dolibarr';
 
 
@@ -50,7 +50,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
 		$langs->load("companies");
@@ -58,32 +58,32 @@ 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'USERGROUP_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'USERGROUP_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva USERGROUP_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva USERGROUP_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -95,7 +95,7 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("companies");
 		$langs->load("errors");
@@ -103,91 +103,91 @@ 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="USERGROUP_ADDON_PDF_ODT_PATH">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="USERGROUP_ADDON_PDF_ODT_PATH">';
 		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 		{
-			$texte.= '<input type="hidden" name="param2" value="USERGROUP_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="USERGROUP_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="USERGROUP_ADDON_PDF_ODT_CLOSED">';
+			$texte .= '<input type="hidden" name="param2" value="USERGROUP_ADDON_PDF_ODT_DEFAULT">';
+			$texte .= '<input type="hidden" name="param3" value="USERGROUP_ADDON_PDF_ODT_TOBILL">';
+			$texte .= '<input type="hidden" name="param4" value="USERGROUP_ADDON_PDF_ODT_CLOSED">';
 		}
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->USERGROUP_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->USERGROUP_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
 		if (count($listofdir))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste=ModelePDFUserGroup::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->USERGROUP_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->USERGROUP_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
+				$liste = ModelePDFUserGroup::liste_modeles($this->db);
+				$texte .= '<table width="50%;">';
+				$texte .= '<tr>';
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value2', $liste, $conf->global->USERGROUP_ADDON_PDF_ODT_DEFAULT);
+				$texte .= "</td></tr>";
+
+				$texte .= '<tr>';
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value3', $liste, $conf->global->USERGROUP_ADDON_PDF_ODT_TOBILL);
+				$texte .= "</td></tr>";
+				$texte .= '<tr>';
+
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value4', $liste, $conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
+				$texte .= "</td></tr>";
+				$texte .= '</table>';
 			}
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -203,9 +203,9 @@ 
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -214,17 +214,17 @@ 
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -234,28 +234,28 @@ 
 		if ($conf->user->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new UserGroup($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
 
 			$dir = $conf->usergroup->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -263,26 +263,26 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$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';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $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
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -292,19 +292,19 @@ 
 
 
 				// If CUSTOMER contact defined on user, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (! empty($usecontact))
+				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->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
@@ -313,10 +313,10 @@ 
 				}
 				else
 				{
-					$socobject=$object->thirdparty;
+					$socobject = $object->thirdparty;
 				}
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
@@ -325,15 +325,15 @@ 
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Line of free text
-				$newfreetext='';
-				$paramfreetext='user_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'user_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext))
 				{
-					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
 				// Open and load template
@@ -343,15 +343,15 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->user->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					return -1;
 				}
 				// After construction $odfHandler->contentXml contains content and
@@ -365,33 +365,33 @@ 
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
 				}
 
 				// Make substitutions into odt
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_global=$this->get_substitutionarray_each_var_object($object,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_objet=$this->get_substitutionarray_each_var_object($object,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_global = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_objet = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 		                // retrieve contact information for use in user as contact_xxx tags
                 		$array_thirdparty_contact = array();
                 		if ($usecontact)
-                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+                    			$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
 
-				$tmparray = array_merge($array_global,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($array_global, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				$object->fetch_optionals();
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-				foreach($tmparray as $key=>$value)
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				foreach ($tmparray as $key=>$value)
 				{
 					try
 					{
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -401,7 +401,7 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
@@ -412,7 +412,7 @@ 
 					try {
 						$listlines = $odfHandler->setSegment('lines');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -422,25 +422,25 @@ 
 					{
 						foreach ($object->members as $u)
 						{
-							$tmparray=$this->get_substitutionarray_each_var_object($u,$outputlangs);
+							$tmparray = $this->get_substitutionarray_each_var_object($u, $outputlangs);
 							unset($tmparray['object_pass']);
 							unset($tmparray['object_pass_indatabase']);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $user, "completesubstitutionarray_users");
 							// Call the ODTSubstitutionLine hook
-							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$u);
-							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-							foreach($tmparray as $key => $val)
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$u);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
-									if(!is_array($val)) {
+									if (!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 								}
 							}
@@ -449,61 +449,61 @@ 
 						$odfHandler->mergeSegment($listlines);
 					}
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				}
 				else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				}
 
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +48 added lines, -43 removed lines

@@ -83,7 +83,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -127,11 +130,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+				$texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -222,7 +228,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -248,7 +256,9 @@ 
 
 			$dir = $conf->usergroup->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+				$dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -275,10 +285,11 @@ 
 				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';
+				    if ($format == '1') {
+				    	$format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -304,14 +315,14 @@ 
 				if (! empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					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;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -348,8 +359,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -364,8 +374,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -378,8 +387,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 		                // retrieve contact information for use in user as contact_xxx tags
                 		$array_thirdparty_contact = array();
-                		if ($usecontact)
-                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+                		if ($usecontact) {
+                		                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+                		}
 
 				$tmparray = array_merge($array_global,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -391,17 +401,18 @@ 
 				{
 					try
 					{
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+							// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -411,8 +422,7 @@ 
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -436,11 +446,9 @@ 
 									if(!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -448,8 +456,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -462,8 +469,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -476,15 +482,14 @@ 
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
@@ -492,16 +497,16 @@ 
 
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

Spacing +153 added lines, -153 removed lines

@@ -39,9 +39,9 @@ 
  */
 class doc_generic_shipment_odt extends ModelePdfExpedition
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 
-	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $phpmin = array(5, 2, 0); // Minimum version of PHP required by module
 	var $version = 'dolibarr';
 
 
@@ -52,7 +52,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
 		$langs->load("companies");
@@ -60,32 +60,32 @@ 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'EXPEDITION_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'EXPEDITION_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva EXPEDITION_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva EXPEDITION_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -97,7 +97,7 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("companies");
 		$langs->load("errors");
@@ -105,74 +105,74 @@ 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="EXPEDITION_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="EXPEDITION_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->EXPEDITION_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->EXPEDITION_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=count($listoffiles);
+			$texte .= count($listoffiles);
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$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).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -188,9 +188,9 @@ 
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -199,17 +199,17 @@ 
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -219,28 +219,28 @@ 
 		if ($conf->expedition->dir_output."/sending")
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Expedition($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
 
 			$dir = $conf->expedition->dir_output."/sending";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -248,25 +248,25 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$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';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $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
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -276,28 +276,28 @@ 
 
 
 				// If BILLING contact defined on invoice, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','BILLING');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'BILLING');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (! empty($usecontact))
+				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else $socobject = $object->thirdparty;
 				}
 				else
 				{
-					$socobject=$object->thirdparty;
+					$socobject = $object->thirdparty;
 				}
 
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
@@ -306,15 +306,15 @@ 
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Line of free text
-				$newfreetext='';
-				$paramfreetext='EXPEDITION_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'EXPEDITION_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext))
 				{
-					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
 				// Open and load template
@@ -324,15 +324,15 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->expedition->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					return -1;
 				}
 				// After construction $odfHandler->contentXml contains content and
@@ -346,17 +346,17 @@ 
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
 				}
 
 				// Make substitutions into odt of user info
-				$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
+				$tmparray = $this->get_substitutionarray_user($user, $outputlangs);
 				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
@@ -367,17 +367,17 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
 				// Make substitutions into odt of mysoc
-				$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$tmparray = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
 				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/', $key))	// Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
@@ -388,16 +388,16 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
 				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				foreach($tmparray as $key=>$value)
+				$tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/', $key))	// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -407,20 +407,20 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
 				// Replace tags of object + external modules
-				$tmparray=$this->get_substitutionarray_shipment($object,$outputlangs);
+				$tmparray = $this->get_substitutionarray_shipment($object, $outputlangs);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-				foreach($tmparray as $key=>$value)
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -430,7 +430,7 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
@@ -441,7 +441,7 @@ 
 					try {
 						$listlines = $odfHandler->setSegment('lines');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -451,21 +451,21 @@ 
 					{
 						foreach ($object->lines as $line)
 						{
-							$tmparray=$this->get_substitutionarray_shipment_lines($line,$outputlangs);
+							$tmparray = $this->get_substitutionarray_shipment_lines($line, $outputlangs);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
-							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-							foreach($tmparray as $key => $val)
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 								}
 							}
@@ -474,61 +474,61 @@ 
 						$odfHandler->mergeSegment($listlines);
 					}
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 					}
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				}
 				else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +68 added lines, -59 removed lines

@@ -85,7 +85,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -123,11 +126,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+				$texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -207,7 +213,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -233,7 +241,9 @@ 
 
 			$dir = $conf->expedition->dir_output."/sending";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+				$dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -259,10 +269,11 @@ 
 				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';
+				    if ($format == '1') {
+				    	$format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -288,10 +299,12 @@ 
 				if (! empty($usecontact))
 				{
 					// 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;
-				}
-				else
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+					}
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -329,8 +342,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -345,8 +357,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -356,18 +367,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+							// Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -377,18 +389,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+							// Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -397,17 +410,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+							// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -420,17 +434,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+							// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -440,8 +455,7 @@ 
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -461,11 +475,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -473,8 +485,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -487,8 +498,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -501,15 +511,14 @@ 
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
@@ -517,16 +526,16 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

htdocs/core/lib/functions.lib.php

Spacing +1663 added lines, -1663 removed lines

@@ -35,7 +35,7 @@ 
  *					This file contains all frequently used functions.
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 
 
 /**
@@ -51,7 +51,7 @@ 
  */
 function getStaticMember($class, $member)
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);
 
 	// This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member
 	/*if (version_compare(phpversion(), '5.3.0', '<'))
@@ -75,7 +75,7 @@ 
 	}*/
 
 	if (isset($class::$member)) return $class::$member;
-	dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
+	dol_print_error('', 'Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
 	return null;
 }
 
@@ -93,10 +93,10 @@ 
  */
 function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 {
-	require_once DOL_DOCUMENT_ROOT ."/core/db/".$type.'.class.php';
+	require_once DOL_DOCUMENT_ROOT."/core/db/".$type.'.class.php';
 
-	$class='DoliDB'.ucfirst($type);
-	$dolidb=new $class($type, $host, $user, $pass, $name, $port);
+	$class = 'DoliDB'.ucfirst($type);
+	$dolidb = new $class($type, $host, $user, $pass, $name, $port);
 	return $dolidb;
 }
 
@@ -117,14 +117,14 @@ 
  *  @param	int		$forceentity	Entity id
  * 	@return	mixed				Entity id(s) to use
  */
-function getEntity($element, $shared=1, $forceentity=null)
+function getEntity($element, $shared = 1, $forceentity = null)
 {
 	global $conf, $mc;
 
 	// For backward compatibilty
-	if ($element == 'actioncomm') $element='agenda';
-	if ($element == 'fichinter')  $element='intervention';
-	if ($element == 'categorie')  $element='category';
+	if ($element == 'actioncomm') $element = 'agenda';
+	if ($element == 'fichinter')  $element = 'intervention';
+	if ($element == 'categorie')  $element = 'category';
 
 	if (is_object($mc))
 	{
@@ -132,10 +132,10 @@ 
 	}
 	else
 	{
-		$out='';
+		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-		if (in_array($element, $addzero)) $out.= '0,';
-		$out.= $conf->entity;
+		if (in_array($element, $addzero)) $out .= '0,';
+		$out .= $conf->entity;
 		return $out;
 	}
 }
@@ -160,9 +160,9 @@ 
 {
 	include_once DOL_DOCUMENT_ROOT.'/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php';
 
-	$name='unknown';
-	$version='';
-	$os='unknown';
+	$name = 'unknown';
+	$version = '';
+	$os = 'unknown';
 	$phone = '';
 
 	$detectmobile = new Mobile_Detect(null, $user_agent);
@@ -194,22 +194,22 @@ 
 	}
 
 	// OS
-	if (preg_match('/linux/i', $user_agent))			{ $os='linux'; }
-	elseif (preg_match('/macintosh/i', $user_agent))	{ $os='macintosh'; }
-	elseif (preg_match('/windows/i', $user_agent))		{ $os='windows'; }
+	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; }
+	elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; }
+	elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
 
 	// Name
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg))      { $name='firefox';   $version=$reg[2]; }
-	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg))     { $name='edge';      $version=$reg[2]; }
-	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg))   { $name='chrome';    $version=$reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg))                   { $name='chrome'; }
-	elseif (preg_match('/iceweasel/i', $user_agent))                      { $name='iceweasel'; }
-	elseif (preg_match('/epiphany/i', $user_agent))                       { $name='epiphany';  }
-	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg))   { $name='safari';    $version=$reg[2]; }	// Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; }
-	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
-	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
-	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; }
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; }
+	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; }
+	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; }
+	elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; }
+	elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; }
+	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; }	// Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; }
+	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
+	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
+	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }
 
 	if ($tablet) {
 		$layout = 'tablet';
@@ -236,10 +236,10 @@ 
  */
 function dol_shutdown()
 {
-	global $conf,$user,$langs,$db;
-	$disconnectdone=false; $depth=0;
-	if (is_object($db) && ! empty($db->connected)) { $depth=$db->transaction_opened; $disconnectdone=$db->close(); }
-	dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth)?' (Warn: db disconnection forced, transaction depth was '.$depth.')':''), (($disconnectdone && $depth)?LOG_WARNING:LOG_INFO));
+	global $conf, $user, $langs, $db;
+	$disconnectdone = false; $depth = 0;
+	if (is_object($db) && !empty($db->connected)) { $depth = $db->transaction_opened; $disconnectdone = $db->close(); }
+	dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ?LOG_WARNING:LOG_INFO));
 }
 
 /**
@@ -276,9 +276,9 @@ 
  *  @param	string	$noreplace	 Force disable of replacement of __xxx__ strings.
  *  @return string|string[]      Value found (string or array), or '' if check fails
  */
-function GETPOST($paramname, $check='none', $method=0, $filter=NULL, $options=NULL, $noreplace=0)
+function GETPOST($paramname, $check = 'none', $method = 0, $filter = NULL, $options = NULL, $noreplace = 0)
 {
-	global $mysoc,$user,$conf;
+	global $mysoc, $user, $conf;
 
 	if (empty($paramname)) return 'BadFirstParameterForGETPOST';
 	if (empty($check))
@@ -288,11 +288,11 @@ 
 		//var_dump(debug_backtrace()[0]);
 	}
 
-	if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
-	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
-	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
-	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
+	if (empty($method)) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+	elseif ($method == 1) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+	elseif ($method == 2) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+	elseif ($method == 3) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+	elseif ($method == 4) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
 	else return 'BadThirdParameterForGETPOST';
 
 	if (empty($method) || $method == 3 || $method == 4)
@@ -300,7 +300,7 @@ 
 
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		//var_dump($relativepathstring);
@@ -308,25 +308,25 @@ 
 
 		// Code for search criteria persistence.
 		// Retrieve values if restore_lastsearch_values is set and there is saved values
-		if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+		if (!empty($_GET['restore_lastsearch_values']) && !empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
 		{
-			$tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+			$tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
 			if (is_array($tmp))
 			{
-				foreach($tmp as $key => $val)
+				foreach ($tmp as $key => $val)
 				{
 					if ($key == $paramname)
 					{
-						$out=$val;
+						$out = $val;
 						break;
 					}
 				}
 			}
 		}
 		// Else, retreive default values if we are not doing a sort
-		elseif (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
-			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 			{
 				// Search default value from $object->field
 				global $object;
@@ -335,28 +335,28 @@ 
 					$out = $object->fields[$paramname]['default'];
 				}
 			}
-			if (! empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
+			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 			{
-				if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+				if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
 					// Now search in setup to overwrite default values
-					if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
 					{
 						if (isset($user->default_values[$relativepathstring]['createform']))
 						{
-							foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
+							foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
 							{
 								$qualified = 0;
 								if ($defkey != '_noquery_')
 								{
-									$tmpqueryarraytohave=explode('&', $defkey);
-									$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-									$foundintru=0;
-									foreach($tmpqueryarraytohave as $tmpquerytohave)
+									$tmpqueryarraytohave = explode('&', $defkey);
+									$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+									$foundintru = 0;
+									foreach ($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
 									}
-									if (! $foundintru) $qualified=1;
+									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
 								}
 								else $qualified = 1;
@@ -376,45 +376,45 @@ 
 				}
 				// Management of default search_filters and sort order
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
-				elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
+				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
-					if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
 					{
 						//var_dump($user->default_values[$relativepathstring]);
 						if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
 						{
 							if (isset($user->default_values[$relativepathstring]['sortorder']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
 							{
-								foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
+								foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
 								{
 									$qualified = 0;
 									if ($defkey != '_noquery_')
 									{
-										$tmpqueryarraytohave=explode('&', $defkey);
-										$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-										$foundintru=0;
-										foreach($tmpqueryarraytohave as $tmpquerytohave)
+										$tmpqueryarraytohave = explode('&', $defkey);
+										$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+										$foundintru = 0;
+										foreach ($tmpqueryarraytohave as $tmpquerytohave)
 										{
-											if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
 										}
-										if (! $foundintru) $qualified=1;
+										if (!$foundintru) $qualified = 1;
 										//var_dump($defkey.'-'.$qualified);
 									}
 									else $qualified = 1;
 
 									if ($qualified)
 									{
-										$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
-										foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
+										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
+										foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
 										{
-											if ($out) $out.=', ';
+											if ($out) $out .= ', ';
 											if ($paramname == 'sortfield')
 											{
-												$out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
+												$out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);
 											}
 											if ($paramname == 'sortorder')
 											{
-												$out.=dol_string_nospecial($val, '', $forbidden_chars_to_replace);
+												$out .= dol_string_nospecial($val, '', $forbidden_chars_to_replace);
 											}
 										}
 										//break;	// No break for sortfield and sortorder so we can cumulate fields (is it realy usefull ?)
@@ -424,19 +424,19 @@ 
 						}
 						elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
-							foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)
+							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)
 							{
 								$qualified = 0;
 								if ($defkey != '_noquery_')
 								{
-									$tmpqueryarraytohave=explode('&', $defkey);
-									$tmpqueryarraywehave=explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-									$foundintru=0;
-									foreach($tmpqueryarraytohave as $tmpquerytohave)
+									$tmpqueryarraytohave = explode('&', $defkey);
+									$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
+									$foundintru = 0;
+									foreach ($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
 									}
-									if (! $foundintru) $qualified=1;
+									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
 								}
 								else $qualified = 1;
@@ -448,13 +448,13 @@ 
 										// We made a search from quick search menu, do we still use default filter ?
 										if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))
 										{
-											$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
 									}
 									else
 									{
-										$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
+										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 									}
 									break;
@@ -470,22 +470,22 @@ 
 	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable paramaters)
 	// Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOMPANY_COUNTRY_ID__, __USER_ID__, ...
 	// We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
-	if (! is_array($out) && empty($_POST[$paramname]) && empty($noreplace))
+	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace))
 	{
-		$maxloop=20; $loopnb=0;    // Protection against infinite loop
+		$maxloop = 20; $loopnb = 0; // Protection against infinite loop
 		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 		{
 				$loopnb++; $newout = '';
 
-				if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-				elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
-				elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
-				elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-				elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-				elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-				elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-				elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-				elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
+				if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
+				elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; }
+				elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; }
+				elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+				elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+				elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
+				elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+				elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+				elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
 				elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
 				{
 					$newout = $mysoc->country_id;
@@ -502,9 +502,9 @@ 
 				{
 					$newout = $conf->entity;
 				}
-				else $newout = '';     // Key not found, we replace with empty string
+				else $newout = ''; // Key not found, we replace with empty string
 				//var_dump('__'.$reg[1].'__ -> '.$newout);
-				$out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
+				$out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
 		}
 	}
 
@@ -514,58 +514,58 @@ 
 		case 'none':
 			break;
 		case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
-			if (! is_numeric($out)) { $out=''; }
+			if (!is_numeric($out)) { $out = ''; }
 			break;
 		case 'intcomma':
-			if (preg_match('/[^0-9,-]+/i',$out)) $out='';
+			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
 			break;
 		case 'alpha':
-			if (! is_array($out))
+			if (!is_array($out))
 			{
-				$out=trim($out);
+				$out = trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				if (preg_match('/"/',$out)) $out='';
-				else if (preg_match('/\.\.\//',$out)) $out='';
+				if (preg_match('/"/', $out)) $out = '';
+				else if (preg_match('/\.\.\//', $out)) $out = '';
 			}
 			break;
 		case 'san_alpha':
-			$out=filter_var($out,FILTER_SANITIZE_STRING);
+			$out = filter_var($out, FILTER_SANITIZE_STRING);
 			break;
 		case 'aZ':
-			if (! is_array($out))
+			if (!is_array($out))
 			{
-				$out=trim($out);
-				if (preg_match('/[^a-z]+/i',$out)) $out='';
+				$out = trim($out);
+				if (preg_match('/[^a-z]+/i', $out)) $out = '';
 			}
 			break;
 		case 'aZ09':
-			if (! is_array($out))
+			if (!is_array($out))
 			{
-				$out=trim($out);
-				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+				$out = trim($out);
+				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out = '';
 			}
 			break;
 		case 'array':
-			if (! is_array($out) || empty($out)) $out=array();
+			if (!is_array($out) || empty($out)) $out = array();
 			break;
 		case 'nohtml':
-			$out=dol_string_nohtmltag($out, 0);
+			$out = dol_string_nohtmltag($out, 0);
 			break;
 		case 'alphanohtml':	// Recommended for search params
-			if (! is_array($out))
+			if (!is_array($out))
 			{
-				$out=trim($out);
+				$out = trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				if (preg_match('/"/',$out)) $out='';
-				else if (preg_match('/\.\.\//',$out)) $out='';
-				$out=dol_string_nohtmltag($out);
+				if (preg_match('/"/', $out)) $out = '';
+				else if (preg_match('/\.\.\//', $out)) $out = '';
+				$out = dol_string_nohtmltag($out);
 			}
 			break;
 		case 'custom':
 			if (empty($filter)) return 'BadFourthParameterForGETPOST';
-			$out=filter_var($out, $filter, $options);
+			$out = filter_var($out, $filter, $options);
 			break;
 	}
 
@@ -574,7 +574,7 @@ 
 	if (empty($method) || $method == 3 || $method == 4)
 	{
 		//if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield", 'smonth', 'syear', 'month', 'year')))
-		if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder','sortfield')))
+		if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield')))
 		{
 			//var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);
 
@@ -583,9 +583,9 @@ 
 			// - if value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
 
 			//if (! empty($out) || ! empty($user->default_values[$relativepathstring]['filters'][$paramname]))
-			if (! empty($out))
+			if (!empty($out))
 			{
-				$user->lastsearch_values_tmp[$relativepathstring][$paramname]=$out;
+				$user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out;
 			}
 		}
 	}
@@ -603,14 +603,14 @@ 
  *  @param  string  $mode       			'' (prefix for session name) or 'email' (prefix for email id)
  *  @return	string      					A calculated prefix
  */
-if (! function_exists('dol_getprefix'))
+if (!function_exists('dol_getprefix'))
 {
-	function dol_getprefix($mode='')
+	function dol_getprefix($mode = '')
 	{
 		global $conf;
 
 		// If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
-		if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+		if ($mode == 'email' && !empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
 		{
 			if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
 			else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
@@ -636,9 +636,9 @@ 
  * 	@param	string	$classname	Class name (deprecated)
  *  @return bool                True if load is a success, False if it fails
  */
-function dol_include_once($relpath, $classname='')
+function dol_include_once($relpath, $classname = '')
 {
-	global $conf,$langs,$user,$mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']
+	global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']
 
 	$fullpath = dol_buildpath($relpath);
 
@@ -647,7 +647,7 @@ 
 		return false;
 	}
 
-	if (! empty($classname) && ! class_exists($classname)) {
+	if (!empty($classname) && !class_exists($classname)) {
 		return include $fullpath;
 	} else {
 		return include_once $fullpath;
@@ -665,27 +665,27 @@ 
  *  											2:If $type==0 and if file was not found into alternate dir, test into main dir, return default path if found, empty string if not found
  *  @return string								Full filesystem path (if path=0), Full url path (if mode=1)
  */
-function dol_buildpath($path, $type=0, $returnemptyifnotfound=0)
+function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 {
 	global $conf;
 
-	$path=preg_replace('/^\//','',$path);
+	$path = preg_replace('/^\//', '', $path);
 
 	if (empty($type))	// For a filesystem path
 	{
-		$res = DOL_DOCUMENT_ROOT.'/'.$path;		// Standard default path
+		$res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path
 		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
 			if ($key == 'main') continue;
 			if (file_exists($dirroot.'/'.$path))
 			{
-				$res=$dirroot.'/'.$path;
+				$res = $dirroot.'/'.$path;
 				return $res;
 			}
 		}
 		if ($returnemptyifnotfound)								// Not found into alternate dir
 		{
-			if ($returnemptyifnotfound == 1 || ! file_exists($res)) return '';
+			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
 		}
 	}
 	else				// For an url path
@@ -694,9 +694,9 @@ 
 		// Note that trying to know if a file on disk exist by forging path on disk from url
 		// works only for some web server and some setup. This is bugged when
 		// using proxy, rewriting, virtual path, etc...
-		$res='';
-		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path;			// Standard value
-		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path;		// Standard value
+		$res = '';
+		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value
+		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value
 		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
 
 		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
@@ -708,38 +708,38 @@ 
 					global $dolibarr_main_url_root;
 
 					// Define $urlwithroot
-					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+					$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 					//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-					$res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).'/'.$path;     // Test on start with http is for old conf syntax
+					$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax
 				}
 				continue;
 			}
-			preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i',$path,$regs);    // Take part before '?'
-			if (! empty($regs[1]))
+			preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'
+			if (!empty($regs[1]))
 			{
 				//print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";
 				if (file_exists($dirroot.'/'.$regs[1]))
 				{
 					if ($type == 1)
 					{
-						$res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
+						$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
 					}
 					if ($type == 2)
 					{
-						$res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
+						$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
 					}
 					if ($type == 3)
 					{
 						global $dolibarr_main_url_root;
 
 						// Define $urlwithroot
-						$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-						$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+						$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 						//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-						$res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path;     // Test on start with http is for old conf syntax
+						$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax
 					}
 					break;
 				}
@@ -760,17 +760,17 @@ 
  *	@return object				Object clone
  *  @see https://php.net/manual/language.oop5.cloning.php
  */
-function dol_clone($object, $native=0)
+function dol_clone($object, $native = 0)
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
 
 	if (empty($native))
 	{
-		$myclone=unserialize(serialize($object));
+		$myclone = unserialize(serialize($object));
 	}
 	else
 	{
-		$myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
+		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
 
 	return $myclone;
@@ -785,7 +785,7 @@ 
  * 								'width' = function is used to define a width
  *	@return int					New size after optimizing
  */
-function dol_size($size,$type='')
+function dol_size($size, $type = '')
 {
 	global $conf;
 	if (empty($conf->dol_optimize_smallscreen)) return $size;
@@ -804,10 +804,10 @@ 
  *
  * 	@see        	dol_string_nospecial, dol_string_unaccent, dol_sanitizePathName
  */
-function dol_sanitizeFileName($str,$newstr='_',$unaccent=1)
+function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 {
-	$filesystem_forbidden_chars = array('<','>','/','\\','?','*','|','"','°');
-	return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars);
+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', '°');
+	return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 }
 
 /**
@@ -820,10 +820,10 @@ 
  *
  * 	@see        	dol_string_nospecial, dol_string_unaccent, dol_sanitizeFileName
  */
-function dol_sanitizePathName($str,$newstr='_',$unaccent=1)
+function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)
 {
-	$filesystem_forbidden_chars = array('<','>','?','*','|','"','°');
-	return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars);
+	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°');
+	return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 }
 
 /**
@@ -841,21 +841,21 @@ 
 		// See http://www.utf8-chartable.de/
 		$string = rawurlencode($str);
 		$replacements = array(
-		'%C3%80' => 'A','%C3%81' => 'A','%C3%82' => 'A','%C3%83' => 'A','%C3%84' => 'A','%C3%85' => 'A',
-		'%C3%88' => 'E','%C3%89' => 'E','%C3%8A' => 'E','%C3%8B' => 'E',
-		'%C3%8C' => 'I','%C3%8D' => 'I','%C3%8E' => 'I','%C3%8F' => 'I',
-		'%C3%92' => 'O','%C3%93' => 'O','%C3%94' => 'O','%C3%95' => 'O','%C3%96' => 'O',
-		'%C3%99' => 'U','%C3%9A' => 'U','%C3%9B' => 'U','%C3%9C' => 'U',
-		'%C3%A0' => 'a','%C3%A1' => 'a','%C3%A2' => 'a','%C3%A3' => 'a','%C3%A4' => 'a','%C3%A5' => 'a',
+		'%C3%80' => 'A', '%C3%81' => 'A', '%C3%82' => 'A', '%C3%83' => 'A', '%C3%84' => 'A', '%C3%85' => 'A',
+		'%C3%88' => 'E', '%C3%89' => 'E', '%C3%8A' => 'E', '%C3%8B' => 'E',
+		'%C3%8C' => 'I', '%C3%8D' => 'I', '%C3%8E' => 'I', '%C3%8F' => 'I',
+		'%C3%92' => 'O', '%C3%93' => 'O', '%C3%94' => 'O', '%C3%95' => 'O', '%C3%96' => 'O',
+		'%C3%99' => 'U', '%C3%9A' => 'U', '%C3%9B' => 'U', '%C3%9C' => 'U',
+		'%C3%A0' => 'a', '%C3%A1' => 'a', '%C3%A2' => 'a', '%C3%A3' => 'a', '%C3%A4' => 'a', '%C3%A5' => 'a',
 		'%C3%A7' => 'c',
-		'%C3%A8' => 'e','%C3%A9' => 'e','%C3%AA' => 'e','%C3%AB' => 'e',
-		'%C3%AC' => 'i','%C3%AD' => 'i','%C3%AE' => 'i','%C3%AF' => 'i',
+		'%C3%A8' => 'e', '%C3%A9' => 'e', '%C3%AA' => 'e', '%C3%AB' => 'e',
+		'%C3%AC' => 'i', '%C3%AD' => 'i', '%C3%AE' => 'i', '%C3%AF' => 'i',
 		'%C3%B1' => 'n',
-		'%C3%B2' => 'o','%C3%B3' => 'o','%C3%B4' => 'o','%C3%B5' => 'o','%C3%B6' => 'o',
-		'%C3%B9' => 'u','%C3%BA' => 'u','%C3%BB' => 'u','%C3%BC' => 'u',
+		'%C3%B2' => 'o', '%C3%B3' => 'o', '%C3%B4' => 'o', '%C3%B5' => 'o', '%C3%B6' => 'o',
+		'%C3%B9' => 'u', '%C3%BA' => 'u', '%C3%BB' => 'u', '%C3%BC' => 'u',
 		'%C3%BF' => 'y'
 		);
-		$string=strtr($string, $replacements);
+		$string = strtr($string, $replacements);
 		return rawurldecode($string);
 	}
 	else
@@ -892,14 +892,14 @@ 
  *
  * 	@see    		dol_sanitizeFilename, dol_string_unaccent
  */
-function dol_string_nospecial($str,$newstr='_',$badcharstoreplace='')
+function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 {
-	$forbidden_chars_to_replace=array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName
-	$forbidden_chars_to_remove=array();
-	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace=$badcharstoreplace;
+	$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName
+	$forbidden_chars_to_remove = array();
+	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace = $badcharstoreplace;
 	//$forbidden_chars_to_remove=array("(",")");
 
-	return str_replace($forbidden_chars_to_replace,$newstr,str_replace($forbidden_chars_to_remove,"",$str));
+	return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
 }
 
 
@@ -911,7 +911,7 @@ 
  */
 function dolEscapeXML($string)
 {
-	return strtr($string, array('\''=>'&apos;','"'=>'&quot;','&'=>'&amp;','<'=>'&lt;','>'=>'&gt;'));
+	return strtr($string, array('\''=>'&apos;', '"'=>'&quot;', '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'));
 }
 
 /**
@@ -922,16 +922,16 @@ 
  *  @param		int		$noescapebackslashn	0=Escape also \n. 1=Do not escape \n.
  *  @return     string     		 				Escaped string. Both ' and " are escaped into ' if they are escaped.
  */
-function dol_escape_js($stringtoescape, $mode=0, $noescapebackslashn=0)
+function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 {
 	// escape quotes and backslashes, newlines, etc.
-	$substitjs=array("&#039;"=>"\\'","\r"=>'\\r');
+	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
-	if (empty($noescapebackslashn)) { $substitjs["\n"]='\\n'; $substitjs['\\']='\\\\'; }
-	if (empty($mode)) { $substitjs["'"]="\\'"; $substitjs['"']="\\'"; }
-	else if ($mode == 1) $substitjs["'"]="\\'";
-	else if ($mode == 2) { $substitjs['"']='\\"'; }
-	else if ($mode == 3) { $substitjs["'"]="\\'"; $substitjs['"']="\\\""; }
+	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }
+	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; }
+	else if ($mode == 1) $substitjs["'"] = "\\'";
+	else if ($mode == 2) { $substitjs['"'] = '\\"'; }
+	else if ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -945,13 +945,13 @@ 
  *  @return     string     				 		Escaped string
  *  @see		dol_string_nohtmltag
  */
-function dol_escape_htmltag($stringtoescape, $keepb=0, $keepn=0)
+function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)
 {
 	// escape quotes and backslashes, newlines, etc.
-	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html tags
-	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
-	if (! $keepn) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
-	return htmlentities($tmp, ENT_COMPAT, 'UTF-8');						// TODO Use htmlspecialchars instead, that make only required change for html tags
+	$tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars_decode instead, that make only required change for html tags
+	if (!$keepb) $tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));
+	if (!$keepn) $tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));
+	return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags
 }
 
 
@@ -998,14 +998,14 @@ 
  *  @param	string		$restricttologhandler	Output log only for this log handler
  *  @return	void
  */
-function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='', $restricttologhandler='')
+function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '')
 {
 	global $conf, $user;
 
 	// If syslog module enabled
 	if (empty($conf->syslog->enabled)) return;
 
-	if (! empty($message))
+	if (!empty($message))
 	{
 		// Test log level
 		$logLevels = array(LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG);
@@ -1016,14 +1016,14 @@ 
 		if ($level > $conf->global->SYSLOG_LEVEL) return;
 
 		// If adding log inside HTML page is required
-		if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
+		if (!empty($_REQUEST['logtohtml']) && (!empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || !empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
 		{
-			$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
+			$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$message;
 		}
 
 		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
 		// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
-		if (! empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && ! empty($_GET["log"]))
+		if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"]))
 		{
 			print "\n\n<!-- Log start\n";
 			print $message."\n";
@@ -1032,32 +1032,32 @@ 
 
 		$data = array(
 			'message' => $message,
-			'script' => (isset($_SERVER['PHP_SELF'])? basename($_SERVER['PHP_SELF'],'.php') : false),
+			'script' => (isset($_SERVER['PHP_SELF']) ? basename($_SERVER['PHP_SELF'], '.php') : false),
 			'level' => $level,
 			'user' => ((is_object($user) && $user->id) ? $user->login : false),
 			'ip' => false
 		);
 
 		// This is when server run behind a reverse proxy
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"])?'':'->'.$_SERVER['REMOTE_ADDR']);
+		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"]) ? '' : '->'.$_SERVER['REMOTE_ADDR']);
 		// This is when server run normally on a server
-		else if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
+		else if (!empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
 		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-		else if (! empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
+		else if (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-		else if (! empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME'])?'':'@'.$_SERVER['USERNAME']);
+		else if (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
 		// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-		else if (! empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		else if (!empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];
 		// Loop on each log handler and send output
 		foreach ($conf->loghandlers as $loghandlerinstance)
 		{
 			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) continue;
-			$loghandlerinstance->export($data,$suffixinfilename);
+			$loghandlerinstance->export($data, $suffixinfilename);
 		}
 		unset($data);
 	}
 
-	if (! empty($ident))
+	if (!empty($ident))
 	{
 		foreach ($conf->loghandlers as $loghandlerinstance)
 		{
@@ -1079,7 +1079,7 @@ 
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
  * 	@return	void
  */
-function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0, $morehtmlright='')
+function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '')
 {
 	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright);
 }
@@ -1096,153 +1096,153 @@ 
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
  * 	@return	string
  */
-function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $picto='', $pictoisfullpath=0, $morehtmlright='')
+function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '')
 {
 	global $conf, $langs, $hookmanager;
 
-	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
+	$out = "\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
-	if ($morehtmlright) $out.='<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>';	// Output right area first so when space is missing, text is in front of tabs and not under.
+	if ($morehtmlright) $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.
 
 	// Show title
-	$showtitle=1;
-	if (! empty($conf->dol_optimize_smallscreen)) $showtitle=0;
-	if (! empty($title) && $showtitle)
+	$showtitle = 1;
+	if (!empty($conf->dol_optimize_smallscreen)) $showtitle = 0;
+	if (!empty($title) && $showtitle)
 	{
-		$limittitle=30;
-		$out.='<a class="tabTitle">';
-		if ($picto) $out.=img_picto($title,($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
-		$out.='<span class="tabTitleText">'.dol_trunc($title,$limittitle).'</span>';
-		$out.='</a>';
+		$limittitle = 30;
+		$out .= '<a class="tabTitle">';
+		if ($picto) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';
+		$out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';
+		$out .= '</a>';
 	}
 
 	// Define max of key (max may be higher than sizeof because of hole due to module disabling some tabs).
-	$maxkey=-1;
-	if (is_array($links) && ! empty($links))
+	$maxkey = -1;
+	if (is_array($links) && !empty($links))
 	{
-		$keys=array_keys($links);
-		if (count($keys)) $maxkey=max($keys);
+		$keys = array_keys($links);
+		if (count($keys)) $maxkey = max($keys);
 	}
 
-	if (! empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD=2;
+	if (!empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD = 2;
 
 	// Show tabs
-	$bactive=false;
+	$bactive = false;
 	// if =0 we don't use the feature
-	$limittoshow=(empty($conf->global->MAIN_MAXTABS_IN_CARD)?99:$conf->global->MAIN_MAXTABS_IN_CARD);
-	$displaytab=0;
-	$nbintab=0;
-	$popuptab=0; $outmore='';
-	for ($i = 0 ; $i <= $maxkey ; $i++)
+	$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
+	$displaytab = 0;
+	$nbintab = 0;
+	$popuptab = 0; $outmore = '';
+	for ($i = 0; $i <= $maxkey; $i++)
 	{
-		if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
+		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2]))
 		{
 			// If active tab is already present
 			if ($i >= $limittoshow) $limittoshow--;
 		}
 	}
 
-	for ($i = 0 ; $i <= $maxkey ; $i++)
+	for ($i = 0; $i <= $maxkey; $i++)
 	{
-		if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
+		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2]))
 		{
-			$isactive=true;
-			$bactive=true;
+			$isactive = true;
+			$bactive = true;
 		}
 		else
 		{
-			$isactive=false;
+			$isactive = false;
 		}
 
 		if ($i < $limittoshow || $isactive)
 		{
-			$out.='<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((! $isactive && ! empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT))?' hideonprint':'').'"><!-- id tab = '.(empty($links[$i][2])?'':$links[$i][2]).' -->';
+			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
 				if (!empty($links[$i][0]))
 				{
-					$out.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+					$out .= '<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 				}
 				else
 				{
-					$out.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+					$out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
 			}
-			else if (! empty($links[$i][1]))
+			else if (!empty($links[$i][1]))
 			{
 				//print "x $i $active ".$links[$i][2]." z";
 				if ($isactive)
 				{
-					$out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabactive tab inline-block" href="'.$links[$i][0].'">';
-					$out.=$links[$i][1];
-					$out.='</a>'."\n";
+					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block" href="'.$links[$i][0].'">';
+					$out .= $links[$i][1];
+					$out .= '</a>'."\n";
 				}
 				else
 				{
-					$out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabunactive tab inline-block" href="'.$links[$i][0].'">';
-					$out.=$links[$i][1];
-					$out.='</a>'."\n";
+					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block" href="'.$links[$i][0].'">';
+					$out .= $links[$i][1];
+					$out .= '</a>'."\n";
 				}
 			}
-			$out.='</div>';
+			$out .= '</div>';
 		}
 		else
 		{
 			// The popup with the other tabs
-			if (! $popuptab)
+			if (!$popuptab)
 			{
-				$popuptab=1;
-				$outmore.='<div class="popuptabset wordwrap">';	// The css used to hide/show popup
+				$popuptab = 1;
+				$outmore .= '<div class="popuptabset wordwrap">'; // The css used to hide/show popup
 			}
-			$outmore.='<div class="popuptab wordwrap" style="display:inherit;">';
+			$outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
 				if (!empty($links[$i][0]))
-					$outmore.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+					$outmore .= '<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 				else
-					$outmore.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+					$outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 
 			}
-			else if (! empty($links[$i][1]))
+			else if (!empty($links[$i][1]))
 			{
-				$outmore.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="wordwrap inline-block" href="'.$links[$i][0].'">';
-				$outmore.=preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]);	// Replace x/y with x / y to allow wrap on long composed texts.
-				$outmore.='</a>'."\n";
+				$outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block" href="'.$links[$i][0].'">';
+				$outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
+				$outmore .= '</a>'."\n";
 			}
-			$outmore.='</div>';
+			$outmore .= '</div>';
 
 			$nbintab++;
 		}
-		$displaytab=$i;
+		$displaytab = $i;
 	}
-	if ($popuptab) $outmore.='</div>';
+	if ($popuptab) $outmore .= '</div>';
 
 	if ($displaytab > $limittoshow)
 	{
-		$left=($langs->trans("DIRECTION") == 'rtl'?'right':'left');
-		$right=($langs->trans("DIRECTION") == 'rtl'?'left':'right');
+		$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
+		$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
 
-		$tabsname=str_replace("@", "", $picto);
-		$out.='<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out.='<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>';
-		$out.='<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';
-		$out.=$outmore;
-		$out.='</div>';
-		$out.='<div></div>';
-		$out.="</div>\n";
+		$tabsname = str_replace("@", "", $picto);
+		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
+		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>';
+		$out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';
+		$out .= $outmore;
+		$out .= '</div>';
+		$out .= '<div></div>';
+		$out .= "</div>\n";
 
-		$out.="<script>";
-		$out.="$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";
-		$out.="$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";
-		$out.="</script>";
+		$out .= "<script>";
+		$out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";
+		$out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";
+		$out .= "</script>";
 	}
 
-	$out.="</div>\n";
+	$out .= "</div>\n";
 
-	if (! $notab || $notab == -1) $out.="\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
+	if (!$notab || $notab == -1) $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
 
-	$parameters=array('tabname' => $active, 'out' => $out);
-	$reshook=$hookmanager->executeHooks('printTabsHead',$parameters);	// This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
+	$parameters = array('tabname' => $active, 'out' => $out);
+	$reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
 	if ($reshook > 0)
 	{
 		$out = $hookmanager->resPrint;
@@ -1257,7 +1257,7 @@ 
  *  @param	int		$notab       -1 or 0=Add tab footer, 1=no tab footer
  *  @return	void
  */
-function dol_fiche_end($notab=0)
+function dol_fiche_end($notab = 0)
 {
 	print dol_get_fiche_end($notab);
 }
@@ -1268,9 +1268,9 @@ 
  *	@param  int		$notab		-1 or 0=Add tab footer, 1=no tab footer
  *  @return	string
  */
-function dol_get_fiche_end($notab=0)
+function dol_get_fiche_end($notab = 0)
 {
-	if (! $notab || $notab == -1) return "\n</div>\n";
+	if (!$notab || $notab == -1) return "\n</div>\n";
 	else return '';
 }
 
@@ -1293,53 +1293,53 @@ 
  *	@param	string	$morehtmlright	More html code to show before navigation arrows
  *  @return	void
  */
-function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='rowid', $fieldref='ref', $morehtmlref='', $moreparam='', $nodbprefix=0, $morehtmlleft='', $morehtmlstatus='', $onlybanner=0, $morehtmlright='')
+function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $onlybanner = 0, $morehtmlright = '')
 {
 	global $conf, $form, $user, $langs;
 
 	$error = 0;
 
-	$maxvisiblephotos=1;
-	$showimage=1;
-	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-	$modulepart='unknown';
+	$maxvisiblephotos = 1;
+	$showimage = 1;
+	$showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+	$modulepart = 'unknown';
 
-	if ($object->element == 'societe')         $modulepart='societe';
-	if ($object->element == 'contact')         $modulepart='contact';
-	if ($object->element == 'member')          $modulepart='memberphoto';
-	if ($object->element == 'user')            $modulepart='userphoto';
-	if ($object->element == 'product')         $modulepart='product';
+	if ($object->element == 'societe')         $modulepart = 'societe';
+	if ($object->element == 'contact')         $modulepart = 'contact';
+	if ($object->element == 'member')          $modulepart = 'memberphoto';
+	if ($object->element == 'user')            $modulepart = 'userphoto';
+	if ($object->element == 'product')         $modulepart = 'product';
 
 	if (class_exists("Imagick"))
 	{
-		if ($object->element == 'propal')            $modulepart='propal';
-		if ($object->element == 'commande')          $modulepart='commande';
-		if ($object->element == 'facture')           $modulepart='facture';
-		if ($object->element == 'fichinter')         $modulepart='ficheinter';
-		if ($object->element == 'contrat')           $modulepart='contract';
-		if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
-		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
-		if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
-		if ($object->element == 'expensereport')     $modulepart='expensereport';
+		if ($object->element == 'propal')            $modulepart = 'propal';
+		if ($object->element == 'commande')          $modulepart = 'commande';
+		if ($object->element == 'facture')           $modulepart = 'facture';
+		if ($object->element == 'fichinter')         $modulepart = 'ficheinter';
+		if ($object->element == 'contrat')           $modulepart = 'contract';
+		if ($object->element == 'supplier_proposal') $modulepart = 'supplier_proposal';
+		if ($object->element == 'order_supplier')    $modulepart = 'supplier_order';
+		if ($object->element == 'invoice_supplier')  $modulepart = 'supplier_invoice';
+		if ($object->element == 'expensereport')     $modulepart = 'expensereport';
 	}
 
 	if ($object->element == 'product')
 	{
-		$width=80; $cssclass='photoref';
-		$showimage=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
-		$maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
-		if ($conf->browser->phone) $maxvisiblephotos=1;
-		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
+		$width = 80; $cssclass = 'photoref';
+		$showimage = $object->is_photo_available($conf->product->multidir_output[$object->entity]);
+		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
+		if ($conf->browser->phone) $maxvisiblephotos = 1;
+		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
 		else
 		{
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
-				$nophoto='';
-				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
+				$nophoto = '';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			}
 			//elseif ($conf->browser->layout != 'phone') {    // Show no photo link
-				$nophoto='/public/theme/common/nophoto.png';
-				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
+				$nophoto = '/public/theme/common/nophoto.png';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			//}
 		}
 	}
@@ -1349,28 +1349,28 @@ 
 		{
 			if ($modulepart != 'unknown')
 			{
-				$phototoshow='';
+				$phototoshow = '';
 				// Check if a preview file is available
 				if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick"))
 				{
 					$objectref = dol_sanitizeFileName($object->ref);
-					$dir_output = $conf->$modulepart->dir_output . "/";
+					$dir_output = $conf->$modulepart->dir_output."/";
 					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
 					{
-						$subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref;		// the objectref dir is not include into get_exdir when used with level=2, so we add it here
+						$subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref; // the objectref dir is not include into get_exdir when used with level=2, so we add it here
 					}
 					else
 					{
 						$subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart);
 					}
 
-					$filepath = $dir_output . $subdir . "/";
-					$file = $filepath . $objectref . ".pdf";
+					$filepath = $dir_output.$subdir."/";
+					$file = $filepath.$objectref.".pdf";
 					$relativepath = $subdir.'/'.$objectref.'.pdf';
 
 					// Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")
-					$fileimage = $file.'_preview.png';              // If PDF has 1 page
-					$fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
+					$fileimage = $file.'_preview.png'; // If PDF has 1 page
+					$fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page
 					$relativepathimage = $relativepath.'_preview.png';
 
 					// Si fichier PDF existe
@@ -1378,8 +1378,8 @@ 
 					{
 						$encfile = urlencode($file);
 						// Conversion du PDF en image png si fichier png non existant
-						if ( (! file_exists($fileimage) || (filemtime($fileimage) < filemtime($file)))
-						  && (! file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))
+						if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file)))
+						  && (!file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))
 						   )
 						{
 							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experienc trouble with pdf thumb generation and imagick, you can disable here.
@@ -1389,146 +1389,146 @@ 
 							}
 						}
 
-						$heightforphotref=70;
-						if (! empty($conf->dol_optimize_smallscreen)) $heightforphotref=60;
+						$heightforphotref = 70;
+						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
 						// Si fichier png PDF d'1 page trouve
 						if (file_exists($fileimage))
 						{
 							$phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-							$phototoshow.= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-							$phototoshow.= '</div></div>';
+							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+							$phototoshow .= '</div></div>';
 						}
 						// Si fichier png PDF de plus d'1 page trouve
 						elseif (file_exists($fileimagebis))
 						{
-							$preview = preg_replace('/\.png/','',$relativepathimage) . "-0.png";
+							$preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";
 							$phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
-							$phototoshow.= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
-							$phototoshow.= '</div></div>';
+							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';
+							$phototoshow .= '</div></div>';
 						}
 					}
 				}
-				else if (! $phototoshow)
+				else if (!$phototoshow)
 				{
-					$phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
+					$phototoshow = $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
 
 				if ($phototoshow)
 				{
-					$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
-					$morehtmlleft.=$phototoshow;
-					$morehtmlleft.='</div>';
+					$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
+					$morehtmlleft .= $phototoshow;
+					$morehtmlleft .= '</div>';
 				}
 			}
 
-			if (! $phototoshow)      // Show No photo link (picto of pbject)
+			if (!$phototoshow)      // Show No photo link (picto of pbject)
 			{
-				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
 				if ($object->element == 'action')
 				{
-					$width=80;
-					$cssclass='photorefcenter';
-					$nophoto=img_picto('', 'title_agenda', '', false, 1);
+					$width = 80;
+					$cssclass = 'photorefcenter';
+					$nophoto = img_picto('', 'title_agenda', '', false, 1);
 				}
 				else
 				{
-					$width=14; $cssclass='photorefcenter';
+					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
-					if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
-					$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
+					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
+					$nophoto = img_picto('', 'object_'.$picto, '', false, 1);
 				}
-				$morehtmlleft.='<!-- No photo to show -->';
-				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.$nophoto.'"></div></div>';
+				$morehtmlleft .= '<!-- No photo to show -->';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';
 
-				$morehtmlleft.='</div>';
+				$morehtmlleft .= '</div>';
 			}
 		}
 	}
 
-	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	if ($showbarcode) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
 
 	if ($object->element == 'societe')
 	{
-		if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
+		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
 		{
-		   	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+		   	$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
 		}
 		else {
-			$morehtmlstatus.=$object->getLibStatut(6);
+			$morehtmlstatus .= $object->getLibStatut(6);
 		}
 	}
 	elseif ($object->element == 'product')
 	{
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
-		if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-			$morehtmlstatus.=ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			$morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
 		} else {
-			$morehtmlstatus.='<span class="statusrefsell">'.$object->getLibStatut(5,0).'</span>';
+			$morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';
 		}
-		$morehtmlstatus.=' &nbsp; ';
+		$morehtmlstatus .= ' &nbsp; ';
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';
-		if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-			$morehtmlstatus.=ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			$morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
 		} else {
-			$morehtmlstatus.='<span class="statusrefbuy">'.$object->getLibStatut(5,1).'</span>';
+			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';
 		}
 	}
 	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
-		$tmptxt=$object->getLibStatut(6, $object->totalpaye);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
-		$morehtmlstatus.=$tmptxt;
+		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+		$morehtmlstatus .= $tmptxt;
 	}
 	elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
-		if ($object->statut == 0) $morehtmlstatus.=$object->getLibStatut(5);
-		else $morehtmlstatus.=$object->getLibStatut(4);
+		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
+		else $morehtmlstatus .= $object->getLibStatut(4);
 	}
 	elseif ($object->element == 'facturerec')
 	{
-		if ($object->frequency == 0) $morehtmlstatus.=$object->getLibStatut(2);
-		else $morehtmlstatus.=$object->getLibStatut(5);
+		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
+		else $morehtmlstatus .= $object->getLibStatut(5);
 	}
 	else { // Generic case
-		$tmptxt=$object->getLibStatut(6);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5);
-		$morehtmlstatus.=$tmptxt;
+		$tmptxt = $object->getLibStatut(6);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') $tmptxt = $object->getLibStatut(5);
+		$morehtmlstatus .= $tmptxt;
 	}
 
 	// Add if object was dispatched "into accountancy"
-	if (! empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport')))
+	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport')))
 	{
 		if (method_exists($object, 'getVentilExportCompta'))
 		{
 			$accounted = $object->getVentilExportCompta();
 			$langs->load("accountancy");
-			$morehtmlstatus.='</div><div class="statusref statusrefbis">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));
+			$morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));
 		}
 	}
 
 	// Add alias for thirdparty
-	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';
+	if (!empty($object->name_alias)) $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';
 
 	// Add label
 	if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
 	{
-		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
+		if (!empty($object->label)) $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';
 	}
 
 	if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files')
 	{
-		$morehtmlref.='<div class="refidno">';
-		$morehtmlref.=$object->getBannerAddress('refaddress',$object);
-		$morehtmlref.='</div>';
+		$morehtmlref .= '<div class="refidno">';
+		$morehtmlref .= $object->getBannerAddress('refaddress', $object);
+		$morehtmlref .= '</div>';
 	}
-	if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product')))
+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product')))
 	{
-		$morehtmlref.='<div style="clear: both;"></div><div class="refidno">';
-		$morehtmlref.=$langs->trans("TechnicalID").': '.$object->id;
-		$morehtmlref.='</div>';
+		$morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';
+		$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
+		$morehtmlref .= '</div>';
 	}
 
-	print '<div class="'.($onlybanner?'arearefnobottom ':'arearef ').'heightref valignmiddle" width="100%">';
+	print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';
 	print '<div class="underrefbanner clearboth"></div>';
@@ -1542,15 +1542,15 @@ 
  * @param	int		$fieldrequired	1=Field is mandatory
  * @deprecated Form::editfieldkey
  */
-function fieldLabel($langkey, $fieldkey, $fieldrequired=0)
+function fieldLabel($langkey, $fieldkey, $fieldrequired = 0)
 {
 	global $conf, $langs;
-	$ret='';
-	if ($fieldrequired) $ret.='<span class="fieldrequired">';
-	if (($conf->dol_use_jmobile != 4)) $ret.='<label for="'.$fieldkey.'">';
-	$ret.=$langs->trans($langkey);
-	if (($conf->dol_use_jmobile != 4)) $ret.='</label>';
-	if ($fieldrequired) $ret.='</span>';
+	$ret = '';
+	if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+	if (($conf->dol_use_jmobile != 4)) $ret .= '<label for="'.$fieldkey.'">';
+	$ret .= $langs->trans($langkey);
+	if (($conf->dol_use_jmobile != 4)) $ret .= '</label>';
+	if ($fieldrequired) $ret .= '</span>';
 	return $ret;
 }
 
@@ -1561,11 +1561,11 @@ 
  * @param	string	$moreclass		More class to add
  * @return	string					String to add class onto HTML element
  */
-function dol_bc($var,$moreclass='')
+function dol_bc($var, $moreclass = '')
 {
 	global $bc;
-	$ret=' '.$bc[$var];
-	if ($moreclass) $ret=preg_replace('/class=\"/','class="'.$moreclass.' ',$ret);
+	$ret = ' '.$bc[$var];
+	if ($moreclass) $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);
 	return $ret;
 }
 
@@ -1580,62 +1580,62 @@ 
  *      @return string						Formated string
  *      @see dol_print_address
  */
-function dol_format_address($object, $withcountry=0, $sep="\n", $outputlangs='', $mode=0)
+function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
-	$ret='';
-	$countriesusingstate=array('AU','CA','US','IN','GB','ES','UK','TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS
+	$ret = '';
+	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
 
 	// Address
 	if (empty($mode)) {
 		$ret .= $object->address;
 	}
 	// Zip/Town/State
-	if (in_array($object->country_code,array('AU', 'CA', 'US')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
+	if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
 	{
-		$ret .= ($ret ? $sep : '' ).$object->town;
+		$ret .= ($ret ? $sep : '').$object->town;
 		if ($object->state)
 		{
-			$ret.=($ret?", ":'').$object->state;
+			$ret .= ($ret ? ", " : '').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret?", ":'').$object->zip;
+		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
 	}
-	else if (in_array($object->country_code,array('GB','UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+	else if (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
 	{
-		$ret .= ($ret ? $sep : '' ).$object->town;
+		$ret .= ($ret ? $sep : '').$object->town;
 		if ($object->state)
 		{
-			$ret.=($ret?", ":'').$object->state;
+			$ret .= ($ret ? ", " : '').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? $sep : '' ).$object->zip;
+		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
 	}
-	else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+	else if (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
 	{
-		$ret .= ($ret ? $sep : '' ).$object->zip;
-		$ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
+		$ret .= ($ret ? $sep : '').$object->zip;
+		$ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');
 		if ($object->state)
 		{
-			$ret.="\n".$object->state;
+			$ret .= "\n".$object->state;
 		}
 	}
-	else if (in_array($object->country_code,array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	else if (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
-                $ret .= ($ret ? $sep : '' ).$object->zip;
-                $ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
-                $ret .= ($object->departement_id?(' ('.($object->departement_id).')'):'');
+                $ret .= ($ret ? $sep : '').$object->zip;
+                $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');
+                $ret .= ($object->departement_id ? (' ('.($object->departement_id).')') : '');
 	}
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
-		$ret .= $object->zip ? (($ret ? $sep : '' ).$object->zip) : '';
-		$ret .= ($object->town?(($object->zip?' ':($ret ? $sep : '' )).$object->town):'');
-		if ($object->state && in_array($object->country_code,$countriesusingstate))
+		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
+		$ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');
+		if ($object->state && in_array($object->country_code, $countriesusingstate))
 		{
-			$ret.=($ret?", ":'').$object->state;
+			$ret .= ($ret ? ", " : '').$object->state;
 		}
 	}
-	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if ($withcountry) $ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	if (!is_object($outputlangs)) $outputlangs = $langs;
+	if ($withcountry) $ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');
 
 	return $ret;
 }
@@ -1650,10 +1650,10 @@ 
  *  @param	int		$is_gmt		See comment of timestamp parameter
  *	@return	string				A formatted string
  */
-function dol_strftime($fmt, $ts=false, $is_gmt=false)
+function dol_strftime($fmt, $ts = false, $is_gmt = false)
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-		return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+		return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
 	}
 	else return 'Error date into a not supported range';
 }
@@ -1679,144 +1679,144 @@ 
  *
  *  @see        dol_mktime, dol_stringtotime, dol_getdate
  */
-function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$encodetooutput=false)
+function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlangs = '', $encodetooutput = false)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
 	// Clean parameters
-	$to_gmt=false;
-	$offsettz=$offsetdst=0;
+	$to_gmt = false;
+	$offsettz = $offsetdst = 0;
 	if ($tzoutput)
 	{
-		$to_gmt=true;	// For backward compatibility
+		$to_gmt = true; // For backward compatibility
 		if (is_string($tzoutput))
 		{
 			if ($tzoutput == 'tzserver')
 			{
-				$to_gmt=false;
-				$offsettzstring=@date_default_timezone_get();		// Example 'Europe/Berlin' or 'Indian/Reunion'
-				$offsettz=0;
-				$offsetdst=0;
+				$to_gmt = false;
+				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
+				$offsettz = 0;
+				$offsetdst = 0;
 			}
 			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
 			{
-				$to_gmt=true;
-				$offsettzstring=(empty($_SESSION['dol_tz_string'])?'UTC':$_SESSION['dol_tz_string']);	// Example 'Europe/Berlin' or 'Indian/Reunion'
-				$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;		// Will not be used anymore
-				$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;	// Will not be used anymore
+				$to_gmt = true;
+				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
+				$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
+				$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore
 			}
 		}
 	}
-	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if (! $format) $format='daytextshort';
-	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','dayhour')))?1:0;
-	$formatwithoutreduce = preg_replace('/reduceformat/','',$format);
-	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat=1; }  // so format 'dayreduceformat' is processed like day
+	if (!is_object($outputlangs)) $outputlangs = $langs;
+	if (!$format) $format = 'daytextshort';
+	$reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;
+	$formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
+	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat = 1; }  // so format 'dayreduceformat' is processed like day
 
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
 	// TODO Add format daysmallyear and dayhoursmallyear
-	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
-	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
-	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
-	else if ($format == 'daytext')			 $format=($outputlangs->trans("FormatDateText")!="FormatDateText"?$outputlangs->trans("FormatDateText"):$conf->format_date_text);
-	else if ($format == 'daytextshort')	$format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
-	else if ($format == 'dayhour')			 $format=($outputlangs->trans("FormatDateHourShort")!="FormatDateHourShort"?$outputlangs->trans("FormatDateHourShort"):$conf->format_date_hour_short);
-	else if ($format == 'dayhoursec')		 $format=($outputlangs->trans("FormatDateHourSecShort")!="FormatDateHourSecShort"?$outputlangs->trans("FormatDateHourSecShort"):$conf->format_date_hour_sec_short);
-	else if ($format == 'dayhourtext')		 $format=($outputlangs->trans("FormatDateHourText")!="FormatDateHourText"?$outputlangs->trans("FormatDateHourText"):$conf->format_date_hour_text);
-	else if ($format == 'dayhourtextshort') $format=($outputlangs->trans("FormatDateHourTextShort")!="FormatDateHourTextShort"?$outputlangs->trans("FormatDateHourTextShort"):$conf->format_date_hour_text_short);
+	if ($format == 'day')				$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+	else if ($format == 'hour')			$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+	else if ($format == 'hourduration')	$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+	else if ($format == 'daytext')			 $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+	else if ($format == 'daytextshort')	$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
+	else if ($format == 'dayhour')			 $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+	else if ($format == 'dayhoursec')		 $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+	else if ($format == 'dayhourtext')		 $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+	else if ($format == 'dayhourtextshort') $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
 	// Format not sensitive to language
-	else if ($format == 'dayhourlog')		 $format='%Y%m%d%H%M%S';
-	else if ($format == 'dayhourldap')		 $format='%Y%m%d%H%M%SZ';
-	else if ($format == 'dayhourxcard')	$format='%Y%m%dT%H%M%SZ';
-	else if ($format == 'dayxcard')	 	$format='%Y%m%d';
-	else if ($format == 'dayrfc')			 $format='%Y-%m-%d';             // DATE_RFC3339
-	else if ($format == 'dayhourrfc')		 $format='%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-	else if ($format == 'standard')		$format='%Y-%m-%d %H:%M:%S';
+	else if ($format == 'dayhourlog')		 $format = '%Y%m%d%H%M%S';
+	else if ($format == 'dayhourldap')		 $format = '%Y%m%d%H%M%SZ';
+	else if ($format == 'dayhourxcard')	$format = '%Y%m%dT%H%M%SZ';
+	else if ($format == 'dayxcard')	 	$format = '%Y%m%d';
+	else if ($format == 'dayrfc')			 $format = '%Y-%m-%d'; // DATE_RFC3339
+	else if ($format == 'dayhourrfc')		 $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339
+	else if ($format == 'standard')		$format = '%Y-%m-%d %H:%M:%S';
 
 	if ($reduceformat)
 	{
-		$format=str_replace('%Y','%y',$format);
-		$format=str_replace('yyyy','yy',$format);
+		$format = str_replace('%Y', '%y', $format);
+		$format = str_replace('yyyy', 'yy', $format);
 	}
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) return '';		// $time=0 allowed (it means 01/01/1970 00:00:00)
+	if (dol_strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
 
 	// Clean format
-	if (preg_match('/%b/i',$format))		// There is some text to translate
+	if (preg_match('/%b/i', $format))		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
-		$format=str_replace('%b','__b__',$format);
-		$format=str_replace('%B','__B__',$format);
+		$format = str_replace('%b', '__b__', $format);
+		$format = str_replace('%B', '__B__', $format);
 	}
-	if (preg_match('/%a/i',$format))		// There is some text to translate
+	if (preg_match('/%a/i', $format))		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
-		$format=str_replace('%a','__a__',$format);
-		$format=str_replace('%A','__A__',$format);
+		$format = str_replace('%a', '__a__', $format);
+		$format = str_replace('%A', '__A__', $format);
 	}
 
 	// Analyze date
-	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$time,$reg)
-	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i',$time,$reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
+	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)
+	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
 		// TODO Remove this.
 		// This part of code should not be used.
 		dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);
 		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'
-		$syear	= (! empty($reg[1]) ? $reg[1] : '');
-		$smonth	= (! empty($reg[2]) ? $reg[2] : '');
-		$sday	= (! empty($reg[3]) ? $reg[3] : '');
-		$shour	= (! empty($reg[4]) ? $reg[4] : '');
-		$smin	= (! empty($reg[5]) ? $reg[5] : '');
-		$ssec	= (! empty($reg[6]) ? $reg[6] : '');
+		$syear	= (!empty($reg[1]) ? $reg[1] : '');
+		$smonth = (!empty($reg[2]) ? $reg[2] : '');
+		$sday	= (!empty($reg[3]) ? $reg[3] : '');
+		$shour	= (!empty($reg[4]) ? $reg[4] : '');
+		$smin	= (!empty($reg[5]) ? $reg[5] : '');
+		$ssec	= (!empty($reg[6]) ? $reg[6] : '');
 
-		$time=dol_mktime($shour,$smin,$ssec,$smonth,$sday,$syear,true);
-		$ret=adodb_strftime($format, $time+$offsettz+$offsetdst, $to_gmt);
+		$time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
+		$ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
 	}
 	else
 	{
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
 		{
-			$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-			$ret=adodb_strftime($format, $timetouse, $to_gmt);
+			$ret = adodb_strftime($format, $timetouse, $to_gmt);
 		}
-		else $ret='Bad value '.$time.' for date';
+		else $ret = 'Bad value '.$time.' for date';
 	}
 
-	if (preg_match('/__b__/i',$format))
+	if (preg_match('/__b__/i', $format))
 	{
-		$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
-		$month=adodb_strftime('%m', $timetouse);
-		$month=sprintf("%02d", $month);	// $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
+		$month = adodb_strftime('%m', $timetouse);
+		$month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
 		if ($encodetooutput)
 		{
-			$monthtext=$outputlangs->transnoentities('Month'.$month);
-			$monthtextshort=$outputlangs->transnoentities('MonthShort'.$month);
+			$monthtext = $outputlangs->transnoentities('Month'.$month);
+			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
 		}
 		else
 		{
-			$monthtext=$outputlangs->transnoentitiesnoconv('Month'.$month);
-			$monthtextshort=$outputlangs->transnoentitiesnoconv('MonthShort'.$month);
+			$monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);
+			$monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);
 		}
 		//print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;
-		$ret=str_replace('__b__',$monthtextshort,$ret);
-		$ret=str_replace('__B__',$monthtext,$ret);
+		$ret = str_replace('__b__', $monthtextshort, $ret);
+		$ret = str_replace('__B__', $monthtext, $ret);
 		//print 'x'.$outputlangs->charset_output.'-'.$ret.'x';
 		//return $ret;
 	}
-	if (preg_match('/__a__/i',$format))
+	if (preg_match('/__a__/i', $format))
 	{
-		$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
-		$w=adodb_strftime('%w', $timetouse);						// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
-		$dayweek=$outputlangs->transnoentitiesnoconv('Day'.$w);
-		$ret=str_replace('__A__',$dayweek,$ret);
-		$ret=str_replace('__a__',dol_substr($dayweek,0,3),$ret);
+		$w = adodb_strftime('%w', $timetouse); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);
+		$ret = str_replace('__A__', $dayweek, $ret);
+		$ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);
 	}
 
 	return $ret;
@@ -1856,21 +1856,21 @@ 
  *										'ndays' => $ndays
  * 	@see 								dol_print_date, dol_stringtotime, dol_mktime
  */
-function dol_getdate($timestamp,$fast=false)
+function dol_getdate($timestamp, $fast = false)
 {
 	global $conf;
 
-	$usealternatemethod=false;
-	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
-	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
+	$usealternatemethod = false;
+	if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
+	if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
 
 	if ($usealternatemethod)
 	{
-		$arrayinfo=adodb_getdate($timestamp,$fast);
+		$arrayinfo = adodb_getdate($timestamp, $fast);
 	}
 	else
 	{
-		$arrayinfo=getdate($timestamp);
+		$arrayinfo = getdate($timestamp);
 	}
 
 	return $arrayinfo;
@@ -1895,55 +1895,55 @@ 
  *	@return	int|string					Date as a timestamp, '' or false if error
  * 	@see 								dol_print_date, dol_stringtotime, dol_getdate
  */
-function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
+function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $check = 1)
 {
 	global $conf;
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
 
 	// Clean parameters
-	if ($hour   == -1 || empty($hour)) $hour=0;
-	if ($minute == -1 || empty($minute)) $minute=0;
-	if ($second == -1 || empty($second)) $second=0;
+	if ($hour == -1 || empty($hour)) $hour = 0;
+	if ($minute == -1 || empty($minute)) $minute = 0;
+	if ($second == -1 || empty($second)) $second = 0;
 
 	// Check parameters
 	if ($check)
 	{
-		if (! $month || ! $day)  return '';
-		if ($day   > 31) return '';
+		if (!$month || !$day)  return '';
+		if ($day > 31) return '';
 		if ($month > 12) return '';
-		if ($hour  < 0 || $hour   > 24) return '';
-		if ($minute< 0 || $minute > 60) return '';
-		if ($second< 0 || $second > 60) return '';
+		if ($hour < 0 || $hour > 24) return '';
+		if ($minute < 0 || $minute > 60) return '';
+		if ($second < 0 || $second > 60) return '';
 	}
 
-	if (method_exists('DateTime','getTimestamp'))
+	if (method_exists('DateTime', 'getTimestamp'))
 	{
 		if (empty($gm) || $gm === 'server')
 		{
-			$default_timezone=@date_default_timezone_get();		// Example 'Europe/Berlin'
+			$default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'
 			$localtz = new DateTimeZone($default_timezone);
 		}
 		else if ($gm === 'user')
 		{
 			// We use dol_tz_string first because it is more reliable.
-			$default_timezone=(empty($_SESSION["dol_tz_string"])?@date_default_timezone_get():$_SESSION["dol_tz_string"]);		// Example 'Europe/Berlin'
+			$default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
 			try {
 				$localtz = new DateTimeZone($default_timezone);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
-				$default_timezone=@date_default_timezone_get();
+				$default_timezone = @date_default_timezone_get();
 			}
 		}
 		else if (strrpos($gm, "tz,") !== false)
 		{
-			$timezone=str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'
+			$timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
 			try
 			{
 				$localtz = new DateTimeZone($timezone);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 			}
@@ -1954,16 +1954,16 @@ 
 		}
 		//var_dump($localtz);
 		//var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute);
-		$dt = new DateTime(null,$localtz);
-		$dt->setDate($year,$month,$day);
+		$dt = new DateTime(null, $localtz);
+		$dt->setDate($year, $month, $day);
 		$dt->setTime((int) $hour, (int) $minute, (int) $second);
-		$date=$dt->getTimestamp();	// should include daylight saving time
+		$date = $dt->getTimestamp(); // should include daylight saving time
 		//var_dump($date);
 		return $date;
 	}
 	else
 	{
-		dol_print_error('','PHP version must be 5.3+');
+		dol_print_error('', 'PHP version must be 5.3+');
 		return '';
 	}
 }
@@ -1978,18 +1978,18 @@ 
  * 								'tzuser' => we add the user timezone
  *	@return int   $date	Timestamp
  */
-function dol_now($mode='gmt')
+function dol_now($mode = 'gmt')
 {
-	$ret=0;
+	$ret = 0;
 
 	// Note that gmmktime and mktime return same value (GMT) when used without parameters
 	//if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead
-	if ($mode == 'gmt') $ret=time();	// Time for now at greenwich.
+	if ($mode == 'gmt') $ret = time(); // Time for now at greenwich.
 	else if ($mode == 'tzserver')		// Time for now with PHP server timezone added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$tzsecond=getServerTimeZoneInt('now');    // Contains tz+dayling saving time
-		$ret=(int) dol_now('gmt')+($tzsecond*3600);
+		$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
+		$ret = (int) dol_now('gmt') + ($tzsecond * 3600);
 	}
 	/*else if ($mode == 'tzref')				// Time for now with parent company timezone is added
 	{
@@ -2000,9 +2000,9 @@ 
 	else if ($mode == 'tzuser')				// Time for now with user timezone added
 	{
 		//print 'eeee'.time().'-'.mktime().'-'.gmmktime();
-		$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
-		$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
-		$ret=(int) dol_now('gmt')+($offsettz+$offsetdst);
+		$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
+		$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60;
+		$ret = (int) dol_now('gmt') + ($offsettz + $offsetdst);
 	}
 
 	return $ret;
@@ -2017,29 +2017,29 @@ 
  * @param	int		$shortunit	Use short value of size unit
  * @return	string				Link
  */
-function dol_print_size($size,$shortvalue=0,$shortunit=0)
+function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 {
-	global $conf,$langs;
-	$level=1024;
+	global $conf, $langs;
+	$level = 1024;
 
-	if (! empty($conf->dol_optimize_smallscreen)) $shortunit=1;
+	if (!empty($conf->dol_optimize_smallscreen)) $shortunit = 1;
 
 	// Set value text
-	if (empty($shortvalue) || $size < ($level*10))
+	if (empty($shortvalue) || $size < ($level * 10))
 	{
-		$ret=$size;
-		$textunitshort=$langs->trans("b");
-		$textunitlong=$langs->trans("Bytes");
+		$ret = $size;
+		$textunitshort = $langs->trans("b");
+		$textunitlong = $langs->trans("Bytes");
 	}
 	else
 	{
-		$ret=round($size/$level,0);
-		$textunitshort=$langs->trans("Kb");
-		$textunitlong=$langs->trans("KiloBytes");
+		$ret = round($size / $level, 0);
+		$textunitshort = $langs->trans("Kb");
+		$textunitlong = $langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret.=' '.$textunitlong; }
-	else { $ret.=' '.$textunitshort; }
+	if (empty($shortunit)) { $ret .= ' '.$textunitlong; }
+	else { $ret .= ' '.$textunitshort; }
 
 	return $ret;
 }
@@ -2053,22 +2053,22 @@ 
  * @param	int			$withpicto	With picto
  * @return	string					HTML Link
  */
-function dol_print_url($url,$target='_blank',$max=32,$withpicto=0)
+function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
 {
 	global $langs;
 
 	if (empty($url)) return '';
 
-	$link='<a href="';
-	if (! preg_match('/^http/i',$url)) $link.='http://';
-	$link.=$url;
-	$link.='"';
-	if ($target) $link.=' target="'.$target.'"';
-	$link.='>';
-	if (! preg_match('/^http/i',$url)) $link.='http://';
-	$link.=dol_trunc($url,$max);
-	$link.='</a>';
-	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto($langs->trans("Url"), 'object_globe.png').' ':'').$link.'</div>';
+	$link = '<a href="';
+	if (!preg_match('/^http/i', $url)) $link .= 'http://';
+	$link .= $url;
+	$link .= '"';
+	if ($target) $link .= ' target="'.$target.'"';
+	$link .= '>';
+	if (!preg_match('/^http/i', $url)) $link .= 'http://';
+	$link .= dol_trunc($url, $max);
+	$link .= '</a>';
+	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'object_globe.png').' ' : '').$link.'</div>';
 }
 
 /**
@@ -2083,44 +2083,44 @@ 
  * @param	int			$withpicto		Show picto
  * @return	string						HTML Link
  */
-function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=1,$withpicto=0)
+function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0)
 {
-	global $conf,$user,$langs;
+	global $conf, $user, $langs;
 
-	$newemail=$email;
+	$newemail = $email;
 
 	if (empty($email)) return '&nbsp;';
 
-	if (! empty($addlink))
+	if (!empty($addlink))
 	{
-		$newemail='<a style="text-overflow: ellipsis;" href="';
-		if (! preg_match('/^mailto:/i',$email)) $newemail.='mailto:';
-		$newemail.=$email;
-		$newemail.='">';
-		$newemail.=dol_trunc($email,$max);
-		$newemail.='</a>';
-		if ($showinvalid && ! isValidEmail($email))
+		$newemail = '<a style="text-overflow: ellipsis;" href="';
+		if (!preg_match('/^mailto:/i', $email)) $newemail .= 'mailto:';
+		$newemail .= $email;
+		$newemail .= '">';
+		$newemail .= dol_trunc($email, $max);
+		$newemail .= '</a>';
+		if ($showinvalid && !isValidEmail($email))
 		{
 			$langs->load("errors");
-			$newemail.=img_warning($langs->trans("ErrorBadEMail",$email));
+			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
 		}
 
-		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
-			$type='AC_EMAIL'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newemail='<div>'.$newemail.' '.$link.'</div>';
+			$type = 'AC_EMAIL'; $link = '';
+			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
 		}
 	}
 	else
 	{
-		if ($showinvalid && ! isValidEmail($email))
+		if ($showinvalid && !isValidEmail($email))
 		{
 			$langs->load("errors");
-			$newemail.=img_warning($langs->trans("ErrorBadEMail",$email));
+			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
 		}
 	}
-	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto($langs->trans("EMail"), 'object_email.png').' ':'').$newemail.'</div>';
+	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';
 }
 
 /**
@@ -2133,41 +2133,41 @@ 
  * @param	int			$max			Max number of characters to show
  * @return	string						HTML Link
  */
-function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
+function dol_print_skype($skype, $cid = 0, $socid = 0, $addlink = 0, $max = 64)
 {
-	global $conf,$user,$langs;
+	global $conf, $user, $langs;
 
-	$newskype=$skype;
+	$newskype = $skype;
 
 	if (empty($skype)) return '&nbsp;';
 
-	if (! empty($addlink))
+	if (!empty($addlink))
 	{
-		$newskype =img_picto($langs->trans("Skype"), 'object_skype.png');
-		$newskype.= '&nbsp;';
-		$newskype.=dol_trunc($skype,$max);
-		$newskype.= '&nbsp;';
-		$newskype.='<a href="skype:';
-		$newskype.=dol_trunc($skype,$max);
-		$newskype.='?call" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
-		$newskype.='<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';
-		$newskype.='</a>&nbsp;&nbsp;&nbsp;<a href="skype:';
-		$newskype.=dol_trunc($skype,$max);
-		$newskype.='?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$skype.'" title="'.$langs->trans("Chat").'&nbsp;'.$skype.'">';
-		$newskype.='<img src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
-		$newskype.='</a>';
+		$newskype = img_picto($langs->trans("Skype"), 'object_skype.png');
+		$newskype .= '&nbsp;';
+		$newskype .= dol_trunc($skype, $max);
+		$newskype .= '&nbsp;';
+		$newskype .= '<a href="skype:';
+		$newskype .= dol_trunc($skype, $max);
+		$newskype .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
+		$newskype .= '<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';
+		$newskype .= '</a>&nbsp;&nbsp;&nbsp;<a href="skype:';
+		$newskype .= dol_trunc($skype, $max);
+		$newskype .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$skype.'" title="'.$langs->trans("Chat").'&nbsp;'.$skype.'">';
+		$newskype .= '<img src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
+		$newskype .= '</a>';
 
-		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
-			$type='AC_SKYPE'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			$newskype='<div class="divskype nowrap">'.$newskype.($link?' '.$link:'').'</div>';
+			$type = 'AC_SKYPE'; $link = '';
+			if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			$newskype = '<div class="divskype nowrap">'.$newskype.($link ? ' '.$link : '').'</div>';
 		}
 	}
 	else
 	{
 		$langs->load("errors");
-		$newskype.=img_warning($langs->trans("ErrorBadSkype",$skype));
+		$newskype .= img_warning($langs->trans("ErrorBadSkype", $skype));
 	}
 	return $newskype;
 }
@@ -2186,373 +2186,373 @@ 
  *  @param  int     $adddivfloat    Add div float around phone.
  * 	@return string 				    Formated phone number
  */
-function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$separ="&nbsp;",$withpicto='',$titlealt='',$adddivfloat=0)
+function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addlink = '', $separ = "&nbsp;", $withpicto = '', $titlealt = '', $adddivfloat = 0)
 {
 	global $conf, $user, $langs, $mysoc, $hookmanager;
 
 	// Clean phone parameter
-	$phone = preg_replace("/[\s.-]/","",trim($phone));
+	$phone = preg_replace("/[\s.-]/", "", trim($phone));
 	if (empty($phone)) { return ''; }
-	if (empty($countrycode)) $countrycode=$mysoc->country_code;
+	if (empty($countrycode)) $countrycode = $mysoc->country_code;
 
 	// Short format for small screens
-	if ($conf->dol_optimize_smallscreen) $separ='';
+	if ($conf->dol_optimize_smallscreen) $separ = '';
 
-	$newphone=$phone;
+	$newphone = $phone;
 	if (strtoupper($countrycode) == "FR")
 	{
 		// France
 		if (dol_strlen($phone) == 10) {
-			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,2).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2);
+			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);
 		}
 		elseif (dol_strlen($phone) == 7)
 		{
-			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);
 		}
 		elseif (dol_strlen($phone) == 9)
 		{
-			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2);
+			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);
 		}
 		elseif (dol_strlen($phone) == 11)
 		{
-			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
 		elseif (dol_strlen($phone) == 12)
 		{
-			$newphone=substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 
 	elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
-			$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
+			$newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);
 		}
 	}
-	elseif (strtoupper($countrycode) == "PT" )
+	elseif (strtoupper($countrycode) == "PT")
 	{//Portugal
 		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
-			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
 	}
-	elseif (strtoupper($countrycode) == "SR" )
+	elseif (strtoupper($countrycode) == "SR")
 	{//Suriname
 		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
-			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);
 		}
 		elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
-			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);
 		}
 	}
-	elseif (strtoupper($countrycode) == "DE" )
+	elseif (strtoupper($countrycode) == "DE")
 	{//Allemagne
 		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
-			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);
 		}
 		elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
-			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
-			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
-			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
-			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "TR")
 	{//Turquie
 		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
-			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
-			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
+			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
 		}
 		elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
 		elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ML")
 	{//Mali
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
-		if(dol_strlen($phone) == 11)
+		if (dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
 		}
-		elseif(dol_strlen($phone) == 12)
+		elseif (dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);
 		}
 		}
 	elseif (strtoupper($countrycode) == "MU")
 	{//Maurice
-		if(dol_strlen($phone) == 11)
+		if (dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
-		elseif(dol_strlen($phone) == 12)
+		elseif (dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-		elseif(dol_strlen($phone) == 13)
+		elseif (dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
 		}
-		elseif(dol_strlen($phone) == 13)
+		elseif (dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-		elseif(dol_strlen($phone) == 14)
+		elseif (dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
-		if(dol_strlen($phone) == 11)
+		if (dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
 		}
-		elseif(dol_strlen($phone) == 12)
+		elseif (dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +261_AB_CD_EF_GHI
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-		elseif(dol_strlen($phone) == 15)
+		elseif (dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
-			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
+			$newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);
 		}
 	}
 	elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
 	}
 	elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
-		if(dol_strlen($phone) == 13)
+		if (dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
-			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
 	}
 	elseif (strtoupper($countrycode) == "IT")
 	{//Italie
-		if(dol_strlen($phone) == 12)
+		if (dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-		elseif(dol_strlen($phone) == 13)
+		elseif (dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
 	}
-	elseif(strtoupper($countrycode) == "AU")
+	elseif (strtoupper($countrycode) == "AU")
 	{//Australie
-		 if(dol_strlen($phone) == 12)
+		 if (dol_strlen($phone) == 12)
 		{//ex: +61_A_BCDE_FGHI
-			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
+			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
 		}
 	}
-	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
+	if (!empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
-		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
+		if (!empty($conf->browser->phone) || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
 		{
-			$newphone ='<a href="tel:'.$phone.'"';
-			$newphone.='>'.$phone.'</a>';
+			$newphone = '<a href="tel:'.$phone.'"';
+			$newphone .= '>'.$phone.'</a>';
 		}
-		else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		else if (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
 
 			// Define urlmask
-			$urlmask='ErrorClickToDialModuleNotConfigured';
-			if (! empty($conf->global->CLICKTODIAL_URL)) $urlmask=$conf->global->CLICKTODIAL_URL;
-			if (! empty($user->clicktodial_url)) $urlmask=$user->clicktodial_url;
+			$urlmask = 'ErrorClickToDialModuleNotConfigured';
+			if (!empty($conf->global->CLICKTODIAL_URL)) $urlmask = $conf->global->CLICKTODIAL_URL;
+			if (!empty($user->clicktodial_url)) $urlmask = $user->clicktodial_url;
 
-			$clicktodial_poste=(! empty($user->clicktodial_poste)?urlencode($user->clicktodial_poste):'');
-			$clicktodial_login=(! empty($user->clicktodial_login)?urlencode($user->clicktodial_login):'');
-			$clicktodial_password=(! empty($user->clicktodial_password)?urlencode($user->clicktodial_password):'');
+			$clicktodial_poste = (!empty($user->clicktodial_poste) ?urlencode($user->clicktodial_poste) : '');
+			$clicktodial_login = (!empty($user->clicktodial_login) ?urlencode($user->clicktodial_login) : '');
+			$clicktodial_password = (!empty($user->clicktodial_password) ?urlencode($user->clicktodial_password) : '');
 			// This line is for backward compatibility
 			$url = sprintf($urlmask, urlencode($phone), $clicktodial_poste, $clicktodial_login, $clicktodial_password);
 			// Thoose lines are for substitution
-			$substitarray=array('__PHONEFROM__'=>$clicktodial_poste,
+			$substitarray = array('__PHONEFROM__'=>$clicktodial_poste,
 								'__PHONETO__'=>urlencode($phone),
 								'__LOGIN__'=>$clicktodial_login,
 								'__PASS__'=>$clicktodial_password);
 			$url = make_substitutions($url, $substitarray);
-			$newphonesav=$newphone;
-			$newphone ='<a href="'.$url.'"';
-			if (! empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone.=' target="_blank"';
-			$newphone.='>'.$newphonesav.'</a>';
+			$newphonesav = $newphone;
+			$newphone = '<a href="'.$url.'"';
+			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone .= ' target="_blank"';
+			$newphone .= '>'.$newphonesav.'</a>';
 		}
 
 		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-		if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+		if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
-			$type='AC_TEL'; $link='';
-			if ($addlink == 'AC_FAX') $type='AC_FAX';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newphone='<div>'.$newphone.' '.$link.'</div>';
+			$type = 'AC_TEL'; $link = '';
+			if ($addlink == 'AC_FAX') $type = 'AC_FAX';
+			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			if ($link) $newphone = '<div>'.$newphone.' '.$link.'</div>';
 		}
 	}
 
 	if (empty($titlealt))
 	{
-		$titlealt=($withpicto=='fax'?$langs->trans("Fax"):$langs->trans("Phone"));
+		$titlealt = ($withpicto == 'fax' ? $langs->trans("Fax") : $langs->trans("Phone"));
 	}
-	$rep='';
+	$rep = '';
 
 	if ($hookmanager) {
-            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $withpicto);
+            $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid, 'titlealt' => $titlealt, 'picto' => $withpicto);
             $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
-            $rep.=$hookmanager->resPrint;
+            $rep .= $hookmanager->resPrint;
         }
 	 if (empty($reshook))
         {
 		$picto = '';
-		if($withpicto){
-			if($withpicto=='fax'){
+		if ($withpicto) {
+			if ($withpicto == 'fax') {
 				$picto = 'phoning_fax';
-			}elseif($withpicto=='phone'){
+			}elseif ($withpicto == 'phone') {
 				$picto = 'phoning';
-			}elseif($withpicto=='mobile'){
+			}elseif ($withpicto == 'mobile') {
 				$picto = 'phoning_mobile';
-			}else{
+			} else {
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) $rep.='<div class="nospan float" style="margin-right: 10px">';
-		else $rep.='<span style="margin-right: 10px;">';
-		$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
-		if ($adddivfloat) $rep.='</div>';
-		else $rep.='</span>';
+		if ($adddivfloat) $rep .= '<div class="nospan float" style="margin-right: 10px">';
+		else $rep .= '<span style="margin-right: 10px;">';
+		$rep .= ($withpicto ?img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;
+		if ($adddivfloat) $rep .= '</div>';
+		else $rep .= '</span>';
 	  }
 
 	return $rep;
@@ -2565,24 +2565,24 @@ 
  * 	@param	int		$mode		0=return IP + country/flag, 1=return only country/flag, 2=return only IP
  * 	@return string 				Formated IP, with country if GeoIP module is enabled
  */
-function dol_print_ip($ip,$mode=0)
+function dol_print_ip($ip, $mode = 0)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
-	$ret='';
+	$ret = '';
 
-	if (empty($mode)) $ret.=$ip;
+	if (empty($mode)) $ret .= $ip;
 
 	if ($mode != 2)
 	{
-		$countrycode=dolGetCountryCodeFromIp($ip);
+		$countrycode = dolGetCountryCodeFromIp($ip);
 		if ($countrycode)	// If success, countrycode is us, fr, ...
 		{
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
-				$ret.=' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"),DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png','',1);
+				$ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png', '', 1);
 			}
-			else $ret.=' ('.$countrycode.')';
+			else $ret .= ' ('.$countrycode.')';
 		}
 	}
 
@@ -2599,19 +2599,19 @@ 
 {
 	global $conf;
 
-	$countrycode='';
+	$countrycode = '';
 
-	if (! empty($conf->geoipmaxmind->enabled))
+	if (!empty($conf->geoipmaxmind->enabled))
 	{
-		$datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
+		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
 		//$ip='24.24.24.24';
 		//$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
-		$geoip=new DolGeoIP('country',$datafile);
+		$geoip = new DolGeoIP('country', $datafile);
 		//print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";
 		//print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";
-		$countrycode=$geoip->getCountryCodeFromIP($ip);
+		$countrycode = $geoip->getCountryCodeFromIP($ip);
 	}
 
 	return $countrycode;
@@ -2626,20 +2626,20 @@ 
  */
 function dol_user_country()
 {
-	global $conf,$langs,$user;
+	global $conf, $langs, $user;
 
 	//$ret=$user->xxx;
-	$ret='';
-	if (! empty($conf->geoipmaxmind->enabled))
+	$ret = '';
+	if (!empty($conf->geoipmaxmind->enabled))
 	{
-		$ip=$_SERVER["REMOTE_ADDR"];
-		$datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
+		$ip = $_SERVER["REMOTE_ADDR"];
+		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
 		//$ip='24.24.24.24';
 		//$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
-		$geoip=new DolGeoIP('country',$datafile);
-		$countrycode=$geoip->getCountryCodeFromIP($ip);
-		$ret=$countrycode;
+		$geoip = new DolGeoIP('country', $datafile);
+		$countrycode = $geoip->getCountryCodeFromIP($ip);
+		$ret = $countrycode;
 	}
 	return $ret;
 }
@@ -2656,7 +2656,7 @@ 
  *  @return string|void			Nothing if noprint is 0, formatted address if noprint is 1
  *  @see dol_format_address
  */
-function dol_print_address($address, $htmlid, $mode, $id, $noprint=0, $charfornl='')
+function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfornl = '')
 {
 	global $conf, $user, $langs, $hookmanager;
 
@@ -2667,32 +2667,32 @@ 
 		if ($hookmanager) {
 			$parameters = array('element' => $mode, 'id' => $id);
 			$reshook = $hookmanager->executeHooks('printAddress', $parameters, $address);
-			$out.=$hookmanager->resPrint;
+			$out .= $hookmanager->resPrint;
 		}
 		if (empty($reshook))
 		{
-			if (empty($charfornl)) $out.=nl2br($address);
-			else $out.=preg_replace('/[\r\n]+/', $charfornl, $address);
+			if (empty($charfornl)) $out .= nl2br($address);
+			else $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
 
-			$showgmap=$showomap=0;
+			$showgmap = $showomap = 0;
 
 			// TODO Add a hook here
-			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap=1;
-			if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap=1;
-			if ($mode=='member' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap=1;
-			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap=1;
-			if ($mode=='contact' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap=1;
-			if ($mode=='member' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap=1;
+			if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap = 1;
+			if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap = 1;
+			if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap = 1;
+			if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap = 1;
+			if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap = 1;
+			if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap = 1;
 
 			if ($showgmap)
 			{
-				$url=dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id,1);
-				$out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
+				$url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);
+				$out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
 			}
 			if ($showomap)
 			{
-				$url=dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id,1);
-				$out.=' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
+				$url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);
+				$out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
 			}
 		}
 	}
@@ -2708,7 +2708,7 @@ 
  *  @param		int			$acceptsupervisorkey	If 1, the special string '__SUPERVISOREMAIL__' is also accepted as valid
  *	@return     boolean     						true if email syntax is OK, false if KO or empty string
  */
-function isValidEmail($address, $acceptsupervisorkey=0)
+function isValidEmail($address, $acceptsupervisorkey = 0)
 {
 	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true;
 	if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true;
@@ -2736,9 +2736,9 @@ 
  * @param   string		$stringencoding		Encoding of string
  * @return  int								Length of string
  */
-function dol_strlen($string,$stringencoding='UTF-8')
+function dol_strlen($string, $stringencoding = 'UTF-8')
 {
-	if (function_exists('mb_strlen')) return mb_strlen($string,$stringencoding);
+	if (function_exists('mb_strlen')) return mb_strlen($string, $stringencoding);
 	else return strlen($string);
 }
 
@@ -2751,20 +2751,20 @@ 
  * @param   string	$stringencoding		Page code used for input string encoding
  * @return  string						substring
  */
-function dol_substr($string,$start,$length,$stringencoding='')
+function dol_substr($string, $start, $length, $stringencoding = '')
 {
 	global $langs;
 
-	if (empty($stringencoding)) $stringencoding=$langs->charset_output;
+	if (empty($stringencoding)) $stringencoding = $langs->charset_output;
 
-	$ret='';
+	$ret = '';
 	if (function_exists('mb_substr'))
 	{
-		$ret=mb_substr($string,$start,$length,$stringencoding);
+		$ret = mb_substr($string, $start, $length, $stringencoding);
 	}
 	else
 	{
-		$ret=substr($string,$start,$length);
+		$ret = substr($string, $start, $length);
 	}
 	return $ret;
 }
@@ -2788,12 +2788,12 @@ 
  *  @deprecated
  *  @see DolGraph
  */
-function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0,$url='',$combineother=0.05,$shownographyet=0)
+function dol_print_graph($htmlid, $width, $height, $data, $showlegend = 0, $type = 'pie', $showpercent = 0, $url = '', $combineother = 0.05, $shownographyet = 0)
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);
 
-	global $conf,$langs;
-	global $theme_datacolor;    // To have var kept when function is called several times
+	global $conf, $langs;
+	global $theme_datacolor; // To have var kept when function is called several times
 
 	if ($shownographyet)
 	{
@@ -2803,8 +2803,8 @@ 
 	}
 
 	if (empty($conf->use_javascript_ajax)) return;
-	$jsgraphlib='flot';
-	$datacolor=array();
+	$jsgraphlib = 'flot';
+	$datacolor = array();
 
 	// Load colors of theme into $datacolor array
 	$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
@@ -2813,10 +2813,10 @@ 
 		include_once $color_file;
 		if (isset($theme_datacolor))
 		{
-			$datacolor=array();
-			foreach($theme_datacolor as $val)
+			$datacolor = array();
+			foreach ($theme_datacolor as $val)
 			{
-				$datacolor[]="#".sprintf("%02x",$val[0]).sprintf("%02x",$val[1]).sprintf("%02x",$val[2]);
+				$datacolor[] = "#".sprintf("%02x", $val[0]).sprintf("%02x", $val[1]).sprintf("%02x", $val[2]);
 			}
 		}
 	}
@@ -2861,8 +2861,8 @@ 
 										return \'';
 										print '<div style="font-size:8pt;text-align:center;padding:2px;color:black;">';
 										if ($url) print '<a style="color: #FFFFFF;" border="0" href="'.$url.'">';
-										print '\'+'.($showlegend?'number':'label+\' \'+number');
-										if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
+										print '\'+'.($showlegend ? 'number' : 'label+\' \'+number');
+										if (!empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
 										print '+\'';
 										if ($url) print '</a>';
 										print '</div>\';
@@ -2882,9 +2882,9 @@ 
 						},';
 						if (count($datacolor))
 						{
-							print 'colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+							print 'colors: '.(!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
 						}
-						print 'legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+						print 'legend: {show: '.($showlegend ? 'true' : 'false').', position: \'ne\' }
 					});
 				}
 				plotWithOptions();
@@ -2902,10 +2902,10 @@ 
 			<script type="text/javascript">
 			$(function () {
 				var data = [';
-				$i=0; $outputserie=0;
-				foreach($data['series'] as $serie)
+				$i = 0; $outputserie = 0;
+				foreach ($data['series'] as $serie)
 				{
-					if ($data['seriestype'][$i]=='line') { $i++; continue; };
+					if ($data['seriestype'][$i] == 'line') { $i++; continue; };
 					if ($outputserie > 0) print ',';
 					print '{ bars: { stack: 0, show: true, barWidth: 0.9, align: \'center\' }, label: \''.dol_escape_js($serie['label']).'\', data: '.json_encode($serie['data']).'}'."\n";
 					$outputserie++; $i++;
@@ -2913,10 +2913,10 @@ 
 				if ($outputserie) print ', ';
 				//print '];
 				//var datalines = [';
-				$i=0; $outputserie=0;
-				foreach($data['series'] as $serie)
+				$i = 0; $outputserie = 0;
+				foreach ($data['series'] as $serie)
 				{
-					if (empty($data['seriestype'][$i]) || $data['seriestype'][$i]=='bar') { $i++; continue; };
+					if (empty($data['seriestype'][$i]) || $data['seriestype'][$i] == 'bar') { $i++; continue; };
 					if ($outputserie > 0) print ',';
 					print '{ lines: { show: true }, label: \''.dol_escape_js($serie['label']).'\', data: '.json_encode($serie['data']).'}'."\n";
 					$outputserie++; $i++;
@@ -2940,7 +2940,7 @@ 
 						{
 							print 'colors: '.json_encode($datacolor).',';
 						}
-						print 'legend: {show: '.($showlegend?'true':'false').'},
+						print 'legend: {show: '.($showlegend ? 'true' : 'false').'},
 						xaxis: {ticks: dataticks}
 					});
 				}
@@ -2965,51 +2965,51 @@ 
  *  @param  int     $display            Trunc is use to display and can be changed for small screen. TODO Remove this param (must be dealt with CSS)
  *	@return string						Truncated string. WARNING: length is never higher than $size if $nodot is set, but can be 3 chars higher otherwise.
  */
-function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0, $display=0)
+function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF-8', $nodot = 0, $display = 0)
 {
 	global $conf;
 
-	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
+	if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
 
-	if (empty($stringencoding)) $stringencoding='UTF-8';
+	if (empty($stringencoding)) $stringencoding = 'UTF-8';
 	// reduce for small screen
-	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
+	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) $size = round($size / 3);
 
 	// We go always here
 	if ($trunc == 'right')
 	{
-		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
-		return dol_substr($newstring,0,$size,$stringencoding).($nodot?'':'...');
+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
+		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');
 		else
 		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
 	}
 	elseif ($trunc == 'middle')
 	{
-		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > 2 && dol_strlen($newstring,$stringencoding) > ($size+1))
+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
+		if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1))
 		{
-			$size1=round($size/2);
-			$size2=round($size/2);
-			return dol_substr($newstring,0,$size1,$stringencoding).'...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size2,$size2,$stringencoding);
+			$size1 = round($size / 2);
+			$size2 = round($size / 2);
+			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
 		}
 		else
 		return $string;
 	}
 	elseif ($trunc == 'left')
 	{
-		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
-		return '...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size,$size,$stringencoding);
+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
+		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
 		else
 		return $string;
 	}
 	elseif ($trunc == 'wrap')
 	{
-		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+1))
-		return dol_substr($newstring,0,$size,$stringencoding)."\n".dol_trunc(dol_substr($newstring,$size,dol_strlen($newstring,$stringencoding)-$size,$stringencoding),$size,$trunc);
+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
+		if (dol_strlen($newstring, $stringencoding) > ($size + 1))
+		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
 		else
 		return $string;
 	}
@@ -3034,7 +3034,7 @@ 
  *  @return     string       				    Return img tag
  *  @see        #img_object, #img_picto_common
  */
-function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly=0, $notitle=0, $alt='', $morecss='')
+function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '')
 {
 	global $conf, $langs;
 
@@ -3042,7 +3042,7 @@ 
 	if ($pictoisfullpath)
 	{
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) $picto .= '.png';
+		if (!preg_match('/(\.png|\.gif|\.svg)$/i', $picto)) $picto .= '.png';
 		$fullpathpicto = $picto;
 	}
 	else
@@ -3050,15 +3050,15 @@ 
 		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		{
-			$fakey = $picto; $facolor=''; $fasize='';
-			if ($picto == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor='#999';    $fasize='2em'; }
-			if ($picto == 'switch_on')  { $fakey = 'fa-toggle-on';  $facolor='#227722'; $fasize='2em'; }
-			if ($picto == 'off') { $fakey = 'fa-square-o'; $fasize='1.3em'; }
-			if ($picto == 'on')  { $fakey = 'fa-check-square-o'; $fasize='1.3em'; }
-			$enabledisablehtml='';
-			$enabledisablehtml.='<span class="fa '.$fakey.' valignmiddle'.($morecss?' '.$morecss:'').'" style="'.($fasize?('font-size: '.$fasize.';'):'').($facolor?(' color: '.$facolor.';'):'').'" alt="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'"'.($moreatt?' '.$moreatt:'').'">';
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$titlealt;
-			$enabledisablehtml.='</span>';
+			$fakey = $picto; $facolor = ''; $fasize = '';
+			if ($picto == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor = '#999'; $fasize = '2em'; }
+			if ($picto == 'switch_on') { $fakey = 'fa-toggle-on'; $facolor = '#227722'; $fasize = '2em'; }
+			if ($picto == 'off') { $fakey = 'fa-square-o'; $fasize = '1.3em'; }
+			if ($picto == 'on') { $fakey = 'fa-check-square-o'; $fasize = '1.3em'; }
+			$enabledisablehtml = '';
+			$enabledisablehtml .= '<span class="fa '.$fakey.' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'"'.($moreatt ? ' '.$moreatt : '').'">';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml .= $titlealt;
+			$enabledisablehtml .= '</span>';
 			return $enabledisablehtml;
 		}
 
@@ -3067,26 +3067,26 @@ 
 		$theme = $conf->theme;
 
 		$path = 'theme/'.$theme;
-		if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme;	// If the theme does not have the same name as the module
-		else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme
-		else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme;	// If the theme have the same name as the module
+		if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module
+		else if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme
+		else if (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module
 
 		// If we ask an image into $url/$mymodule/img (instead of default path)
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $picto, $regs))
 		{
 			$picto = $regs[1];
-			$path = $regs[2];	// $path is $mymodule
+			$path = $regs[2]; // $path is $mymodule
 		}
 
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) $picto .= '.png';
+		if (!preg_match('/(\.png|\.gif|\.svg)$/i', $picto)) $picto .= '.png';
 		// If alt path are defined, define url where img file is, according to physical path
 		foreach ($conf->file->dol_document_root as $type => $dirroot)	// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
 		{
 			if ($type == 'main') continue;
 			if (file_exists($dirroot.'/'.$path.'/img/'.$picto))	// This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
 			{
-				$url=DOL_URL_ROOT.$conf->file->dol_url_root[$type];
+				$url = DOL_URL_ROOT.$conf->file->dol_url_root[$type];
 				break;
 			}
 		}
@@ -3103,8 +3103,8 @@ 
 		//if (empty($notitle) && preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt);		// We explode if we have TextA:TextB. Not if we have TextA: TextB
 		//$title=$tmparray[0];
 		//$alt=empty($tmparray[1])?'':$tmparray[1];
-		$title=$titlealt;
-		return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($title))?'':' title="'.dol_escape_htmltag($title).'"').($moreatt?' '.$moreatt:' class="inline-block"').'>';	// Alt is used for accessibility, title for popup
+		$title = $titlealt;
+		return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($title)) ? '' : ' title="'.dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : ' class="inline-block"').'>'; // Alt is used for accessibility, title for popup
 	}
 }
 
@@ -3121,7 +3121,7 @@ 
  *	@return	string						Return img tag
  *	@see	#img_picto, #img_picto_common
  */
-function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
+function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
 {
 	return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
 }
@@ -3140,7 +3140,7 @@ 
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3161,14 +3161,14 @@ 
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	if ($pictoisfullpath) $path = $picto;
 	else
 	{
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
-		if (! empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
+		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
 		{
 			$themepath = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto;
 
@@ -3192,14 +3192,14 @@ 
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO')			{ $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
-		elseif ($numaction ==  '0' || $numaction == 'ST_NEVER') 	{ $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
-		elseif ($numaction ==  '1' || $numaction == 'ST_TODO')  	{ $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
-		elseif ($numaction ==  '2' || $numaction == 'ST_PEND')  	{ $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
-		elseif ($numaction ==  '3' || $numaction == 'ST_DONE')  	{ $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
+		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
+		elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
+		elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
+		elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
+		elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
 		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
 	}
-	if (! is_numeric($numaction)) $numaction=0;
+	if (!is_numeric($numaction)) $numaction = 0;
 
 	return img_picto($titlealt, 'stcomm'.$numaction.'.png');
 }
@@ -3242,7 +3242,7 @@ 
  *	@param  string	$other      Add more attributes on img
  *	@return string      		Return tag img
  */
-function img_edit_remove($titlealt = 'default', $other='')
+function img_edit_remove($titlealt = 'default', $other = '')
 {
 	global $conf, $langs;
 
@@ -3265,7 +3265,7 @@ 
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
 
-	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : "") . ($other?' '.$other:''));
+	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));
 }
 
 /**
@@ -3310,11 +3310,11 @@ 
  *  @param  string  $other      Add more attributes on img
  *  @return string              Retourne tag img
  */
-function img_printer($titlealt = "default", $other='')
+function img_printer($titlealt = "default", $other = '')
 {
-	global $conf,$langs;
-	if ($titlealt=="default") $titlealt=$langs->trans("Print");
-	return img_picto($titlealt,'printer.png',$other);
+	global $conf, $langs;
+	if ($titlealt == "default") $titlealt = $langs->trans("Print");
+	return img_picto($titlealt, 'printer.png', $other);
 }
 
 /**
@@ -3350,7 +3350,7 @@ 
 		else $usealttitle = $langs->trans('Info');
 	}
 
-	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help': ($usehelpcursor == 2 ? ' cursor: pointer':'')).'"');
+	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');
 }
 
 /**
@@ -3382,7 +3382,7 @@ 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
 
 	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
-	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): ''));
+	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));
 }
 
 /**
@@ -3407,7 +3407,7 @@ 
 *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_next($titlealt = 'default', $moreatt='')
+function img_next($titlealt = 'default', $moreatt = '')
 {
 	global $conf, $langs;
 
@@ -3424,7 +3424,7 @@ 
  *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_previous($titlealt = 'default', $moreatt='')
+function img_previous($titlealt = 'default', $moreatt = '')
 {
 	global $conf, $langs;
 
@@ -3442,13 +3442,13 @@ 
  *  @param	string	$moreclass	Add more CSS classes
  *	@return string      		Return img tag
  */
-function img_down($titlealt = 'default', $selected = 0, $moreclass='')
+function img_down($titlealt = 'default', $selected = 0, $moreclass = '')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Down');
 
-	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass?" ".$moreclass:"").'"');
+	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');
 }
 
 /**
@@ -3459,13 +3459,13 @@ 
  *  @param	string	$moreclass	Add more CSS classes
  *	@return string      		Return img tag
  */
-function img_up($titlealt = 'default', $selected = 0, $moreclass='')
+function img_up($titlealt = 'default', $selected = 0, $moreclass = '')
 {
 	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Up');
 
-	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass?" ".$moreclass:"").'"');
+	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');
 }
 
 /**
@@ -3476,7 +3476,7 @@ 
  *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_left($titlealt = 'default', $selected = 0, $moreatt='')
+function img_left($titlealt = 'default', $selected = 0, $moreatt = '')
 {
 	global $conf, $langs;
 
@@ -3493,7 +3493,7 @@ 
  *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_right($titlealt = 'default', $selected = 0, $moreatt='')
+function img_right($titlealt = 'default', $selected = 0, $moreatt = '')
 {
 	global $conf, $langs;
 
@@ -3529,7 +3529,7 @@ 
  *  @param	string	$morecss	More css
  *	@return string     			Return img tag
  */
-function img_mime($file, $titlealt = '', $morecss='')
+function img_mime($file, $titlealt = '', $morecss = '')
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -3556,9 +3556,9 @@ 
  */
 function img_phone($titlealt = 'default', $option = 0)
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);
 
-	global $conf,$langs;
+	global $conf, $langs;
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Call');
 
@@ -3584,7 +3584,7 @@ 
 	$img = img_picto($titlealt, 'search.png', $other, false, 1);
 
 	$input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';
-	$input.= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
+	$input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
 
 	return $input;
 }
@@ -3605,7 +3605,7 @@ 
 	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
 	$input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';
-	$input.= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
+	$input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
 
 	return $input;
 }
@@ -3620,16 +3620,16 @@ 
  *  @param	string	$morecss		More CSS
  *	@return	string					String with info text
  */
-function info_admin($text, $infoonimgalt = 0, $nodiv=0, $admin='1', $morecss='')
+function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = '')
 {
 	global $conf, $langs;
 
 	if ($infoonimgalt)
 	{
-		return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss?' '.$morecss:'').'"');
+		return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
 	}
 
-	return ($nodiv?'':'<div class="'.(empty($admin)?'':($admin=='1'?'info':$admin)).' hideonsmartphone'.($morecss?' '.$morecss:'').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin?$langs->trans('InfoAdmin'):$langs->trans('Note')).'"></span> '.$text.($nodiv?'':'</div>');
+	return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
 }
 
 
@@ -3645,18 +3645,18 @@ 
  *	@return 	void
  *  @see    	dol_htmloutput_errors
  */
-function dol_print_error($db='',$error='',$errors=null)
+function dol_print_error($db = '', $error = '', $errors = null)
 {
-	global $conf,$langs,$argv;
+	global $conf, $langs, $argv;
 	global $dolibarr_main_prod;
 
 	$out = '';
 	$syslog = '';
 
 	// Si erreur intervenue avant chargement langue
-	if (! $langs)
+	if (!$langs)
 	{
-		require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate('', $conf);
 		$langs->load("main");
 	}
@@ -3665,58 +3665,58 @@ 
 
 	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
 	{
-		$out.=$langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
-		$out.=$langs->trans("InformationToHelpDiagnose").":<br>\n";
+		$out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		$out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";
 
-		$out.="<b>".$langs->trans("Date").":</b> ".dol_print_date(time(),'dayhourlog')."<br>\n";
-		$out.="<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";
-		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out.="<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		$out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";
+		$out .= "<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";
+		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
 		if (function_exists("phpversion"))
 		{
-			$out.="<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
+			$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
 		}
-		$out.="<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+		$out .= "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
 		if (function_exists("php_uname"))
 		{
-			$out.="<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
+			$out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
 		}
-		$out.="<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";
-		$out.="<br>\n";
-		$out.="<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"],ENT_COMPAT,'UTF-8')."<br>\n";
-		$out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?dol_htmlentities($_SERVER["HTTP_REFERER"],ENT_COMPAT,'UTF-8'):'')."<br>\n";
-		$out.="<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu)?$conf->standard_menu:'')."<br>\n";
-		$out.="<br>\n";
-		$syslog.="url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
-		$syslog.=", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+		$out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";
+		$out .= "<br>\n";
+		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";
+		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ?dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";
+		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? $conf->standard_menu : '')."<br>\n";
+		$out .= "<br>\n";
+		$syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
+		$syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 	}
 	else                              // Mode CLI
 	{
-		$out.='> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
-		$syslog.="pid=".dol_getmypid();
+		$out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
+		$syslog .= "pid=".dol_getmypid();
 	}
 
 	if (is_object($db))
 	{
 		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 		{
-			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
-			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?dol_escape_htmltag($db->lasterrno()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?dol_escape_htmltag($db->lasterror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out.="<br>\n";
+			$out .= "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
+			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ?dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ?dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out .= "<br>\n";
 		}
 		else                            // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
-			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
-			$out.='> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror()?$db->lastqueryerror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno()?$db->lasterrno():$langs->transnoentities("ErrorNoRequestInError"))."\n";
-			$out.='> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror()?$db->lasterror():$langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
+			$out .= '> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out .= '> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError"))."\n";
+			$out .= '> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";
 
 		}
-		$syslog.=", sql=".$db->lastquery();
-		$syslog.=", db_error=".$db->lasterror();
+		$syslog .= ", sql=".$db->lastquery();
+		$syslog .= ", db_error=".$db->lasterror();
 	}
 
 	if ($error || $errors)
@@ -3724,33 +3724,33 @@ 
 		$langs->load("errors");
 
 		// Merge all into $errors array
-		if (is_array($error) && is_array($errors)) $errors=array_merge($error,$errors);
-		elseif (is_array($error)) $errors=$error;
-		elseif (is_array($errors)) $errors=array_merge(array($error),$errors);
-		else $errors=array_merge(array($error));
+		if (is_array($error) && is_array($errors)) $errors = array_merge($error, $errors);
+		elseif (is_array($error)) $errors = $error;
+		elseif (is_array($errors)) $errors = array_merge(array($error), $errors);
+		else $errors = array_merge(array($error));
 
-		foreach($errors as $msg)
+		foreach ($errors as $msg)
 		{
 			if (empty($msg)) continue;
 			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 			{
-				$out.="<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n" ;
+				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
 			}
 			else                        // Mode CLI
 			{
-				$out.='> '.$langs->transnoentities("Message").":\n".$msg."\n" ;
+				$out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";
 			}
-			$syslog.=", msg=".$msg;
+			$syslog .= ", msg=".$msg;
 		}
 	}
 	if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file'))
 	{
 		xdebug_print_function_stack();
-		$out.='<b>XDebug informations:</b>'."<br>\n";
-		$out.='File: '.xdebug_call_file()."<br>\n";
-		$out.='Line: '.xdebug_call_line()."<br>\n";
-		$out.='Function: '.xdebug_call_function()."<br>\n";
-		$out.="<br>\n";
+		$out .= '<b>XDebug informations:</b>'."<br>\n";
+		$out .= 'File: '.xdebug_call_file()."<br>\n";
+		$out .= 'Line: '.xdebug_call_line()."<br>\n";
+		$out .= 'Function: '.xdebug_call_function()."<br>\n";
+		$out .= "<br>\n";
 	}
 
 	if (empty($dolibarr_main_prod)) print $out;
@@ -3773,18 +3773,18 @@ 
  * @param	string	$morecss		More css
  * @return	void
  */
-function dol_print_error_email($prefixcode, $errormessage='', $errormessages=array(), $morecss='error')
+function dol_print_error_email($prefixcode, $errormessage = '', $errormessages = array(), $morecss = 'error')
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	$langs->load("errors");
-	$now=dol_now();
+	$now = dol_now();
 	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
-	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
+	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now, '%Y%m%d'));
 	if ($errormessage) print '<br><br>'.$errormessage;
 	if (is_array($errormessages) && count($errormessages))
 	{
-		foreach($errormessages as $mesgtoshow)
+		foreach ($errormessages as $mesgtoshow)
 		{
 			print '<br><br>'.$mesgtoshow;
 		}
@@ -3807,7 +3807,7 @@ 
  *  @param	string	$tooltip	 Tooltip
  *	@return	void
  */
-function print_liste_field_titre($name, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="", $prefix="", $tooltip="")
+function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $tooltip = "")
 {
 	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $moreattrib, $sortfield, $sortorder, $prefix, 0, $tooltip);
 }
@@ -3829,68 +3829,68 @@ 
  *  @param	string	$tooltip	 		Tooltip
  *	@return	string
  */
-function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="", $prefix="", $disablesortlink=0, $tooltip='')
+function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '')
 {
 	global $conf, $langs, $form;
 	//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
 
-	$sortorder=strtoupper($sortorder);
-	$out='';
-	$sortimg='';
+	$sortorder = strtoupper($sortorder);
+	$out = '';
+	$sortimg = '';
 
-	$tag='th';
-	if ($thead==2) $tag='div';
+	$tag = 'th';
+	if ($thead == 2) $tag = 'div';
 
-	$tmpsortfield=explode(',',$sortfield);
-	$sortfield1=trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
-	$tmpfield=explode(',',$field);
-	$field1=trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'
+	$tmpsortfield = explode(',', $sortfield);
+	$sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
+	$tmpfield = explode(',', $field);
+	$field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'
 
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
-	else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
+	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';
+	else $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
 	{
-		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
-		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
-		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
+		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
+		$options = preg_replace('/&+/i', '&', $options);
+		if (!preg_match('/^&/', $options)) $options = '&'.$options;
 
 		if ($field1 != $sortfield1) // We are on another field
 		{
-			if (preg_match('/^DESC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+			if (preg_match('/^DESC/', $sortorder)) $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+			else $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 		else                      // We are of first sorting criteria
 		{
-			if (preg_match('/^ASC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+			if (preg_match('/^ASC/', $sortorder)) $out .= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
+			else $out .= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 	}
 
-	if ($tooltip) $out.=$form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
-	else $out.=$langs->trans($name);
+	if ($tooltip) $out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
+	else $out .= $langs->trans($name);
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
 	{
-		$out.='</a>';
+		$out .= '</a>';
 	}
 
 	if (empty($thead) && $field)    // If this is a sort field
 	{
-		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
-		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
-		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
+		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
+		$options = preg_replace('/&+/i', '&', $options);
+		if (!preg_match('/^&/', $options)) $options = '&'.$options;
 
 		//print "&nbsp;";
 		//$sortimg.= '<img width="2" src="'.DOL_URL_ROOT.'/theme/common/transparent.png" alt="">';
 		//$sortimg.= '<span class="nowrap">';
 
-		if (! $sortorder || $field1 != $sortfield1)
+		if (!$sortorder || $field1 != $sortfield1)
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
@@ -3900,21 +3900,21 @@ 
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
-				$sortimg.= '<span class="nowrap">'.img_up("Z-A",0).'</span>';
+				$sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';
 			}
 			if (preg_match('/^ASC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-				$sortimg.= '<span class="nowrap">'.img_down("A-Z",0).'</span>';
+				$sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';
 			}
 		}
 
 		//$sortimg.= '</span>';
 	}
 
-	$out.=$sortimg;
+	$out .= $sortimg;
 
-	$out.='</'.$tag.'>';
+	$out .= '</'.$tag.'>';
 
 	return $out;
 }
@@ -3929,7 +3929,7 @@ 
  */
 function print_titre($title)
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);
 
 	print '<div class="titre">'.$title.'</div>';
 }
@@ -3945,7 +3945,7 @@ 
  * 	@return	void
  *  @deprecated Use print load_fiche_titre instead
  */
-function print_fiche_titre($title, $mesg='', $picto='title_generic.png', $pictoisfullpath=0, $id='')
+function print_fiche_titre($title, $mesg = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = '')
 {
 	print load_fiche_titre($title, $mesg, $picto, $pictoisfullpath, $id);
 }
@@ -3963,30 +3963,30 @@ 
  * 	@return	string
  *  @see print_barre_liste
  */
-function load_fiche_titre($titre, $morehtmlright='', $picto='title_generic.png', $pictoisfullpath=0, $id=0, $morecssontable='', $morehtmlcenter='')
+function load_fiche_titre($titre, $morehtmlright = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = 0, $morecssontable = '', $morehtmlcenter = '')
 {
 	global $conf;
 
-	$return='';
+	$return = '';
 
-	if ($picto == 'setup') $picto='title.png';
-	if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif';
+	if ($picto == 'setup') $picto = 'title.png';
+	if (($conf->browser->name == 'ie') && $picto == 'title.png') $picto = 'title.gif';
 
-	$return.= "\n";
-	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" class="centpercent notopnoleftnoright'.($morecssontable?' '.$morecssontable:'').'" style="margin-bottom: 2px;"><tr>';
-	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
-	$return.= '<td class="nobordernopadding" valign="middle">';
-	$return.= '<div class="titre">'.$titre.'</div>';
-	$return.= '</td>';
+	$return .= "\n";
+	$return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 2px;"><tr>';
+	if ($picto) $return .= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
+	$return .= '<td class="nobordernopadding" valign="middle">';
+	$return .= '<div class="titre">'.$titre.'</div>';
+	$return .= '</td>';
 	if (dol_strlen($morehtmlcenter))
 	{
-		$return.= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';
+		$return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';
 	}
 	if (dol_strlen($morehtmlright))
 	{
-		$return.= '<td class="nobordernopadding titre_right" align="right" valign="middle">'.$morehtmlright.'</td>';
+		$return .= '<td class="nobordernopadding titre_right" align="right" valign="middle">'.$morehtmlright.'</td>';
 	}
-	$return.= '</tr></table>'."\n";
+	$return .= '</tr></table>'."\n";
 
 	return $return;
 }
@@ -4012,16 +4012,16 @@ 
  *  @param  int         $hidenavigation     Force to hide all navigation tools
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $morehtmlcenter='', $num=-1, $totalnboflines='', $picto='title_generic.png', $pictoisfullpath=0, $morehtmlright='', $morecss='', $limit=-1, $hideselectlimit=0, $hidenavigation=0)
+function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
 	$savlimit = $limit;
 	$savtotalnboflines = $totalnboflines;
-	$totalnboflines=abs($totalnboflines);
+	$totalnboflines = abs($totalnboflines);
 
-	if ($picto == 'setup') $picto='title_setup.png';
-	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
+	if ($picto == 'setup') $picto = 'title_setup.png';
+	if (($conf->browser->name == 'ie') && $picto == 'title_generic.png') $picto = 'title.gif';
 	if ($limit < 0) $limit = $conf->liste_limit;
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
@@ -4035,7 +4035,7 @@ 
 
 	print "\n";
 	print "<!-- Begin title '".$titre."' -->\n";
-	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
+	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>';
 
 	// Left
 	//if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
@@ -4062,48 +4062,48 @@ 
 		if ($totalnboflines)	// If we know total nb of lines
 		{
 			// Define nb of extra page links before and after selected page + ... + first or last
-			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1);
+			$maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 1);
 
-			if ($limit > 0) $nbpages=ceil($totalnboflines/$limit);
-			else $nbpages=1;
-			$cpt=($page-$maxnbofpage);
-			if ($cpt < 0) { $cpt=0; }
+			if ($limit > 0) $nbpages = ceil($totalnboflines / $limit);
+			else $nbpages = 1;
+			$cpt = ($page - $maxnbofpage);
+			if ($cpt < 0) { $cpt = 0; }
 
-			if ($cpt>=1)
+			if ($cpt >= 1)
 			{
-				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';
-				if ($cpt > 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
-				else if ($cpt == 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+				$pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';
+				if ($cpt > 2) $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';
+				else if ($cpt == 2) $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
 			}
 
 			do
 			{
-				if ($cpt==$page)
+				if ($cpt == $page)
 				{
-					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1).'</span></li>';
+					$pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1).'</span></li>';
 				}
 				else
 				{
-					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
+					$pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
 				}
 				$cpt++;
 			}
-			while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage);
+			while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);
 
-			if ($cpt<$nbpages)
+			if ($cpt < $nbpages)
 			{
-				if ($cpt<$nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
-				else if ($cpt == $nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
-				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
+				if ($cpt < $nbpages - 2) $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';
+				else if ($cpt == $nbpages - 2) $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
+				$pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 			}
 		}
 		else
 		{
-			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1)."</li>";
+			$pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1)."</li>";
 		}
 	}
 
-	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);		// output the div and ul for previous/last completed with page numbers into $pagelist
+	print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist
 
 	print '</td>';
 
@@ -4125,33 +4125,33 @@ 
  *  @param  int             $hideselectlimit    Force to hide select limit
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betweenarrows='', $afterarrows='', $limit=-1, $totalnboflines=0, $hideselectlimit=0)
+function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0)
 {
 	global $conf, $langs;
 
 	print '<div class="pagination"><ul>';
 	if ((int) $limit >= 0 && empty($hideselectlimit))
 	{
-		$pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
+		$pagesizechoices = '10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
 		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 		//$pagesizechoices.=',2:2';
-		if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
+		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
 
 		print '<li class="pagination">';
 		print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
-		$tmpchoice=explode(',',$pagesizechoices);
-		$tmpkey=$limit.':'.$limit;
-		if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
-		$tmpkey=$conf->liste_limit.':'.$conf->liste_limit;
-		if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+		$tmpchoice = explode(',', $pagesizechoices);
+		$tmpkey = $limit.':'.$limit;
+		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;
+		$tmpkey = $conf->liste_limit.':'.$conf->liste_limit;
+		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;
 		asort($tmpchoice, SORT_NUMERIC);
-		$found=false;
-		foreach($tmpchoice as $val)
+		$found = false;
+		foreach ($tmpchoice as $val)
 		{
-			$selected='';
-			$tmp=explode(':',$val);
-			$key=$tmp[0];
-			$val=$tmp[1];
+			$selected = '';
+			$tmp = explode(':', $val);
+			$key = $tmp[0];
+			$val = $tmp[1];
 			if ($key != '' && $val != '')
 			{
 				if ((int) $key == (int) $limit)
@@ -4180,7 +4180,7 @@ 
 	}
 	if ($page > 0)
 	{
-		print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
+		print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	}
 	if ($betweenarrows)
 	{
@@ -4188,7 +4188,7 @@ 
 	}
 	if ($nextpage > 0)
 	{
-		print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
+		print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	}
 	if ($afterarrows)
 	{
@@ -4210,35 +4210,35 @@ 
  *	@param	int		$usestarfornpr	-1=Never show, 0 or 1=Use '*' for NPR vat rates
  *  @return	string					String with formated amounts ('19,6' or '19,6%' or '8.5% (NPR)' or '8.5% *' or '19,6 (CODEX)')
  */
-function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
+function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
 {
-	$morelabel='';
+	$morelabel = '';
 
-	if (preg_match('/%/',$rate))
+	if (preg_match('/%/', $rate))
 	{
-		$rate=str_replace('%','',$rate);
-		$addpercent=true;
+		$rate = str_replace('%', '', $rate);
+		$addpercent = true;
 	}
-	if (preg_match('/\((.*)\)/',$rate,$reg))
+	if (preg_match('/\((.*)\)/', $rate, $reg))
 	{
-		$morelabel=' ('.$reg[1].')';
-		$rate=preg_replace('/\s*'.preg_quote($morelabel,'/').'/','',$rate);
+		$morelabel = ' ('.$reg[1].')';
+		$rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);
 	}
-	if (preg_match('/\*/',$rate))
+	if (preg_match('/\*/', $rate))
 	{
-		$rate=str_replace('*','',$rate);
+		$rate = str_replace('*', '', $rate);
 		$info_bits |= 1;
 	}
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-	if (! preg_match('/\//', $rate)) $ret=price($rate,0,'',0,0).($addpercent?'%':'');
+	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
 	else
 	{
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
-		$ret=$rate.($addpercent?'%':'');
+		$ret = $rate.($addpercent ? '%' : '');
 	}
-	if (($info_bits & 1) && $usestarfornpr >= 0) $ret.=' *';
-	$ret.=$morelabel;
+	if (($info_bits & 1) && $usestarfornpr >= 0) $ret .= ' *';
+	$ret .= $morelabel;
 	return $ret;
 }
 
@@ -4258,47 +4258,47 @@ 
  *
  *		@see	price2num					Revert function of price
  */
-function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerounding=-1, $currency_code='')
+function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $forcerounding = -1, $currency_code = '')
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	// Clean parameters
-	if (empty($amount)) $amount=0;	// To have a numeric value if amount not defined or = ''
-	$amount = (is_numeric($amount)?$amount:0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-	if ($rounding < 0) $rounding=min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-	$nbdecimal=$rounding;
+	if (empty($amount)) $amount = 0; // To have a numeric value if amount not defined or = ''
+	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
+	if ($rounding < 0) $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+	$nbdecimal = $rounding;
 
 	// Output separators by default (french)
-	$dec=','; $thousand=' ';
+	$dec = ','; $thousand = ' ';
 
 	// If $outlangs not forced, we use use language
-	if (! is_object($outlangs)) $outlangs=$langs;
+	if (!is_object($outlangs)) $outlangs = $langs;
 
-	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec=$outlangs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($outlangs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") $thousand=$outlangs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand='';
-	else if ($thousand == 'Space') $thousand=' ';
+	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+	if ($thousand == 'None') $thousand = '';
+	else if ($thousand == 'Space') $thousand = ' ';
 	//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	//print "amount=".$amount."-";
-	$amount = str_replace(',','.',$amount);	// should be useless
+	$amount = str_replace(',', '.', $amount); // should be useless
 	//print $amount."-";
-	$datas = explode('.',$amount);
-	$decpart = isset($datas[1])?$datas[1]:'';
-	$decpart = preg_replace('/0+$/i','',$decpart);	// Supprime les 0 de fin de partie decimale
+	$datas = explode('.', $amount);
+	$decpart = isset($datas[1]) ? $datas[1] : '';
+	$decpart = preg_replace('/0+$/i', '', $decpart); // Supprime les 0 de fin de partie decimale
 	//print "decpart=".$decpart."<br>";
-	$end='';
+	$end = '';
 
 	// We increase nbdecimal if there is more decimal than asked (to not loose information)
-	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal=dol_strlen($decpart);
+	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal = dol_strlen($decpart);
 	// Si on depasse max
 	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN)
 	{
-		$nbdecimal=$conf->global->MAIN_MAX_DECIMALS_SHOWN;
-		if (preg_match('/\.\.\./i',$conf->global->MAIN_MAX_DECIMALS_SHOWN))
+		$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;
+		if (preg_match('/\.\.\./i', $conf->global->MAIN_MAX_DECIMALS_SHOWN))
 		{
 			// Si un affichage est tronque, on montre des ...
-			$end='...';
+			$end = '...';
 		}
 	}
 
@@ -4306,27 +4306,27 @@ 
 	if ($forcerounding >= 0) $nbdecimal = $forcerounding;
 
 	// Format number
-	$output=number_format($amount, $nbdecimal, $dec, $thousand);
+	$output = number_format($amount, $nbdecimal, $dec, $thousand);
 	if ($form)
 	{
-		$output=preg_replace('/\s/','&nbsp;',$output);
-		$output=preg_replace('/\'/','&#039;',$output);
+		$output = preg_replace('/\s/', '&nbsp;', $output);
+		$output = preg_replace('/\'/', '&#039;', $output);
 	}
 	// Add symbol of currency if requested
-	$cursymbolbefore=$cursymbolafter='';
+	$cursymbolbefore = $cursymbolafter = '';
 	if ($currency_code)
 	{
-		if ($currency_code == 'auto') $currency_code=$conf->currency;
+		if ($currency_code == 'auto') $currency_code = $conf->currency;
 
-		$listofcurrenciesbefore=array('USD','GBP','AUD','MXN','PEN','CNY');
-		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
+		$listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');
+		if (in_array($currency_code, $listofcurrenciesbefore)) $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
 		else
 		{
-			$tmpcur=$outlangs->getCurrencySymbol($currency_code);
-			$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
+			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
+			$cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
 		}
 	}
-	$output=$cursymbolbefore.$output.$end.($cursymbolafter?' ':'').$cursymbolafter;
+	$output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;
 
 	return $output;
 }
@@ -4345,18 +4345,18 @@ 
  *
  *	@see    price					Opposite function of price2num
  */
-function price2num($amount,$rounding='',$alreadysqlnb=0)
+function price2num($amount, $rounding = '', $alreadysqlnb = 0)
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	// Round PHP function does not allow number like '1,234.56' nor '1.234,56' nor '1 234,56'
 	// Numbers must be '1234.56'
 	// Decimal delimiter for PHP and database SQL requests must be '.'
-	$dec=','; $thousand=' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($langs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand='';
-	elseif ($thousand == 'Space') $thousand=' ';
+	$dec = ','; $thousand = ' ';
+	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+	if ($thousand == 'None') $thousand = '';
+	elseif ($thousand == 'Space') $thousand = ' ';
 	//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	// Convert value to universal number format (no thousand separator, '.' as decimal separator)
@@ -4369,30 +4369,30 @@ 
 		if (is_numeric($amount))
 		{
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps=sprintf("%0.10F",$amount-intval($amount));	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
-			$temps=preg_replace('/([\.1-9])0+$/','\\1',$temps); // temps=0. or 0.00002 or 9999.1
-			$nbofdec=max(0,dol_strlen($temps)-2);	// -2 to remove "0."
-			$amount=number_format($amount,$nbofdec,$dec,$thousand);
+			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
+			$nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."
+			$amount = number_format($amount, $nbofdec, $dec, $thousand);
 		}
 		//print "QQ".$amount.'<br>';
 
 		// Now make replace (the main goal of function)
-		if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount);	// To accept 2 notations for french users
-		$amount=str_replace(' ','',$amount);		// To avoid spaces
-		$amount=str_replace($thousand,'',$amount);	// Replace of thousand before replace of dec to avoid pb if thousand is .
-		$amount=str_replace($dec,'.',$amount);
+		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		$amount = str_replace(' ', '', $amount); // To avoid spaces
+		$amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
+		$amount = str_replace($dec, '.', $amount);
 	}
 
 	// Now, make a rounding if required
 	if ($rounding)
 	{
-		$nbofdectoround='';
-		if ($rounding == 'MU')     $nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_UNIT;
-		elseif ($rounding == 'MT') $nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_TOT;
-		elseif ($rounding == 'MS') $nbofdectoround=empty($conf->global->MAIN_MAX_DECIMALS_STOCK)?5:$conf->global->MAIN_MAX_DECIMALS_STOCK;
-		elseif (is_numeric($rounding))  $nbofdectoround=$rounding; 	// For admin info page
+		$nbofdectoround = '';
+		if ($rounding == 'MU')     $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+		elseif ($rounding == 'MT') $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+		elseif ($rounding == 'MS') $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+		elseif (is_numeric($rounding))  $nbofdectoround = $rounding; // For admin info page
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-		if (dol_strlen($nbofdectoround)) $amount = round($amount,$nbofdectoround);	// $nbofdectoround can be 0.
+		if (dol_strlen($nbofdectoround)) $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.
 		else return 'ErrorBadParameterProvidedToFunction';
 		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 
@@ -4401,19 +4401,19 @@ 
 		if (is_numeric($amount))
 		{
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps=sprintf("%0.10F",$amount-intval($amount));	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
-			$temps=preg_replace('/([\.1-9])0+$/','\\1',$temps); // temps=0. or 0.00002 or 9999.1
-			$nbofdec=max(0,dol_strlen($temps)-2);	// -2 to remove "0."
-			$amount=number_format($amount,min($nbofdec,$nbofdectoround),$dec,$thousand);		// Convert amount to format with dolibarr dec and thousand
+			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
+			$nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."
+			$amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand
 		}
 		//print "TT".$amount.'<br>';
 
 		// Always make replace because each math function (like round) replace
 		// with local values and we want a number that has a SQL string format x.y
-		if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount);	// To accept 2 notations for french users
-		$amount=str_replace(' ','',$amount);		// To avoid spaces
-		$amount=str_replace($thousand,'',$amount);	// Replace of thousand before replace of dec to avoid pb if thousand is .
-		$amount=str_replace($dec,'.',$amount);
+		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		$amount = str_replace(' ', '', $amount); // To avoid spaces
+		$amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
+		$amount = str_replace($dec, '.', $amount);
 	}
 
 	return $amount;
@@ -4431,16 +4431,16 @@ 
  * @param   string      $forceunitoutput    'no' or numeric (-3, -6, ...) compared to $unit
  * @return  string                      String to show dimensions
  */
-function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitoutput='no')
+function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-	if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))
+	if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))
 	{
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
 	}
-	elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
+	elseif (($forceunitoutput == 'no' && $dimension < 1 / 10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
 	{
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
@@ -4456,7 +4456,7 @@ 
 		$unit = $unit + 3;
 	}
 
-	$ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
+	$ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
 
 	return $ret;
 }
@@ -4474,13 +4474,13 @@ 
  * 	@return	mixed			   					0 if not found, localtax rate if found
  *  @see get_default_tva
  */
-function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller="", $vatnpr=0)
+function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_seller = "", $vatnpr = 0)
 {
 	global $db, $conf, $mysoc;
 
-	if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) $thirdparty_seller=$mysoc;
+	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) $thirdparty_seller = $mysoc;
 
-	dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
+	dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
 
 	$vatratecleaned = $vatrate;
 	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
@@ -4499,34 +4499,34 @@ 
 	{
 		if ($local == 1)
 		{
-			if (! $mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
+			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (! $thirdparty_buyer->localtax1_assuj) return 0;
+				if (!$thirdparty_buyer->localtax1_assuj) return 0;
 			}
 			else
 			{
-				if (! $thirdparty_seller->localtax1_assuj) return 0;
+				if (!$thirdparty_seller->localtax1_assuj) return 0;
 			}
 		}
 
 		if ($local == 2)
 		{
-			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
+			if (!$mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (! $thirdparty_buyer->localtax2_assuj) return 0;
+				if (!$thirdparty_buyer->localtax2_assuj) return 0;
 			}
 			else
 			{
-				if (! $thirdparty_seller->localtax2_assuj) return 0;
+				if (!$thirdparty_seller->localtax2_assuj) return 0;
 			}
 		}
 	}
 	else
 	{
-		if ($local == 1 && ! $thirdparty_seller->localtax1_assuj) return 0;
-		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) return 0;
+		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
+		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
 	}
 
 	// For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -4536,9 +4536,9 @@ 
 	}
 
 	// Search local taxes
-	if (! empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
+	if (!empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
 	{
-		if ($local==1)
+		if ($local == 1)
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
@@ -4555,7 +4555,7 @@ 
 				}
 			}
 		}
-		if ($local==2)
+		if ($local == 2)
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
@@ -4576,20 +4576,20 @@ 
 	}
 
 	// By default, search value of local tax on line of common tax
-	$sql  = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+	$sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";		// If we have the code, we use it in priority
-   	else $sql.= " AND t.recuperableonly ='".$vatnpr."'";
+   	if ($vatratecode) $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority
+   	else $sql .= " AND t.recuperableonly ='".$vatnpr."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
-   	$resql=$db->query($sql);
+   	$resql = $db->query($sql);
 
    	if ($resql)
    	{
    		$obj = $db->fetch_object($resql);
-   		if ($local==1) return $obj->localtax1;
-   		elseif ($local==2) return $obj->localtax2;
+   		if ($local == 1) return $obj->localtax1;
+   		elseif ($local == 2) return $obj->localtax2;
 	}
 
 	return 0;
@@ -4606,11 +4606,11 @@ 
  */
 function isOnlyOneLocalTax($local)
 {
-	$tax=get_localtax_by_third($local);
+	$tax = get_localtax_by_third($local);
 
-	$valors=explode(":", $tax);
+	$valors = explode(":", $tax);
 
-	if (count($valors)>1)
+	if (count($valors) > 1)
 	{
 		return false;
 	}
@@ -4629,19 +4629,19 @@ 
 function get_localtax_by_third($local)
 {
 	global $db, $mysoc;
-	$sql ="SELECT t.localtax1, t.localtax2 ";
-	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";
-	$sql.=" WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";
-	$sql.="  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";
-	$sql.="  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";
-	$sql.="  )";
-
-	$resql=$db->query($sql);
+	$sql = "SELECT t.localtax1, t.localtax2 ";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";
+	$sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";
+	$sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";
+	$sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";
+	$sql .= "  )";
+
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($local==1) return $obj->localtax1;
-		elseif ($local==2) return $obj->localtax2;
+		if ($local == 1) return $obj->localtax1;
+		elseif ($local == 2) return $obj->localtax2;
 	}
 
 	return 0;
@@ -4660,7 +4660,7 @@ 
  *  @return	array       	  				array('rowid'=> , 'code'=> ...)
  *  @see getLocalTaxesFromRate
  */
-function getTaxesFromId($vatrate, $buyer=null, $seller=null, $firstparamisid=1)
+function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid = 1)
 {
 	global $db, $mysoc;
 
@@ -4668,8 +4668,8 @@ 
 
 	// Search local taxes
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
+	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
 	else
 	{
 		$vatratecleaned = $vatrate;
@@ -4680,14 +4680,14 @@ 
 			$vatratecode = $reg[2];
 		}
 
-		$sql.=", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
+		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
+		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??
 		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
-		$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
+		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";
 	}
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
@@ -4715,7 +4715,7 @@ 
  *  @return	array    	    				array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)
  *  @see getTaxesFromId
  */
-function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid=0)
+function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid = 0)
 {
 	global $db, $mysoc;
 
@@ -4724,7 +4724,7 @@ 
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
+	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
 	else
 	{
 		$vatratecleaned = $vatrate;
@@ -4735,46 +4735,46 @@ 
 			$vatratecode = $reg[2];
 		}
 
-		$sql.=", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
+		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
+		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??
 		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
-		$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
+		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";
 	}
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 		if ($local == 1)
 		{
-			if (! isOnlyOneLocalTax(1))
+			if (!isOnlyOneLocalTax(1))
 			{
 				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 			else
 			{
-				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
+				return array($obj->localtax1_type, $obj->localtax1, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 		}
 		elseif ($local == 2)
 		{
-			if (! isOnlyOneLocalTax(2))
+			if (!isOnlyOneLocalTax(2))
 			{
-				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell, $obj->accountancy_code_buy);
+				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 			else
 			{
-				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
+				return array($obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
 		}
 		else
 		{
-			if(! isOnlyOneLocalTax(1))
+			if (!isOnlyOneLocalTax(1))
 			{
-				if(! isOnlyOneLocalTax(2))
+				if (!isOnlyOneLocalTax(2))
 				{
-					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
+					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
 				else
 				{
@@ -4783,7 +4783,7 @@ 
 			}
 			else
 			{
-				if(! isOnlyOneLocalTax(2))
+				if (!isOnlyOneLocalTax(2))
 				{
 					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
@@ -4808,35 +4808,35 @@ 
  *  @return float|string   				    Vat rate to use with format 5.0 or '5.0 (XXX)'
  *  @see get_product_localtax_for_country
  */
-function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice=0)
+function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice = 0)
 {
-	global $db,$conf,$mysoc;
+	global $db, $conf, $mysoc;
 
-	require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-	$ret=0;
-	$found=0;
+	$ret = 0;
+	$found = 0;
 
 	if ($idprod > 0)
 	{
 		// Load product
-		$product=new Product($db);
-		$result=$product->fetch($idprod);
+		$product = new Product($db);
+		$result = $product->fetch($idprod);
 
 		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
 		{
 			if ($idprodfournprice > 0)     // We want vat for product for a "supplier" order or invoice
 			{
-				$product->get_buyprice($idprodfournprice,0,0,0);
-				$ret=$product->vatrate_supplier;
-				if ($product->default_vat_code) $ret.=' ('.$product->default_vat_code.')';
+				$product->get_buyprice($idprodfournprice, 0, 0, 0);
+				$ret = $product->vatrate_supplier;
+				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
 			else
 			{
-				$ret=$product->tva_tx;    // Default vat of product we defined
-				if ($product->default_vat_code) $ret.=' ('.$product->default_vat_code.')';
+				$ret = $product->tva_tx; // Default vat of product we defined
+				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
-			$found=1;
+			$found = 1;
 		}
 		else
 		{
@@ -4845,30 +4845,30 @@ 
 		}
 	}
 
-	if (! $found)
+	if (!$found)
 	{
 		if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS))
 		{
 			// If vat of product for the country not found or not defined, we return the first higher vat of country.
 			$sql = "SELECT taux as vat_rate";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-			$sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
-			$sql.= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";
-			$sql.= $db->plimit(1);
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
+			$sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";
+			$sql .= $db->plimit(1);
 
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
-				$obj=$db->fetch_object($resql);
+				$obj = $db->fetch_object($resql);
 				if ($obj)
 				{
-					$ret=$obj->vat_rate;
+					$ret = $obj->vat_rate;
 				}
 				$db->free($sql);
 			}
 			else dol_print_error($db);
 		}
-		else $ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails
+		else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -4886,20 +4886,20 @@ 
  */
 function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 {
-	global $db,$mysoc;
+	global $db, $mysoc;
 
-	if (! class_exists('Product')) {
-		require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+	if (!class_exists('Product')) {
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 	}
 
-	$ret=0;
-	$found=0;
+	$ret = 0;
+	$found = 0;
 
 	if ($idprod > 0)
 	{
 		// Load product
-		$product=new Product($db);
-		$result=$product->fetch($idprod);
+		$product = new Product($db);
+		$result = $product->fetch($idprod);
 
 		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
 		{
@@ -4917,23 +4917,23 @@ 
 		}
 	}
 
-	if (! $found)
+	if (!$found)
 	{
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
-		$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
-		$sql.= $db->plimit(1);
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
+		$sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";
+		$sql .= $db->plimit(1);
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$obj=$db->fetch_object($resql);
+			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				if ($local==1) $ret=$obj->localtax1;
-				elseif ($local==2) $ret=$obj->localtax2;
+				if ($local == 1) $ret = $obj->localtax1;
+				elseif ($local == 2) $ret = $obj->localtax2;
 			}
 		}
 		else dol_print_error($db);
@@ -4959,14 +4959,14 @@ 
  *	@return float|string   				      	Vat rate to use with format 5.0 or '5.0 (XXX)', -1 if we can't guess it
  *  @see get_default_npr, get_default_localtax
  */
-function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod=0, $idprodfournprice=0)
+function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)
 {
 	global $conf;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 	// Note: possible values for tva_assuj are 0/1 or franchise/reel
-	$seller_use_vat=((is_numeric($thirdparty_seller->tva_assuj) && ! $thirdparty_seller->tva_assuj) || (! is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj=='franchise'))?0:1;
+	$seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;
 
 	$seller_country_code = $thirdparty_seller->country_code;
 	$seller_in_cee = isInEEC($thirdparty_seller);
@@ -4974,21 +4974,21 @@ 
 	$buyer_country_code = $thirdparty_buyer->country_code;
 	$buyer_in_cee = isInEEC($thirdparty_buyer);
 
-	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(! empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC)?$conf->global->SERVICES_ARE_ECOMMERCE_200238EC:''));
+	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
 
 	// If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)
 	// we use the buyer VAT.
-	if (! empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))
+	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))
 	{
-		if ($seller_in_cee && $buyer_in_cee && ! $thirdparty_buyer->isACompany())
+		if ($seller_in_cee && $buyer_in_cee && !$thirdparty_buyer->isACompany())
 		{
 			//print 'VATRULE 0';
-			return get_product_vat_for_country($idprod,$thirdparty_buyer,$idprodfournprice);
+			return get_product_vat_for_country($idprod, $thirdparty_buyer, $idprodfournprice);
 		}
 	}
 
 	// If seller does not use VAT
-	if (! $seller_use_vat)
+	if (!$seller_use_vat)
 	{
 		//print 'VATRULE 1';
 		return 0;
@@ -4998,10 +4998,10 @@ 
 
 	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
 	if (($seller_country_code == $buyer_country_code)
-	|| (in_array($seller_country_code,array('FR,MC')) && in_array($buyer_country_code,array('FR','MC')))) // Warning ->country_code not always defined
+	|| (in_array($seller_country_code, array('FR,MC')) && in_array($buyer_country_code, array('FR', 'MC')))) // Warning ->country_code not always defined
 	{
 		//print 'VATRULE 2';
-		return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
+		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 	}
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
@@ -5011,7 +5011,7 @@ 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
 	if (($seller_in_cee && $buyer_in_cee))
 	{
-		$isacompany=$thirdparty_buyer->isACompany();
+		$isacompany = $thirdparty_buyer->isACompany();
 		if ($isacompany)
 		{
 			//print 'VATRULE 3';
@@ -5020,7 +5020,7 @@ 
 		else
 		{
 			//print 'VATRULE 4';
-			return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
+			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 		}
 	}
 
@@ -5041,22 +5041,22 @@ 
  *	@return float       			        	0 or 1
  *  @see get_default_tva, get_default_localtax
  */
-function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod=0, $idprodfournprice=0)
+function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)
 {
 	global $db;
 
 	if ($idprodfournprice > 0)
 	{
-		if (! class_exists('ProductFournisseur'))
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+		if (!class_exists('ProductFournisseur'))
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
 	}
 	elseif ($idprod > 0)
 	{
-		if (! class_exists('Product'))
-			require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+		if (!class_exists('Product'))
+			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prod = new Product($db);
 		$prod->fetch($idprod);
 		return $prod->tva_npr;
@@ -5078,31 +5078,31 @@ 
  *	@return integer        				       	localtax, -1 si ne peut etre determine
  *  @see get_default_tva, get_default_npr
  */
-function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod=0)
+function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod = 0)
 {
 	global $mysoc;
 
 	if (!is_object($thirdparty_seller)) return -1;
 	if (!is_object($thirdparty_buyer)) return -1;
 
-	if ($local==1) // Localtax 1
+	if ($local == 1) // Localtax 1
 	{
 		if ($mysoc->country_code == 'ES')
 		{
-			if (is_numeric($thirdparty_buyer->localtax1_assuj) && ! $thirdparty_buyer->localtax1_assuj) return 0;
+			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
 		}
 		else
 		{
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
-			if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) return 0;
-			if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') return 0;
+			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
+			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
 		}
 	}
-	elseif ($local==2) //I Localtax 2
+	elseif ($local == 2) //I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
-		if (is_numeric($thirdparty_seller->localtax2_assuj) && ! $thirdparty_seller->localtax2_assuj) return 0;
-		if (! is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj=='localtax2off') return 0;
+		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;
+		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') return 0;
 	}
 
 	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code)
@@ -5121,28 +5121,28 @@ 
  *	@param	int		$color			0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
  *	@return	string					HTML string
  */
-function yn($yesno, $case=1, $color=0)
+function yn($yesno, $case = 1, $color = 0)
 {
 	global $langs;
-	$result='unknown'; $classname='';
+	$result = 'unknown'; $classname = '';
 	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
 	{
-		$result=$langs->trans('yes');
-		if ($case == 1 || $case == 3) $result=$langs->trans("Yes");
-		if ($case == 2) $result='<input type="checkbox" value="1" checked disabled>';
-		if ($case == 3) $result='<input type="checkbox" value="1" checked disabled> '.$result;
+		$result = $langs->trans('yes');
+		if ($case == 1 || $case == 3) $result = $langs->trans("Yes");
+		if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';
+		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
-		$classname='ok';
+		$classname = 'ok';
 	}
 	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
-		$result=$langs->trans("no");
-		if ($case == 1 || $case == 3) $result=$langs->trans("No");
-		if ($case == 2) $result='<input type="checkbox" value="0" disabled>';
-		if ($case == 3) $result='<input type="checkbox" value="0" disabled> '.$result;
+		$result = $langs->trans("no");
+		if ($case == 1 || $case == 3) $result = $langs->trans("No");
+		if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';
+		if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;
 
-		if ($color == 2) $classname='ok';
-		else $classname='error';
+		if ($color == 2) $classname = 'ok';
+		else $classname = 'error';
 	}
 	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
 	return $result;
@@ -5170,30 +5170,30 @@ 
 
 	$path = '';
 
-	$arrayforoldpath=array('cheque','user','category','holiday','supplier_invoice','invoice_supplier','mailing','supplier_payment');
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
-	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
+	$arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
+	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';
+	if (!empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
-		if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
-		else $num = preg_replace('/^.*\-/i','',$num);
+		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);
+		else $num = preg_replace('/^.*\-/i', '', $num);
 		$num = substr("000".$num, -$level);
-		if ($level == 1) $path = substr($num,0,1);
-		if ($level == 2) $path = substr($num,1,1).'/'.substr($num,0,1);
-		if ($level == 3) $path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1);
+		if ($level == 1) $path = substr($num, 0, 1);
+		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
+		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
 	}
 	else
 	{
 		// TODO
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
-		if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice','shipment')))
+		if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice', 'shipment')))
 		{
-			$path=($object->ref?$object->ref:$object->id);
+			$path = ($object->ref ? $object->ref : $object->id);
 		}
 	}
 
-	if (empty($withoutslash) && ! empty($path)) $path.='/';
+	if (empty($withoutslash) && !empty($path)) $path .= '/';
 
 	return $path;
 }
@@ -5206,64 +5206,64 @@ 
  *  @param	int		$newmask	Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
  *	@return int         		< 0 if KO, 0 = already exists, > 0 if OK
  */
-function dol_mkdir($dir, $dataroot='', $newmask=null)
+function dol_mkdir($dir, $dataroot = '', $newmask = null)
 {
 	global $conf;
 
-	dol_syslog("functions.lib::dol_mkdir: dir=".$dir,LOG_INFO);
+	dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);
 
-	$dir_osencoded=dol_osencode($dir);
+	$dir_osencoded = dol_osencode($dir);
 	if (@is_dir($dir_osencoded)) return 0;
 
-	$nberr=0;
-	$nbcreated=0;
+	$nberr = 0;
+	$nbcreated = 0;
 
-	$ccdir='';
-	if (! empty($dataroot)) {
+	$ccdir = '';
+	if (!empty($dataroot)) {
 		// Remove data root from loop
 		$dir = str_replace($dataroot.'/', '', $dir);
 		$ccdir = $dataroot.'/';
 	}
 
 	$cdir = explode("/", $dir);
-	$num=count($cdir);
+	$num = count($cdir);
 	for ($i = 0; $i < $num; $i++)
 	{
 		if ($i > 0) $ccdir .= '/'.$cdir[$i];
 		else $ccdir .= $cdir[$i];
-		if (preg_match("/^.:$/",$ccdir,$regs)) continue;	// Si chemin Windows incomplet, on poursuit par rep suivant
+		if (preg_match("/^.:$/", $ccdir, $regs)) continue; // Si chemin Windows incomplet, on poursuit par rep suivant
 
 		// Attention, le is_dir() peut echouer bien que le rep existe.
 		// (ex selon config de open_basedir)
 		if ($ccdir)
 		{
-			$ccdir_osencoded=dol_osencode($ccdir);
-			if (! @is_dir($ccdir_osencoded))
+			$ccdir_osencoded = dol_osencode($ccdir);
+			if (!@is_dir($ccdir_osencoded))
 			{
-				dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.",LOG_DEBUG);
+				dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);
 
 				umask(0);
-				$dirmaskdec=octdec($newmask);
+				$dirmaskdec = octdec($newmask);
 				if (empty($newmask)) {
-					$dirmaskdec = empty( $conf->global->MAIN_UMASK ) ? octdec( '0755' ) : octdec( $conf->global->MAIN_UMASK );
+					$dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
 				}
-				$dirmaskdec |= octdec('0111');  // Set x bit required for directories
-				if (! @mkdir($ccdir_osencoded, $dirmaskdec))
+				$dirmaskdec |= octdec('0111'); // Set x bit required for directories
+				if (!@mkdir($ccdir_osencoded, $dirmaskdec))
 				{
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
-					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.",LOG_WARNING);
+					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
 				}
 				else
 				{
-					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created",LOG_DEBUG);
-					$nberr=0;	// On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
+					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);
+					$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
 			}
 			else
 			{
-				$nberr=0;	// On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
+				$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
 		}
 	}
@@ -5296,26 +5296,26 @@ 
  *
  * 	@see	dol_escape_htmltag strip_tags
  */
-function dol_string_nohtmltag($stringtoclean,$removelinefeed=1,$pagecodeto='UTF-8')
+function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8')
 {
 	// TODO Try to replace with  strip_tags($stringtoclean)
 	$pattern = "/<[^<>]+>/";
 	$stringtoclean = preg_replace('/<br[^>]*>/', "\n", $stringtoclean);
-	$temp = dol_html_entity_decode($stringtoclean,ENT_COMPAT,$pagecodeto);
+	$temp = dol_html_entity_decode($stringtoclean, ENT_COMPAT, $pagecodeto);
 
 	// Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
-	$temp = preg_replace($pattern,"",$temp);    // pass 1
+	$temp = preg_replace($pattern, "", $temp); // pass 1
 	// $temp after pass 1: <a href="/myurl" title="A title">0000-021
-	$temp = preg_replace($pattern,"",$temp);    // pass 2
+	$temp = preg_replace($pattern, "", $temp); // pass 2
 	// $temp after pass 2: 0000-021
 
 	// Supprime aussi les retours
-	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
+	if ($removelinefeed) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
 
 	// et les espaces doubles
-	while(strpos($temp,"  "))
+	while (strpos($temp, "  "))
 	{
-		$temp = str_replace("  "," ",$temp);
+		$temp = str_replace("  ", " ", $temp);
 	}
 
 	return trim($temp);
@@ -5330,29 +5330,29 @@ 
  * @return	string				Output text
  * @see dol_nboflines_bis, dol_string_nohtmltag, dol_escape_htmltag
  */
-function dolGetFirstLineOfText($text, $nboflines=1)
+function dolGetFirstLineOfText($text, $nboflines = 1)
 {
 	if ($nboflines == 1)
 	{
 		if (dol_textishtml($text))
 		{
-			$firstline=preg_replace('/<br[^>]*>.*$/s','',$text);		// The s pattern modifier means the . can match newline characters
-			$firstline=preg_replace('/<div[^>]*>.*$/s','',$firstline);	// The s pattern modifier means the . can match newline characters
+			$firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters
+			$firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters
 
 		}
 		else
 		{
-			$firstline=preg_replace('/[\n\r].*/','',$text);
+			$firstline = preg_replace('/[\n\r].*/', '', $text);
 		}
-		return $firstline.((strlen($firstline) != strlen($text))?'...':'');
+		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');
 	}
 	else
 	{
-		$ishtml=0;
+		$ishtml = 0;
 		if (dol_textishtml($text))
 		{
-			$text=preg_replace('/\n/','',$text);
-			$ishtml=1;
+			$text = preg_replace('/\n/', '', $text);
+			$ishtml = 1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 		else
@@ -5362,20 +5362,20 @@ 
 
 		$text = strtr($text, $repTable);
 		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-		else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
+		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		$firstline='';
-		$i=0;
-		$nba = count($a);	// 2x nb of lines in $a because $a contains also a line for each new line separator
+		$firstline = '';
+		$i = 0;
+		$nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator
 		while (($i < $nba) && ($i < ($nboflines * 2)))
 		{
 			if ($i % 2 == 0) $firstline .= $a[$i];
-			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml?"<br>\n":"\n");
+			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml ? "<br>\n" : "\n");
 			$i++;
 		}
 		unset($a);
-		return $firstline.(($i < $nba)?'...':'');
+		return $firstline.(($i < $nba) ? '...' : '');
 	}
 }
 
@@ -5389,12 +5389,12 @@ 
  * @return	string						String encoded
  * @see dol_nboflines, dolGetFirstLineOfText
  */
-function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
+function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
 {
 	if (!$nl2brmode) {
 		return nl2br($stringtoencode, $forxml);
 	} else {
-		$ret=preg_replace('/(\r\n|\r|\n)/i', ($forxml?'<br />':'<br>'), $stringtoencode);
+		$ret = preg_replace('/(\r\n|\r|\n)/i', ($forxml ? '<br />' : '<br>'), $stringtoencode);
 		return $ret;
 	}
 }
@@ -5417,21 +5417,21 @@ 
  *  @param	int		$removelasteolbr	1=Remove last br or lasts \n (default), 0=Do nothing
  *  @return	string						String encoded
  */
-function dol_htmlentitiesbr($stringtoencode, $nl2brmode=0, $pagecodefrom='UTF-8', $removelasteolbr=1)
+function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UTF-8', $removelasteolbr = 1)
 {
-	$newstring=$stringtoencode;
+	$newstring = $stringtoencode;
 	if (dol_textishtml($stringtoencode))	// Check if text is already HTML or not
 	{
-		$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring);	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-		if ($removelasteolbr) $newstring=preg_replace('/<br>$/i','',$newstring);	// Remove last <br> (remove only last one)
-		$newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__'));
-		$newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom);	// Make entity encoding
-		$newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"'));
+		$newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
+		if ($removelasteolbr) $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)
+		$newstring = strtr($newstring, array('&'=>'__and__', '<'=>'__lt__', '>'=>'__gt__', '"'=>'__dquot__'));
+		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
+		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
 	}
 	else
 	{
-		if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring);	// Remove last \n (may remove several)
-		$newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode);
+		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
+		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
 	// Other substitutions that htmlentities does not do
 	//$newstring=str_replace(chr(128),'&euro;',$newstring);	// 128 = 0x80. Not in html entity table.     // Seems useles with TCPDF. Make bug with UTF8 languages
@@ -5445,13 +5445,13 @@ 
  *	@param	string	$pagecodeto			Page code for result
  *	@return	string						String decoded
  */
-function dol_htmlentitiesbr_decode($stringtodecode,$pagecodeto='UTF-8')
+function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')
 {
-	$ret=dol_html_entity_decode($stringtodecode,ENT_COMPAT,$pagecodeto);
-	$ret=preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i',"<br>",$ret);
-	$ret=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i',"\r\n",$ret);
-	$ret=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i',"\n",$ret);
-	$ret=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i',"\n",$ret);
+	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);
+	$ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);
+	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);
+	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);
+	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);
 	return $ret;
 }
 
@@ -5463,7 +5463,7 @@ 
  */
 function dol_htmlcleanlastbr($stringtodecode)
 {
-	$ret=preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i',"",$stringtodecode);
+	$ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);
 	return $ret;
 }
 
@@ -5475,9 +5475,9 @@ 
  * @param   string	$c		Operand c
  * @return  string			String decoded
  */
-function dol_html_entity_decode($a,$b,$c='UTF-8')
+function dol_html_entity_decode($a, $b, $c = 'UTF-8')
 {
-	return html_entity_decode($a,$b,$c);
+	return html_entity_decode($a, $b, $c);
 }
 
 /**
@@ -5490,7 +5490,7 @@ 
  * @param   bool    $double_encode  When double_encode is turned off, PHP will not encode existing html entities
  * @return  string  $ret            Encoded string
  */
-function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false)
+function dol_htmlentities($string, $flags = null, $encoding = 'UTF-8', $double_encode = false)
 {
 	return htmlentities($string, $flags, $encoding, $double_encode);
 }
@@ -5505,14 +5505,14 @@ 
  */
 function dol_string_is_good_iso($s)
 {
-	$len=dol_strlen($s);
-	$ok=1;
-	for($scursor=0;$scursor<$len;$scursor++)
+	$len = dol_strlen($s);
+	$ok = 1;
+	for ($scursor = 0; $scursor < $len; $scursor++)
 	{
-		$ordchar=ord($s{$scursor});
+		$ordchar = ord($s{$scursor});
 		//print $scursor.'-'.$ordchar.'<br>';
-		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok=0; break; }
-		if ($ordchar > 126 && $ordchar < 160) { $ok=0; break; }
+		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; }
+		if ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; }
 	}
 	return $ok;
 }
@@ -5526,11 +5526,11 @@ 
  *	@return	int					Number of lines
  *  @see	dol_nboflines_bis, dolGetFirstLineOfText
  */
-function dol_nboflines($s,$maxchar=0)
+function dol_nboflines($s, $maxchar = 0)
 {
 	if ($s == '') return 0;
-	$arraystring=explode("\n",$s);
-	$nb=count($arraystring);
+	$arraystring = explode("\n", $s);
+	$nb = count($arraystring);
 
 	return $nb;
 }
@@ -5545,30 +5545,30 @@ 
  *	@return int						Number of lines
  *	@see	dol_nboflines, dolGetFirstLineOfText
  */
-function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
+function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 {
 	$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 
 	$text = strtr($text, $repTable);
 	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-	else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
+	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-	$nblines = (int) floor((count($a)+1)/2);
+	$nblines = (int) floor((count($a) + 1) / 2);
 	// count possible auto line breaks
-	if($maxlinesize)
+	if ($maxlinesize)
 	{
 		foreach ($a as $line)
 		{
-			if (dol_strlen($line)>$maxlinesize)
+			if (dol_strlen($line) > $maxlinesize)
 			{
 				//$line_dec = html_entity_decode(strip_tags($line));
 				$line_dec = html_entity_decode($line);
-				if(dol_strlen($line_dec)>$maxlinesize)
+				if (dol_strlen($line_dec) > $maxlinesize)
 				{
-					$line_dec=wordwrap($line_dec,$maxlinesize,'\n',true);
-					$nblines+=substr_count($line_dec,'\n');
+					$line_dec = wordwrap($line_dec, $maxlinesize, '\n', true);
+					$nblines += substr_count($line_dec, '\n');
 				}
 			}
 		}
@@ -5587,7 +5587,7 @@ 
  */
 function dol_microtime_float()
 {
-	dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+	dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);
 
 	return microtime(true);
 }
@@ -5600,28 +5600,28 @@ 
  *	@return	boolean				true/false
  *	@see	dol_concatdesc
  */
-function dol_textishtml($msg,$option=0)
+function dol_textishtml($msg, $option = 0)
 {
 	if ($option == 1)
 	{
-		if (preg_match('/<html/i',$msg))				return true;
-		elseif (preg_match('/<body/i',$msg))			return true;
-		elseif (preg_match('/<br/i',$msg))				return true;
+		if (preg_match('/<html/i', $msg))				return true;
+		elseif (preg_match('/<body/i', $msg))			return true;
+		elseif (preg_match('/<br/i', $msg))				return true;
 		return false;
 	}
 	else
 	{
-		if (preg_match('/<html/i',$msg))				return true;
-		elseif (preg_match('/<body/i',$msg))			return true;
-		elseif (preg_match('/<(b|em|i|u)>/i',$msg))		return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) 	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;
-		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i',$msg)) return true;	// must accept <img src="http://example.com/aaa.png" />
-		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i',$msg)) return true;	// must accept <a href="http://example.com/aaa.png" />
-		elseif (preg_match('/<h[0-9]>/i',$msg))			return true;
-		elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg))	return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-		elseif (preg_match('/&#[0-9]{2,3};/i',$msg))	return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+		if (preg_match('/<html/i', $msg))				return true;
+		elseif (preg_match('/<body/i', $msg))			return true;
+		elseif (preg_match('/<(b|em|i|u)>/i', $msg))		return true;
+		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) 	  return true;
+		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) return true;
+		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) return true;
+		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) return true; // must accept <img src="http://example.com/aaa.png" />
+		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) return true; // must accept <a href="http://example.com/aaa.png" />
+		elseif (preg_match('/<h[0-9]>/i', $msg))			return true;
+		elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))	return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+		elseif (preg_match('/&#[0-9]{2,3};/i', $msg))	return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
 		return false;
 	}
 }
@@ -5639,12 +5639,12 @@ 
  *  @return	string				Text 1 + new line + Text2
  *  @see    dol_textishtml
  */
-function dol_concatdesc($text1,$text2,$forxml=false)
+function dol_concatdesc($text1, $text2, $forxml = false)
 {
-	$ret='';
-	$ret.= (! dol_textishtml($text1) && dol_textishtml($text2))?dol_nl2br($text1, 0, $forxml):$text1;
-	$ret.= (! empty($text1) && ! empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2))?($forxml?"<br \>\n":"<br>\n") : "\n") : "";
-	$ret.= (dol_textishtml($text1) && ! dol_textishtml($text2))?dol_nl2br($text2, 0, $forxml):$text2;
+	$ret = '';
+	$ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ?dol_nl2br($text1, 0, $forxml) : $text1;
+	$ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
+	$ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ?dol_nl2br($text2, 0, $forxml) : $text2;
 	return $ret;
 }
 
@@ -5659,21 +5659,21 @@ 
  * @return	array						Array of substitutions
  * @see setSubstitFromObject
  */
-function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $object=null)
+function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null)
 {
 	global $db, $conf, $mysoc, $user;
 
-	$substitutionarray=array();
+	$substitutionarray = array();
 
-	if (empty($exclude) || ! in_array('system', $exclude))
+	if (empty($exclude) || !in_array('system', $exclude))
 	{
-		$substitutionarray['__(AnyTranslationKey)__']=$outputlangs->trans('TranslationOfKey');
-		$substitutionarray['__[AnyConstantKey]__']=$outputlangs->trans('ValueOfConstant');
-		$substitutionarray['__DOL_MAIN_URL_ROOT__']=DOL_MAIN_URL_ROOT;
+		$substitutionarray['__(AnyTranslationKey)__'] = $outputlangs->trans('TranslationOfKey');
+		$substitutionarray['__[AnyConstantKey]__'] = $outputlangs->trans('ValueOfConstant');
+		$substitutionarray['__DOL_MAIN_URL_ROOT__'] = DOL_MAIN_URL_ROOT;
 	}
-	if ((empty($exclude) || ! in_array('mycompany', $exclude)) && is_object($mysoc))
+	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc))
 	{
-		$substitutionarray=array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
@@ -5691,7 +5691,7 @@ 
 			'__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
 		));
 	}
-	if (($onlykey || is_object($object)) && (empty($exclude) || ! in_array('object', $exclude)))
+	if (($onlykey || is_object($object)) && (empty($exclude) || !in_array('object', $exclude)))
 	{
 		if ($onlykey)
 		{
@@ -5729,8 +5729,8 @@ 
 
 			if (is_object($object) && $object->element == 'shipping')
 			{
-				$substitutionarray['__SHIPPINGTRACKNUM__']='Shipping tacking number';
-				$substitutionarray['__SHIPPINGTRACKNUMURL__']='Shipping tracking url';
+				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
+				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
 		}
 		else
@@ -5743,62 +5743,62 @@ 
 			// TODO USe this ?
 			$msgishtml = 0;
 
-			$birthday = dol_print_date($object->birth,'day');
+			$birthday = dol_print_date($object->birth, 'day');
 
 			if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
-			$substitutionarray['__MEMBER_FIRSTNAME__']=$msgishtml?dol_htmlentitiesbr($object->firstname):$object->firstname;
-			$substitutionarray['__MEMBER_LASTNAME__']=$msgishtml?dol_htmlentitiesbr($object->lastname):$object->lastname;
-			if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__']=$msgishtml?dol_htmlentitiesbr($object->getFullName($outputlangs)):$object->getFullName($outputlangs);
-			$substitutionarray['__MEMBER_COMPANY__']=$msgishtml?dol_htmlentitiesbr($object->societe):$object->societe;
-			$substitutionarray['__MEMBER_ADDRESS__']=$msgishtml?dol_htmlentitiesbr($object->address):$object->address;
-			$substitutionarray['__MEMBER_ZIP__']=$msgishtml?dol_htmlentitiesbr($object->zip):$object->zip;
-			$substitutionarray['__MEMBER_TOWN__']=$msgishtml?dol_htmlentitiesbr($object->town):$object->town;
-			$substitutionarray['__MEMBER_COUNTRY__']=$msgishtml?dol_htmlentitiesbr($object->country):$object->country;
-			$substitutionarray['__MEMBER_EMAIL__']=$msgishtml?dol_htmlentitiesbr($object->email):$object->email;
-			$substitutionarray['__MEMBER_BIRTH__']=$msgishtml?dol_htmlentitiesbr($birthday):$birthday;
-			$substitutionarray['__MEMBER_PHOTO__']=$msgishtml?dol_htmlentitiesbr($object->photo):$object->photo;
-			$substitutionarray['__MEMBER_LOGIN__']=$msgishtml?dol_htmlentitiesbr($object->login):$object->login;
-			$substitutionarray['__MEMBER_PASSWORD__']=$msgishtml?dol_htmlentitiesbr($object->pass):$object->pass;
-			$substitutionarray['__MEMBER_PHONE__']=$msgishtml?dol_htmlentitiesbr($object->phone):$object->phone;
-			$substitutionarray['__MEMBER_PHONEPRO__']=$msgishtml?dol_htmlentitiesbr($object->phone_perso):$object->phone_perso;
-			$substitutionarray['__MEMBER_PHONEMOBILE__']=$msgishtml?dol_htmlentitiesbr($object->phone_mobile):$object->phone_mobile;
+			$substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ?dol_htmlentitiesbr($object->firstname) : $object->firstname;
+			$substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ?dol_htmlentitiesbr($object->lastname) : $object->lastname;
+			if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ?dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+			$substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ?dol_htmlentitiesbr($object->societe) : $object->societe;
+			$substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ?dol_htmlentitiesbr($object->address) : $object->address;
+			$substitutionarray['__MEMBER_ZIP__'] = $msgishtml ?dol_htmlentitiesbr($object->zip) : $object->zip;
+			$substitutionarray['__MEMBER_TOWN__'] = $msgishtml ?dol_htmlentitiesbr($object->town) : $object->town;
+			$substitutionarray['__MEMBER_COUNTRY__'] = $msgishtml ?dol_htmlentitiesbr($object->country) : $object->country;
+			$substitutionarray['__MEMBER_EMAIL__'] = $msgishtml ?dol_htmlentitiesbr($object->email) : $object->email;
+			$substitutionarray['__MEMBER_BIRTH__'] = $msgishtml ?dol_htmlentitiesbr($birthday) : $birthday;
+			$substitutionarray['__MEMBER_PHOTO__'] = $msgishtml ?dol_htmlentitiesbr($object->photo) : $object->photo;
+			$substitutionarray['__MEMBER_LOGIN__'] = $msgishtml ?dol_htmlentitiesbr($object->login) : $object->login;
+			$substitutionarray['__MEMBER_PASSWORD__'] = $msgishtml ?dol_htmlentitiesbr($object->pass) : $object->pass;
+			$substitutionarray['__MEMBER_PHONE__'] = $msgishtml ?dol_htmlentitiesbr($object->phone) : $object->phone;
+			$substitutionarray['__MEMBER_PHONEPRO__'] = $msgishtml ?dol_htmlentitiesbr($object->phone_perso) : $object->phone_perso;
+			$substitutionarray['__MEMBER_PHONEMOBILE__'] = $msgishtml ?dol_htmlentitiesbr($object->phone_mobile) : $object->phone_mobile;
 
 			if (is_object($object) && $object->element == 'societe')
 			{
-				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object)?$object->id:'');
-				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:'');
-				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object)?$object->name_alias:'');
-				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object)?$object->email:'');
+				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object) ? $object->id : '');
+				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object) ? $object->name : '');
+				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object) ? $object->name_alias : '');
+				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object) ? $object->email : '');
 			}
 			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 			{
-				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
-				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
-				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object->thirdparty)?$object->thirdparty->name_alias:'');
-				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty)?$object->thirdparty->email:'');
+				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty) ? $object->thirdparty->id : '');
+				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty) ? $object->thirdparty->name : '');
+				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object->thirdparty) ? $object->thirdparty->name_alias : '');
+				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty) ? $object->thirdparty->email : '');
 			}
 
 			if (is_object($object->projet) && $object->projet->id > 0)
 			{
-				$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
-				$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
+				$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet) ? $object->projet->id : '');
+				$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet) ? $object->projet->ref : '');
+				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet) ? $object->projet->title : '');
 			}
 
 			if (is_object($object) && $object->element == 'shipping')
 			{
-				$substitutionarray['__SHIPPINGTRACKNUM__']=$object->tracking_number;
-				$substitutionarray['__SHIPPINGTRACKNUMURL__']=$object->tracking_url;
+				$substitutionarray['__SHIPPINGTRACKNUM__'] = $object->tracking_number;
+				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = $object->tracking_url;
 			}
 
 			if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
 			{
-				$dateplannedstart='';
-				$datenextexpiration='';
-				foreach($object->lines as $line)
+				$dateplannedstart = '';
+				$datenextexpiration = '';
+				foreach ($object->lines as $line)
 				{
 					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
+					if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
 				}
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
@@ -5813,22 +5813,22 @@ 
 				$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
 				$object->fetch_optionals();
 				foreach ($extrafieldstmp->attribute_label as $key => $label) {
-					$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+					$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
 				}
 			}
 
 			$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'TODO';
 		}
 	}
-	if (empty($exclude) || ! in_array('objectamount', $exclude))
+	if (empty($exclude) || !in_array('objectamount', $exclude))
 	{
-		$substitutionarray['__DATE_YMD__']        = is_object($object)?(isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '') : '';
-		$substitutionarray['__DATE_DUE_YMD__']    = is_object($object)?(isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '') : '';
-		$substitutionarray['__AMOUNT__']          = is_object($object)?$object->total_ttc:'';
-		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object)?$object->total_ht:'';
-		$substitutionarray['__AMOUNT_VAT__']      = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
- 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
+		$substitutionarray['__DATE_YMD__']        = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '') : '';
+		$substitutionarray['__DATE_DUE_YMD__']    = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '') : '';
+		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';
+		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
+		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
+ 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? ($object->total_localtax1 ? $object->total_localtax1 : $object->total_localtax1) : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? ($object->total_localtax2 ? $object->total_localtax2 : $object->total_localtax2) : '';
 
 		/* TODO Add key for multicurrency
     	$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object)?price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
@@ -5838,23 +5838,23 @@ 
 		// For backward compatibility
 		if ($onlykey != 2)
 		{
-			$substitutionarray['__TOTAL_TTC__']    = is_object($object)?$object->total_ttc:'';
-			$substitutionarray['__TOTAL_HT__']     = is_object($object)?$object->total_ht:'';
-			$substitutionarray['__TOTAL_VAT__']    = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+			$substitutionarray['__TOTAL_TTC__']    = is_object($object) ? $object->total_ttc : '';
+			$substitutionarray['__TOTAL_HT__']     = is_object($object) ? $object->total_ht : '';
+			$substitutionarray['__TOTAL_VAT__']    = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
 		}
 	}
 
-	if (empty($exclude) || ! in_array('date', $exclude))
+	if (empty($exclude) || !in_array('date', $exclude))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-		$tmp=dol_getdate(dol_now(), true);
-		$tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
-		$tmp3=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']);
-		$tmp4=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
-		$tmp5=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+		$tmp = dol_getdate(dol_now(), true);
+		$tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+		$tmp3 = dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']);
+		$tmp4 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+		$tmp5 = dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']);
 
-		$substitutionarray=array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__DAY__' => (string) $tmp['mday'],
 			'__MONTH__' => (string) $tmp['mon'],
 			'__YEAR__' => (string) $tmp['year'],
@@ -5867,12 +5867,12 @@ 
 		));
 	}
 
-	if (empty($exclude) || ! in_array('user', $exclude))
+	if (empty($exclude) || !in_array('user', $exclude))
 	{
 		// Add SIGNATURE into substitutionarray first, so, when we will make the substitution,
 		// this will also replace var found into content of signature
 		$signature = $user->signature;
-		$substitutionarray=array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')
 		)
 			);
@@ -5882,7 +5882,7 @@ 
 			$substitutionarray['__SIGNATURE__'] = (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '');
 		}
 
-		$substitutionarray=array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__USER_ID__' => (string) $user->id,
 			'__USER_LOGIN__' => (string) $user->login,
 			'__USER_LASTNAME__' => (string) $user->lastname,
@@ -5893,9 +5893,9 @@ 
 			)
 		);
 	}
-	if (! empty($conf->multicompany->enabled))
+	if (!empty($conf->multicompany->enabled))
 	{
-		$substitutionarray=array_merge($substitutionarray, array('__ENTITY_ID__' => $conf->entity));
+		$substitutionarray = array_merge($substitutionarray, array('__ENTITY_ID__' => $conf->entity));
 	}
 
 	return $substitutionarray;
@@ -5915,13 +5915,13 @@ 
  * 	@return string  		    				Output string after substitutions
  *  @see	complete_substitutions_array
  */
-function make_substitutions($text, $substitutionarray, $outputlangs=null)
+function make_substitutions($text, $substitutionarray, $outputlangs = null)
 {
 	global $conf, $langs;
 
-	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	if (!is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
 
-	if (empty($outputlangs)) $outputlangs=$langs;
+	if (empty($outputlangs)) $outputlangs = $langs;
 
 	// Make substitution for language keys
 	if (is_object($outputlangs))
@@ -5929,13 +5929,13 @@ 
 		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))
 		{
 			$msgishtml = 0;
-			if (dol_textishtml($text,1)) $msgishtml = 1;
+			if (dol_textishtml($text, 1)) $msgishtml = 1;
 
 			// If key is __(TranslationKey|langfile)__, then force load of langfile.lang
-			$tmp=explode('|',$reg[1]);
-			if (! empty($tmp[1])) $outputlangs->load($tmp[1]);
+			$tmp = explode('|', $reg[1]);
+			if (!empty($tmp[1])) $outputlangs->load($tmp[1]);
 
-			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
+			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
 	}
 
@@ -5944,21 +5944,21 @@ 
 	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg))
 	{
 		$msgishtml = 0;
-		if (dol_textishtml($text,1)) $msgishtml = 1;
+		if (dol_textishtml($text, 1)) $msgishtml = 1;
 
 		$keyfound = $reg[1];
 		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
-		else $newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
-		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml?dol_htmlentitiesbr($newval):$newval, $text);
+		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}
 
 	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
-		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';		// Protection
-		if ($key == '__USER_SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';	// Protection
+		if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
+		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
 
-		$text=str_replace("$key","$value",$text);	// We must keep the " to work when value is 123.5 for example
+		$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
 	}
 
 	return $text;
@@ -5976,9 +5976,9 @@ 
  *  @return	void
  *  @see 	make_substitutions
  */
-function complete_substitutions_array(&$substitutionarray, $outputlangs, $object=null, $parameters=null, $callfunc="completesubstitutionarray")
+function complete_substitutions_array(&$substitutionarray, $outputlangs, $object = null, $parameters = null, $callfunc = "completesubstitutionarray")
 {
-	global $conf,$user;
+	global $conf, $user;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -5996,28 +5996,28 @@ 
 	}*/
 
 	// Check if there is external substitution to do, requested by plugins
-	$dirsubstitutions=array_merge(array(),(array) $conf->modules_parts['substitutions']);
+	$dirsubstitutions = array_merge(array(), (array) $conf->modules_parts['substitutions']);
 
-	foreach($dirsubstitutions as $reldir)
+	foreach ($dirsubstitutions as $reldir)
 	{
-		$dir=dol_buildpath($reldir,0);
+		$dir = dol_buildpath($reldir, 0);
 
 		// Check if directory exists
-		if (! dol_is_dir($dir)) continue;
+		if (!dol_is_dir($dir)) continue;
 
-		$substitfiles=dol_dir_list($dir,'files',0,'functions_');
-		foreach($substitfiles as $substitfile)
+		$substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
+		foreach ($substitfiles as $substitfile)
 		{
-			if (preg_match('/functions_(.*)\.lib\.php/i',$substitfile['name'],$reg))
+			if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg))
 			{
-				$module=$reg[1];
+				$module = $reg[1];
 
 				dol_syslog("Library functions_".$substitfile['name']." found into ".$dir);
 				// Include the user's functions file
 				require_once $dir.$substitfile['name'];
 				// Call the user's function, and only if it is defined
-				$function_name=$module."_".$callfunc;
-				if (function_exists($function_name)) $function_name($substitutionarray,$outputlangs,$object,$parameters);
+				$function_name = $module."_".$callfunc;
+				if (function_exists($function_name)) $function_name($substitutionarray, $outputlangs, $object, $parameters);
 			}
 		}
 	}
@@ -6032,9 +6032,9 @@ 
  *    @param	Translate	$outputlangs   Output language
  *    @return	void
  */
-function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
+function print_date_range($date_start, $date_end, $format = '', $outputlangs = '')
 {
-	print get_date_range($date_start,$date_end,$format,$outputlangs);
+	print get_date_range($date_start, $date_end, $format, $outputlangs);
 }
 
 /**
@@ -6047,25 +6047,25 @@ 
  *    @param	integer		$withparenthesis	1=Add parenthesis, 0=non parenthesis
  *    @return	string							String
  */
-function get_date_range($date_start,$date_end,$format = '',$outputlangs='', $withparenthesis=1)
+function get_date_range($date_start, $date_end, $format = '', $outputlangs = '', $withparenthesis = 1)
 {
 	global $langs;
 
-	$out='';
+	$out = '';
 
-	if (! is_object($outputlangs)) $outputlangs=$langs;
+	if (!is_object($outputlangs)) $outputlangs = $langs;
 
 	if ($date_start && $date_end)
 	{
-		$out.= ($withparenthesis?' (':'').$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($date_start, $format, false, $outputlangs),dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis?')':'');
+		$out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');
 	}
-	if ($date_start && ! $date_end)
+	if ($date_start && !$date_end)
 	{
-		$out.= ($withparenthesis?' (':'').$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis?')':'');
+		$out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');
 	}
-	if (! $date_start && $date_end)
+	if (!$date_start && $date_end)
 	{
-		$out.= ($withparenthesis?' (':'').$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis?')':'');
+		$out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');
 	}
 
 	return $out;
@@ -6079,28 +6079,28 @@ 
  * @param	int		$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname
  * @return	string					Firstname + lastname or Lastname + firstname
  */
-function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
+function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 {
 	global $conf;
 
-	$ret='';
+	$ret = '';
 	// If order not defined, we use the setup
-	if ($nameorder < 0) $nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
+	if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
 	if ($nameorder && ((string) $nameorder != '2'))
 	{
-		$ret.=$firstname;
-		if ($firstname && $lastname) $ret.=' ';
-		$ret.=$lastname;
+		$ret .= $firstname;
+		if ($firstname && $lastname) $ret .= ' ';
+		$ret .= $lastname;
 	}
 	else if ($nameorder == 2)
 	{
-	   $ret.=$firstname;
+	   $ret .= $firstname;
 	}
 	else
 	{
-		$ret.=$lastname;
-		if ($firstname && $lastname) $ret.=' ';
-		$ret.=$firstname;
+		$ret .= $lastname;
+		if ($firstname && $lastname) $ret .= ' ';
+		$ret .= $firstname;
 	}
 	return $ret;
 }
@@ -6116,16 +6116,16 @@ 
  *  @return	void
  *  @see	dol_htmloutput_events
  */
-function setEventMessage($mesgs, $style='mesgs')
+function setEventMessage($mesgs, $style = 'mesgs')
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
-	if (! is_array($mesgs))		// If mesgs is a string
+	if (!is_array($mesgs))		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
 	}
 	else						// If mesgs is an array
 	{
-		foreach($mesgs as $mesg)
+		foreach ($mesgs as $mesg)
 		{
 			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
 		}
@@ -6142,13 +6142,13 @@ 
  *  @return	void
  *  @see	dol_htmloutput_events
  */
-function setEventMessages($mesg, $mesgs, $style='mesgs')
+function setEventMessages($mesg, $mesgs, $style = 'mesgs')
 {
-	if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter style='.$style.' for setEventMessages');
+	if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
 	if (empty($mesgs)) setEventMessage($mesg, $style);
 	else
 	{
-		if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style);	// Add message string if not already into array
+		if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
 		setEventMessage($mesgs, $style);
 	}
 }
@@ -6162,7 +6162,7 @@ 
  *  @return	void
  *  @see    									dol_htmloutput_mesg
  */
-function dol_htmloutput_events($disabledoutputofmessages=0)
+function dol_htmloutput_events($disabledoutputofmessages = 0)
 {
 	// Show mesgs
 	if (isset($_SESSION['dol_events']['mesgs'])) {
@@ -6197,57 +6197,57 @@ 
  *  @see    dol_htmloutput_errors
  *  @see    setEventMessages
  */
-function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepembedded=0)
+function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $keepembedded = 0)
 {
 	global $conf, $langs;
 
-	$ret=0; $return='';
-	$out='';
-	$divstart=$divend='';
+	$ret = 0; $return = '';
+	$out = '';
+	$divstart = $divend = '';
 
 	// If inline message with no format, we add it.
-	if ((empty($conf->use_javascript_ajax) || ! empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && ! preg_match('/<div class=".*">/i',$out))
+	if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out))
 	{
-		$divstart='<div class="'.$style.' clearboth">';
-		$divend='</div>';
+		$divstart = '<div class="'.$style.' clearboth">';
+		$divend = '</div>';
 	}
 
 	if ((is_array($mesgarray) && count($mesgarray)) || $mesgstring)
 	{
 		$langs->load("errors");
-		$out.=$divstart;
+		$out .= $divstart;
 		if (is_array($mesgarray) && count($mesgarray))
 		{
-			foreach($mesgarray as $message)
+			foreach ($mesgarray as $message)
 			{
 				$ret++;
-				$out.= $langs->trans($message);
-				if ($ret < count($mesgarray)) $out.= "<br>\n";
+				$out .= $langs->trans($message);
+				if ($ret < count($mesgarray)) $out .= "<br>\n";
 			}
 		}
 		if ($mesgstring)
 		{
 			$langs->load("errors");
 			$ret++;
-			$out.= $langs->trans($mesgstring);
+			$out .= $langs->trans($mesgstring);
 		}
-		$out.=$divend;
+		$out .= $divend;
 	}
 
 	if ($out)
 	{
-		if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded))
+		if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded))
 		{
 			$return = '<script type="text/javascript">
 					$(document).ready(function() {
-						var block = '.(! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI)?"true":"false").'
+						var block = '.(!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'
 						if (block) {
 							$.dolEventValid("","'.dol_escape_js($out).'");
 						} else {
 							/* jnotify(message, preset of message type, keepmessage) */
 							$.jnotify("'.dol_escape_js($out).'",
-							"'.($style=="ok" ? 3000 : $style).'",
-							'.($style=="ok" ? "false" : "true").',
+							"'.($style == "ok" ? 3000 : $style).'",
+							'.($style == "ok" ? "false" : "true").',
 							{ remove: function (){} } );
 						}
 					});
@@ -6273,9 +6273,9 @@ 
  *  @see    dol_print_error
  *  @see    dol_htmloutput_mesg
  */
-function get_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
+function get_htmloutput_errors($mesgstring = '', $mesgarray = '', $keepembedded = 0)
 {
-	return get_htmloutput_mesg($mesgstring, $mesgarray,'error',$keepembedded);
+	return get_htmloutput_mesg($mesgstring, $mesgarray, 'error', $keepembedded);
 }
 
 /**
@@ -6291,47 +6291,47 @@ 
  *  @see    dol_htmloutput_errors
  *  @see    setEventMessages
  */
-function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepembedded=0)
+function dol_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $keepembedded = 0)
 {
-	if (empty($mesgstring) && (! is_array($mesgarray) || count($mesgarray) == 0)) return;
+	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) return;
 
-	$iserror=0;
-	$iswarning=0;
+	$iserror = 0;
+	$iswarning = 0;
 	if (is_array($mesgarray))
 	{
-		foreach($mesgarray as $val)
+		foreach ($mesgarray as $val)
 		{
-			if ($val && preg_match('/class="error"/i',$val)) { $iserror++; break; }
-			if ($val && preg_match('/class="warning"/i',$val)) { $iswarning++; break; }
+			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }
+			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }
 		}
 	}
-	else if ($mesgstring && preg_match('/class="error"/i',$mesgstring)) $iserror++;
-	else if ($mesgstring && preg_match('/class="warning"/i',$mesgstring)) $iswarning++;
-	if ($style=='error') $iserror++;
-	if ($style=='warning') $iswarning++;
+	else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
+	else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;
+	if ($style == 'error') $iserror++;
+	if ($style == 'warning') $iswarning++;
 
 	if ($iserror || $iswarning)
 	{
 		// Remove div from texts
-		$mesgstring=preg_replace('/<\/div><div class="(error|warning)">/','<br>',$mesgstring);
-		$mesgstring=preg_replace('/<div class="(error|warning)">/','',$mesgstring);
-		$mesgstring=preg_replace('/<\/div>/','',$mesgstring);
+		$mesgstring = preg_replace('/<\/div><div class="(error|warning)">/', '<br>', $mesgstring);
+		$mesgstring = preg_replace('/<div class="(error|warning)">/', '', $mesgstring);
+		$mesgstring = preg_replace('/<\/div>/', '', $mesgstring);
 		// Remove div from texts array
 		if (is_array($mesgarray))
 		{
-			$newmesgarray=array();
-			foreach($mesgarray as $val)
+			$newmesgarray = array();
+			foreach ($mesgarray as $val)
 			{
-				$tmpmesgstring=preg_replace('/<\/div><div class="(error|warning)">/','<br>',$val);
-				$tmpmesgstring=preg_replace('/<div class="(error|warning)">/','',$tmpmesgstring);
-				$tmpmesgstring=preg_replace('/<\/div>/','',$tmpmesgstring);
-				$newmesgarray[]=$tmpmesgstring;
+				$tmpmesgstring = preg_replace('/<\/div><div class="(error|warning)">/', '<br>', $val);
+				$tmpmesgstring = preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
+				$tmpmesgstring = preg_replace('/<\/div>/', '', $tmpmesgstring);
+				$newmesgarray[] = $tmpmesgstring;
 			}
-			$mesgarray=$newmesgarray;
+			$mesgarray = $newmesgarray;
 		}
-		print get_htmloutput_mesg($mesgstring,$mesgarray,($iserror?'error':'warning'),$keepembedded);
+		print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
 	}
-	else print get_htmloutput_mesg($mesgstring,$mesgarray,'ok',$keepembedded);
+	else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
 }
 
 /**
@@ -6345,7 +6345,7 @@ 
  *  @see    dol_print_error
  *  @see    dol_htmloutput_mesg
  */
-function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
+function dol_htmloutput_errors($mesgstring = '', $mesgarray = '', $keepembedded = 0)
 {
 	dol_htmloutput_mesg($mesgstring, $mesgarray, 'error', $keepembedded);
 }
@@ -6363,29 +6363,29 @@ 
  *  @param		int			$keepindex			If 0 and index key of array to sort is a numeric, than index will be rewrote. If 1 or index key is not numeric, key for index is kept after sorting.
  *  @return     array							Sorted array
  */
-function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensitive=0, $keepindex=0)
+function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sensitive = 0, $keepindex = 0)
 {
 	// Clean parameters
-	$order=strtolower($order);
+	$order = strtolower($order);
 
-	$sizearray=count($array);
-	if (is_array($array) && $sizearray>0)
+	$sizearray = count($array);
+	if (is_array($array) && $sizearray > 0)
 	{
 		$temp = array();
-		foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
+		foreach (array_keys($array) as $key) $temp[$key] = $array[$key][$index];
 
-		if (!$natsort) ($order=='asc') ? asort($temp) : arsort($temp);
+		if (!$natsort) ($order == 'asc') ? asort($temp) : arsort($temp);
 		else
 		{
 			($case_sensitive) ? natsort($temp) : natcasesort($temp);
-			if($order!='asc') $temp=array_reverse($temp,TRUE);
+			if ($order != 'asc') $temp = array_reverse($temp, TRUE);
 		}
 
 		$sorted = array();
 
-		foreach(array_keys($temp) as $key)
+		foreach (array_keys($temp) as $key)
 		{
-			(is_numeric($key) && empty($keepindex)) ? $sorted[]=$array[$key] : $sorted[$key]=$array[$key];
+			(is_numeric($key) && empty($keepindex)) ? $sorted[] = $array[$key] : $sorted[$key] = $array[$key];
 		}
 
 		return $sorted;
@@ -6404,16 +6404,16 @@ 
 {
 	// We must use here a binary strlen function (so not dol_strlen)
 	$strLength = dol_strlen($str);
-	for ($i=0; $i<$strLength; $i++)
+	for ($i = 0; $i < $strLength; $i++)
 	{
 		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
-		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n=5; // 1111110b
+		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n = 1; // 110bbbbb
+		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n = 2; // 1110bbbb
+		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n = 3; // 11110bbb
+		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n = 4; // 111110bb
+		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n = 5; // 1111110b
 		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
 			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
 			return false;
 		}
@@ -6433,10 +6433,10 @@ 
 {
 	global $conf;
 
-	$tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
-	if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
-	if (empty($tmp)) $tmp='utf-8';										// By default for other
-	if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
+	$tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
+	if (empty($tmp) && !empty($_SERVER["WINDIR"])) $tmp = 'iso-8859-1'; // By default for windows
+	if (empty($tmp)) $tmp = 'utf-8'; // By default for other
+	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
 
 	if ($tmp == 'iso-8859-1') return utf8_decode($str);
 	return $str;
@@ -6456,7 +6456,7 @@ 
  *      @return int						<0 if KO, Id of code if OK
  *      @see $langs->getLabelFromKey
  */
-function dol_getIdFromCode($db, $key, $tablename, $fieldkey='code', $fieldid='id', $entityfilter=0)
+function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)
 {
 	global $cache_codes;
 
@@ -6466,22 +6466,22 @@ 
 	// Check in cache
 	if (isset($cache_codes[$tablename][$key]))	// Can be defined to 0 or ''
 	{
-		return $cache_codes[$tablename][$key];   // Found in cache
+		return $cache_codes[$tablename][$key]; // Found in cache
 	}
 
 	$sql = "SELECT ".$fieldid." as valuetoget";
-	$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
-	$sql.= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
-	if (! empty($entityfilter))
-		$sql.= " AND entity IN (" . getEntity($tablename) . ")";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$tablename;
+	$sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
+	if (!empty($entityfilter))
+		$sql .= " AND entity IN (".getEntity($tablename).")";
 
 	dol_syslog('dol_getIdFromCode', LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $cache_codes[$tablename][$key]=$obj->valuetoget;
-		else $cache_codes[$tablename][$key]='';
+		if ($obj) $cache_codes[$tablename][$key] = $obj->valuetoget;
+		else $cache_codes[$tablename][$key] = '';
 		$db->free($resql);
 		return $cache_codes[$tablename][$key];
 	}
@@ -6499,9 +6499,9 @@ 
  */
 function verifCond($strRights)
 {
-	global $user,$conf,$langs;
+	global $user, $conf, $langs;
 	global $leftmenu;
-	global $rights;    // To export to dol_eval function
+	global $rights; // To export to dol_eval function
 
 	//print $strRights."<br>\n";
 	$rights = true;
@@ -6510,7 +6510,7 @@ 
 		//$tab_rights = explode('&&', $strRights);
 		//$i = 0;
 		//while (($i < count($tab_rights)) && ($rights == true)) {
-		$str = 'if(!(' . $strRights . ')) { $rights = false; }';
+		$str = 'if(!('.$strRights.')) { $rights = false; }';
 		dol_eval($str);
 		//	$i++;
 		//}
@@ -6527,7 +6527,7 @@ 
  * @param   int     $hideerrors     1=Hide errors
  * @return	mixed					Nothing or return of eval
  */
-function dol_eval($s, $returnvalue=0, $hideerrors=1)
+function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 {
 	// Only global variables can be changed by eval function and returned to caller
 	global $db, $langs, $user, $conf;
@@ -6536,8 +6536,8 @@ 
 	global $object;
 	global $mysoc;
 
-	global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
-	global $soc;       // For backward compatibility
+	global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
+	global $soc; // For backward compatibility
 
 	//print $s."<br>\n";
 	if ($returnvalue)
@@ -6630,7 +6630,7 @@ 
  *  @param  string		$mode  	        	'add' to complete head, 'remove' to remove entries
  *	@return	void
  */
-function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode='add')
+function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')
 {
 	global $hookmanager;
 
@@ -6638,9 +6638,9 @@ 
 	{
 		foreach ($conf->modules_parts['tabs'][$type] as $value)
 		{
-			$values=explode(':',$value);
+			$values = explode(':', $value);
 
-			if ($mode == 'add' && ! preg_match('/^\-/',$values[1]))
+			if ($mode == 'add' && !preg_match('/^\-/', $values[1]))
 			{
 				if (count($values) == 6)       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
 				{
@@ -6649,17 +6649,17 @@ 
 					if (verifCond($values[4]))
 					{
 						if ($values[3]) $langs->load($values[3]);
-						if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
+						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))
 						{
-							$substitutionarray=array();
-							complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
-							$label=make_substitutions($reg[1], $substitutionarray);
+							$substitutionarray = array();
+							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
+							$label = make_substitutions($reg[1], $substitutionarray);
 						}
-						else $label=$langs->trans($values[2]);
+						else $label = $langs->trans($values[2]);
 
-						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && ! empty($object->id))?$object->id:''), $values[5]), 1);
+						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
 						$head[$h][1] = $label;
-						$head[$h][2] = str_replace('+','',$values[1]);
+						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
 				}
@@ -6669,28 +6669,28 @@ 
 
 					if ($values[0] != $type) continue;
 					if ($values[3]) $langs->load($values[3]);
-					if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
+					if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))
 					{
-						$substitutionarray=array();
-						complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
-						$label=make_substitutions($reg[1], $substitutionarray);
+						$substitutionarray = array();
+						complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
+						$label = make_substitutions($reg[1], $substitutionarray);
 					}
-					else $label=$langs->trans($values[2]);
+					else $label = $langs->trans($values[2]);
 
-					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && ! empty($object->id))?$object->id:''), $values[4]), 1);
+					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
 					$head[$h][1] = $label;
-					$head[$h][2] = str_replace('+','',$values[1]);
+					$head[$h][2] = str_replace('+', '', $values[1]);
 					$h++;
 				}
 			}
-			else if ($mode == 'remove' && preg_match('/^\-/',$values[1]))
+			else if ($mode == 'remove' && preg_match('/^\-/', $values[1]))
 			{
 				if ($values[0] != $type) continue;
-				$tabname=str_replace('-','',$values[1]);
-				foreach($head as $key => $val)
+				$tabname = str_replace('-', '', $values[1]);
+				foreach ($head as $key => $val)
 				{
-					$condition = (! empty($values[3]) ? verifCond($values[3]) : 1);
-					if ($head[$key][2]==$tabname && $condition)
+					$condition = (!empty($values[3]) ? verifCond($values[3]) : 1);
+					if ($head[$key][2] == $tabname && $condition)
 					{
 						unset($head[$key]);
 						break;
@@ -6701,10 +6701,10 @@ 
 	}
 
 	// No need to make a return $head. Var is modified as a reference
-	if (! empty($hookmanager))
+	if (!empty($hookmanager))
 	{
-		$parameters=array('object' => $object, 'mode' => $mode, 'head'=>$head);
-		$reshook=$hookmanager->executeHooks('completeTabsHead',$parameters);
+		$parameters = array('object' => $object, 'mode' => $mode, 'head'=>$head);
+		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters);
 		if ($reshook > 0)
 		{
 			$head = $hookmanager->resArray;
@@ -6723,7 +6723,7 @@ 
  * @param	string	$zone	'private' (for private pages) or 'public' (for public pages)
  * @return	void
  */
-function printCommonFooter($zone='private')
+function printCommonFooter($zone = 'private')
 {
 	global $conf, $hookmanager;
 	global $micro_start_time;
@@ -6731,14 +6731,14 @@ 
 	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";
 	else print "\n".'<!-- Common footer for public page -->'."\n";
 
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('printCommonFooter',$parameters);    // Note that $action and $object may have been modified by some hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook))
 	{
-		if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
+		if (!empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
 
 		print "\n";
-		if (! empty($conf->use_javascript_ajax))
+		if (!empty($conf->use_javascript_ajax))
 		{
 			print '<script type="text/javascript" language="javascript">'."\n";
 
@@ -6755,7 +6755,7 @@ 
 			}
 
 			// Google Analytics (need Google module)
-			if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
+			if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 			{
 				if (($conf->dol_use_jmobile != 4))
 				{
@@ -6774,17 +6774,17 @@ 
 			}
 
 			// End of tuning
-			if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || ! empty($conf->global->MAIN_SHOW_TUNING_INFO))
+			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || !empty($conf->global->MAIN_SHOW_TUNING_INFO))
 			{
 				print "\n";
 				print "/* JS CODE TO ENABLE to add memory info */\n";
 				print 'window.console && console.log("';
-				if (! empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
-				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off');
-				if (! empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
+				if (!empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');
+				if (!empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
 				{
 					$micro_end_time = microtime(true);
-					print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
+					print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';
 				}
 				if (function_exists("memory_get_usage"))
 				{
@@ -6792,13 +6792,13 @@ 
 				}
 				if (function_exists("xdebug_memory_usage"))
 				{
-					print ' - XDebug time: '.ceil(1000*xdebug_time_index()).' ms';
+					print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';
 					print ' - XDebug mem: '.xdebug_memory_usage();
 					print ' - XDebug mem peak: '.xdebug_peak_memory_usage();
 				}
 				if (function_exists("zend_loader_file_encoded"))
 				{
-					print ' - Zend encoded file: '.(zend_loader_file_encoded()?'yes':'no');
+					print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');
 				}
 				print '");'."\n";
 			}
@@ -6818,7 +6818,7 @@ 
 			print "\n";
 			print "<!-- Start of log output\n";
 			//print '<div class="hidden">'."\n";
-			foreach($conf->logbuffer as $logline)
+			foreach ($conf->logbuffer as $logline)
 			{
 				print $logline."<br>\n";
 			}
@@ -6879,8 +6879,8 @@ 
  */
 function dol_getmypid()
 {
-	if (! function_exists('getmypid')) {
-		return mt_rand(1,32768);
+	if (!function_exists('getmypid')) {
+		return mt_rand(1, 32768);
 	} else {
 		return getmypid();
 	}
@@ -6902,26 +6902,26 @@ 
  * @param	integer			$nofirstand	1=Do not output the first 'AND'
  * @return 	string 			$res 		The statement to append to the SQL query
  */
-function natural_search($fields, $value, $mode=0, $nofirstand=0)
+function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 {
-	global $db,$langs;
+	global $db, $langs;
 
-	$value=trim($value);
+	$value = trim($value);
 
 	if ($mode == 0)
 	{
-		$value=preg_replace('/\*/','%',$value);	// Replace * with %
+		$value = preg_replace('/\*/', '%', $value); // Replace * with %
 	}
 	if ($mode == 1)
 	{
-		$value=preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"),'/').'\-])/','\1\2',$value);	// Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
+		$value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
 	}
 
-	$value = preg_replace('/\s*\|\s*/','|', $value);
+	$value = preg_replace('/\s*\|\s*/', '|', $value);
 
 	$crits = explode(' ', $value);
 	$res = '';
-	if (! is_array($fields)) $fields = array($fields);
+	if (!is_array($fields)) $fields = array($fields);
 
 	$nboffields = count($fields);
 	$end2 = count($crits);
@@ -6934,10 +6934,10 @@ 
 		{
 			if ($mode == 1)
 			{
-				$operator='=';
-				$newcrit = preg_replace('/([<>=]+)/','',trim($crit));
+				$operator = '=';
+				$newcrit = preg_replace('/([<>=]+)/', '', trim($crit));
 
-				preg_match('/([<>=]+)/',trim($crit), $reg);
+				preg_match('/([<>=]+)/', trim($crit), $reg);
 				if ($reg[1])
 				{
 					$operator = $reg[1];
@@ -6947,66 +6947,66 @@ 
 					$numnewcrit = price2num($newcrit);
 					if (is_numeric($numnewcrit))
 					{
-						$newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' '.$operator.' '.$numnewcrit;
+						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;
 					}
 					else
 					{
-						$newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2';	// force false
+						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
-					$i2++;	// a criteria was added to string
+					$i2++; // a criteria was added to string
 				}
 			}
 			else if ($mode == 2)
 			{
-				$newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";
-				$i2++;	// a criteria was added to string
+				$newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";
+				$i2++; // a criteria was added to string
 			}
 			else if ($mode == 3)
 			{
-				$tmparray=explode(',',trim($crit));
+				$tmparray = explode(',', trim($crit));
 				if (count($tmparray))
 				{
-					$listofcodes='';
-					foreach($tmparray as $val)
+					$listofcodes = '';
+					foreach ($tmparray as $val)
 					{
 						if ($val)
 						{
-							$listofcodes.=($listofcodes?',':'');
-							$listofcodes.="'".$db->escape(trim($val))."'";
+							$listofcodes .= ($listofcodes ? ',' : '');
+							$listofcodes .= "'".$db->escape(trim($val))."'";
 						}
 					}
-					$newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";
-					$i2++;	// a criteria was added to string
+					$newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";
+					$i2++; // a criteria was added to string
 				}
 			}
 			else    // $mode=0
 			{
 				$textcrit = '';
-				$tmpcrits = explode('|',$crit);
+				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
-				foreach($tmpcrits as $tmpcrit)
+				foreach ($tmpcrits as $tmpcrit)
 				{
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
 					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
 					{
-						$newres .= $field . " = " . (is_numeric(trim($tmpcrit))?trim($tmpcrit):'0');
+						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
 					}
 					else
 					{
-						$newres .= $field . " LIKE '";
+						$newres .= $field." LIKE '";
 
-						$tmpcrit=trim($tmpcrit);
-						$tmpcrit2=$tmpcrit;
-						$tmpbefore='%'; $tmpafter='%';
+						$tmpcrit = trim($tmpcrit);
+						$tmpcrit2 = $tmpcrit;
+						$tmpbefore = '%'; $tmpafter = '%';
 						if (preg_match('/^[\^\$]/', $tmpcrit))
 						{
-							$tmpbefore='';
+							$tmpbefore = '';
 							$tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2);
 						}
 						if (preg_match('/[\^\$]$/', $tmpcrit))
 						{
-							$tmpafter='';
+							$tmpafter = '';
 							$tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2);
 						}
 						$newres .= $tmpbefore;
@@ -7015,20 +7015,20 @@ 
 						$newres .= "'";
 						if ($tmpcrit2 == '')
 						{
-							$newres .= ' OR ' . $field . " IS NULL";
+							$newres .= ' OR '.$field." IS NULL";
 						}
 					}
 
 					$i3++;
 				}
-				$i2++;	// a criteria was added to string
+				$i2++; // a criteria was added to string
 			}
 			$i++;
 		}
-		if ($newres) $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : '');
+		if ($newres) $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');
 		$j++;
 	}
-	$res = ($nofirstand?"":" AND ")."(" . $res . ")";
+	$res = ($nofirstand ? "" : " AND ")."(".$res.")";
 	//print 'xx'.$res.'yy';
 	return $res;
 }
@@ -7043,14 +7043,14 @@ 
 {
 	global $conf, $langs;
 
-	$out='';
+	$out = '';
 	$url = $object->getLastMainDocLink($object->element);
 
 	if ($url)
 	{
-		$out.= img_picto('','object_globe.png').' '.$langs->trans("DirectDownloadLink").'<br>';
-		$out.= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';
-		$out.= ajax_autoselect("directdownloadlink", 0);
+		$out .= img_picto('', 'object_globe.png').' '.$langs->trans("DirectDownloadLink").'<br>';
+		$out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';
+		$out .= ajax_autoselect("directdownloadlink", 0);
 	}
 	return $out;
 }
@@ -7063,26 +7063,26 @@ 
  * @param   string  $extImgTarget   Force image extension for thumbs. Use '' to keep same extension than original image (default).
  * @return  string                  New file name (full or relative path, including the thumbs/)
  */
-function getImageFileNameForSize($file, $extName, $extImgTarget='')
+function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {
 	$dirName = dirname($file);
-	if ($dirName == '.') $dirName='';
+	if ($dirName == '.') $dirName = '';
 
-	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// We remove extension, whatever is its case
+	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case
 	$fileName = basename($fileName);
 
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
 
-	if (! $extImgTarget) return $file;
+	if (!$extImgTarget) return $file;
 
-	$subdir='';
+	$subdir = '';
 	if ($extName) $subdir = 'thumbs/';
 
-	return ($dirName?$dirName.'/':'').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
+	return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }
 
 
@@ -7095,7 +7095,7 @@ 
  * @param	string	  $param		  More param on http links
  * @return  string|array              Output string with href link or array with all components of link
  */
-function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata=0, $param='')
+function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param = '')
 {
 	global $conf, $langs;
 
@@ -7108,12 +7108,12 @@ 
 
 	if ($alldata == 1)
 	{
-		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
+		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath),);
 		else return array();
 	}
 
 	// old behavior
-	if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param?'&'.$param:'')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+	if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
 	else return '';
 }
 
@@ -7124,7 +7124,7 @@ 
  * @param string	$htmlname	Id of html object
  * @param string	$addlink	Add a 'link to' after
  */
-function ajax_autoselect($htmlname, $addlink='')
+function ajax_autoselect($htmlname, $addlink = '')
 {
 	global $langs;
 	$out = '<script type="text/javascript">
@@ -7132,7 +7132,7 @@ 
 				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
 	return $out;
 }
 
@@ -7146,96 +7146,96 @@ 
  *	@return string 		    	Return a mime type family (text/xxx, application/xxx, image/xxx, audio, video, archive)
  *  @see    image_format_supported (images.lib.php)
  */
-function dol_mimetype($file, $default='application/octet-stream', $mode=0)
+function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 {
-	$mime=$default;
-	$imgmime='other.png';
-	$famime='file-o';
-	$srclang='';
+	$mime = $default;
+	$imgmime = 'other.png';
+	$famime = 'file-o';
+	$srclang = '';
 
-	$tmpfile=preg_replace('/\.noexe$/','',$file);
+	$tmpfile = preg_replace('/\.noexe$/', '', $file);
 
 	// Text files
-	if (preg_match('/\.txt$/i',$tmpfile))         			   { $mime='text/plain';    $imgmime='text.png'; $famime='file-text-o'; }
-	if (preg_match('/\.rtx$/i',$tmpfile))                      { $mime='text/richtext'; $imgmime='text.png'; $famime='file-text-o'; }
-	if (preg_match('/\.csv$/i',$tmpfile))					   { $mime='text/csv';      $imgmime='text.png'; $famime='file-text-o'; }
-	if (preg_match('/\.tsv$/i',$tmpfile))					   { $mime='text/tab-separated-values'; $imgmime='text.png'; $famime='file-text-o'; }
-	if (preg_match('/\.(cf|conf|log)$/i',$tmpfile))            { $mime='text/plain';    $imgmime='text.png'; $famime='file-text-o'; }
-	if (preg_match('/\.ini$/i',$tmpfile))                      { $mime='text/plain';    $imgmime='text.png'; $srclang='ini'; $famime='file-text-o'; }
-	if (preg_match('/\.css$/i',$tmpfile))                      { $mime='text/css';      $imgmime='css.png'; $srclang='css'; $famime='file-text-o'; }
+	if (preg_match('/\.txt$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.rtx$/i', $tmpfile)) { $mime = 'text/richtext'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.csv$/i', $tmpfile)) { $mime = 'text/csv'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; }
+	if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; }
 	// Certificate files
-	if (preg_match('/\.(crt|cer|key|pub)$/i',$tmpfile))        { $mime='text/plain';    $imgmime='text.png'; $famime='file-text-o'; }
+	if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	// HTML/XML
-	if (preg_match('/\.(html|htm|shtml)$/i',$tmpfile))         { $mime='text/html';     $imgmime='html.png'; $srclang='html'; $famime='file-text-o'; }
-	if (preg_match('/\.(xml|xhtml)$/i',$tmpfile))              { $mime='text/xml';      $imgmime='other.png'; $srclang='xml'; $famime='file-text-o'; }
+	if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; }
+	if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; }
 	// Languages
-	if (preg_match('/\.bas$/i',$tmpfile))                      { $mime='text/plain'; $imgmime='text.png'; $srclang='bas';  $famime='file-code-o'; }
-	if (preg_match('/\.(c)$/i',$tmpfile))                      { $mime='text/plain'; $imgmime='text.png'; $srclang='c';  $famime='file-code-o'; }
-	if (preg_match('/\.(cpp)$/i',$tmpfile))                    { $mime='text/plain'; $imgmime='text.png'; $srclang='cpp';  $famime='file-code-o'; }
-	if (preg_match('/\.(h)$/i',$tmpfile))                      { $mime='text/plain'; $imgmime='text.png'; $srclang='h';  $famime='file-code-o'; }
-	if (preg_match('/\.(java|jsp)$/i',$tmpfile))               { $mime='text/plain'; $imgmime='text.png'; $srclang='java';  $famime='file-code-o'; }
-	if (preg_match('/\.php([0-9]{1})?$/i',$tmpfile))           { $mime='text/plain'; $imgmime='php.png'; $srclang='php';  $famime='file-code-o'; }
-	if (preg_match('/\.phtml$/i',$tmpfile))                    { $mime='text/plain'; $imgmime='php.png'; $srclang='php';  $famime='file-code-o'; }
-	if (preg_match('/\.(pl|pm)$/i',$tmpfile))                  { $mime='text/plain'; $imgmime='pl.png'; $srclang='perl';  $famime='file-code-o'; }
-	if (preg_match('/\.sql$/i',$tmpfile))                      { $mime='text/plain'; $imgmime='text.png'; $srclang='sql';  $famime='file-code-o'; }
-	if (preg_match('/\.js$/i',$tmpfile))                       { $mime='text/x-javascript'; $imgmime='jscript.png'; $srclang='js';  $famime='file-code-o'; }
+	if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; }
+	if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; }
+	if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; }
+	if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; }
+	if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; }
+	if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }
+	if (preg_match('/\.phtml$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }
+	if (preg_match('/\.(pl|pm)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'pl.png'; $srclang = 'perl'; $famime = 'file-code-o'; }
+	if (preg_match('/\.sql$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'sql'; $famime = 'file-code-o'; }
+	if (preg_match('/\.js$/i', $tmpfile)) { $mime = 'text/x-javascript'; $imgmime = 'jscript.png'; $srclang = 'js'; $famime = 'file-code-o'; }
 	// Open office
-	if (preg_match('/\.odp$/i',$tmpfile))                      { $mime='application/vnd.oasis.opendocument.presentation'; $imgmime='ooffice.png'; $famime='file-powerpoint-o'; }
-	if (preg_match('/\.ods$/i',$tmpfile))                      { $mime='application/vnd.oasis.opendocument.spreadsheet';  $imgmime='ooffice.png'; $famime='file-excel-o'; }
-	if (preg_match('/\.odt$/i',$tmpfile))                      { $mime='application/vnd.oasis.opendocument.text';         $imgmime='ooffice.png'; $famime='file-word-o'; }
+	if (preg_match('/\.odp$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.presentation'; $imgmime = 'ooffice.png'; $famime = 'file-powerpoint-o'; }
+	if (preg_match('/\.ods$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.spreadsheet'; $imgmime = 'ooffice.png'; $famime = 'file-excel-o'; }
+	if (preg_match('/\.odt$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.text'; $imgmime = 'ooffice.png'; $famime = 'file-word-o'; }
 	// MS Office
-	if (preg_match('/\.mdb$/i',$tmpfile))					   { $mime='application/msaccess'; $imgmime='mdb.png'; $famime='file-o'; }
-	if (preg_match('/\.doc(x|m)?$/i',$tmpfile))				   { $mime='application/msword'; $imgmime='doc.png'; $famime='file-word-o'; }
-	if (preg_match('/\.dot(x|m)?$/i',$tmpfile))				   { $mime='application/msword'; $imgmime='doc.png'; $famime='file-word-o'; }
-	if (preg_match('/\.xlt(x)?$/i',$tmpfile))				   { $mime='application/vnd.ms-excel'; $imgmime='xls.png'; $famime='file-excel-o'; }
-	if (preg_match('/\.xla(m)?$/i',$tmpfile))				   { $mime='application/vnd.ms-excel'; $imgmime='xls.png'; $famime='file-excel-o'; }
-	if (preg_match('/\.xls$/i',$tmpfile))			           { $mime='application/vnd.ms-excel'; $imgmime='xls.png'; $famime='file-excel-o'; }
-	if (preg_match('/\.xls(b|m|x)$/i',$tmpfile))			   { $mime='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; $imgmime='xls.png'; $famime='file-excel-o'; }
-	if (preg_match('/\.pps(m|x)?$/i',$tmpfile))				   { $mime='application/vnd.ms-powerpoint'; $imgmime='ppt.png'; $famime='file-powerpoint-o'; }
-	if (preg_match('/\.ppt(m|x)?$/i',$tmpfile))				   { $mime='application/x-mspowerpoint'; $imgmime='ppt.png'; $famime='file-powerpoint-o'; }
+	if (preg_match('/\.mdb$/i', $tmpfile)) { $mime = 'application/msaccess'; $imgmime = 'mdb.png'; $famime = 'file-o'; }
+	if (preg_match('/\.doc(x|m)?$/i', $tmpfile)) { $mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o'; }
+	if (preg_match('/\.dot(x|m)?$/i', $tmpfile)) { $mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o'; }
+	if (preg_match('/\.xlt(x)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
+	if (preg_match('/\.xla(m)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
+	if (preg_match('/\.xls$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
+	if (preg_match('/\.xls(b|m|x)$/i', $tmpfile)) { $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
+	if (preg_match('/\.pps(m|x)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-powerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o'; }
+	if (preg_match('/\.ppt(m|x)?$/i', $tmpfile)) { $mime = 'application/x-mspowerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o'; }
 	// Other
-	if (preg_match('/\.pdf$/i',$tmpfile))                      { $mime='application/pdf'; $imgmime='pdf.png'; $famime='file-pdf-o'; }
+	if (preg_match('/\.pdf$/i', $tmpfile)) { $mime = 'application/pdf'; $imgmime = 'pdf.png'; $famime = 'file-pdf-o'; }
 	// Scripts
-	if (preg_match('/\.bat$/i',$tmpfile))                      { $mime='text/x-bat';  $imgmime='script.png'; $srclang='dos'; $famime='file-code-o'; }
-	if (preg_match('/\.sh$/i',$tmpfile))                       { $mime='text/x-sh';   $imgmime='script.png'; $srclang='bash'; $famime='file-code-o'; }
-	if (preg_match('/\.ksh$/i',$tmpfile))                      { $mime='text/x-ksh';  $imgmime='script.png'; $srclang='bash'; $famime='file-code-o'; }
-	if (preg_match('/\.bash$/i',$tmpfile))                     { $mime='text/x-bash'; $imgmime='script.png'; $srclang='bash'; $famime='file-code-o'; }
+	if (preg_match('/\.bat$/i', $tmpfile)) { $mime = 'text/x-bat'; $imgmime = 'script.png'; $srclang = 'dos'; $famime = 'file-code-o'; }
+	if (preg_match('/\.sh$/i', $tmpfile)) { $mime = 'text/x-sh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }
+	if (preg_match('/\.ksh$/i', $tmpfile)) { $mime = 'text/x-ksh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }
+	if (preg_match('/\.bash$/i', $tmpfile)) { $mime = 'text/x-bash'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }
 	// Images
-	if (preg_match('/\.ico$/i',$tmpfile))                      { $mime='image/x-icon'; $imgmime='image.png'; $famime='file-image-o'; }
-	if (preg_match('/\.(jpg|jpeg)$/i',$tmpfile))			   { $mime='image/jpeg';   $imgmime='image.png'; $famime='file-image-o'; }
-	if (preg_match('/\.png$/i',$tmpfile))					   { $mime='image/png';    $imgmime='image.png'; $famime='file-image-o'; }
-	if (preg_match('/\.gif$/i',$tmpfile))					   { $mime='image/gif';    $imgmime='image.png'; $famime='file-image-o'; }
-	if (preg_match('/\.bmp$/i',$tmpfile))					   { $mime='image/bmp';    $imgmime='image.png'; $famime='file-image-o'; }
-	if (preg_match('/\.(tif|tiff)$/i',$tmpfile))			   { $mime='image/tiff';   $imgmime='image.png'; $famime='file-image-o'; }
-	if (preg_match('/\.svg$/i',$tmpfile))					   { $mime='image/svg+xml';$imgmime='image.png'; $famime='file-image-o'; }
+	if (preg_match('/\.ico$/i', $tmpfile)) { $mime = 'image/x-icon'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.(jpg|jpeg)$/i', $tmpfile)) { $mime = 'image/jpeg'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.png$/i', $tmpfile)) { $mime = 'image/png'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.gif$/i', $tmpfile)) { $mime = 'image/gif'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.bmp$/i', $tmpfile)) { $mime = 'image/bmp'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.(tif|tiff)$/i', $tmpfile)) { $mime = 'image/tiff'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.svg$/i', $tmpfile)) { $mime = 'image/svg+xml'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
 	// Calendar
-	if (preg_match('/\.vcs$/i',$tmpfile))					   { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
-	if (preg_match('/\.ics$/i',$tmpfile))					   { $mime='text/calendar'; $imgmime='other.png'; $famime='file-text-o'; }
+	if (preg_match('/\.vcs$/i', $tmpfile)) { $mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.ics$/i', $tmpfile)) { $mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o'; }
 	// Other
-	if (preg_match('/\.torrent$/i',$tmpfile))				   { $mime='application/x-bittorrent'; $imgmime='other.png'; $famime='file-o'; }
+	if (preg_match('/\.torrent$/i', $tmpfile)) { $mime = 'application/x-bittorrent'; $imgmime = 'other.png'; $famime = 'file-o'; }
 	// Audio
-	if (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i',$tmpfile)) { $mime='audio'; $imgmime='audio.png'; $famime='file-audio-o'; }
+	if (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) { $mime = 'audio'; $imgmime = 'audio.png'; $famime = 'file-audio-o'; }
 	// Video
-	if (preg_match('/\.ogv$/i',$tmpfile))                      { $mime='video/ogg';       $imgmime='video.png'; $famime='file-video-o'; }
-	if (preg_match('/\.webm$/i',$tmpfile))                     { $mime='video/webm';      $imgmime='video.png'; $famime='file-video-o'; }
-	if (preg_match('/\.avi$/i',$tmpfile))                      { $mime='video/x-msvideo'; $imgmime='video.png'; $famime='file-video-o'; }
-	if (preg_match('/\.divx$/i',$tmpfile))                     { $mime='video/divx';      $imgmime='video.png'; $famime='file-video-o'; }
-	if (preg_match('/\.xvid$/i',$tmpfile))                     { $mime='video/xvid';      $imgmime='video.png'; $famime='file-video-o'; }
-	if (preg_match('/\.(wmv|mpg|mpeg)$/i',$tmpfile))           { $mime='video';           $imgmime='video.png'; $famime='file-video-o'; }
+	if (preg_match('/\.ogv$/i', $tmpfile)) { $mime = 'video/ogg'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
+	if (preg_match('/\.webm$/i', $tmpfile)) { $mime = 'video/webm'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
+	if (preg_match('/\.avi$/i', $tmpfile)) { $mime = 'video/x-msvideo'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
+	if (preg_match('/\.divx$/i', $tmpfile)) { $mime = 'video/divx'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
+	if (preg_match('/\.xvid$/i', $tmpfile)) { $mime = 'video/xvid'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
+	if (preg_match('/\.(wmv|mpg|mpeg)$/i', $tmpfile)) { $mime = 'video'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
 	// Archive
-	if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh)$/i',$tmpfile))   { $mime='archive'; $imgmime='archive.png'; $famime='file-archive-o'; }    // application/xxx where zzz is zip, ...
+	if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh)$/i', $tmpfile)) { $mime = 'archive'; $imgmime = 'archive.png'; $famime = 'file-archive-o'; }    // application/xxx where zzz is zip, ...
 	// Exe
-	if (preg_match('/\.(exe|com)$/i',$tmpfile))                { $mime='application/octet-stream'; $imgmime='other.png'; $famime='file-o'; }
+	if (preg_match('/\.(exe|com)$/i', $tmpfile)) { $mime = 'application/octet-stream'; $imgmime = 'other.png'; $famime = 'file-o'; }
 	// Lib
-	if (preg_match('/\.(dll|lib|o|so|a)$/i',$tmpfile))         { $mime='library'; $imgmime='library.png'; $famime='file-o'; }
+	if (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) { $mime = 'library'; $imgmime = 'library.png'; $famime = 'file-o'; }
 	// Err
-	if (preg_match('/\.err$/i',$tmpfile))                      { $mime='error'; $imgmime='error.png'; $famime='file-text-o'; }
+	if (preg_match('/\.err$/i', $tmpfile)) { $mime = 'error'; $imgmime = 'error.png'; $famime = 'file-text-o'; }
 
 	// Return string
 	if ($mode == 1)
 	{
-		$tmp=explode('/',$mime);
-		return (! empty($tmp[1])?$tmp[1]:$tmp[0]);
+		$tmp = explode('/', $mime);
+		return (!empty($tmp[1]) ? $tmp[1] : $tmp[0]);
 	}
 	if ($mode == 2)
 	{
@@ -7261,15 +7261,15 @@ 
  * @param bool		$checkentity	add filter on entity
  * @param string	$rowidfield		name of the column rowid
  */
-function getDictvalue($tablename, $field, $id, $checkentity=false, $rowidfield='rowid')
+function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')
 {
-	global $dictvalues,$db,$langs;
+	global $dictvalues, $db, $langs;
 
 	if (!isset($dictvalues[$tablename]))
 	{
 		$dictvalues[$tablename] = array();
 		$sql = 'SELECT * FROM '.$tablename.' WHERE 1';
-		if ($checkentity) $sql.= ' entity IN (0,'.getEntity('').')';
+		if ($checkentity) $sql .= ' entity IN (0,'.getEntity('').')';
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -7305,7 +7305,7 @@ 
 	if (!empty($stringcolor))
 	{
 		$res = 0;
-		$tmp=explode(',', $stringcolor);
+		$tmp = explode(',', $stringcolor);
 		if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')
 		{
 			$r = $tmp[0];
@@ -7314,14 +7314,14 @@ 
 		}
 		else
 		{
-			$hexr=$stringcolor[0].$stringcolor[1];
-			$hexg=$stringcolor[2].$stringcolor[3];
-			$hexb=$stringcolor[4].$stringcolor[5];
+			$hexr = $stringcolor[0].$stringcolor[1];
+			$hexg = $stringcolor[2].$stringcolor[3];
+			$hexb = $stringcolor[4].$stringcolor[5];
 			$r = hexdec($hexr);
 			$g = hexdec($hexg);
 			$b = hexdec($hexb);
 		}
-		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
+		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm
 		if ($bright > 0.6) $res = 1;
 	}
 	return $res;
@@ -7341,21 +7341,21 @@ 
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition
+	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{
-		$tmploops=explode('|',$menuentry['module']);
-		$found=0;
-		foreach($tmploops as $tmploop)
+		$tmploops = explode('|', $menuentry['module']);
+		$found = 0;
+		foreach ($tmploops as $tmploop)
 		{
 			if (in_array($tmploop, $listofmodulesforexternal)) {
 				$found++; break;
 			}
 		}
-		if (! $found) return 0;	// Entry is for menus all excluded to external users
+		if (!$found) return 0; // Entry is for menus all excluded to external users
 	}
-	if (! $menuentry['perms'] && $type_user) return 0; 											// No permissions and user is external
-	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0;	// No permissions and option to hide when not allowed, even for internal user, is on
-	if (! $menuentry['perms']) return 2;															// No permissions and user is external
+	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external
+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on
+	if (!$menuentry['perms']) return 2; // No permissions and user is external
 	return 1;
 }

Braces +1732 added lines, -901 removed lines

@@ -74,7 +74,9 @@ 
 		if ($found) return $result;
 	}*/
 
-	if (isset($class::$member)) return $class::$member;
+	if (isset($class::$member)) {
+		return $class::$member;
+	}
 	dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
 	return null;
 }
@@ -122,19 +124,26 @@ 
 	global $conf, $mc;
 
 	// For backward compatibilty
-	if ($element == 'actioncomm') $element='agenda';
-	if ($element == 'fichinter')  $element='intervention';
-	if ($element == 'categorie')  $element='category';
+	if ($element == 'actioncomm') {
+		$element='agenda';
+	}
+	if ($element == 'fichinter') {
+		$element='intervention';
+	}
+	if ($element == 'categorie') {
+		$element='category';
+	}
 
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared, $forceentity);
-	}
-	else
+	} else
 	{
 		$out='';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-		if (in_array($element, $addzero)) $out.= '0,';
+		if (in_array($element, $addzero)) {
+			$out.= '0,';
+		}
 		$out.= $conf->entity;
 		return $out;
 	}
@@ -194,20 +203,12 @@ 
 	}
 
 	// OS
-	if (preg_match('/linux/i', $user_agent))			{ $os='linux'; }
-	elseif (preg_match('/macintosh/i', $user_agent))	{ $os='macintosh'; }
-	elseif (preg_match('/windows/i', $user_agent))		{ $os='windows'; }
+	if (preg_match('/linux/i', $user_agent))			{ $os='linux'; } elseif (preg_match('/macintosh/i', $user_agent))	{ $os='macintosh'; } elseif (preg_match('/windows/i', $user_agent))		{ $os='windows'; }
 
 	// Name
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg))      { $name='firefox';   $version=$reg[2]; }
-	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg))     { $name='edge';      $version=$reg[2]; }
-	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg))   { $name='chrome';    $version=$reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg))                   { $name='chrome'; }
-	elseif (preg_match('/iceweasel/i', $user_agent))                      { $name='iceweasel'; }
-	elseif (preg_match('/epiphany/i', $user_agent))                       { $name='epiphany';  }
-	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg))   { $name='safari';    $version=$reg[2]; }	// Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; }
-	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg))      { $name='firefox';   $version=$reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg))     { $name='edge';      $version=$reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg))   { $name='chrome';    $version=$reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg))                   { $name='chrome'; } elseif (preg_match('/iceweasel/i', $user_agent))                      { $name='iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent))                       { $name='epiphany';  } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg))   { $name='safari';    $version=$reg[2]; }	// Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; }
 
@@ -280,7 +281,9 @@ 
 {
 	global $mysoc,$user,$conf;
 
-	if (empty($paramname)) return 'BadFirstParameterForGETPOST';
+	if (empty($paramname)) {
+		return 'BadFirstParameterForGETPOST';
+	}
 	if (empty($check))
 	{
 		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
@@ -288,19 +291,28 @@ 
 		//var_dump(debug_backtrace()[0]);
 	}
 
-	if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
-	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
-	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
-	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
-	else return 'BadThirdParameterForGETPOST';
+	if (empty($method)) {
+		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
+	} elseif ($method==1) {
+		$out = isset($_GET[$paramname])?$_GET[$paramname]:'';
+	} elseif ($method==2) {
+		$out = isset($_POST[$paramname])?$_POST[$paramname]:'';
+	} elseif ($method==3) {
+		$out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
+	} elseif ($method==4) {
+		$out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
+	} else {
+		return 'BadThirdParameterForGETPOST';
+	}
 
 	if (empty($method) || $method == 3 || $method == 4)
 	{
 
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) {
+			$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		}
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		//var_dump($relativepathstring);
@@ -308,9 +320,11 @@ 
 
 		// Code for search criteria persistence.
 		// Retrieve values if restore_lastsearch_values is set and there is saved values
-		if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+		if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring])) {
+			// Keep $_GET here
 		{
 			$tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+		}
 			if (is_array($tmp))
 			{
 				foreach($tmp as $key => $val)
@@ -324,12 +338,14 @@ 
 			}
 		}
 		// Else, retreive default values if we are not doing a sort
-		elseif (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+		elseif (! isset($_GET['sortfield'])) {
+			// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 			{
 				// Search default value from $object->field
 				global $object;
+		}
 				if (is_object($object) && isset($object->fields[$paramname]['default']))
 				{
 					$out = $object->fields[$paramname]['default'];
@@ -340,13 +356,15 @@ 
 				if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				{
 					// Now search in setup to overwrite default values
-					if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (! empty($user->default_values)) {
+						// $user->default_values defined from menu 'Setup - Default values'
 					{
 						if (isset($user->default_values[$relativepathstring]['createform']))
 						{
 							foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
 							{
 								$qualified = 0;
+					}
 								if ($defkey != '_noquery_')
 								{
 									$tmpqueryarraytohave=explode('&', $defkey);
@@ -354,12 +372,17 @@ 
 									$foundintru=0;
 									foreach($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru=1;
+										}
+									}
+									if (! $foundintru) {
+										$qualified=1;
 									}
-									if (! $foundintru) $qualified=1;
 									//var_dump($defkey.'-'.$qualified);
+								} else {
+									$qualified = 1;
 								}
-								else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -378,7 +401,8 @@ 
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				{
-					if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (! empty($user->default_values)) {
+						// $user->default_values defined from menu 'Setup - Default values'
 					{
 						//var_dump($user->default_values[$relativepathstring]);
 						if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
@@ -388,6 +412,7 @@ 
 								foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
 								{
 									$qualified = 0;
+					}
 									if ($defkey != '_noquery_')
 									{
 										$tmpqueryarraytohave=explode('&', $defkey);
@@ -395,19 +420,26 @@ 
 										$foundintru=0;
 										foreach($tmpqueryarraytohave as $tmpquerytohave)
 										{
-											if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+											if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+												$foundintru=1;
+											}
+										}
+										if (! $foundintru) {
+											$qualified=1;
 										}
-										if (! $foundintru) $qualified=1;
 										//var_dump($defkey.'-'.$qualified);
+									} else {
+										$qualified = 1;
 									}
-									else $qualified = 1;
 
 									if ($qualified)
 									{
 										$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 										foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
 										{
-											if ($out) $out.=', ';
+											if ($out) {
+												$out.=', ';
+											}
 											if ($paramname == 'sortfield')
 											{
 												$out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
@@ -421,8 +453,7 @@ 
 									}
 								}
 							}
-						}
-						elseif (isset($user->default_values[$relativepathstring]['filters']))
+						} elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
 							foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)
 							{
@@ -434,12 +465,17 @@ 
 									$foundintru=0;
 									foreach($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru=1;
+										}
+									}
+									if (! $foundintru) {
+										$qualified=1;
 									}
-									if (! $foundintru) $qualified=1;
 									//var_dump($defkey.'-'.$qualified);
+								} else {
+									$qualified = 1;
 								}
-								else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -451,8 +487,7 @@ 
 											$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
-									}
-									else
+									} else
 									{
 										$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
@@ -473,36 +508,29 @@ 
 	if (! is_array($out) && empty($_POST[$paramname]) && empty($noreplace))
 	{
 		$maxloop=20; $loopnb=0;    // Protection against infinite loop
-		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
-		{
-				$loopnb++; $newout = '';
-
-				if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-				elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
-				elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
-				elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-				elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-				elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-				elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-				elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-				elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-				elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
+		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {
+			// Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
+		{
+				$loopnb++;
+		}
+		$newout = '';
+
+				if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; } elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  } elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; } elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
 				{
 					$newout = $mysoc->country_id;
-				}
-				elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
+				} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
 				{
 					$newout = $user->id;
-				}
-				elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
+				} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
 				{
 					$newout = $user->fk_user;
-				}
-				elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
+				} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
 				{
 					$newout = $conf->entity;
+				} else {
+					$newout = '';
 				}
-				else $newout = '';     // Key not found, we replace with empty string
+				// Key not found, we replace with empty string
 				//var_dump('__'.$reg[1].'__ -> '.$newout);
 				$out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
 		}
@@ -517,7 +545,9 @@ 
 			if (! is_numeric($out)) { $out=''; }
 			break;
 		case 'intcomma':
-			if (preg_match('/[^0-9,-]+/i',$out)) $out='';
+			if (preg_match('/[^0-9,-]+/i',$out)) {
+				$out='';
+			}
 			break;
 		case 'alpha':
 			if (! is_array($out))
@@ -525,8 +555,11 @@ 
 				$out=trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				if (preg_match('/"/',$out)) $out='';
-				else if (preg_match('/\.\.\//',$out)) $out='';
+				if (preg_match('/"/',$out)) {
+					$out='';
+				} else if (preg_match('/\.\.\//',$out)) {
+					$out='';
+				}
 			}
 			break;
 		case 'san_alpha':
@@ -536,18 +569,24 @@ 
 			if (! is_array($out))
 			{
 				$out=trim($out);
-				if (preg_match('/[^a-z]+/i',$out)) $out='';
+				if (preg_match('/[^a-z]+/i',$out)) {
+					$out='';
+				}
 			}
 			break;
 		case 'aZ09':
 			if (! is_array($out))
 			{
 				$out=trim($out);
-				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) {
+					$out='';
+				}
 			}
 			break;
 		case 'array':
-			if (! is_array($out) || empty($out)) $out=array();
+			if (! is_array($out) || empty($out)) {
+				$out=array();
+			}
 			break;
 		case 'nohtml':
 			$out=dol_string_nohtmltag($out, 0);
@@ -558,13 +597,18 @@ 
 				$out=trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				if (preg_match('/"/',$out)) $out='';
-				else if (preg_match('/\.\.\//',$out)) $out='';
+				if (preg_match('/"/',$out)) {
+					$out='';
+				} else if (preg_match('/\.\.\//',$out)) {
+					$out='';
+				}
 				$out=dol_string_nohtmltag($out);
 			}
 			break;
 		case 'custom':
-			if (empty($filter)) return 'BadFourthParameterForGETPOST';
+			if (empty($filter)) {
+				return 'BadFourthParameterForGETPOST';
+			}
 			$out=filter_var($out, $filter, $options);
 			break;
 	}
@@ -612,8 +656,11 @@ 
 		// If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
 		if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
 		{
-			if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
-			else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+			if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+				return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+			} else if (isset($_SERVER["SERVER_NAME"])) {
+				return $_SERVER["SERVER_NAME"];
+			}
 		}
 
 		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
@@ -621,8 +668,9 @@ 
 			return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 			// Use this for a "readable" cookie name
 			//return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+		} else {
+			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 		}
-		else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 	}
 }
 
@@ -671,41 +719,57 @@ 
 
 	$path=preg_replace('/^\//','',$path);
 
-	if (empty($type))	// For a filesystem path
+	if (empty($type)) {
+		// For a filesystem path
 	{
-		$res = DOL_DOCUMENT_ROOT.'/'.$path;		// Standard default path
-		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
+		$res = DOL_DOCUMENT_ROOT.'/'.$path;
+	}
+	// Standard default path
+		foreach ($conf->file->dol_document_root as $key => $dirroot) {
+			// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
 			if ($key == 'main') continue;
+		}
 			if (file_exists($dirroot.'/'.$path))
 			{
 				$res=$dirroot.'/'.$path;
 				return $res;
 			}
 		}
-		if ($returnemptyifnotfound)								// Not found into alternate dir
+		if ($returnemptyifnotfound) {
+			// Not found into alternate dir
 		{
 			if ($returnemptyifnotfound == 1 || ! file_exists($res)) return '';
 		}
-	}
-	else				// For an url path
+		}
+	} else				// For an url path
 	{
 		// We try to get local path of file on filesystem from url
 		// Note that trying to know if a file on disk exist by forging path on disk from url
 		// works only for some web server and some setup. This is bugged when
 		// using proxy, rewriting, virtual path, etc...
 		$res='';
-		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path;			// Standard value
-		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path;		// Standard value
-		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
+		if ($type == 1) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
+		// Standard value
+		if ($type == 2) {
+			$res = DOL_MAIN_URL_ROOT.'/'.$path;
+		}
+		// Standard value
+		if ($type == 3) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
 
-		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
+		foreach ($conf->file->dol_document_root as $key => $dirroot) {
+			// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
 			if ($key == 'main')
 			{
 				if ($type == 3)
 				{
 					global $dolibarr_main_url_root;
+		}
 
 					// Define $urlwithroot
 					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -767,8 +831,7 @@ 
 	if (empty($native))
 	{
 		$myclone=unserialize(serialize($object));
-	}
-	else
+	} else
 	{
 		$myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
@@ -788,10 +851,15 @@ 
 function dol_size($size,$type='')
 {
 	global $conf;
-	if (empty($conf->dol_optimize_smallscreen)) return $size;
-	if ($type == 'width' && $size > 250) return 250;
-	else return 10;
-}
+	if (empty($conf->dol_optimize_smallscreen)) {
+		return $size;
+	}
+	if ($type == 'width' && $size > 250) {
+		return 250;
+	} else {
+		return 10;
+	}
+	}
 
 
 /**
@@ -857,8 +925,7 @@ 
 		);
 		$string=strtr($string, $replacements);
 		return rawurldecode($string);
-	}
-	else
+	} else
 	{
 		// See http://www.ascii-code.com/
 		$string = strtr(
@@ -896,7 +963,9 @@ 
 {
 	$forbidden_chars_to_replace=array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName
 	$forbidden_chars_to_remove=array();
-	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace=$badcharstoreplace;
+	if (is_array($badcharstoreplace)) {
+		$forbidden_chars_to_replace=$badcharstoreplace;
+	}
 	//$forbidden_chars_to_remove=array("(",")");
 
 	return str_replace($forbidden_chars_to_replace,$newstr,str_replace($forbidden_chars_to_remove,"",$str));
@@ -928,10 +997,9 @@ 
 	$substitjs=array("&#039;"=>"\\'","\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
 	if (empty($noescapebackslashn)) { $substitjs["\n"]='\\n'; $substitjs['\\']='\\\\'; }
-	if (empty($mode)) { $substitjs["'"]="\\'"; $substitjs['"']="\\'"; }
-	else if ($mode == 1) $substitjs["'"]="\\'";
-	else if ($mode == 2) { $substitjs['"']='\\"'; }
-	else if ($mode == 3) { $substitjs["'"]="\\'"; $substitjs['"']="\\\""; }
+	if (empty($mode)) { $substitjs["'"]="\\'"; $substitjs['"']="\\'"; } else if ($mode == 1) {
+		$substitjs["'"]="\\'";
+	} else if ($mode == 2) { $substitjs['"']='\\"'; } else if ($mode == 3) { $substitjs["'"]="\\'"; $substitjs['"']="\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -949,8 +1017,12 @@ 
 {
 	// escape quotes and backslashes, newlines, etc.
 	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html tags
-	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
-	if (! $keepn) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
+	if (! $keepb) {
+		$tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
+	}
+	if (! $keepn) {
+		$tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
+	}
 	return htmlentities($tmp, ENT_COMPAT, 'UTF-8');						// TODO Use htmlspecialchars instead, that make only required change for html tags
 }
 
@@ -1003,7 +1075,9 @@ 
 	global $conf, $user;
 
 	// If syslog module enabled
-	if (empty($conf->syslog->enabled)) return;
+	if (empty($conf->syslog->enabled)) {
+		return;
+	}
 
 	if (! empty($message))
 	{
@@ -1013,13 +1087,17 @@ 
 		{
 			throw new Exception('Incorrect log level');
 		}
-		if ($level > $conf->global->SYSLOG_LEVEL) return;
+		if ($level > $conf->global->SYSLOG_LEVEL) {
+			return;
+		}
 
 		// If adding log inside HTML page is required
-		if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
+		if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML))) {
+			// MAIN_LOGTOHTML kept for backward compatibility
 		{
 			$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
 		}
+		}
 
 		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
 		// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
@@ -1039,19 +1117,31 @@ 
 		);
 
 		// This is when server run behind a reverse proxy
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"])?'':'->'.$_SERVER['REMOTE_ADDR']);
+		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+			$data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"])?'':'->'.$_SERVER['REMOTE_ADDR']);
+		}
 		// This is when server run normally on a server
-		else if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
+		else if (! empty($_SERVER["REMOTE_ADDR"])) {
+			$data['ip'] = $_SERVER['REMOTE_ADDR'];
+		}
 		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-		else if (! empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
+		else if (! empty($_SERVER['SERVER_ADDR'])) {
+			$data['ip'] = $_SERVER['SERVER_ADDR'];
+		}
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-		else if (! empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME'])?'':'@'.$_SERVER['USERNAME']);
+		else if (! empty($_SERVER['COMPUTERNAME'])) {
+			$data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME'])?'':'@'.$_SERVER['USERNAME']);
+		}
 		// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-		else if (! empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		else if (! empty($_SERVER['LOGNAME'])) {
+			$data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		}
 		// Loop on each log handler and send output
 		foreach ($conf->loghandlers as $loghandlerinstance)
 		{
-			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) continue;
+			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+				continue;
+			}
 			$loghandlerinstance->export($data,$suffixinfilename);
 		}
 		unset($data);
@@ -1102,16 +1192,23 @@ 
 
 	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
-	if ($morehtmlright) $out.='<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>';	// Output right area first so when space is missing, text is in front of tabs and not under.
+	if ($morehtmlright) {
+		$out.='<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>';
+	}
+	// Output right area first so when space is missing, text is in front of tabs and not under.
 
 	// Show title
 	$showtitle=1;
-	if (! empty($conf->dol_optimize_smallscreen)) $showtitle=0;
+	if (! empty($conf->dol_optimize_smallscreen)) {
+		$showtitle=0;
+	}
 	if (! empty($title) && $showtitle)
 	{
 		$limittitle=30;
 		$out.='<a class="tabTitle">';
-		if ($picto) $out.=img_picto($title,($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
+		if ($picto) {
+			$out.=img_picto($title,($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
+		}
 		$out.='<span class="tabTitleText">'.dol_trunc($title,$limittitle).'</span>';
 		$out.='</a>';
 	}
@@ -1121,10 +1218,14 @@ 
 	if (is_array($links) && ! empty($links))
 	{
 		$keys=array_keys($links);
-		if (count($keys)) $maxkey=max($keys);
+		if (count($keys)) {
+			$maxkey=max($keys);
+		}
 	}
 
-	if (! empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD=2;
+	if (! empty($conf->dol_optimize_smallscreen)) {
+		$conf->global->MAIN_MAXTABS_IN_CARD=2;
+	}
 
 	// Show tabs
 	$bactive=false;
@@ -1138,7 +1239,9 @@ 
 		if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
 		{
 			// If active tab is already present
-			if ($i >= $limittoshow) $limittoshow--;
+			if ($i >= $limittoshow) {
+				$limittoshow--;
+			}
 		}
 	}
 
@@ -1148,8 +1251,7 @@ 
 		{
 			$isactive=true;
 			$bactive=true;
-		}
-		else
+		} else
 		{
 			$isactive=false;
 		}
@@ -1162,13 +1264,11 @@ 
 				if (!empty($links[$i][0]))
 				{
 					$out.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				}
-				else
+				} else
 				{
 					$out.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
-			}
-			else if (! empty($links[$i][1]))
+			} else if (! empty($links[$i][1]))
 			{
 				//print "x $i $active ".$links[$i][2]." z";
 				if ($isactive)
@@ -1176,8 +1276,7 @@ 
 					$out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabactive tab inline-block" href="'.$links[$i][0].'">';
 					$out.=$links[$i][1];
 					$out.='</a>'."\n";
-				}
-				else
+				} else
 				{
 					$out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabunactive tab inline-block" href="'.$links[$i][0].'">';
 					$out.=$links[$i][1];
@@ -1185,8 +1284,7 @@ 
 				}
 			}
 			$out.='</div>';
-		}
-		else
+		} else
 		{
 			// The popup with the other tabs
 			if (! $popuptab)
@@ -1197,13 +1295,13 @@ 
 			$outmore.='<div class="popuptab wordwrap" style="display:inherit;">';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
-				if (!empty($links[$i][0]))
-					$outmore.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else
-					$outmore.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				if (!empty($links[$i][0])) {
+									$outmore.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				} else {
+									$outmore.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				}
 
-			}
-			else if (! empty($links[$i][1]))
+			} else if (! empty($links[$i][1]))
 			{
 				$outmore.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="wordwrap inline-block" href="'.$links[$i][0].'">';
 				$outmore.=preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]);	// Replace x/y with x / y to allow wrap on long composed texts.
@@ -1215,7 +1313,9 @@ 
 		}
 		$displaytab=$i;
 	}
-	if ($popuptab) $outmore.='</div>';
+	if ($popuptab) {
+		$outmore.='</div>';
+	}
 
 	if ($displaytab > $limittoshow)
 	{
@@ -1239,7 +1339,9 @@ 
 
 	$out.="</div>\n";
 
-	if (! $notab || $notab == -1) $out.="\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
+	if (! $notab || $notab == -1) {
+		$out.="\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
+	}
 
 	$parameters=array('tabname' => $active, 'out' => $out);
 	$reshook=$hookmanager->executeHooks('printTabsHead',$parameters);	// This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
@@ -1270,9 +1372,12 @@ 
  */
 function dol_get_fiche_end($notab=0)
 {
-	if (! $notab || $notab == -1) return "\n</div>\n";
-	else return '';
-}
+	if (! $notab || $notab == -1) {
+		return "\n</div>\n";
+	} else {
+		return '';
+	}
+	}
 
 /**
  *  Show tab footer of a card.
@@ -1302,26 +1407,56 @@ 
 	$maxvisiblephotos=1;
 	$showimage=1;
 	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+		$showbarcode=0;
+	}
 	$modulepart='unknown';
 
-	if ($object->element == 'societe')         $modulepart='societe';
-	if ($object->element == 'contact')         $modulepart='contact';
-	if ($object->element == 'member')          $modulepart='memberphoto';
-	if ($object->element == 'user')            $modulepart='userphoto';
-	if ($object->element == 'product')         $modulepart='product';
+	if ($object->element == 'societe') {
+		$modulepart='societe';
+	}
+	if ($object->element == 'contact') {
+		$modulepart='contact';
+	}
+	if ($object->element == 'member') {
+		$modulepart='memberphoto';
+	}
+	if ($object->element == 'user') {
+		$modulepart='userphoto';
+	}
+	if ($object->element == 'product') {
+		$modulepart='product';
+	}
 
 	if (class_exists("Imagick"))
 	{
-		if ($object->element == 'propal')            $modulepart='propal';
-		if ($object->element == 'commande')          $modulepart='commande';
-		if ($object->element == 'facture')           $modulepart='facture';
-		if ($object->element == 'fichinter')         $modulepart='ficheinter';
-		if ($object->element == 'contrat')           $modulepart='contract';
-		if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
-		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
-		if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
-		if ($object->element == 'expensereport')     $modulepart='expensereport';
+		if ($object->element == 'propal') {
+			$modulepart='propal';
+		}
+		if ($object->element == 'commande') {
+			$modulepart='commande';
+		}
+		if ($object->element == 'facture') {
+			$modulepart='facture';
+		}
+		if ($object->element == 'fichinter') {
+			$modulepart='ficheinter';
+		}
+		if ($object->element == 'contrat') {
+			$modulepart='contract';
+		}
+		if ($object->element == 'supplier_proposal') {
+			$modulepart='supplier_proposal';
+		}
+		if ($object->element == 'order_supplier') {
+			$modulepart='supplier_order';
+		}
+		if ($object->element == 'invoice_supplier') {
+			$modulepart='supplier_invoice';
+		}
+		if ($object->element == 'expensereport') {
+			$modulepart='expensereport';
+		}
 	}
 
 	if ($object->element == 'product')
@@ -1329,9 +1464,12 @@ 
 		$width=80; $cssclass='photoref';
 		$showimage=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
 		$maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
-		if ($conf->browser->phone) $maxvisiblephotos=1;
-		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
-		else
+		if ($conf->browser->phone) {
+			$maxvisiblephotos=1;
+		}
+		if ($showimage) {
+			$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
+		} else
 		{
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto='';
@@ -1342,8 +1480,7 @@ 
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			//}
 		}
-	}
-	else
+	} else
 	{
 		if ($showimage)
 		{
@@ -1358,8 +1495,7 @@ 
 					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
 					{
 						$subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref;		// the objectref dir is not include into get_exdir when used with level=2, so we add it here
-					}
-					else
+					} else
 					{
 						$subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart);
 					}
@@ -1382,15 +1518,21 @@ 
 						  && (! file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))
 						   )
 						{
-							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experienc trouble with pdf thumb generation and imagick, you can disable here.
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {
+								// If you experienc trouble with pdf thumb generation and imagick, you can disable here.
 							{
 								$ret = dol_convert_file($file, 'png', $fileimage);
-								if ($ret < 0) $error++;
+							}
+								if ($ret < 0) {
+									$error++;
+								}
 							}
 						}
 
 						$heightforphotref=70;
-						if (! empty($conf->dol_optimize_smallscreen)) $heightforphotref=60;
+						if (! empty($conf->dol_optimize_smallscreen)) {
+							$heightforphotref=60;
+						}
 						// Si fichier png PDF d'1 page trouve
 						if (file_exists($fileimage))
 						{
@@ -1407,8 +1549,7 @@ 
 							$phototoshow.= '</div></div>';
 						}
 					}
-				}
-				else if (! $phototoshow)
+				} else if (! $phototoshow)
 				{
 					$phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
 				}
@@ -1421,20 +1562,24 @@ 
 				}
 			}
 
-			if (! $phototoshow)      // Show No photo link (picto of pbject)
+			if (! $phototoshow) {
+				// Show No photo link (picto of pbject)
 			{
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
+			}
 				if ($object->element == 'action')
 				{
 					$width=80;
 					$cssclass='photorefcenter';
 					$nophoto=img_picto('', 'title_agenda', '', false, 1);
-				}
-				else
+				} else
 				{
 					$width=14; $cssclass='photorefcenter';
 					$picto = $object->picto;
-					if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
+					if ($object->element == 'project' && ! $object->public) {
+						$picto = 'project';
+					}
+					// instead of projectpub
 					$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
 				}
 				$morehtmlleft.='<!-- No photo to show -->';
@@ -1445,19 +1590,19 @@ 
 		}
 	}
 
-	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	if ($showbarcode) {
+		$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	}
 
 	if ($object->element == 'societe')
 	{
 		if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
 		{
 		   	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-		}
-		else {
+		} else {
 			$morehtmlstatus.=$object->getLibStatut(6);
 		}
-	}
-	elseif ($object->element == 'product')
+	} elseif ($object->element == 'product')
 	{
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
 		if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1472,26 +1617,32 @@ 
 		} else {
 			$morehtmlstatus.='<span class="statusrefbuy">'.$object->getLibStatut(5,1).'</span>';
 		}
-	}
-	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 		$tmptxt=$object->getLibStatut(6, $object->totalpaye);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') {
+			$tmptxt=$object->getLibStatut(5, $object->totalpaye);
+		}
 		$morehtmlstatus.=$tmptxt;
-	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract')
+	} elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
-		if ($object->statut == 0) $morehtmlstatus.=$object->getLibStatut(5);
-		else $morehtmlstatus.=$object->getLibStatut(4);
-	}
-	elseif ($object->element == 'facturerec')
+		if ($object->statut == 0) {
+			$morehtmlstatus.=$object->getLibStatut(5);
+		} else {
+			$morehtmlstatus.=$object->getLibStatut(4);
+		}
+	} elseif ($object->element == 'facturerec')
 	{
-		if ($object->frequency == 0) $morehtmlstatus.=$object->getLibStatut(2);
-		else $morehtmlstatus.=$object->getLibStatut(5);
-	}
-	else { // Generic case
+		if ($object->frequency == 0) {
+			$morehtmlstatus.=$object->getLibStatut(2);
+		} else {
+			$morehtmlstatus.=$object->getLibStatut(5);
+		}
+	} else { // Generic case
 		$tmptxt=$object->getLibStatut(6);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') {
+			$tmptxt=$object->getLibStatut(5);
+		}
 		$morehtmlstatus.=$tmptxt;
 	}
 
@@ -1507,12 +1658,16 @@ 
 	}
 
 	// Add alias for thirdparty
-	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';
+	if (! empty($object->name_alias)) {
+		$morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';
+	}
 
 	// Add label
 	if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
 	{
-		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
+		if (! empty($object->label)) {
+			$morehtmlref.='<div class="refidno">'.$object->label.'</div>';
+		}
 	}
 
 	if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files')
@@ -1546,11 +1701,19 @@ 
 {
 	global $conf, $langs;
 	$ret='';
-	if ($fieldrequired) $ret.='<span class="fieldrequired">';
-	if (($conf->dol_use_jmobile != 4)) $ret.='<label for="'.$fieldkey.'">';
+	if ($fieldrequired) {
+		$ret.='<span class="fieldrequired">';
+	}
+	if (($conf->dol_use_jmobile != 4)) {
+		$ret.='<label for="'.$fieldkey.'">';
+	}
 	$ret.=$langs->trans($langkey);
-	if (($conf->dol_use_jmobile != 4)) $ret.='</label>';
-	if ($fieldrequired) $ret.='</span>';
+	if (($conf->dol_use_jmobile != 4)) {
+		$ret.='</label>';
+	}
+	if ($fieldrequired) {
+		$ret.='</span>';
+	}
 	return $ret;
 }
 
@@ -1565,7 +1728,9 @@ 
 {
 	global $bc;
 	$ret=' '.$bc[$var];
-	if ($moreclass) $ret=preg_replace('/class=\"/','class="'.$moreclass.' ',$ret);
+	if ($moreclass) {
+		$ret=preg_replace('/class=\"/','class="'.$moreclass.' ',$ret);
+	}
 	return $ret;
 }
 
@@ -1592,40 +1757,48 @@ 
 		$ret .= $object->address;
 	}
 	// Zip/Town/State
-	if (in_array($object->country_code,array('AU', 'CA', 'US')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
+	if (in_array($object->country_code,array('AU', 'CA', 'US')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {
+		// US: title firstname name \n address lines \n town, state, zip \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->town;
+	}
 		if ($object->state)
 		{
 			$ret.=($ret?", ":'').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret?", ":'').$object->zip;
-	}
-	else if (in_array($object->country_code,array('GB','UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+		if ($object->zip) {
+			$ret .= ($ret?", ":'').$object->zip;
+		}
+	} else if (in_array($object->country_code,array('GB','UK'))) {
+		// UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->town;
+	}
 		if ($object->state)
 		{
 			$ret.=($ret?", ":'').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? $sep : '' ).$object->zip;
-	}
-	else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+		if ($object->zip) {
+			$ret .= ($ret ? $sep : '' ).$object->zip;
+		}
+	} else if (in_array($object->country_code,array('ES','TR'))) {
+		// ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
+	}
 		$ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
 		if ($object->state)
 		{
 			$ret.="\n".$object->state;
 		}
-	}
-	else if (in_array($object->country_code,array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	} else if (in_array($object->country_code,array('IT'))) {
+		// IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
                 $ret .= ($ret ? $sep : '' ).$object->zip;
+	}
                 $ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
                 $ret .= ($object->departement_id?(' ('.($object->departement_id).')'):'');
-	}
-	else                                        		// Other: title firstname name \n address lines \n zip town \n country
+	} else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= $object->zip ? (($ret ? $sep : '' ).$object->zip) : '';
 		$ret .= ($object->town?(($object->zip?' ':($ret ? $sep : '' )).$object->town):'');
@@ -1634,8 +1807,12 @@ 
 			$ret.=($ret?", ":'').$object->state;
 		}
 	}
-	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if ($withcountry) $ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	if (! is_object($outputlangs)) {
+		$outputlangs=$langs;
+	}
+	if ($withcountry) {
+		$ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	}
 
 	return $ret;
 }
@@ -1654,9 +1831,10 @@ 
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+	} else {
+		return 'Error date into a not supported range';
+	}
 	}
-	else return 'Error date into a not supported range';
-}
 
 /**
  *	Output date in a string format according to outputlangs (or langs if not defined).
@@ -1697,8 +1875,7 @@ 
 				$offsettzstring=@date_default_timezone_get();		// Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz=0;
 				$offsetdst=0;
-			}
-			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
 			{
 				$to_gmt=true;
 				$offsettzstring=(empty($_SESSION['dol_tz_string'])?'UTC':$_SESSION['dol_tz_string']);	// Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -1707,31 +1884,57 @@ 
 			}
 		}
 	}
-	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if (! $format) $format='daytextshort';
+	if (! is_object($outputlangs)) {
+		$outputlangs=$langs;
+	}
+	if (! $format) {
+		$format='daytextshort';
+	}
 	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','dayhour')))?1:0;
 	$formatwithoutreduce = preg_replace('/reduceformat/','',$format);
 	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat=1; }  // so format 'dayreduceformat' is processed like day
 
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
 	// TODO Add format daysmallyear and dayhoursmallyear
-	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
-	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
-	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
-	else if ($format == 'daytext')			 $format=($outputlangs->trans("FormatDateText")!="FormatDateText"?$outputlangs->trans("FormatDateText"):$conf->format_date_text);
-	else if ($format == 'daytextshort')	$format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
-	else if ($format == 'dayhour')			 $format=($outputlangs->trans("FormatDateHourShort")!="FormatDateHourShort"?$outputlangs->trans("FormatDateHourShort"):$conf->format_date_hour_short);
-	else if ($format == 'dayhoursec')		 $format=($outputlangs->trans("FormatDateHourSecShort")!="FormatDateHourSecShort"?$outputlangs->trans("FormatDateHourSecShort"):$conf->format_date_hour_sec_short);
-	else if ($format == 'dayhourtext')		 $format=($outputlangs->trans("FormatDateHourText")!="FormatDateHourText"?$outputlangs->trans("FormatDateHourText"):$conf->format_date_hour_text);
-	else if ($format == 'dayhourtextshort') $format=($outputlangs->trans("FormatDateHourTextShort")!="FormatDateHourTextShort"?$outputlangs->trans("FormatDateHourTextShort"):$conf->format_date_hour_text_short);
+	if ($format == 'day') {
+		$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
+	} else if ($format == 'hour') {
+		$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
+	} else if ($format == 'hourduration') {
+		$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
+	} else if ($format == 'daytext') {
+		$format=($outputlangs->trans("FormatDateText")!="FormatDateText"?$outputlangs->trans("FormatDateText"):$conf->format_date_text);
+	} else if ($format == 'daytextshort') {
+		$format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
+	} else if ($format == 'dayhour') {
+		$format=($outputlangs->trans("FormatDateHourShort")!="FormatDateHourShort"?$outputlangs->trans("FormatDateHourShort"):$conf->format_date_hour_short);
+	} else if ($format == 'dayhoursec') {
+		$format=($outputlangs->trans("FormatDateHourSecShort")!="FormatDateHourSecShort"?$outputlangs->trans("FormatDateHourSecShort"):$conf->format_date_hour_sec_short);
+	} else if ($format == 'dayhourtext') {
+		$format=($outputlangs->trans("FormatDateHourText")!="FormatDateHourText"?$outputlangs->trans("FormatDateHourText"):$conf->format_date_hour_text);
+	} else if ($format == 'dayhourtextshort') {
+		$format=($outputlangs->trans("FormatDateHourTextShort")!="FormatDateHourTextShort"?$outputlangs->trans("FormatDateHourTextShort"):$conf->format_date_hour_text_short);
+	}
 	// Format not sensitive to language
-	else if ($format == 'dayhourlog')		 $format='%Y%m%d%H%M%S';
-	else if ($format == 'dayhourldap')		 $format='%Y%m%d%H%M%SZ';
-	else if ($format == 'dayhourxcard')	$format='%Y%m%dT%H%M%SZ';
-	else if ($format == 'dayxcard')	 	$format='%Y%m%d';
-	else if ($format == 'dayrfc')			 $format='%Y-%m-%d';             // DATE_RFC3339
-	else if ($format == 'dayhourrfc')		 $format='%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-	else if ($format == 'standard')		$format='%Y-%m-%d %H:%M:%S';
+	else if ($format == 'dayhourlog') {
+		$format='%Y%m%d%H%M%S';
+	} else if ($format == 'dayhourldap') {
+		$format='%Y%m%d%H%M%SZ';
+	} else if ($format == 'dayhourxcard') {
+		$format='%Y%m%dT%H%M%SZ';
+	} else if ($format == 'dayxcard') {
+		$format='%Y%m%d';
+	} else if ($format == 'dayrfc') {
+		$format='%Y-%m-%d';
+	}
+	// DATE_RFC3339
+	else if ($format == 'dayhourrfc') {
+		$format='%Y-%m-%dT%H:%M:%SZ';
+	}
+	// DATETIME RFC3339
+	else if ($format == 'standard') {
+		$format='%Y-%m-%d %H:%M:%S';
+	}
 
 	if ($reduceformat)
 	{
@@ -1740,29 +1943,38 @@ 
 	}
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) return '';		// $time=0 allowed (it means 01/01/1970 00:00:00)
+	if (dol_strlen($time) == 0) {
+		return '';
+	}
+	// $time=0 allowed (it means 01/01/1970 00:00:00)
 
 	// Clean format
-	if (preg_match('/%b/i',$format))		// There is some text to translate
+	if (preg_match('/%b/i',$format)) {
+		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format=str_replace('%b','__b__',$format);
+	}
 		$format=str_replace('%B','__B__',$format);
 	}
-	if (preg_match('/%a/i',$format))		// There is some text to translate
+	if (preg_match('/%a/i',$format)) {
+		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format=str_replace('%a','__a__',$format);
+	}
 		$format=str_replace('%A','__A__',$format);
 	}
 
 	// Analyze date
 	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$time,$reg)
-	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i',$time,$reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
+	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i',$time,$reg)) {
+		// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
 		// TODO Remove this.
 		// This part of code should not be used.
 		dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);
+	}
 		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'
 		$syear	= (! empty($reg[1]) ? $reg[1] : '');
 		$smonth	= (! empty($reg[2]) ? $reg[2] : '');
@@ -1773,17 +1985,20 @@ 
 
 		$time=dol_mktime($shour,$smin,$ssec,$smonth,$sday,$syear,true);
 		$ret=adodb_strftime($format, $time+$offsettz+$offsetdst, $to_gmt);
-	}
-	else
+	} else
 	{
 		// Date is a timestamps
-		if ($time < 100000000000)	// Protection against bad date values
+		if ($time < 100000000000) {
+			// Protection against bad date values
 		{
-			$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+			$timetouse = $time+$offsettz+$offsetdst;
+		}
+		// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret=adodb_strftime($format, $timetouse, $to_gmt);
+		} else {
+			$ret='Bad value '.$time.' for date';
 		}
-		else $ret='Bad value '.$time.' for date';
 	}
 
 	if (preg_match('/__b__/i',$format))
@@ -1797,8 +2012,7 @@ 
 		{
 			$monthtext=$outputlangs->transnoentities('Month'.$month);
 			$monthtextshort=$outputlangs->transnoentities('MonthShort'.$month);
-		}
-		else
+		} else
 		{
 			$monthtext=$outputlangs->transnoentitiesnoconv('Month'.$month);
 			$monthtextshort=$outputlangs->transnoentitiesnoconv('MonthShort'.$month);
@@ -1861,14 +2075,19 @@ 
 	global $conf;
 
 	$usealternatemethod=false;
-	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
-	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
+	if ($timestamp <= 0) {
+		$usealternatemethod=true;
+	}
+	// <= 1970
+	if ($timestamp >= 2145913200) {
+		$usealternatemethod=true;
+	}
+	// >= 2038
 
 	if ($usealternatemethod)
 	{
 		$arrayinfo=adodb_getdate($timestamp,$fast);
-	}
-	else
+	} else
 	{
 		$arrayinfo=getdate($timestamp);
 	}
@@ -1901,19 +2120,37 @@ 
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
 
 	// Clean parameters
-	if ($hour   == -1 || empty($hour)) $hour=0;
-	if ($minute == -1 || empty($minute)) $minute=0;
-	if ($second == -1 || empty($second)) $second=0;
+	if ($hour   == -1 || empty($hour)) {
+		$hour=0;
+	}
+	if ($minute == -1 || empty($minute)) {
+		$minute=0;
+	}
+	if ($second == -1 || empty($second)) {
+		$second=0;
+	}
 
 	// Check parameters
 	if ($check)
 	{
-		if (! $month || ! $day)  return '';
-		if ($day   > 31) return '';
-		if ($month > 12) return '';
-		if ($hour  < 0 || $hour   > 24) return '';
-		if ($minute< 0 || $minute > 60) return '';
-		if ($second< 0 || $second > 60) return '';
+		if (! $month || ! $day) {
+			return '';
+		}
+		if ($day   > 31) {
+			return '';
+		}
+		if ($month > 12) {
+			return '';
+		}
+		if ($hour  < 0 || $hour   > 24) {
+			return '';
+		}
+		if ($minute< 0 || $minute > 60) {
+			return '';
+		}
+		if ($second< 0 || $second > 60) {
+			return '';
+		}
 	}
 
 	if (method_exists('DateTime','getTimestamp'))
@@ -1922,28 +2159,24 @@ 
 		{
 			$default_timezone=@date_default_timezone_get();		// Example 'Europe/Berlin'
 			$localtz = new DateTimeZone($default_timezone);
-		}
-		else if ($gm === 'user')
+		} else if ($gm === 'user')
 		{
 			// We use dol_tz_string first because it is more reliable.
 			$default_timezone=(empty($_SESSION["dol_tz_string"])?@date_default_timezone_get():$_SESSION["dol_tz_string"]);		// Example 'Europe/Berlin'
 			try {
 				$localtz = new DateTimeZone($default_timezone);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
 				$default_timezone=@date_default_timezone_get();
 			}
-		}
-		else if (strrpos($gm, "tz,") !== false)
+		} else if (strrpos($gm, "tz,") !== false)
 		{
 			$timezone=str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'
 			try
 			{
 				$localtz = new DateTimeZone($timezone);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 			}
@@ -1960,8 +2193,7 @@ 
 		$date=$dt->getTimestamp();	// should include daylight saving time
 		//var_dump($date);
 		return $date;
-	}
-	else
+	} else
 	{
 		dol_print_error('','PHP version must be 5.3+');
 		return '';
@@ -1984,10 +2216,15 @@ 
 
 	// Note that gmmktime and mktime return same value (GMT) when used without parameters
 	//if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead
-	if ($mode == 'gmt') $ret=time();	// Time for now at greenwich.
-	else if ($mode == 'tzserver')		// Time for now with PHP server timezone added
+	if ($mode == 'gmt') {
+		$ret=time();
+	}
+	// Time for now at greenwich.
+	else if ($mode == 'tzserver') {
+		// Time for now with PHP server timezone added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	}
 		$tzsecond=getServerTimeZoneInt('now');    // Contains tz+dayling saving time
 		$ret=(int) dol_now('gmt')+($tzsecond*3600);
 	}
@@ -1997,10 +2234,12 @@ 
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
 		$ret=dol_now('gmt')+($tzsecond*3600);
 	}*/
-	else if ($mode == 'tzuser')				// Time for now with user timezone added
+	else if ($mode == 'tzuser') {
+		// Time for now with user timezone added
 	{
 		//print 'eeee'.time().'-'.mktime().'-'.gmmktime();
 		$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
+	}
 		$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
 		$ret=(int) dol_now('gmt')+($offsettz+$offsetdst);
 	}
@@ -2022,7 +2261,9 @@ 
 	global $conf,$langs;
 	$level=1024;
 
-	if (! empty($conf->dol_optimize_smallscreen)) $shortunit=1;
+	if (! empty($conf->dol_optimize_smallscreen)) {
+		$shortunit=1;
+	}
 
 	// Set value text
 	if (empty($shortvalue) || $size < ($level*10))
@@ -2030,16 +2271,14 @@ 
 		$ret=$size;
 		$textunitshort=$langs->trans("b");
 		$textunitlong=$langs->trans("Bytes");
-	}
-	else
+	} else
 	{
 		$ret=round($size/$level,0);
 		$textunitshort=$langs->trans("Kb");
 		$textunitlong=$langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret.=' '.$textunitlong; }
-	else { $ret.=' '.$textunitshort; }
+	if (empty($shortunit)) { $ret.=' '.$textunitlong; } else { $ret.=' '.$textunitshort; }
 
 	return $ret;
 }
@@ -2057,15 +2296,23 @@ 
 {
 	global $langs;
 
-	if (empty($url)) return '';
+	if (empty($url)) {
+		return '';
+	}
 
 	$link='<a href="';
-	if (! preg_match('/^http/i',$url)) $link.='http://';
+	if (! preg_match('/^http/i',$url)) {
+		$link.='http://';
+	}
 	$link.=$url;
 	$link.='"';
-	if ($target) $link.=' target="'.$target.'"';
+	if ($target) {
+		$link.=' target="'.$target.'"';
+	}
 	$link.='>';
-	if (! preg_match('/^http/i',$url)) $link.='http://';
+	if (! preg_match('/^http/i',$url)) {
+		$link.='http://';
+	}
 	$link.=dol_trunc($url,$max);
 	$link.='</a>';
 	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto($langs->trans("Url"), 'object_globe.png').' ':'').$link.'</div>';
@@ -2089,12 +2336,16 @@ 
 
 	$newemail=$email;
 
-	if (empty($email)) return '&nbsp;';
+	if (empty($email)) {
+		return '&nbsp;';
+	}
 
 	if (! empty($addlink))
 	{
 		$newemail='<a style="text-overflow: ellipsis;" href="';
-		if (! preg_match('/^mailto:/i',$email)) $newemail.='mailto:';
+		if (! preg_match('/^mailto:/i',$email)) {
+			$newemail.='mailto:';
+		}
 		$newemail.=$email;
 		$newemail.='">';
 		$newemail.=dol_trunc($email,$max);
@@ -2108,11 +2359,14 @@ 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_EMAIL'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newemail='<div>'.$newemail.' '.$link.'</div>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+				$link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			}
+			if ($link) {
+				$newemail='<div>'.$newemail.' '.$link.'</div>';
+			}
 		}
-	}
-	else
+	} else
 	{
 		if ($showinvalid && ! isValidEmail($email))
 		{
@@ -2139,7 +2393,9 @@ 
 
 	$newskype=$skype;
 
-	if (empty($skype)) return '&nbsp;';
+	if (empty($skype)) {
+		return '&nbsp;';
+	}
 
 	if (! empty($addlink))
 	{
@@ -2160,11 +2416,12 @@ 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_SKYPE'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+				$link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			}
 			$newskype='<div class="divskype nowrap">'.$newskype.($link?' '.$link:'').'</div>';
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		$newskype.=img_warning($langs->trans("ErrorBadSkype",$skype));
@@ -2193,10 +2450,14 @@ 
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/","",trim($phone));
 	if (empty($phone)) { return ''; }
-	if (empty($countrycode)) $countrycode=$mysoc->country_code;
+	if (empty($countrycode)) {
+		$countrycode=$mysoc->country_code;
+	}
 
 	// Short format for small screens
-	if ($conf->dol_optimize_smallscreen) $separ='';
+	if ($conf->dol_optimize_smallscreen) {
+		$separ='';
+	}
 
 	$newphone=$phone;
 	if (strtoupper($countrycode) == "FR")
@@ -2204,297 +2465,257 @@ 
 		// France
 		if (dol_strlen($phone) == 10) {
 			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,2).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2);
-		}
-		elseif (dol_strlen($phone) == 7)
+		} elseif (dol_strlen($phone) == 7)
 		{
 			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2);
-		}
-		elseif (dol_strlen($phone) == 9)
+		} elseif (dol_strlen($phone) == 9)
 		{
 			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{
 			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{
 			$newphone=substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-
-	elseif (strtoupper($countrycode) == "CA")
+	} elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PT" )
+	} elseif (strtoupper($countrycode) == "PT" )
 	{//Portugal
 		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SR" )
+	} elseif (strtoupper($countrycode) == "SR" )
 	{//Suriname
 		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DE" )
+	} elseif (strtoupper($countrycode) == "DE" )
 	{//Allemagne
 		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ES")
+	} elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BF")
+	} elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "RO")
+	} elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TR")
+	} elseif (strtoupper($countrycode) == "TR")
 	{//Turquie
 		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "US")
+	} elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MX")
+	} elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ML")
+	} elseif (strtoupper($countrycode) == "ML")
 	{//Mali
 		if(dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TH")
+	} elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
 		if(dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
-		}
-		elseif(dol_strlen($phone) == 12)
+		} elseif(dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
 		}
-		}
-	elseif (strtoupper($countrycode) == "MU")
+		} elseif (strtoupper($countrycode) == "MU")
 	{//Maurice
 		if(dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
-		}
-		elseif(dol_strlen($phone) == 12)
+		} elseif(dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ZA")
+	} elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
 		if(dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SY")
+	} elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
 		if(dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
-		}
-		elseif(dol_strlen($phone) == 13)
+		} elseif(dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AE")
+	} elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
 		if(dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
-		}
-		elseif(dol_strlen($phone) == 13)
+		} elseif(dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
-		}
-		elseif(dol_strlen($phone) == 14)
+		} elseif(dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DZ")
+	} elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
 		if(dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BE")
+	} elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
 		if(dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
-		}
-		elseif(dol_strlen($phone) == 12)
+		} elseif(dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PF")
+	} elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
 		if(dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CO")
+	} elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
 		if(dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JO")
+	} elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
 		if(dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MG")
+	} elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if(dol_strlen($phone) == 13)
 		{//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GB")
+	} elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
 		if(dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CH")
+	} elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
 		if(dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
-		}
-		elseif(dol_strlen($phone) == 15)
+		} elseif(dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
 			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TN")
+	} elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
 		if(dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GF")
+	} elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
 		if(dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GP")
+	} elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
 		if(dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MQ")
+	} elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
 		if(dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "IT")
+	} elseif (strtoupper($countrycode) == "IT")
 	{//Italie
 		if(dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
-		}
-		elseif(dol_strlen($phone) == 13)
+		} elseif(dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif(strtoupper($countrycode) == "AU")
+	} elseif(strtoupper($countrycode) == "AU")
 	{//Australie
 		 if(dol_strlen($phone) == 12)
 		{//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
 		}
 	}
-	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
+	if (! empty($addlink)) {
+		// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
 		{
 			$newphone ='<a href="tel:'.$phone.'"';
+	}
 			$newphone.='>'.$phone.'</a>';
-		}
-		else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		} else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {
+			// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
+		}
 
 			// Define urlmask
 			$urlmask='ErrorClickToDialModuleNotConfigured';
-			if (! empty($conf->global->CLICKTODIAL_URL)) $urlmask=$conf->global->CLICKTODIAL_URL;
-			if (! empty($user->clicktodial_url)) $urlmask=$user->clicktodial_url;
+			if (! empty($conf->global->CLICKTODIAL_URL)) {
+				$urlmask=$conf->global->CLICKTODIAL_URL;
+			}
+			if (! empty($user->clicktodial_url)) {
+				$urlmask=$user->clicktodial_url;
+			}
 
 			$clicktodial_poste=(! empty($user->clicktodial_poste)?urlencode($user->clicktodial_poste):'');
 			$clicktodial_login=(! empty($user->clicktodial_login)?urlencode($user->clicktodial_login):'');
@@ -2509,7 +2730,9 @@ 
 			$url = make_substitutions($url, $substitarray);
 			$newphonesav=$newphone;
 			$newphone ='<a href="'.$url.'"';
-			if (! empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone.=' target="_blank"';
+			if (! empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+				$newphone.=' target="_blank"';
+			}
 			$newphone.='>'.$newphonesav.'</a>';
 		}
 
@@ -2517,9 +2740,15 @@ 
 		if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_TEL'; $link='';
-			if ($addlink == 'AC_FAX') $type='AC_FAX';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newphone='<div>'.$newphone.' '.$link.'</div>';
+			if ($addlink == 'AC_FAX') {
+				$type='AC_FAX';
+			}
+			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+				$link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			}
+			if ($link) {
+				$newphone='<div>'.$newphone.' '.$link.'</div>';
+			}
 		}
 	}
 
@@ -2540,19 +2769,25 @@ 
 		if($withpicto){
 			if($withpicto=='fax'){
 				$picto = 'phoning_fax';
-			}elseif($withpicto=='phone'){
+			} elseif($withpicto=='phone'){
 				$picto = 'phoning';
-			}elseif($withpicto=='mobile'){
+			} elseif($withpicto=='mobile'){
 				$picto = 'phoning_mobile';
-			}else{
+			} else{
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) $rep.='<div class="nospan float" style="margin-right: 10px">';
-		else $rep.='<span style="margin-right: 10px;">';
+		if ($adddivfloat) {
+			$rep.='<div class="nospan float" style="margin-right: 10px">';
+		} else {
+			$rep.='<span style="margin-right: 10px;">';
+		}
 		$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
-		if ($adddivfloat) $rep.='</div>';
-		else $rep.='</span>';
+		if ($adddivfloat) {
+			$rep.='</div>';
+		} else {
+			$rep.='</span>';
+		}
 	  }
 
 	return $rep;
@@ -2571,18 +2806,23 @@ 
 
 	$ret='';
 
-	if (empty($mode)) $ret.=$ip;
+	if (empty($mode)) {
+		$ret.=$ip;
+	}
 
 	if ($mode != 2)
 	{
 		$countrycode=dolGetCountryCodeFromIp($ip);
-		if ($countrycode)	// If success, countrycode is us, fr, ...
+		if ($countrycode) {
+			// If success, countrycode is us, fr, ...
 		{
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
 				$ret.=' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"),DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png','',1);
+		}
+			} else {
+				$ret.=' ('.$countrycode.')';
 			}
-			else $ret.=' ('.$countrycode.')';
 		}
 	}
 
@@ -2671,18 +2911,33 @@ 
 		}
 		if (empty($reshook))
 		{
-			if (empty($charfornl)) $out.=nl2br($address);
-			else $out.=preg_replace('/[\r\n]+/', $charfornl, $address);
+			if (empty($charfornl)) {
+				$out.=nl2br($address);
+			} else {
+				$out.=preg_replace('/[\r\n]+/', $charfornl, $address);
+			}
 
 			$showgmap=$showomap=0;
 
 			// TODO Add a hook here
-			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap=1;
-			if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap=1;
-			if ($mode=='member' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap=1;
-			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap=1;
-			if ($mode=='contact' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap=1;
-			if ($mode=='member' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap=1;
+			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+				$showgmap=1;
+			}
+			if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+				$showgmap=1;
+			}
+			if ($mode=='member' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+				$showgmap=1;
+			}
+			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+				$showomap=1;
+			}
+			if ($mode=='contact' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+				$showomap=1;
+			}
+			if ($mode=='member' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+				$showomap=1;
+			}
 
 			if ($showgmap)
 			{
@@ -2696,9 +2951,12 @@ 
 			}
 		}
 	}
-	if ($noprint) return $out;
-	else print $out;
-}
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
+	}
 
 
 /**
@@ -2710,8 +2968,12 @@ 
  */
 function isValidEmail($address, $acceptsupervisorkey=0)
 {
-	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true;
-	if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true;
+	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+		return true;
+	}
+	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+		return true;
+	}
 
 	return false;
 }
@@ -2738,9 +3000,12 @@ 
  */
 function dol_strlen($string,$stringencoding='UTF-8')
 {
-	if (function_exists('mb_strlen')) return mb_strlen($string,$stringencoding);
-	else return strlen($string);
-}
+	if (function_exists('mb_strlen')) {
+		return mb_strlen($string,$stringencoding);
+	} else {
+		return strlen($string);
+	}
+	}
 
 /**
  * Make a substring. Works even in mbstring module is not enabled.
@@ -2755,14 +3020,15 @@ 
 {
 	global $langs;
 
-	if (empty($stringencoding)) $stringencoding=$langs->charset_output;
+	if (empty($stringencoding)) {
+		$stringencoding=$langs->charset_output;
+	}
 
 	$ret='';
 	if (function_exists('mb_substr'))
 	{
 		$ret=mb_substr($string,$start,$length,$stringencoding);
-	}
-	else
+	} else
 	{
 		$ret=substr($string,$start,$length);
 	}
@@ -2802,7 +3068,9 @@ 
 		return;
 	}
 
-	if (empty($conf->use_javascript_ajax)) return;
+	if (empty($conf->use_javascript_ajax)) {
+		return;
+	}
 	$jsgraphlib='flot';
 	$datacolor=array();
 
@@ -2860,11 +3128,17 @@ 
 										var number=series.data[0][1];
 										return \'';
 										print '<div style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-										if ($url) print '<a style="color: #FFFFFF;" border="0" href="'.$url.'">';
+										if ($url) {
+											print '<a style="color: #FFFFFF;" border="0" href="'.$url.'">';
+										}
 										print '\'+'.($showlegend?'number':'label+\' \'+number');
-										if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
+										if (! empty($showpercent)) {
+											print '+\'<br/>\'+percent+\'%\'';
+										}
 										print '+\'';
-										if ($url) print '</a>';
+										if ($url) {
+											print '</a>';
+										}
 										print '</div>\';
 									},
 									background: {
@@ -2890,8 +3164,7 @@ 
 				plotWithOptions();
 			});
 			</script>';
-		}
-		else if ($type == 'barline')
+		} else if ($type == 'barline')
 		{
 			// data is   array('series'=>array(serie1,serie2,...),
 			//                 'seriestype'=>array('bar','line',...),
@@ -2906,18 +3179,24 @@ 
 				foreach($data['series'] as $serie)
 				{
 					if ($data['seriestype'][$i]=='line') { $i++; continue; };
-					if ($outputserie > 0) print ',';
+					if ($outputserie > 0) {
+						print ',';
+					}
 					print '{ bars: { stack: 0, show: true, barWidth: 0.9, align: \'center\' }, label: \''.dol_escape_js($serie['label']).'\', data: '.json_encode($serie['data']).'}'."\n";
 					$outputserie++; $i++;
 				}
-				if ($outputserie) print ', ';
+				if ($outputserie) {
+					print ', ';
+				}
 				//print '];
 				//var datalines = [';
 				$i=0; $outputserie=0;
 				foreach($data['series'] as $serie)
 				{
 					if (empty($data['seriestype'][$i]) || $data['seriestype'][$i]=='bar') { $i++; continue; };
-					if ($outputserie > 0) print ',';
+					if ($outputserie > 0) {
+						print ',';
+					}
 					print '{ lines: { show: true }, label: \''.dol_escape_js($serie['label']).'\', data: '.json_encode($serie['data']).'}'."\n";
 					$outputserie++; $i++;
 				}
@@ -2947,8 +3226,9 @@ 
 				plotWithOptions();
 			});
 			</script>';
+		} else {
+			print 'BadValueForParameterType';
 		}
-		else print 'BadValueForParameterType';
 	}
 }
 
@@ -2969,23 +3249,30 @@ 
 {
 	global $conf;
 
-	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
+	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) {
+		return $string;
+	}
 
-	if (empty($stringencoding)) $stringencoding='UTF-8';
+	if (empty($stringencoding)) {
+		$stringencoding='UTF-8';
+	}
 	// reduce for small screen
-	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
+	if ($conf->dol_optimize_smallscreen==1 && $display==1) {
+		$size = round($size/3);
+	}
 
 	// We go always here
 	if ($trunc == 'right')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3))) {
+			// If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return dol_substr($newstring,0,$size,$stringencoding).($nodot?'':'...');
-		else
-		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+		} else {
+				//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
-	}
-	elseif ($trunc == 'middle')
+		}
+	} elseif ($trunc == 'middle')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
 		if (dol_strlen($newstring,$stringencoding) > 2 && dol_strlen($newstring,$stringencoding) > ($size+1))
@@ -2993,28 +3280,30 @@ 
 			$size1=round($size/2);
 			$size2=round($size/2);
 			return dol_substr($newstring,0,$size1,$stringencoding).'...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size2,$size2,$stringencoding);
+		} else {
+				return $string;
 		}
-		else
-		return $string;
-	}
-	elseif ($trunc == 'left')
+	} elseif ($trunc == 'left')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3))) {
+			// If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size,$size,$stringencoding);
-		else
-		return $string;
-	}
-	elseif ($trunc == 'wrap')
+		} else {
+				return $string;
+		}
+	} elseif ($trunc == 'wrap')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+1))
-		return dol_substr($newstring,0,$size,$stringencoding)."\n".dol_trunc(dol_substr($newstring,$size,dol_strlen($newstring,$stringencoding)-$size,$stringencoding),$size,$trunc);
-		else
-		return $string;
+		if (dol_strlen($newstring,$stringencoding) > ($size+1)) {
+				return dol_substr($newstring,0,$size,$stringencoding)."\n".dol_trunc(dol_substr($newstring,$size,dol_strlen($newstring,$stringencoding)-$size,$stringencoding),$size,$trunc);
+		} else {
+				return $string;
+		}
+	} else {
+		return 'BadParam3CallingDolTrunc';
+	}
 	}
-	else return 'BadParam3CallingDolTrunc';
-}
 
 /**
  *	Show picto whatever it's its name (generic function)
@@ -3042,10 +3331,11 @@ 
 	if ($pictoisfullpath)
 	{
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) $picto .= '.png';
+		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) {
+			$picto .= '.png';
+		}
 		$fullpathpicto = $picto;
-	}
-	else
+	} else
 	{
 		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
@@ -3057,7 +3347,9 @@ 
 			if ($picto == 'on')  { $fakey = 'fa-check-square-o'; $fasize='1.3em'; }
 			$enabledisablehtml='';
 			$enabledisablehtml.='<span class="fa '.$fakey.' valignmiddle'.($morecss?' '.$morecss:'').'" style="'.($fasize?('font-size: '.$fasize.';'):'').($facolor?(' color: '.$facolor.';'):'').'" alt="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'"'.($moreatt?' '.$moreatt:'').'">';
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$titlealt;
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$enabledisablehtml.=$titlealt;
+			}
 			$enabledisablehtml.='</span>';
 			return $enabledisablehtml;
 		}
@@ -3067,9 +3359,18 @@ 
 		$theme = $conf->theme;
 
 		$path = 'theme/'.$theme;
-		if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme;	// If the theme does not have the same name as the module
-		else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme
-		else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme;	// If the theme have the same name as the module
+		if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {
+			$path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme;
+		}
+		// If the theme does not have the same name as the module
+		else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
+			$path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;
+		}
+		// To allow an external module to overwrite image resources whatever is activated theme
+		else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
+			$path = $theme.'/theme/'.$theme;
+		}
+		// If the theme have the same name as the module
 
 		// If we ask an image into $url/$mymodule/img (instead of default path)
 		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
@@ -3079,14 +3380,20 @@ 
 		}
 
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) $picto .= '.png';
+		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) {
+			$picto .= '.png';
+		}
 		// If alt path are defined, define url where img file is, according to physical path
-		foreach ($conf->file->dol_document_root as $type => $dirroot)	// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
+		foreach ($conf->file->dol_document_root as $type => $dirroot) {
+			// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
 		{
 			if ($type == 'main') continue;
-			if (file_exists($dirroot.'/'.$path.'/img/'.$picto))	// This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
+		}
+			if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {
+				// This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
 			{
 				$url=DOL_URL_ROOT.$conf->file->dol_url_root[$type];
+			}
 				break;
 			}
 		}
@@ -3095,8 +3402,9 @@ 
 		$fullpathpicto = $url.'/'.$path.'/img/'.$picto;
 	}
 
-	if ($srconly) return $fullpathpicto;
-	else
+	if ($srconly) {
+		return $fullpathpicto;
+	} else
 	{
 		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people
 		//$tmparray=array(0=>$titlealt);
@@ -3140,7 +3448,9 @@ 
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (! preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3161,10 +3471,13 @@ 
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (! preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
-	if ($pictoisfullpath) $path = $picto;
-	else
+	if ($pictoisfullpath) {
+		$path = $picto;
+	} else
 	{
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
@@ -3172,7 +3485,9 @@ 
 		{
 			$themepath = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto;
 
-			if (file_exists($themepath)) $path = $themepath;
+			if (file_exists($themepath)) {
+				$path = $themepath;
+			}
 		}
 	}
 
@@ -3192,14 +3507,11 @@ 
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO')			{ $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
-		elseif ($numaction ==  '0' || $numaction == 'ST_NEVER') 	{ $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
-		elseif ($numaction ==  '1' || $numaction == 'ST_TODO')  	{ $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
-		elseif ($numaction ==  '2' || $numaction == 'ST_PEND')  	{ $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
-		elseif ($numaction ==  '3' || $numaction == 'ST_DONE')  	{ $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
-		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+		if ($numaction == '-1' || $numaction == 'ST_NO')			{ $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); } elseif ($numaction ==  '0' || $numaction == 'ST_NEVER') 	{ $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); } elseif ($numaction ==  '1' || $numaction == 'ST_TODO')  	{ $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); } elseif ($numaction ==  '2' || $numaction == 'ST_PEND')  	{ $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); } elseif ($numaction ==  '3' || $numaction == 'ST_DONE')  	{ $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); } else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+	}
+	if (! is_numeric($numaction)) {
+		$numaction=0;
 	}
-	if (! is_numeric($numaction)) $numaction=0;
 
 	return img_picto($titlealt, 'stcomm'.$numaction.'.png');
 }
@@ -3215,7 +3527,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Show');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Show');
+	}
 
 	return img_picto($titlealt, 'pdf'.$size.'.png');
 }
@@ -3231,7 +3545,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Add');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Add');
+	}
 
 	return img_picto($titlealt, 'edit_add.png', $other);
 }
@@ -3246,7 +3562,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Remove');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Remove');
+	}
 
 	return img_picto($titlealt, 'edit_remove.png', $other);
 }
@@ -3263,7 +3581,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Modify');
+	}
 
 	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : "") . ($other?' '.$other:''));
 }
@@ -3280,7 +3600,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('View');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('View');
+	}
 
 	$moreatt = ($float ? 'style="float: right" ' : '').$other;
 
@@ -3298,7 +3620,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Delete');
+	}
 
 	return img_picto($titlealt, 'delete.png', $other);
 }
@@ -3313,7 +3637,9 @@ 
 function img_printer($titlealt = "default", $other='')
 {
 	global $conf,$langs;
-	if ($titlealt=="default") $titlealt=$langs->trans("Print");
+	if ($titlealt=="default") {
+		$titlealt=$langs->trans("Print");
+	}
 	return img_picto($titlealt,'printer.png',$other);
 }
 
@@ -3328,7 +3654,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Split');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Split');
+	}
 
 	return img_picto($titlealt, 'split.png', $other);
 }
@@ -3346,8 +3674,11 @@ 
 
 	if ($usealttitle)
 	{
-		if (is_string($usealttitle)) $usealttitle = dol_escape_htmltag($usealttitle);
-		else $usealttitle = $langs->trans('Info');
+		if (is_string($usealttitle)) {
+			$usealttitle = dol_escape_htmltag($usealttitle);
+		} else {
+			$usealttitle = $langs->trans('Info');
+		}
 	}
 
 	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help': ($usehelpcursor == 2 ? ' cursor: pointer':'')).'"');
@@ -3363,7 +3694,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Informations');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Informations');
+	}
 
 	return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');
 }
@@ -3379,7 +3712,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Warning');
+	}
 
 	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
 	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): ''));
@@ -3395,7 +3730,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Error');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Error');
+	}
 
 	return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');
 }
@@ -3411,7 +3748,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Next');
+	}
 
 	//return img_picto($titlealt, 'next.png', $moreatt);
 	return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3428,7 +3767,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Previous');
+	}
 
 	//return img_picto($titlealt, 'previous.png', $moreatt);
 	return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3446,7 +3787,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Down');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Down');
+	}
 
 	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass?" ".$moreclass:"").'"');
 }
@@ -3463,7 +3806,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Up');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Up');
+	}
 
 	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass?" ".$moreclass:"").'"');
 }
@@ -3480,7 +3825,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Left');
+	}
 
 	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
@@ -3497,7 +3844,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Right');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Right');
+	}
 
 	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
 }
@@ -3513,9 +3862,13 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Active');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Active');
+	}
 
-	if ($allow == 1) return img_picto($titlealt, 'tick.png');
+	if ($allow == 1) {
+		return img_picto($titlealt, 'tick.png');
+	}
 
 	return '-';
 }
@@ -3537,7 +3890,9 @@ 
 	$mimeimg = dol_mimetype($file, '', 2);
 	$mimefa = dol_mimetype($file, '', 4);
 
-	if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;
+	if (empty($titlealt)) {
+		$titlealt = 'Mime type: '.$mimetype;
+	}
 
 	//return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
 	return '<i class="fa fa-'.$mimefa.' paddingright"></i>';
@@ -3560,10 +3915,15 @@ 
 
 	global $conf,$langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Call');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Call');
+	}
 
-	if ($option == 1) $img = 'call';
-	else $img = 'call_out';
+	if ($option == 1) {
+		$img = 'call';
+	} else {
+		$img = 'call_out';
+	}
 
 	return img_picto($titlealt, $img);
 }
@@ -3579,7 +3939,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'search.png', $other, false, 1);
 
@@ -3600,7 +3962,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
@@ -3663,15 +4027,21 @@ 
 	$langs->load("main");
 	$langs->load("errors");
 
-	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
+	if ($_SERVER['DOCUMENT_ROOT']) {
+		// Mode web
 	{
 		$out.=$langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+	}
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		}
 		$out.=$langs->trans("InformationToHelpDiagnose").":<br>\n";
 
 		$out.="<b>".$langs->trans("Date").":</b> ".dol_print_date(time(),'dayhourlog')."<br>\n";
 		$out.="<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";
-		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out.="<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out.="<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		}
 		if (function_exists("phpversion"))
 		{
 			$out.="<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
@@ -3689,8 +4059,7 @@ 
 		$out.="<br>\n";
 		$syslog.="url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog.=", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-	}
-	else                              // Mode CLI
+	} else                              // Mode CLI
 	{
 		$out.='> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
 		$syslog.="pid=".dol_getmypid();
@@ -3698,15 +4067,16 @@ 
 
 	if (is_object($db))
 	{
-		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
+		if ($_SERVER['DOCUMENT_ROOT']) {
+			// Mode web
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
+		}
 			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?dol_escape_htmltag($db->lasterrno()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?dol_escape_htmltag($db->lasterror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
-		}
-		else                            // Mode CLI
+		} else                            // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
 			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
@@ -3724,19 +4094,27 @@ 
 		$langs->load("errors");
 
 		// Merge all into $errors array
-		if (is_array($error) && is_array($errors)) $errors=array_merge($error,$errors);
-		elseif (is_array($error)) $errors=$error;
-		elseif (is_array($errors)) $errors=array_merge(array($error),$errors);
-		else $errors=array_merge(array($error));
+		if (is_array($error) && is_array($errors)) {
+			$errors=array_merge($error,$errors);
+		} elseif (is_array($error)) {
+			$errors=$error;
+		} elseif (is_array($errors)) {
+			$errors=array_merge(array($error),$errors);
+		} else {
+			$errors=array_merge(array($error));
+		}
 
 		foreach($errors as $msg)
 		{
-			if (empty($msg)) continue;
-			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
+			if (empty($msg)) {
+				continue;
+			}
+			if ($_SERVER['DOCUMENT_ROOT']) {
+				// Mode web
 			{
 				$out.="<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n" ;
 			}
-			else                        // Mode CLI
+			} else                        // Mode CLI
 			{
 				$out.='> '.$langs->transnoentities("Message").":\n".$msg."\n" ;
 			}
@@ -3753,8 +4131,9 @@ 
 		$out.="<br>\n";
 	}
 
-	if (empty($dolibarr_main_prod)) print $out;
-	else
+	if (empty($dolibarr_main_prod)) {
+		print $out;
+	} else
 	{
 		print $langs->trans("DolibarrHasDetectedError").'. ';
 		print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
@@ -3781,7 +4160,9 @@ 
 	$now=dol_now();
 	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
 	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
-	if ($errormessage) print '<br><br>'.$errormessage;
+	if ($errormessage) {
+		print '<br><br>'.$errormessage;
+	}
 	if (is_array($errormessages) && count($errormessages))
 	{
 		foreach($errormessages as $mesgtoshow)
@@ -3839,7 +4220,9 @@ 
 	$sortimg='';
 
 	$tag='th';
-	if ($thead==2) $tag='div';
+	if ($thead==2) {
+		$tag='div';
+	}
 
 	$tmpsortfield=explode(',',$sortfield);
 	$sortfield1=trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
@@ -3849,42 +4232,63 @@ 
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
-	else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
+	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) {
+		$out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
+	} else {
+		$out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
+	}
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
+	if (empty($thead) && $field && empty($disablesortlink)) {
+		// If this is a sort field
 	{
 		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
+	}
 		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
 		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		if (! preg_match('/^&/',$options)) {
+			$options='&'.$options;
+		}
 
-		if ($field1 != $sortfield1) // We are on another field
+		if ($field1 != $sortfield1) {
+			// We are on another field
 		{
 			if (preg_match('/^DESC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
-		}
-		else                      // We are of first sorting criteria
+		} else {
+				$out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+			}
+		} else                      // We are of first sorting criteria
 		{
-			if (preg_match('/^ASC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+			if (preg_match('/^ASC/', $sortorder)) {
+				$out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
+			} else {
+				$out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+			}
 		}
 	}
 
-	if ($tooltip) $out.=$form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
-	else $out.=$langs->trans($name);
+	if ($tooltip) {
+		$out.=$form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
+	} else {
+		$out.=$langs->trans($name);
+	}
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
+	if (empty($thead) && $field && empty($disablesortlink)) {
+		// If this is a sort field
 	{
 		$out.='</a>';
 	}
+	}
 
-	if (empty($thead) && $field)    // If this is a sort field
+	if (empty($thead) && $field) {
+		// If this is a sort field
 	{
 		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
+	}
 		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
 		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		if (! preg_match('/^&/',$options)) {
+			$options='&'.$options;
+		}
 
 		//print "&nbsp;";
 		//$sortimg.= '<img width="2" src="'.DOL_URL_ROOT.'/theme/common/transparent.png" alt="">';
@@ -3894,8 +4298,7 @@ 
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-		}
-		else
+		} else
 		{
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
@@ -3969,12 +4372,18 @@ 
 
 	$return='';
 
-	if ($picto == 'setup') $picto='title.png';
-	if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif';
+	if ($picto == 'setup') {
+		$picto='title.png';
+	}
+	if (($conf->browser->name == 'ie') && $picto=='title.png') {
+		$picto='title.gif';
+	}
 
 	$return.= "\n";
 	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" class="centpercent notopnoleftnoright'.($morecssontable?' '.$morecssontable:'').'" style="margin-bottom: 2px;"><tr>';
-	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) {
+		$return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
+	}
 	$return.= '<td class="nobordernopadding" valign="middle">';
 	$return.= '<div class="titre">'.$titre.'</div>';
 	$return.= '</td>';
@@ -4020,14 +4429,19 @@ 
 	$savtotalnboflines = $totalnboflines;
 	$totalnboflines=abs($totalnboflines);
 
-	if ($picto == 'setup') $picto='title_setup.png';
-	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
-	if ($limit < 0) $limit = $conf->liste_limit;
+	if ($picto == 'setup') {
+		$picto='title_setup.png';
+	}
+	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') {
+		$picto='title.gif';
+	}
+	if ($limit < 0) {
+		$limit = $conf->liste_limit;
+	}
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
-	}
-	else
+	} else
 	{
 		$nextpage = 0;
 	}
@@ -4040,9 +4454,13 @@ 
 	// Left
 	//if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding valignmiddle">';
-	if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	if ($picto && $titre) {
+		print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	}
 	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print ' ('.$totalnboflines.')';
+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+		print ' ('.$totalnboflines.')';
+	}
 	print '</div></td>';
 
 	// Center
@@ -4053,27 +4471,39 @@ 
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle" align="right">';
-	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
-	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
+	if ($sortfield) {
+		$options .= "&sortfield=".urlencode($sortfield);
+	}
+	if ($sortorder) {
+		$options .= "&sortorder=".urlencode($sortorder);
+	}
 	// Show navigation bar
 	$pagelist = '';
 	if ($savlimit != 0 && ($page > 0 || $num > $limit))
 	{
-		if ($totalnboflines)	// If we know total nb of lines
+		if ($totalnboflines) {
+			// If we know total nb of lines
 		{
 			// Define nb of extra page links before and after selected page + ... + first or last
 			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1);
+		}
 
-			if ($limit > 0) $nbpages=ceil($totalnboflines/$limit);
-			else $nbpages=1;
+			if ($limit > 0) {
+				$nbpages=ceil($totalnboflines/$limit);
+			} else {
+				$nbpages=1;
+			}
 			$cpt=($page-$maxnbofpage);
 			if ($cpt < 0) { $cpt=0; }
 
 			if ($cpt>=1)
 			{
 				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';
-				if ($cpt > 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
-				else if ($cpt == 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+				if ($cpt > 2) {
+					$pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
+				} else if ($cpt == 2) {
+					$pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+				}
 			}
 
 			do
@@ -4081,8 +4511,7 @@ 
 				if ($cpt==$page)
 				{
 					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1).'</span></li>';
-				}
-				else
+				} else
 				{
 					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
 				}
@@ -4092,12 +4521,14 @@ 
 
 			if ($cpt<$nbpages)
 			{
-				if ($cpt<$nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
-				else if ($cpt == $nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
+				if ($cpt<$nbpages-2) {
+					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
+				} else if ($cpt == $nbpages-2) {
+					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
+				}
 				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
 			}
-		}
-		else
+		} else
 		{
 			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1)."</li>";
 		}
@@ -4135,15 +4566,21 @@ 
 		$pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
 		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 		//$pagesizechoices.=',2:2';
-		if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
+		if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+			$pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
+		}
 
 		print '<li class="pagination">';
 		print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
 		$tmpchoice=explode(',',$pagesizechoices);
 		$tmpkey=$limit.':'.$limit;
-		if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+		if (! in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[]=$tmpkey;
+		}
 		$tmpkey=$conf->liste_limit.':'.$conf->liste_limit;
-		if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+		if (! in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[]=$tmpkey;
+		}
 		asort($tmpchoice, SORT_NUMERIC);
 		$found=false;
 		foreach($tmpchoice as $val)
@@ -4231,13 +4668,16 @@ 
 	}
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-	if (! preg_match('/\//', $rate)) $ret=price($rate,0,'',0,0).($addpercent?'%':'');
-	else
+	if (! preg_match('/\//', $rate)) {
+		$ret=price($rate,0,'',0,0).($addpercent?'%':'');
+	} else
 	{
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret=$rate.($addpercent?'%':'');
 	}
-	if (($info_bits & 1) && $usestarfornpr >= 0) $ret.=' *';
+	if (($info_bits & 1) && $usestarfornpr >= 0) {
+		$ret.=' *';
+	}
 	$ret.=$morelabel;
 	return $ret;
 }
@@ -4263,21 +4703,35 @@ 
 	global $langs,$conf;
 
 	// Clean parameters
-	if (empty($amount)) $amount=0;	// To have a numeric value if amount not defined or = ''
+	if (empty($amount)) {
+		$amount=0;
+	}
+	// To have a numeric value if amount not defined or = ''
 	$amount = (is_numeric($amount)?$amount:0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-	if ($rounding < 0) $rounding=min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	if ($rounding < 0) {
+		$rounding=min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	}
 	$nbdecimal=$rounding;
 
 	// Output separators by default (french)
 	$dec=','; $thousand=' ';
 
 	// If $outlangs not forced, we use use language
-	if (! is_object($outlangs)) $outlangs=$langs;
+	if (! is_object($outlangs)) {
+		$outlangs=$langs;
+	}
 
-	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec=$outlangs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($outlangs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") $thousand=$outlangs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand='';
-	else if ($thousand == 'Space') $thousand=' ';
+	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec=$outlangs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($outlangs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") {
+		$thousand=$outlangs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand='';
+	} else if ($thousand == 'Space') {
+		$thousand=' ';
+	}
 	//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	//print "amount=".$amount."-";
@@ -4290,7 +4744,9 @@ 
 	$end='';
 
 	// We increase nbdecimal if there is more decimal than asked (to not loose information)
-	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal=dol_strlen($decpart);
+	if (dol_strlen($decpart) > $nbdecimal) {
+		$nbdecimal=dol_strlen($decpart);
+	}
 	// Si on depasse max
 	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN)
 	{
@@ -4303,7 +4759,9 @@ 
 	}
 
 	// If force rounding
-	if ($forcerounding >= 0) $nbdecimal = $forcerounding;
+	if ($forcerounding >= 0) {
+		$nbdecimal = $forcerounding;
+	}
 
 	// Format number
 	$output=number_format($amount, $nbdecimal, $dec, $thousand);
@@ -4316,11 +4774,14 @@ 
 	$cursymbolbefore=$cursymbolafter='';
 	if ($currency_code)
 	{
-		if ($currency_code == 'auto') $currency_code=$conf->currency;
+		if ($currency_code == 'auto') {
+			$currency_code=$conf->currency;
+		}
 
 		$listofcurrenciesbefore=array('USD','GBP','AUD','MXN','PEN','CNY');
-		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
-		else
+		if (in_array($currency_code,$listofcurrenciesbefore)) {
+			$cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
+		} else
 		{
 			$tmpcur=$outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
@@ -4353,14 +4814,22 @@ 
 	// Numbers must be '1234.56'
 	// Decimal delimiter for PHP and database SQL requests must be '.'
 	$dec=','; $thousand=' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($langs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand='';
-	elseif ($thousand == 'Space') $thousand=' ';
+	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($langs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") {
+		$thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand='';
+	} elseif ($thousand == 'Space') {
+		$thousand=' ';
+	}
 	//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	// Convert value to universal number format (no thousand separator, '.' as decimal separator)
-	if ($alreadysqlnb != 1)	// If not a PHP number or unknown, we change format
+	if ($alreadysqlnb != 1) {
+		// If not a PHP number or unknown, we change format
 	{
 		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
 
@@ -4369,7 +4838,9 @@ 
 		if (is_numeric($amount))
 		{
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps=sprintf("%0.10F",$amount-intval($amount));	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps=sprintf("%0.10F",$amount-intval($amount));
+	}
+	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps=preg_replace('/([\.1-9])0+$/','\\1',$temps); // temps=0. or 0.00002 or 9999.1
 			$nbofdec=max(0,dol_strlen($temps)-2);	// -2 to remove "0."
 			$amount=number_format($amount,$nbofdec,$dec,$thousand);
@@ -4377,7 +4848,10 @@ 
 		//print "QQ".$amount.'<br>';
 
 		// Now make replace (the main goal of function)
-		if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount);	// To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount=str_replace(',','.',$amount);
+		}
+		// To accept 2 notations for french users
 		$amount=str_replace(' ','',$amount);		// To avoid spaces
 		$amount=str_replace($thousand,'',$amount);	// Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount=str_replace($dec,'.',$amount);
@@ -4387,13 +4861,24 @@ 
 	if ($rounding)
 	{
 		$nbofdectoround='';
-		if ($rounding == 'MU')     $nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_UNIT;
-		elseif ($rounding == 'MT') $nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_TOT;
-		elseif ($rounding == 'MS') $nbofdectoround=empty($conf->global->MAIN_MAX_DECIMALS_STOCK)?5:$conf->global->MAIN_MAX_DECIMALS_STOCK;
-		elseif (is_numeric($rounding))  $nbofdectoround=$rounding; 	// For admin info page
+		if ($rounding == 'MU') {
+			$nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_UNIT;
+		} elseif ($rounding == 'MT') {
+			$nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_TOT;
+		} elseif ($rounding == 'MS') {
+			$nbofdectoround=empty($conf->global->MAIN_MAX_DECIMALS_STOCK)?5:$conf->global->MAIN_MAX_DECIMALS_STOCK;
+		} elseif (is_numeric($rounding)) {
+			$nbofdectoround=$rounding;
+		}
+		// For admin info page
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-		if (dol_strlen($nbofdectoround)) $amount = round($amount,$nbofdectoround);	// $nbofdectoround can be 0.
-		else return 'ErrorBadParameterProvidedToFunction';
+		if (dol_strlen($nbofdectoround)) {
+			$amount = round($amount,$nbofdectoround);
+		}
+		// $nbofdectoround can be 0.
+		else {
+			return 'ErrorBadParameterProvidedToFunction';
+		}
 		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 
 		// Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
@@ -4410,7 +4895,10 @@ 
 
 		// Always make replace because each math function (like round) replace
 		// with local values and we want a number that has a SQL string format x.y
-		if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount);	// To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount=str_replace(',','.',$amount);
+		}
+		// To accept 2 notations for french users
 		$amount=str_replace(' ','',$amount);		// To avoid spaces
 		$amount=str_replace($thousand,'',$amount);	// Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount=str_replace($dec,'.',$amount);
@@ -4439,18 +4927,15 @@ 
 	{
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
+	} elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
 	{
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
 	{
 		$dimension = $dimension / 1000000;
 		$unit = $unit + 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
 	{
 		$dimension = $dimension / 1000;
 		$unit = $unit + 3;
@@ -4478,14 +4963,18 @@ 
 {
 	global $db, $conf, $mysoc;
 
-	if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) $thirdparty_seller=$mysoc;
+	if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) {
+		$thirdparty_seller=$mysoc;
+	}
 
 	dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
 
 	$vatratecleaned = $vatrate;
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+		// If vat is "xx (yy)"
 	{
 		$vatratecleaned = trim($reg[1]);
+	}
 		$vatratecode = $reg[2];
 	}
 
@@ -4495,38 +4984,51 @@ 
 	}*/
 
 	// Some test to guess with no need to make database access
-	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
+	if ($mysoc->country_code == 'ES') {
+		// For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
 	{
 		if ($local == 1)
 		{
 			if (! $mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
+	}
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (! $thirdparty_buyer->localtax1_assuj) return 0;
-			}
-			else
+				if (! $thirdparty_buyer->localtax1_assuj) {
+					return 0;
+				}
+			} else
 			{
-				if (! $thirdparty_seller->localtax1_assuj) return 0;
+				if (! $thirdparty_seller->localtax1_assuj) {
+					return 0;
+				}
 			}
 		}
 
 		if ($local == 2)
 		{
-			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
+			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") {
+				return 0;
+			}
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (! $thirdparty_buyer->localtax2_assuj) return 0;
-			}
-			else
+				if (! $thirdparty_buyer->localtax2_assuj) {
+					return 0;
+				}
+			} else
 			{
-				if (! $thirdparty_seller->localtax2_assuj) return 0;
+				if (! $thirdparty_seller->localtax2_assuj) {
+					return 0;
+				}
 			}
 		}
-	}
-	else
+	} else
 	{
-		if ($local == 1 && ! $thirdparty_seller->localtax1_assuj) return 0;
-		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) return 0;
+		if ($local == 1 && ! $thirdparty_seller->localtax1_assuj) {
+			return 0;
+		}
+		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) {
+			return 0;
+		}
 	}
 
 	// For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -4542,35 +5044,41 @@ 
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
-			}
-			else  // i am the seller
+				}
+			} else  // i am the seller
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX1;
 				}
+				}
 			}
 		}
 		if ($local==2)
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				// TODO We should also return value defined on thirdparty only if defined
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
-			}
-			else  // i am the seller
+				}
+			} else  // i am the seller
 			{
-				if (!isOnlyOneLocalTax($local))  // This is for spain only, we don't return value found into datbase even if there is only one locatax vat.
+				if (!isOnlyOneLocalTax($local)) {
+					// This is for spain only, we don't return value found into datbase even if there is only one locatax vat.
 				{
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
+				}
 			}
 		}
 	}
@@ -4580,16 +5088,24 @@ 
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";		// If we have the code, we use it in priority
-   	else $sql.= " AND t.recuperableonly ='".$vatnpr."'";
+   	if ($vatratecode) {
+   		$sql.= " AND t.code ='".$vatratecode."'";
+   	}
+   	// If we have the code, we use it in priority
+   	else {
+   		$sql.= " AND t.recuperableonly ='".$vatnpr."'";
+   	}
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql=$db->query($sql);
 
    	if ($resql)
    	{
    		$obj = $db->fetch_object($resql);
-   		if ($local==1) return $obj->localtax1;
-   		elseif ($local==2) return $obj->localtax2;
+   		if ($local==1) {
+   			return $obj->localtax1;
+   		} elseif ($local==2) {
+   			return $obj->localtax2;
+   		}
 	}
 
 	return 0;
@@ -4613,8 +5129,7 @@ 
 	if (count($valors)>1)
 	{
 		return false;
-	}
-	else
+	} else
 	{
 		return true;
 	}
@@ -4640,8 +5155,11 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($local==1) return $obj->localtax1;
-		elseif ($local==2) return $obj->localtax2;
+		if ($local==1) {
+			return $obj->localtax1;
+		} elseif ($local==2) {
+			return $obj->localtax2;
+		}
 	}
 
 	return 0;
@@ -4669,32 +5187,46 @@ 
 	// Search local taxes
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
-	else
+	if ($firstparamisid) {
+		$sql.= " WHERE t.rowid = ".(int) $vatrate;
+	} else
 	{
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+			// If vat is "xx (yy)"
 		{
 			$vatratecleaned = $reg[1];
+		}
 			$vatratecode = $reg[2];
 		}
 
 		$sql.=", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		if ($mysoc->country_code == 'ES') {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";
+		}
+		// local tax in spain use the buyer country ??
+		else {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		}
 		$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) {
+			$sql.= " AND t.code = '".$vatratecode."'";
+		}
 	}
 
 	$resql=$db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
-		else return array();
+		if ($obj) {
+			return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
+		} else {
+			return array();
+		}
+	} else {
+		dol_print_error($db);
 	}
-	else dol_print_error($db);
 
 	return array();
 }
@@ -4724,22 +5256,32 @@ 
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
-	else
+	if ($firstparamisid) {
+		$sql.= " WHERE t.rowid = ".(int) $vatrate;
+	} else
 	{
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+			// If vat is "xx (yy)"
 		{
 			$vatratecleaned = $reg[1];
+		}
 			$vatratecode = $reg[2];
 		}
 
 		$sql.=", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		if ($mysoc->country_code == 'ES') {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";
+		}
+		// local tax in spain use the buyer country ??
+		else {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		}
 		$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) {
+			$sql.= " AND t.code = '".$vatratecode."'";
+		}
 	}
 
 	$resql=$db->query($sql);
@@ -4751,43 +5293,36 @@ 
 			if (! isOnlyOneLocalTax(1))
 			{
 				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
-			else
+			} else
 			{
 				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
-		}
-		elseif ($local == 2)
+		} elseif ($local == 2)
 		{
 			if (! isOnlyOneLocalTax(2))
 			{
 				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
-			else
+			} else
 			{
 				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
-		}
-		else
+		} else
 		{
 			if(! isOnlyOneLocalTax(1))
 			{
 				if(! isOnlyOneLocalTax(2))
 				{
 					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-				else
+				} else
 				{
 					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
-			}
-			else
+			} else
 			{
 				if(! isOnlyOneLocalTax(2))
 				{
 					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-				}
-				else
+				} else
 				{
 					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
@@ -4823,22 +5358,26 @@ 
 		$product=new Product($db);
 		$result=$product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) {
+			// If selling country is ours
 		{
 			if ($idprodfournprice > 0)     // We want vat for product for a "supplier" order or invoice
 			{
 				$product->get_buyprice($idprodfournprice,0,0,0);
+		}
 				$ret=$product->vatrate_supplier;
-				if ($product->default_vat_code) $ret.=' ('.$product->default_vat_code.')';
-			}
-			else
+				if ($product->default_vat_code) {
+					$ret.=' ('.$product->default_vat_code.')';
+				}
+			} else
 			{
 				$ret=$product->tva_tx;    // Default vat of product we defined
-				if ($product->default_vat_code) $ret.=' ('.$product->default_vat_code.')';
+				if ($product->default_vat_code) {
+					$ret.=' ('.$product->default_vat_code.')';
+				}
 			}
 			$found=1;
-		}
-		else
+		} else
 		{
 			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
@@ -4865,10 +5404,13 @@ 
 					$ret=$obj->vat_rate;
 				}
 				$db->free($sql);
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
+		} else {
+			$ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
 		}
-		else $ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails
+		// Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -4901,7 +5443,8 @@ 
 		$product=new Product($db);
 		$result=$product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) {
+			// If selling country is ours
 		{
 			/* Not defined yet, so we don't use this
 			if ($local==1) $ret=$product->localtax1_tx;
@@ -4921,6 +5464,7 @@ 
 	{
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
 		$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
@@ -4932,11 +5476,15 @@ 
 			$obj=$db->fetch_object($resql);
 			if ($obj)
 			{
-				if ($local==1) $ret=$obj->localtax1;
-				elseif ($local==2) $ret=$obj->localtax2;
+				if ($local==1) {
+					$ret=$obj->localtax1;
+				} elseif ($local==2) {
+					$ret=$obj->localtax2;
+				}
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -4998,11 +5546,13 @@ 
 
 	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
 	if (($seller_country_code == $buyer_country_code)
-	|| (in_array($seller_country_code,array('FR,MC')) && in_array($buyer_country_code,array('FR','MC')))) // Warning ->country_code not always defined
+	|| (in_array($seller_country_code,array('FR,MC')) && in_array($buyer_country_code,array('FR','MC')))) {
+		// Warning ->country_code not always defined
 	{
 		//print 'VATRULE 2';
 		return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
 	}
+	}
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
 	// Not supported
@@ -5016,8 +5566,7 @@ 
 		{
 			//print 'VATRULE 3';
 			return 0;
-		}
-		else
+		} else
 		{
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
@@ -5047,16 +5596,17 @@ 
 
 	if ($idprodfournprice > 0)
 	{
-		if (! class_exists('ProductFournisseur'))
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+		if (! class_exists('ProductFournisseur')) {
+					require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+		}
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
-	}
-	elseif ($idprod > 0)
+	} elseif ($idprod > 0)
 	{
-		if (! class_exists('Product'))
-			require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+		if (! class_exists('Product')) {
+					require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+		}
 		$prod = new Product($db);
 		$prod->fetch($idprod);
 		return $prod->tva_npr;
@@ -5082,27 +5632,39 @@ 
 {
 	global $mysoc;
 
-	if (!is_object($thirdparty_seller)) return -1;
-	if (!is_object($thirdparty_buyer)) return -1;
+	if (!is_object($thirdparty_seller)) {
+		return -1;
+	}
+	if (!is_object($thirdparty_buyer)) {
+		return -1;
+	}
 
-	if ($local==1) // Localtax 1
+	if ($local==1) {
+		// Localtax 1
 	{
 		if ($mysoc->country_code == 'ES')
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && ! $thirdparty_buyer->localtax1_assuj) return 0;
-		}
-		else
+	}
+		} else
 		{
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
-			if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) return 0;
-			if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') return 0;
+			if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) {
+				return 0;
+			}
+			if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') {
+				return 0;
+			}
 		}
-	}
-	elseif ($local==2) //I Localtax 2
+	} elseif ($local==2) {
+		//I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && ! $thirdparty_seller->localtax2_assuj) return 0;
-		if (! is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj=='localtax2off') return 0;
+	}
+		if (! is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj=='localtax2off') {
+			return 0;
+		}
 	}
 
 	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code)
@@ -5125,26 +5687,44 @@ 
 {
 	global $langs;
 	$result='unknown'; $classname='';
-	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
+	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {
+		// A mettre avant test sur no a cause du == 0
 	{
 		$result=$langs->trans('yes');
-		if ($case == 1 || $case == 3) $result=$langs->trans("Yes");
-		if ($case == 2) $result='<input type="checkbox" value="1" checked disabled>';
-		if ($case == 3) $result='<input type="checkbox" value="1" checked disabled> '.$result;
+	}
+		if ($case == 1 || $case == 3) {
+			$result=$langs->trans("Yes");
+		}
+		if ($case == 2) {
+			$result='<input type="checkbox" value="1" checked disabled>';
+		}
+		if ($case == 3) {
+			$result='<input type="checkbox" value="1" checked disabled> '.$result;
+		}
 
 		$classname='ok';
-	}
-	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
+	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
 		$result=$langs->trans("no");
-		if ($case == 1 || $case == 3) $result=$langs->trans("No");
-		if ($case == 2) $result='<input type="checkbox" value="0" disabled>';
-		if ($case == 3) $result='<input type="checkbox" value="0" disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result=$langs->trans("No");
+		}
+		if ($case == 2) {
+			$result='<input type="checkbox" value="0" disabled>';
+		}
+		if ($case == 3) {
+			$result='<input type="checkbox" value="0" disabled> '.$result;
+		}
 
-		if ($color == 2) $classname='ok';
-		else $classname='error';
+		if ($color == 2) {
+			$classname='ok';
+		} else {
+			$classname='error';
+		}
+	}
+	if ($color) {
+		return '<font class="'.$classname.'">'.$result.'</font>';
 	}
-	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
 	return $result;
 }
 
@@ -5171,18 +5751,28 @@ 
 	$path = '';
 
 	$arrayforoldpath=array('cheque','user','category','holiday','supplier_invoice','invoice_supplier','mailing','supplier_payment');
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+		$arrayforoldpath[]='product';
+	}
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
-		if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
-		else $num = preg_replace('/^.*\-/i','',$num);
+		if (empty($alpha)) {
+			$num = preg_replace('/([^0-9])/i','',$num);
+		} else {
+			$num = preg_replace('/^.*\-/i','',$num);
+		}
 		$num = substr("000".$num, -$level);
-		if ($level == 1) $path = substr($num,0,1);
-		if ($level == 2) $path = substr($num,1,1).'/'.substr($num,0,1);
-		if ($level == 3) $path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1);
-	}
-	else
+		if ($level == 1) {
+			$path = substr($num,0,1);
+		}
+		if ($level == 2) {
+			$path = substr($num,1,1).'/'.substr($num,0,1);
+		}
+		if ($level == 3) {
+			$path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1);
+		}
+	} else
 	{
 		// TODO
 		// We will enhance here a common way of forging path for document storage
@@ -5193,7 +5783,9 @@ 
 		}
 	}
 
-	if (empty($withoutslash) && ! empty($path)) $path.='/';
+	if (empty($withoutslash) && ! empty($path)) {
+		$path.='/';
+	}
 
 	return $path;
 }
@@ -5213,7 +5805,9 @@ 
 	dol_syslog("functions.lib::dol_mkdir: dir=".$dir,LOG_INFO);
 
 	$dir_osencoded=dol_osencode($dir);
-	if (@is_dir($dir_osencoded)) return 0;
+	if (@is_dir($dir_osencoded)) {
+		return 0;
+	}
 
 	$nberr=0;
 	$nbcreated=0;
@@ -5229,9 +5823,15 @@ 
 	$num=count($cdir);
 	for ($i = 0; $i < $num; $i++)
 	{
-		if ($i > 0) $ccdir .= '/'.$cdir[$i];
-		else $ccdir .= $cdir[$i];
-		if (preg_match("/^.:$/",$ccdir,$regs)) continue;	// Si chemin Windows incomplet, on poursuit par rep suivant
+		if ($i > 0) {
+			$ccdir .= '/'.$cdir[$i];
+		} else {
+			$ccdir .= $cdir[$i];
+		}
+		if (preg_match("/^.:$/",$ccdir,$regs)) {
+			continue;
+		}
+		// Si chemin Windows incomplet, on poursuit par rep suivant
 
 		// Attention, le is_dir() peut echouer bien que le rep existe.
 		// (ex selon config de open_basedir)
@@ -5253,15 +5853,13 @@ 
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.",LOG_WARNING);
 					$nberr++;
-				}
-				else
+				} else
 				{
 					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created",LOG_DEBUG);
 					$nberr=0;	// On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
-			}
-			else
+			} else
 			{
 				$nberr=0;	// On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
@@ -5310,7 +5908,9 @@ 
 	// $temp after pass 2: 0000-021
 
 	// Supprime aussi les retours
-	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
+	if ($removelinefeed) {
+		$temp=str_replace(array("\r\n","\r","\n")," ",$temp);
+	}
 
 	// et les espaces doubles
 	while(strpos($temp,"  "))
@@ -5339,14 +5939,12 @@ 
 			$firstline=preg_replace('/<br[^>]*>.*$/s','',$text);		// The s pattern modifier means the . can match newline characters
 			$firstline=preg_replace('/<div[^>]*>.*$/s','',$firstline);	// The s pattern modifier means the . can match newline characters
 
-		}
-		else
+		} else
 		{
 			$firstline=preg_replace('/[\n\r].*/','',$text);
 		}
 		return $firstline.((strlen($firstline) != strlen($text))?'...':'');
-	}
-	else
+	} else
 	{
 		$ishtml=0;
 		if (dol_textishtml($text))
@@ -5354,15 +5952,17 @@ 
 			$text=preg_replace('/\n/','',$text);
 			$ishtml=1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
-		}
-		else
+		} else
 		{
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 
 		$text = strtr($text, $repTable);
 		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-		else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
+		else {
+			$pattern = '/(<br[^>]*>)/U';
+		}
+		// /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		$firstline='';
@@ -5370,8 +5970,11 @@ 
 		$nba = count($a);	// 2x nb of lines in $a because $a contains also a line for each new line separator
 		while (($i < $nba) && ($i < ($nboflines * 2)))
 		{
-			if ($i % 2 == 0) $firstline .= $a[$i];
-			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml?"<br>\n":"\n");
+			if ($i % 2 == 0) {
+				$firstline .= $a[$i];
+			} elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+				$firstline .= ($ishtml?"<br>\n":"\n");
+			}
 			$i++;
 		}
 		unset($a);
@@ -5420,17 +6023,25 @@ 
 function dol_htmlentitiesbr($stringtoencode, $nl2brmode=0, $pagecodefrom='UTF-8', $removelasteolbr=1)
 {
 	$newstring=$stringtoencode;
-	if (dol_textishtml($stringtoencode))	// Check if text is already HTML or not
+	if (dol_textishtml($stringtoencode)) {
+		// Check if text is already HTML or not
 	{
-		$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring);	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-		if ($removelasteolbr) $newstring=preg_replace('/<br>$/i','',$newstring);	// Remove last <br> (remove only last one)
+		$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring);
+	}
+	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
+		if ($removelasteolbr) {
+			$newstring=preg_replace('/<br>$/i','',$newstring);
+		}
+		// Remove last <br> (remove only last one)
 		$newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__'));
 		$newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom);	// Make entity encoding
 		$newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"'));
-	}
-	else
+	} else
 	{
-		if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring);	// Remove last \n (may remove several)
+		if ($removelasteolbr) {
+			$newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring);
+		}
+		// Remove last \n (may remove several)
 		$newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode);
 	}
 	// Other substitutions that htmlentities does not do
@@ -5528,7 +6139,9 @@ 
  */
 function dol_nboflines($s,$maxchar=0)
 {
-	if ($s == '') return 0;
+	if ($s == '') {
+		return 0;
+	}
 	$arraystring=explode("\n",$s);
 	$nb=count($arraystring);
 
@@ -5548,11 +6161,16 @@ 
 function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
 {
 	$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
-	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	if (dol_textishtml($text)) {
+		$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	}
 
 	$text = strtr($text, $repTable);
 	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-	else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
+	else {
+		$pattern = '/(<br[^>]*>)/U';
+	}
+	// /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 	$nblines = (int) floor((count($a)+1)/2);
@@ -5604,24 +6222,46 @@ 
 {
 	if ($option == 1)
 	{
-		if (preg_match('/<html/i',$msg))				return true;
-		elseif (preg_match('/<body/i',$msg))			return true;
-		elseif (preg_match('/<br/i',$msg))				return true;
+		if (preg_match('/<html/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<body/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<br/i',$msg)) {
+			return true;
+		}
 		return false;
-	}
-	else
-	{
-		if (preg_match('/<html/i',$msg))				return true;
-		elseif (preg_match('/<body/i',$msg))			return true;
-		elseif (preg_match('/<(b|em|i|u)>/i',$msg))		return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) 	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;
-		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i',$msg)) return true;	// must accept <img src="http://example.com/aaa.png" />
-		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i',$msg)) return true;	// must accept <a href="http://example.com/aaa.png" />
-		elseif (preg_match('/<h[0-9]>/i',$msg))			return true;
-		elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg))	return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-		elseif (preg_match('/&#[0-9]{2,3};/i',$msg))	return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+	} else
+	{
+		if (preg_match('/<html/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<body/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(b|em|i|u)>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i',$msg)) {
+			return true;
+		}
+		// must accept <img src="http://example.com/aaa.png" />
+		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i',$msg)) {
+			return true;
+		}
+		// must accept <a href="http://example.com/aaa.png" />
+		elseif (preg_match('/<h[0-9]>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg)) {
+			return true;
+		}
+		// Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+		elseif (preg_match('/&#[0-9]{2,3};/i',$msg)) {
+			return true;
+		}
+		// Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
 		return false;
 	}
 }
@@ -5732,8 +6372,7 @@ 
 				$substitutionarray['__SHIPPINGTRACKNUM__']='Shipping tacking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__']='Shipping tracking url';
 			}
-		}
-		else
+		} else
 		{
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
@@ -5745,10 +6384,14 @@ 
 
 			$birthday = dol_print_date($object->birth,'day');
 
-			if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+			if (method_exists($object, 'getCivilityLabel')) {
+				$substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+			}
 			$substitutionarray['__MEMBER_FIRSTNAME__']=$msgishtml?dol_htmlentitiesbr($object->firstname):$object->firstname;
 			$substitutionarray['__MEMBER_LASTNAME__']=$msgishtml?dol_htmlentitiesbr($object->lastname):$object->lastname;
-			if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__']=$msgishtml?dol_htmlentitiesbr($object->getFullName($outputlangs)):$object->getFullName($outputlangs);
+			if (method_exists($object, 'getFullName')) {
+				$substitutionarray['__MEMBER_FULLNAME__']=$msgishtml?dol_htmlentitiesbr($object->getFullName($outputlangs)):$object->getFullName($outputlangs);
+			}
 			$substitutionarray['__MEMBER_COMPANY__']=$msgishtml?dol_htmlentitiesbr($object->societe):$object->societe;
 			$substitutionarray['__MEMBER_ADDRESS__']=$msgishtml?dol_htmlentitiesbr($object->address):$object->address;
 			$substitutionarray['__MEMBER_ZIP__']=$msgishtml?dol_htmlentitiesbr($object->zip):$object->zip;
@@ -5769,8 +6412,7 @@ 
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:'');
 				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object)?$object->name_alias:'');
 				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object)?$object->email:'');
-			}
-			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+			} elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
@@ -5797,8 +6439,12 @@ 
 				$datenextexpiration='';
 				foreach($object->lines as $line)
 				{
-					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
+					if ($line->date_ouverture_prevue > $dateplannedstart) {
+						$dateplannedstart = $line->date_ouverture_prevue;
+					}
+					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+						$datenextexpiration = $line->date_fin_prevue;
+					}
 				}
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
@@ -5827,8 +6473,12 @@ 
 		$substitutionarray['__AMOUNT__']          = is_object($object)?$object->total_ttc:'';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object)?$object->total_ht:'';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
- 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
+ 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+ 			$substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
+ 		}
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+			$substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
+		}
 
 		/* TODO Add key for multicurrency
     	$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object)?price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
@@ -5919,9 +6569,13 @@ 
 {
 	global $conf, $langs;
 
-	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	if (! is_array($substitutionarray)) {
+		return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	}
 
-	if (empty($outputlangs)) $outputlangs=$langs;
+	if (empty($outputlangs)) {
+		$outputlangs=$langs;
+	}
 
 	// Make substitution for language keys
 	if (is_object($outputlangs))
@@ -5929,11 +6583,15 @@ 
 		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))
 		{
 			$msgishtml = 0;
-			if (dol_textishtml($text,1)) $msgishtml = 1;
+			if (dol_textishtml($text,1)) {
+				$msgishtml = 1;
+			}
 
 			// If key is __(TranslationKey|langfile)__, then force load of langfile.lang
 			$tmp=explode('|',$reg[1]);
-			if (! empty($tmp[1])) $outputlangs->load($tmp[1]);
+			if (! empty($tmp[1])) {
+				$outputlangs->load($tmp[1]);
+			}
 
 			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
@@ -5944,19 +6602,30 @@ 
 	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg))
 	{
 		$msgishtml = 0;
-		if (dol_textishtml($text,1)) $msgishtml = 1;
+		if (dol_textishtml($text,1)) {
+			$msgishtml = 1;
+		}
 
 		$keyfound = $reg[1];
-		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
-		else $newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
+		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+			$newval = '*****forbidden*****';
+		} else {
+			$newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
+		}
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml?dol_htmlentitiesbr($newval):$newval, $text);
 	}
 
 	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
-		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';		// Protection
-		if ($key == '__USER_SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';	// Protection
+		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value='';
+		}
+		// Protection
+		if ($key == '__USER_SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value='';
+		}
+		// Protection
 
 		$text=str_replace("$key","$value",$text);	// We must keep the " to work when value is 123.5 for example
 	}
@@ -6003,7 +6672,9 @@ 
 		$dir=dol_buildpath($reldir,0);
 
 		// Check if directory exists
-		if (! dol_is_dir($dir)) continue;
+		if (! dol_is_dir($dir)) {
+			continue;
+		}
 
 		$substitfiles=dol_dir_list($dir,'files',0,'functions_');
 		foreach($substitfiles as $substitfile)
@@ -6017,7 +6688,9 @@ 
 				require_once $dir.$substitfile['name'];
 				// Call the user's function, and only if it is defined
 				$function_name=$module."_".$callfunc;
-				if (function_exists($function_name)) $function_name($substitutionarray,$outputlangs,$object,$parameters);
+				if (function_exists($function_name)) {
+					$function_name($substitutionarray,$outputlangs,$object,$parameters);
+				}
 			}
 		}
 	}
@@ -6053,7 +6726,9 @@ 
 
 	$out='';
 
-	if (! is_object($outputlangs)) $outputlangs=$langs;
+	if (! is_object($outputlangs)) {
+		$outputlangs=$langs;
+	}
 
 	if ($date_start && $date_end)
 	{
@@ -6085,21 +6760,25 @@ 
 
 	$ret='';
 	// If order not defined, we use the setup
-	if ($nameorder < 0) $nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
+	if ($nameorder < 0) {
+		$nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
+	}
 	if ($nameorder && ((string) $nameorder != '2'))
 	{
 		$ret.=$firstname;
-		if ($firstname && $lastname) $ret.=' ';
+		if ($firstname && $lastname) {
+			$ret.=' ';
+		}
 		$ret.=$lastname;
-	}
-	else if ($nameorder == 2)
+	} else if ($nameorder == 2)
 	{
 	   $ret.=$firstname;
-	}
-	else
+	} else
 	{
 		$ret.=$lastname;
-		if ($firstname && $lastname) $ret.=' ';
+		if ($firstname && $lastname) {
+			$ret.=' ';
+		}
 		$ret.=$firstname;
 	}
 	return $ret;
@@ -6119,15 +6798,18 @@ 
 function setEventMessage($mesgs, $style='mesgs')
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
-	if (! is_array($mesgs))		// If mesgs is a string
+	if (! is_array($mesgs)) {
+		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
 	}
-	else						// If mesgs is an array
+	} else						// If mesgs is an array
 	{
 		foreach($mesgs as $mesg)
 		{
-			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
+			if ($mesg) {
+				$_SESSION['dol_events'][$style][] = $mesg;
+			}
 		}
 	}
 }
@@ -6144,11 +6826,17 @@ 
  */
 function setEventMessages($mesg, $mesgs, $style='mesgs')
 {
-	if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter style='.$style.' for setEventMessages');
-	if (empty($mesgs)) setEventMessage($mesg, $style);
-	else
+	if (! in_array((string) $style, array('mesgs','warnings','errors'))) {
+		dol_print_error('','Bad parameter style='.$style.' for setEventMessages');
+	}
+	if (empty($mesgs)) {
+		setEventMessage($mesg, $style);
+	} else
 	{
-		if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style);	// Add message string if not already into array
+		if (! empty($mesg) && ! in_array($mesg, $mesgs)) {
+			setEventMessage($mesg, $style);
+		}
+		// Add message string if not already into array
 		setEventMessage($mesgs, $style);
 	}
 }
@@ -6166,19 +6854,25 @@ 
 {
 	// Show mesgs
 	if (isset($_SESSION['dol_events']['mesgs'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		}
 		unset($_SESSION['dol_events']['mesgs']);
 	}
 
 	// Show errors
 	if (isset($_SESSION['dol_events']['errors'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		}
 		unset($_SESSION['dol_events']['errors']);
 	}
 
 	// Show warnings
 	if (isset($_SESSION['dol_events']['warnings'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		}
 		unset($_SESSION['dol_events']['warnings']);
 	}
 }
@@ -6222,7 +6916,9 @@ 
 			{
 				$ret++;
 				$out.= $langs->trans($message);
-				if ($ret < count($mesgarray)) $out.= "<br>\n";
+				if ($ret < count($mesgarray)) {
+					$out.= "<br>\n";
+				}
 			}
 		}
 		if ($mesgstring)
@@ -6252,8 +6948,7 @@ 
 						}
 					});
 				</script>';
-		}
-		else
+		} else
 		{
 			$return = $out;
 		}
@@ -6293,7 +6988,9 @@ 
  */
 function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepembedded=0)
 {
-	if (empty($mesgstring) && (! is_array($mesgarray) || count($mesgarray) == 0)) return;
+	if (empty($mesgstring) && (! is_array($mesgarray) || count($mesgarray) == 0)) {
+		return;
+	}
 
 	$iserror=0;
 	$iswarning=0;
@@ -6304,11 +7001,17 @@ 
 			if ($val && preg_match('/class="error"/i',$val)) { $iserror++; break; }
 			if ($val && preg_match('/class="warning"/i',$val)) { $iswarning++; break; }
 		}
+	} else if ($mesgstring && preg_match('/class="error"/i',$mesgstring)) {
+		$iserror++;
+	} else if ($mesgstring && preg_match('/class="warning"/i',$mesgstring)) {
+		$iswarning++;
+	}
+	if ($style=='error') {
+		$iserror++;
+	}
+	if ($style=='warning') {
+		$iswarning++;
 	}
-	else if ($mesgstring && preg_match('/class="error"/i',$mesgstring)) $iserror++;
-	else if ($mesgstring && preg_match('/class="warning"/i',$mesgstring)) $iswarning++;
-	if ($style=='error') $iserror++;
-	if ($style=='warning') $iswarning++;
 
 	if ($iserror || $iswarning)
 	{
@@ -6330,9 +7033,10 @@ 
 			$mesgarray=$newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring,$mesgarray,($iserror?'error':'warning'),$keepembedded);
+	} else {
+		print get_htmloutput_mesg($mesgstring,$mesgarray,'ok',$keepembedded);
+	}
 	}
-	else print get_htmloutput_mesg($mesgstring,$mesgarray,'ok',$keepembedded);
-}
 
 /**
  *  Print formated error messages to output (Used to show messages on html output).
@@ -6372,13 +7076,18 @@ 
 	if (is_array($array) && $sizearray>0)
 	{
 		$temp = array();
-		foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
+		foreach(array_keys($array) as $key) {
+			$temp[$key]=$array[$key][$index];
+		}
 
-		if (!$natsort) ($order=='asc') ? asort($temp) : arsort($temp);
-		else
+		if (!$natsort) {
+			($order=='asc') ? asort($temp) : arsort($temp);
+		} else
 		{
 			($case_sensitive) ? natsort($temp) : natcasesort($temp);
-			if($order!='asc') $temp=array_reverse($temp,TRUE);
+			if($order!='asc') {
+				$temp=array_reverse($temp,TRUE);
+			}
 		}
 
 		$sorted = array();
@@ -6406,17 +7115,39 @@ 
 	$strLength = dol_strlen($str);
 	for ($i=0; $i<$strLength; $i++)
 	{
-		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
-		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
+		if (ord($str[$i]) < 0x80) {
+			continue;
+		}
+		// 0bbbbbbb
+		elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+			$n=1;
+		}
+		// 110bbbbb
+		elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+			$n=2;
+		}
+		// 1110bbbb
+		elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+			$n=3;
+		}
+		// 11110bbb
+		elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+			$n=4;
+		}
+		// 111110bb
+		elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+			$n=5;
+		}
+		// 1111110b
+		else {
 			return false;
 		}
+		// Does not match any model
+		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+						return false;
+			}
+		}
 	}
 	return true;
 }
@@ -6434,11 +7165,21 @@ 
 	global $conf;
 
 	$tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
-	if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
-	if (empty($tmp)) $tmp='utf-8';										// By default for other
-	if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
+	if (empty($tmp) && ! empty($_SERVER["WINDIR"])) {
+		$tmp='iso-8859-1';
+	}
+	// By default for windows
+	if (empty($tmp)) {
+		$tmp='utf-8';
+	}
+	// By default for other
+	if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+		$tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
+	}
 
-	if ($tmp == 'iso-8859-1') return utf8_decode($str);
+	if ($tmp == 'iso-8859-1') {
+		return utf8_decode($str);
+	}
 	return $str;
 }
 
@@ -6461,31 +7202,39 @@ 
 	global $cache_codes;
 
 	// If key empty
-	if ($key == '') return '';
+	if ($key == '') {
+		return '';
+	}
 
 	// Check in cache
-	if (isset($cache_codes[$tablename][$key]))	// Can be defined to 0 or ''
+	if (isset($cache_codes[$tablename][$key])) {
+		// Can be defined to 0 or ''
 	{
-		return $cache_codes[$tablename][$key];   // Found in cache
+		return $cache_codes[$tablename][$key];
+	}
+	// Found in cache
 	}
 
 	$sql = "SELECT ".$fieldid." as valuetoget";
 	$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql.= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
-	if (! empty($entityfilter))
-		$sql.= " AND entity IN (" . getEntity($tablename) . ")";
+	if (! empty($entityfilter)) {
+			$sql.= " AND entity IN (" . getEntity($tablename) . ")";
+	}
 
 	dol_syslog('dol_getIdFromCode', LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $cache_codes[$tablename][$key]=$obj->valuetoget;
-		else $cache_codes[$tablename][$key]='';
+		if ($obj) {
+			$cache_codes[$tablename][$key]=$obj->valuetoget;
+		} else {
+			$cache_codes[$tablename][$key]='';
+		}
 		$db->free($resql);
 		return $cache_codes[$tablename][$key];
-	}
-	else
+	} else
 	{
 		return -1;
 	}
@@ -6542,13 +7291,18 @@ 
 	//print $s."<br>\n";
 	if ($returnvalue)
 	{
-		if ($hideerrors) return @eval('return '.$s.';');
-		else return eval('return '.$s.';');
-	}
-	else
+		if ($hideerrors) {
+			return @eval('return '.$s.';');
+		} else {
+			return eval('return '.$s.';');
+		}
+	} else
 	{
-		if ($hideerrors) @eval($s);
-		else eval($s);
+		if ($hideerrors) {
+			@eval($s);
+		} else {
+			eval($s);
+		}
 	}
 }
 
@@ -6574,9 +7328,13 @@ 
 {
 	global $langs;
 
-	if (empty($codelang)) return '';
+	if (empty($codelang)) {
+		return '';
+	}
 
-	if (empty($codelang)) return '';
+	if (empty($codelang)) {
+		return '';
+	}
 
 	if ($codelang == 'auto')
 	{
@@ -6591,8 +7349,9 @@ 
 		'sv_SV' => 'se'
 	);
 
-	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else
+	if (isset($langtocountryflag[$codelang])) {
+		$flagImage = $langtocountryflag[$codelang];
+	} else
 	{
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
@@ -6642,50 +7401,62 @@ 
 
 			if ($mode == 'add' && ! preg_match('/^\-/',$values[1]))
 			{
-				if (count($values) == 6)       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
+				if (count($values) == 6) {
+					// new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
 				{
 					if ($values[0] != $type) continue;
+				}
 
 					if (verifCond($values[4]))
 					{
-						if ($values[3]) $langs->load($values[3]);
+						if ($values[3]) {
+							$langs->load($values[3]);
+						}
 						if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
 						{
 							$substitutionarray=array();
 							complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
 							$label=make_substitutions($reg[1], $substitutionarray);
+						} else {
+							$label=$langs->trans($values[2]);
 						}
-						else $label=$langs->trans($values[2]);
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && ! empty($object->id))?$object->id:''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+','',$values[1]);
 						$h++;
 					}
-				}
-				else if (count($values) == 5)       // deprecated
+				} else if (count($values) == 5) {
+					// deprecated
 				{
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
+				}
 
-					if ($values[0] != $type) continue;
-					if ($values[3]) $langs->load($values[3]);
+					if ($values[0] != $type) {
+						continue;
+					}
+					if ($values[3]) {
+						$langs->load($values[3]);
+					}
 					if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
 					{
 						$substitutionarray=array();
 						complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
 						$label=make_substitutions($reg[1], $substitutionarray);
+					} else {
+						$label=$langs->trans($values[2]);
 					}
-					else $label=$langs->trans($values[2]);
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && ! empty($object->id))?$object->id:''), $values[4]), 1);
 					$head[$h][1] = $label;
 					$head[$h][2] = str_replace('+','',$values[1]);
 					$h++;
 				}
-			}
-			else if ($mode == 'remove' && preg_match('/^\-/',$values[1]))
+			} else if ($mode == 'remove' && preg_match('/^\-/',$values[1]))
 			{
-				if ($values[0] != $type) continue;
+				if ($values[0] != $type) {
+					continue;
+				}
 				$tabname=str_replace('-','',$values[1]);
 				foreach($head as $key => $val)
 				{
@@ -6728,14 +7499,19 @@ 
 	global $conf, $hookmanager;
 	global $micro_start_time;
 
-	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";
-	else print "\n".'<!-- Common footer for public page -->'."\n";
+	if ($zone == 'private') {
+		print "\n".'<!-- Common footer for private page -->'."\n";
+	} else {
+		print "\n".'<!-- Common footer for public page -->'."\n";
+	}
 
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printCommonFooter',$parameters);    // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook))
 	{
-		if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
+		if (! empty($conf->global->MAIN_HTML_FOOTER)) {
+			print $conf->global->MAIN_HTML_FOOTER."\n";
+		}
 
 		print "\n";
 		if (! empty($conf->use_javascript_ajax))
@@ -6779,11 +7555,15 @@ 
 				print "\n";
 				print "/* JS CODE TO ENABLE to add memory info */\n";
 				print 'window.console && console.log("';
-				if (! empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				if (! empty($conf->global->MEMCACHED_SERVER)) {
+					print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				}
 				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off');
-				if (! empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
+				if (! empty($micro_start_time)) {
+					// Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
 				{
 					$micro_end_time = microtime(true);
+				}
 					print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
 				}
 				if (function_exists("memory_get_usage"))
@@ -6921,7 +7701,9 @@ 
 
 	$crits = explode(' ', $value);
 	$res = '';
-	if (! is_array($fields)) $fields = array($fields);
+	if (! is_array($fields)) {
+		$fields = array($fields);
+	}
 
 	$nboffields = count($fields);
 	$end2 = count($crits);
@@ -6948,20 +7730,17 @@ 
 					if (is_numeric($numnewcrit))
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' '.$operator.' '.$numnewcrit;
-					}
-					else
+					} else
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2';	// force false
 					}
 					$i2++;	// a criteria was added to string
 				}
-			}
-			else if ($mode == 2)
+			} else if ($mode == 2)
 			{
 				$newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";
 				$i2++;	// a criteria was added to string
-			}
-			else if ($mode == 3)
+			} else if ($mode == 3)
 			{
 				$tmparray=explode(',',trim($crit));
 				if (count($tmparray))
@@ -6978,8 +7757,7 @@ 
 					$newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";
 					$i2++;	// a criteria was added to string
 				}
-			}
-			else    // $mode=0
+			} else    // $mode=0
 			{
 				$textcrit = '';
 				$tmpcrits = explode('|',$crit);
@@ -6988,11 +7766,12 @@ 
 				{
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
-					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
+					if (preg_match('/\.(id|rowid)$/', $field)) {
+						// Special case for rowid that is sometimes a ref so used as a search field
 					{
 						$newres .= $field . " = " . (is_numeric(trim($tmpcrit))?trim($tmpcrit):'0');
 					}
-					else
+					} else
 					{
 						$newres .= $field . " LIKE '";
 
@@ -7025,7 +7804,9 @@ 
 			}
 			$i++;
 		}
-		if ($newres) $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : '');
+		if ($newres) {
+			$res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : '');
+		}
 		$j++;
 	}
 	$res = ($nofirstand?"":" AND ")."(" . $res . ")";
@@ -7066,21 +7847,37 @@ 
 function getImageFileNameForSize($file, $extName, $extImgTarget='')
 {
 	$dirName = dirname($file);
-	if ($dirName == '.') $dirName='';
+	if ($dirName == '.') {
+		$dirName='';
+	}
 
 	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// We remove extension, whatever is its case
 	$fileName = basename($fileName);
 
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+	}
 
-	if (! $extImgTarget) return $file;
+	if (! $extImgTarget) {
+		return $file;
+	}
 
 	$subdir='';
-	if ($extName) $subdir = 'thumbs/';
+	if ($extName) {
+		$subdir = 'thumbs/';
+	}
 
 	return ($dirName?$dirName.'/':'').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }
@@ -7099,7 +7896,9 @@ 
 {
 	global $conf, $langs;
 
-	if (empty($conf->use_javascript_ajax)) return '';
+	if (empty($conf->use_javascript_ajax)) {
+		return '';
+	}
 
 	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
@@ -7108,14 +7907,20 @@ 
 
 	if ($alldata == 1)
 	{
-		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
-		else return array();
+		if ($num_mime !== false) {
+			return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
+		} else {
+			return array();
+		}
 	}
 
 	// old behavior
-	if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param?'&'.$param:'')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
-	else return '';
-}
+	if ($num_mime !== false) {
+		return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param?'&'.$param:'')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+	} else {
+		return '';
+	}
+	}
 
 
 /**
@@ -7132,7 +7937,9 @@ 
 				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) {
+		$out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	}
 	return $out;
 }
 
@@ -7269,7 +8076,9 @@ 
 	{
 		$dictvalues[$tablename] = array();
 		$sql = 'SELECT * FROM '.$tablename.' WHERE 1';
-		if ($checkentity) $sql.= ' entity IN (0,'.getEntity('').')';
+		if ($checkentity) {
+			$sql.= ' entity IN (0,'.getEntity('').')';
+		}
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -7278,17 +8087,21 @@ 
 			{
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
 	}
 
-	if (!empty($dictvalues[$tablename][$id])) return $dictvalues[$tablename][$id]->{$field}; // Found
+	if (!empty($dictvalues[$tablename][$id])) {
+		return $dictvalues[$tablename][$id]->{$field};
+	}
+	// Found
 	else // Not found
 	{
-		if ($id > 0) return $id;
+		if ($id > 0) {
+			return $id;
+		}
 		return '';
 	}
 }
@@ -7306,13 +8119,14 @@ 
 	{
 		$res = 0;
 		$tmp=explode(',', $stringcolor);
-		if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')
+		if (count($tmp) > 1) {
+			// This is a comma RGB ('255','255','255')
 		{
 			$r = $tmp[0];
+		}
 			$g = $tmp[1];
 			$b = $tmp[2];
-		}
-		else
+		} else
 		{
 			$hexr=$stringcolor[0].$stringcolor[1];
 			$hexg=$stringcolor[2].$stringcolor[3];
@@ -7322,7 +8136,9 @@ 
 			$b = hexdec($hexb);
 		}
 		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
-		if ($bright > 0.6) $res = 1;
+		if ($bright > 0.6) {
+			$res = 1;
+		}
 	}
 	return $res;
 }
@@ -7341,7 +8157,10 @@ 
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition
+	if (empty($menuentry['enabled'])) {
+		return 0;
+	}
+	// Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{
 		$tmploops=explode('|',$menuentry['module']);
@@ -7352,10 +8171,22 @@ 
 				$found++; break;
 			}
 		}
-		if (! $found) return 0;	// Entry is for menus all excluded to external users
+		if (! $found) {
+			return 0;
+		}
+		// Entry is for menus all excluded to external users
+	}
+	if (! $menuentry['perms'] && $type_user) {
+		return 0;
+	}
+	// No permissions and user is external
+	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+		return 0;
+	}
+	// No permissions and option to hide when not allowed, even for internal user, is on
+	if (! $menuentry['perms']) {
+		return 2;
 	}
-	if (! $menuentry['perms'] && $type_user) return 0; 											// No permissions and user is external
-	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0;	// No permissions and option to hide when not allowed, even for internal user, is on
-	if (! $menuentry['perms']) return 2;															// No permissions and user is external
+	// No permissions and user is external
 	return 1;
 }

htdocs/core/lib/files.lib.php

Spacing +581 added lines, -581 removed lines

@@ -34,7 +34,7 @@ 
  */
 function dol_basename($pathfile)
 {
-	return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
+	return preg_replace('/^.*\/([^\/]+)$/', '$1', rtrim($pathfile, '/'));
 }
 
 /**
@@ -55,7 +55,7 @@ 
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  *  @see dol_dir_list_indatabase
  */
-function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="")
+function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "")
 {
 	global $db, $hookmanager;
 	global $object;
@@ -63,23 +63,23 @@ 
 	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
 	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
 
-	$loaddate=($mode==1||$mode==2)?true:false;
-	$loadsize=($mode==1||$mode==3)?true:false;
+	$loaddate = ($mode == 1 || $mode == 2) ?true:false;
+	$loadsize = ($mode == 1 || $mode == 3) ?true:false;
 
 	// Clean parameters
-	$path=preg_replace('/([\\/]+)$/i','',$path);
-	$newpath=dol_osencode($path);
+	$path = preg_replace('/([\\/]+)$/i', '', $path);
+	$newpath = dol_osencode($path);
 
 	$reshook = 0;
 	$file_list = array();
 
-	if (is_object($hookmanager) && ! $nohook)
+	if (is_object($hookmanager) && !$nohook)
 	{
-		$hookmanager->resArray=array();
+		$hookmanager->resArray = array();
 
 		$hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array(
+		$parameters = array(
 				'path' => $newpath,
 				'types'=> $types,
 				'recursive' => $recursive,
@@ -91,63 +91,63 @@ 
 				'loadsize' => $loadsize,
 				'mode' => $mode
 		);
-		$reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('getDirList', $parameters, $object);
 	}
 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (!is_dir($newpath)) return array();
 
 		if ($dir = opendir($newpath))
 		{
-			$filedate='';
-			$filesize='';
+			$filedate = '';
+			$filesize = '';
 
 			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
-				$fullpathfile=($newpath?$newpath.'/':'').$file;
+				if (!utf8_check($file)) $file = utf8_encode($file); // To be sure data is stored in utf8 in memory
+				$fullpathfile = ($newpath ? $newpath.'/' : '').$file;
 
-				$qualified=1;
+				$qualified = 1;
 
 				// Define excludefilterarray
-				$excludefilterarray=array('^\.');
+				$excludefilterarray = array('^\.');
 				if (is_array($excludefilter))
 				{
-					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
+				else if ($excludefilter) $excludefilterarray[] = $excludefilter;
 				// Check if file is qualified
-				foreach($excludefilterarray as $filt)
+				foreach ($excludefilterarray as $filt)
 				{
 					if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
-						$qualified=0; break;
+						$qualified = 0; break;
 					}
 				}
 				//print $fullpathfile.' '.$file.' '.$qualified.'<br>';
 
 				if ($qualified)
 				{
-					$isdir=is_dir(dol_osencode($path."/".$file));
+					$isdir = is_dir(dol_osencode($path."/".$file));
 					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
+					if ($isdir && (($types == "directories") || ($types == "all") || $recursive))
 					{
 						// Add entry into file_list array
-						if (($types=="directories") || ($types=="all"))
+						if (($types == "directories") || ($types == "all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
+							if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into all $path, only into $file part
 							{
-								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-								$level1name=(isset($reg[1])?$reg[1]:'');
+								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+								$level1name = (isset($reg[1]) ? $reg[1] : '');
 								$file_list[] = array(
 										"name" => $file,
 										"path" => $path,
 										"level1name" => $level1name,
-										"relativename" => ($relativename?$relativename.'/':'').$file,
+										"relativename" => ($relativename ? $relativename.'/' : '').$file,
 										"fullname" => $path.'/'.$file,
 										"date" => $filedate,
 										"size" => $filesize,
@@ -159,24 +159,24 @@ 
 						// if we're in a directory and we want recursive behavior, call this function again
 						if ($recursive)
 						{
-							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file));
+							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file));
 						}
 					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					else if (!$isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
+						if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into $path, only into $file
 						{
-							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-							$level1name=(isset($reg[1])?$reg[1]:'');
+							preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+							$level1name = (isset($reg[1]) ? $reg[1] : '');
 							$file_list[] = array(
 									"name" => $file,
 									"path" => $path,
 									"level1name" => $level1name,
-									"relativename" => ($relativename?$relativename.'/':'').$file,
+									"relativename" => ($relativename ? $relativename.'/' : '').$file,
 									"fullname" => $path.'/'.$file,
 									"date" => $filedate,
 									"size" => $filesize,
@@ -189,12 +189,12 @@ 
 			closedir($dir);
 
 			// Obtain a list of columns
-			if (! empty($sortcriteria))
+			if (!empty($sortcriteria))
 			{
-				$myarray=array();
+				$myarray = array();
 				foreach ($file_list as $key => $row)
 				{
-					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+					$myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
 				}
 				// Sort the data
 				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
@@ -221,21 +221,21 @@ 
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','type'=>'dir|file',...)
  *  @see dol_dir_list
  */
-function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
+function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0)
 {
 	global $conf, $db;
 
-	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
-	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
-	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql.=" WHERE filepath = '".$db->escape($path)."'";
-	$sql.=" AND entity = ".$conf->entity;
+	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+	$sql .= " acl, position, share";
+	if ($mode) $sql .= ", description";
+	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
+	$sql .= " WHERE filepath = '".$db->escape($path)."'";
+	$sql .= " AND entity = ".$conf->entity;
 
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$file_list=array();
+		$file_list = array();
 		$num = $db->num_rows($resql);
 		$i = 0;
 		while ($i < $num)
@@ -243,11 +243,11 @@ 
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
-				$level1name=(isset($reg[1])?$reg[1]:'');
+				preg_match('/([^\/]+)\/[^\/]+$/', DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename, $reg);
+				$level1name = (isset($reg[1]) ? $reg[1] : '');
 				$file_list[] = array(
 					"rowid" => $obj->rowid,
-					"label" => $obj->label,         // md5
+					"label" => $obj->label, // md5
 					"name" => $obj->filename,
 					"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
 					"level1name" => $level1name,
@@ -267,12 +267,12 @@ 
 		}
 
 		// Obtain a list of columns
-		if (! empty($sortcriteria))
+		if (!empty($sortcriteria))
 		{
-			$myarray=array();
+			$myarray = array();
 			foreach ($file_list as $key => $row)
 			{
-				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+				$myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
 			}
 			// Sort the data
 			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
@@ -306,38 +306,38 @@ 
 	//var_dump($filearrayindatabase);
 
 	// Complete filearray with properties found into $filearrayindatabase
-	foreach($filearray as $key => $val)
+	foreach ($filearray as $key => $val)
 	{
-		$found=0;
+		$found = 0;
 		// Search if it exists into $filearrayindatabase
-		foreach($filearrayindatabase as $key2 => $val2)
+		foreach ($filearrayindatabase as $key2 => $val2)
 		{
 			if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
 			{
-				$filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
-				$filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
-				$filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
-				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
-				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
-				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
-				$filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
-				$found=1;
+				$filearray[$key]['position_name'] = ($filearrayindatabase[$key2]['position'] ? $filearrayindatabase[$key2]['position'] : '0').'_'.$filearrayindatabase[$key2]['name'];
+				$filearray[$key]['position'] = $filearrayindatabase[$key2]['position'];
+				$filearray[$key]['cover'] = $filearrayindatabase[$key2]['cover'];
+				$filearray[$key]['acl'] = $filearrayindatabase[$key2]['acl'];
+				$filearray[$key]['rowid'] = $filearrayindatabase[$key2]['rowid'];
+				$filearray[$key]['label'] = $filearrayindatabase[$key2]['label'];
+				$filearray[$key]['share'] = $filearrayindatabase[$key2]['share'];
+				$found = 1;
 				break;
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (!$found)    // This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
-			$filearray[$key]['cover']=0;
-			$filearray[$key]['acl']='';
+			$filearray[$key]['position'] = '999999'; // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['cover'] = 0;
+			$filearray[$key]['acl'] = '';
 
-			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filearray[$key]['fullname']);
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-				$ecmfile=new EcmFiles($db);
+				$ecmfile = new EcmFiles($db);
 
 				// Add entry into database
 				$filename = basename($rel_filename);
@@ -347,11 +347,11 @@ 
 
 				$ecmfile->filepath = $rel_dir;
 				$ecmfile->filename = $filename;
-				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
+				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname'])); // $destfile is a full path to file
 				$ecmfile->fullpath_orig = $filearray[$key]['fullname'];
 				$ecmfile->gen_or_uploaded = 'unknown';
-				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
+				$ecmfile->description = ''; // indexed content
+				$ecmfile->keyword = ''; // keyword content
 				$result = $ecmfile->create($user);
 				if ($result < 0)
 				{
@@ -359,12 +359,12 @@ 
 				}
 				else
 				{
-					$filearray[$key]['rowid']=$result;
+					$filearray[$key]['rowid'] = $result;
 				}
 			}
 			else
 			{
-				$filearray[$key]['rowid']=0;     // Should not happened
+				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
 	}
@@ -385,10 +385,10 @@ 
 	global $sortorder;
 	global $sortfield;
 
-	$sortorder=strtoupper($sortorder);
+	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }
+	else { $retup = 1; $retdown = -1; }
 
 	if ($sortfield == 'name')
 	{
@@ -416,7 +416,7 @@ 
  */
 function dol_is_dir($folder)
 {
-	$newfolder=dol_osencode($folder);
+	$newfolder = dol_osencode($folder);
 	if (is_dir($newfolder)) return true;
 	else return false;
 }
@@ -429,7 +429,7 @@ 
  */
 function dol_is_file($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return is_file($newpathoffile);
 }
 
@@ -441,10 +441,10 @@ 
  */
 function dol_is_url($url)
 {
-	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
-	foreach($tmpprot as $prot)
+	$tmpprot = array('file', 'http', 'https', 'ftp', 'zlib', 'data', 'ssh', 'ssh2', 'ogg', 'expect');
+	foreach ($tmpprot as $prot)
 	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
+		if (preg_match('/^'.$prot.':/i', $url)) return true;
 	}
 	return false;
 }
@@ -457,7 +457,7 @@ 
  */
 function dol_dir_is_emtpy($folder)
 {
-	$newfolder=dol_osencode($folder);
+	$newfolder = dol_osencode($folder);
 	if (is_dir($newfolder))
 	{
 		$handle = opendir($newfolder);
@@ -466,7 +466,7 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach ($name_array as $temp) $folder_content .= $temp;
 
 		closedir($handle);
 
@@ -486,24 +486,24 @@ 
  */
 function dol_count_nb_of_line($file)
 {
-	$nb=0;
+	$nb = 0;
 
-	$newfile=dol_osencode($file);
+	$newfile = dol_osencode($file);
 	//print 'x'.$file;
-	$fp=fopen($newfile,'r');
+	$fp = fopen($newfile, 'r');
 	if ($fp)
 	{
 		while (!feof($fp))
 		{
-			$line=fgets($fp);
+			$line = fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (!$line === false) $nb++;
 		}
 		fclose($fp);
 	}
 	else
 	{
-		$nb=-1;
+		$nb = -1;
 	}
 
 	return $nb;
@@ -518,7 +518,7 @@ 
  */
 function dol_filesize($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return filesize($newpathoffile);
 }
 
@@ -530,7 +530,7 @@ 
  */
 function dol_filemtime($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
@@ -545,31 +545,31 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dol_copy dolReplaceRegExInFile
  */
-function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0)
 {
 	global $conf;
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
 	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+	if (empty($destfile)) $destfile = $srcfile;
 
-	$destexists=dol_is_file($destfile);
+	$destexists = dol_is_file($destfile);
 	if (($destfile != $srcfile) && $destexists) return 0;
 
-	$tmpdestfile=$destfile.'.tmp';
+	$tmpdestfile = $destfile.'.tmp';
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathoftmpdestfile=dol_osencode($tmpdestfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
+	$newpathofsrcfile = dol_osencode($srcfile);
+	$newpathoftmpdestfile = dol_osencode($tmpdestfile);
+	$newpathofdestfile = dol_osencode($destfile);
+	$newdirdestfile = dirname($newpathofdestfile);
 
-	if ($destexists && ! is_writable($newpathofdestfile))
+	if ($destexists && !is_writable($newpathofdestfile))
 	{
 		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
 		return -1;
 	}
-	if (! is_writable($newdirdestfile))
+	if (!is_writable($newdirdestfile))
 	{
 		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
 		return -2;
@@ -578,7 +578,7 @@ 
 	dol_delete_file($tmpdestfile);
 
 	// Create $newpathoftmpdestfile from $newpathofsrcfile
-	$content=file_get_contents($newpathofsrcfile, 'r');
+	$content = file_get_contents($newpathofsrcfile, 'r');
 
 	$content = make_substitutions($content, $arrayreplacement, null);
 
@@ -586,17 +586,17 @@ 
 	@chmod($newpathoftmpdestfile, octdec($newmask));
 
 	// Rename
-	$result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
-	if (! $result)
+	$result = dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile) ? 1 : 0), 0, $indexdatabase);
+	if (!$result)
 	{
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 	if (empty($newmask))	// This should no happen
 	{
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
+		$newmask = '0664';
 	}
 
 	@chmod($newpathofdestfile, octdec($newmask));
@@ -615,7 +615,7 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dol_copy dolReplaceInFile
  */
-function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
+function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0)
 {
 	// TODO
 
@@ -631,7 +631,7 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK
  * @see		dol_delete_file
  */
-function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
+function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)
 {
 	global $conf;
 
@@ -639,36 +639,36 @@ 
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
-	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	$destexists = dol_is_file($destfile);
+	if (!$overwriteifexists && $destexists) return 0;
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
+	$newpathofsrcfile = dol_osencode($srcfile);
+	$newpathofdestfile = dol_osencode($destfile);
+	$newdirdestfile = dirname($newpathofdestfile);
 
-	if ($destexists && ! is_writable($newpathofdestfile))
+	if ($destexists && !is_writable($newpathofdestfile))
 	{
 		dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
 		return -1;
 	}
-	if (! is_writable($newdirdestfile))
+	if (!is_writable($newdirdestfile))
 	{
 		dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
 		return -2;
 	}
 	// Copy with overwriting if exists
-	$result=@copy($newpathofsrcfile, $newpathofdestfile);
+	$result = @copy($newpathofsrcfile, $newpathofdestfile);
 	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
-	if (! $result)
+	if (!$result)
 	{
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 	if (empty($newmask))	// This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
+		$newmask = '0664';
 	}
 
 	@chmod($newpathofdestfile, octdec($newmask));
@@ -687,44 +687,44 @@ 
  * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null)
 {
 	global $conf;
 
-	$result=0;
+	$result = 0;
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
-	$destexists=dol_is_dir($destfile);
+	$destexists = dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
-	if (! $destexists)
+	if (!$destexists)
 	{
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
-		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+		$dirmaskdec = octdec($newmask);
+		if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+		$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
 
-	$ossrcfile=dol_osencode($srcfile);
-	$osdestfile=dol_osencode($destfile);
+	$ossrcfile = dol_osencode($srcfile);
+	$osdestfile = dol_osencode($destfile);
 
 	// Recursive function to copy all subdirectories and contents:
 	if (is_dir($ossrcfile))
 	{
-		$dir_handle=opendir($ossrcfile);
-		while ($file=readdir($dir_handle))
+		$dir_handle = opendir($ossrcfile);
+		while ($file = readdir($dir_handle))
 		{
-			if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
+			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file))
 			{
 				if (is_dir($ossrcfile."/".$file))
 				{
 					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+					$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
 				}
 				else
 				{
@@ -732,12 +732,12 @@ 
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
 					{
-						foreach($arrayreplacement as $key => $val)
+						foreach ($arrayreplacement as $key => $val)
 						{
 							$newfile = str_replace($key, $val, $newfile);
 						}
 					}
-					$tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
+					$tmpresult = dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
 				}
 				// Set result
 				if ($result > 0 && $tmpresult >= 0)
@@ -746,7 +746,7 @@ 
 				}
 				else
 				{
-					$result=$tmpresult;
+					$result = $tmpresult;
 				}
 				if ($result < 0) break;
 
@@ -780,31 +780,31 @@ 
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
+function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1)
 {
 	global $user, $db, $conf;
-	$result=false;
+	$result = false;
 
 	dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
-	$srcexists=dol_is_file($srcfile);
-	$destexists=dol_is_file($destfile);
+	$srcexists = dol_is_file($srcfile);
+	$destexists = dol_is_file($destfile);
 
-	if (! $srcexists)
+	if (!$srcexists)
 	{
 		dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
 		return false;
 	}
 
-	if ($overwriteifexists || ! $destexists)
+	if ($overwriteifexists || !$destexists)
 	{
-		$newpathofsrcfile=dol_osencode($srcfile);
-		$newpathofdestfile=dol_osencode($destfile);
+		$newpathofsrcfile = dol_osencode($srcfile);
+		$newpathofdestfile = dol_osencode($destfile);
 
 		// Check virus
-		$testvirusarray=array();
+		$testvirusarray = array();
 		if ($testvirus)
 		{
-			$testvirusarray=dolCheckVirus($newpathofsrcfile);
+			$testvirusarray = dolCheckVirus($newpathofsrcfile);
 			if (count($testvirusarray))
 			{
 				dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
@@ -812,15 +812,15 @@ 
 			}
 		}
 
-		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-		if (! $result)
+		$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+		if (!$result)
 		{
 			if ($destexists)
 			{
 				dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
-				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+				$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
 			}
 			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
@@ -829,9 +829,9 @@ 
 		if ($result && $indexdatabase)
 		{
 			// Rename entry into ecm database
-			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
-			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $srcfile);
+			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $destfile);
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
@@ -840,14 +840,14 @@ 
 				dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 
-				$ecmfiletarget=new EcmFiles($db);
+				$ecmfiletarget = new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
 				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
 				{
 					$ecmfiletarget->delete($user);
 				}
 
-				$ecmfile=new EcmFiles($db);
+				$ecmfile = new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
 				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
 				{
@@ -869,11 +869,11 @@ 
 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
-					$ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+					$ecmfile->label = md5_file(dol_osencode($destfile)); // $destfile is a full path to file
 					$ecmfile->fullpath_orig = $srcfile;
 					$ecmfile->gen_or_uploaded = 'unknown';
-					$ecmfile->description = '';    // indexed content
-					$ecmfile->keyword = '';        // keyword content
+					$ecmfile->description = ''; // indexed content
+					$ecmfile->keyword = ''; // keyword content
 					$resultecm = $ecmfile->create($user);
 					if ($resultecm < 0)
 					{
@@ -885,13 +885,13 @@ 
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result=true;
+				if ($resultecm > 0) $result = true;
 				else $result = false;
 			}
 		}
 
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
-		$newmaskdec=octdec($newmask);
+		if (empty($newmask)) $newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;
+		$newmaskdec = octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
 		// if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
@@ -927,16 +927,16 @@ 
 {
 	global $conf;
 
-	if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 	{
-		if (! class_exists('AntiVir')) {
+		if (!class_exists('AntiVir')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
 		}
-		$antivir=new AntiVir($db);
+		$antivir = new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
 		if ($result < 0)	// If virus or error, we stop here
 		{
-			$reterrors=$antivir->errors;
+			$reterrors = $antivir->errors;
 			return $reterrors;
 		}
 	}
@@ -962,20 +962,20 @@ 
  *	@return int       			  		>0 if OK, <0 or string if KO
  *  @see    dol_move
  */
-function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $nohook=0, $varfiles='addedfile')
+function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan = 0, $uploaderrorcode = 0, $nohook = 0, $varfiles = 'addedfile')
 {
 	global $conf, $db, $user, $langs;
 	global $object, $hookmanager;
 
-	$reshook=0;
+	$reshook = 0;
 	$file_name = $dest_file;
 
 	if (empty($nohook))
 	{
-		$reshook=$hookmanager->initHooks(array('fileslib'));
+		$reshook = $hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
-		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
+		$parameters = array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
+		$reshook = $hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
 
 	if (empty($reshook))
@@ -983,7 +983,7 @@ 
 		// If an upload error has been reported
 		if ($uploaderrorcode)
 		{
-			switch($uploaderrorcode)
+			switch ($uploaderrorcode)
 			{
 				case UPLOAD_ERR_INI_SIZE:	// 1
 					return 'ErrorFileSizeTooLarge';
@@ -1011,25 +1011,25 @@ 
 		// If we need to make a virus scan
 		if (empty($disablevirusscan) && file_exists($src_file))
 		{
-			$checkvirusarray=dolCheckVirus($src_file);
+			$checkvirusarray = dolCheckVirus($src_file);
 			if (count($checkvirusarray))
 			{
-			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
-			   return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',', $checkvirusarray), LOG_WARNING);
+			   return 'ErrorFileIsInfectedWithAVirus: '.join(',', $checkvirusarray);
 			}
 		}
 
 		// Security:
 		// Disallow file with some extensions. We rename them.
 		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i', $dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
 		{
-			$file_name.= '.noexe';
+			$file_name .= '.noexe';
 		}
 
 		// Security:
 		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+		if (preg_match('/^\./', $src_file) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))
 		{
 			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
 			return -1;
@@ -1037,7 +1037,7 @@ 
 
 		// Security:
 		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+		if (preg_match('/^\./', $dest_file) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))
 		{
 			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
 			return -2;
@@ -1047,24 +1047,24 @@ 
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
 	}
 	elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
-		$src_file_osencoded=dol_osencode($src_file);
-		$file_name_osencoded=dol_osencode($file_name);
+		$src_file_osencoded = dol_osencode($src_file);
+		$file_name_osencoded = dol_osencode($file_name);
 
 		// Check if destination dir is writable
-		if (! is_writable(dirname($file_name_osencoded)))
+		if (!is_writable(dirname($file_name_osencoded)))
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
 			return 'ErrorDirNotWritable';
 		}
 
 		// Check if destination file already exists
-		if (! $allowoverwrite)
+		if (!$allowoverwrite)
 		{
 			if (file_exists($file_name_osencoded))
 			{
@@ -1074,21 +1074,21 @@ 
 		}
 
 		// Move file
-		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
+		$return = move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
-			return 1;	// Success
+			return 1; // Success
 		}
 		else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
-			return -3;	// Unknown error
+			return -3; // Unknown error
 		}
 	}
 
-	return 1;	// Success
+	return 1; // Success
 }
 
 /**
@@ -1103,7 +1103,7 @@ 
  *  @return boolean         		True if no error (file is deleted or if glob is used and there's nothing to delete), False if error
  *  @see dol_delete_dir
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=null)
+function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0, $object = null)
 {
 	global $db, $conf, $user, $langs;
 	global $hookmanager;
@@ -1115,7 +1115,7 @@ 
 
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$file) || preg_match('/[<>|]/',$file))
+	if (preg_match('/\.\./', $file) || preg_match('/[<>|]/', $file))
 	{
 		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 		return False;
@@ -1125,13 +1125,13 @@ 
 	{
 		$hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array(
+		$parameters = array(
 				'GET' => $_GET,
 				'file' => $file,
 				'disableglob'=> $disableglob,
 				'nophperrors' => $nophperrors
 		);
-		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
 	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
@@ -1141,35 +1141,35 @@ 
 	}
 	else
 	{
-		$error=0;
+		$error = 0;
 
 		//print "x".$file." ".$disableglob;exit;
-		$file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
-		if (empty($disableglob) && ! empty($file_osencoded))
-		{
-			$ok=true;
-			$globencoded=str_replace('[','\[',$file_osencoded);
-			$globencoded=str_replace(']','\]',$globencoded);
-			$listofdir=glob($globencoded);
-			if (! empty($listofdir) && is_array($listofdir))
+		$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
+		if (empty($disableglob) && !empty($file_osencoded))
+		{
+			$ok = true;
+			$globencoded = str_replace('[', '\[', $file_osencoded);
+			$globencoded = str_replace(']', '\]', $globencoded);
+			$listofdir = glob($globencoded);
+			if (!empty($listofdir) && is_array($listofdir))
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) $ok = @unlink($filename);
+					else $ok = unlink($filename);
 					if ($ok)
 					{
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
-						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filename);
+						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
 						{
 							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
 
 							dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
 							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-							$ecmfile=new EcmFiles($db);
+							$ecmfile = new EcmFiles($db);
 							$result = $ecmfile->fetch(0, '', $rel_filetodelete);
 							if ($result >= 0 && $ecmfile->id > 0)
 							{
@@ -1190,9 +1190,9 @@ 
 		}
 		else
 		{
-			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
+			$ok = false;
+			if ($nophperrors) $ok = @unlink($file_osencoded);
+			else $ok = unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
 			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}
@@ -1210,18 +1210,18 @@ 
  *  @return boolean         		True if success, false if error
  *  @see dol_delete_file dol_copy
  */
-function dol_delete_dir($dir,$nophperrors=0)
+function dol_delete_dir($dir, $nophperrors = 0)
 {
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
+	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir))
 	{
 		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 		return False;
 	}
 
-	$dir_osencoded=dol_osencode($dir);
-	return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
+	$dir_osencoded = dol_osencode($dir);
+	return ($nophperrors ? @rmdir($dir_osencoded) : rmdir($dir_osencoded));
 }
 
 /**
@@ -1234,27 +1234,27 @@ 
  *  @param  int		$countdeleted   Counter to count nb of elements found really deleted
  *  @return int             		Number of files and directory we try to remove. NB really removed is returned into $countdeleted.
  */
-function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
+function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub = 0, &$countdeleted = 0)
 {
-	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
+	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir, LOG_DEBUG);
 	if (dol_is_dir($dir))
 	{
-		$dir_osencoded=dol_osencode($dir);
+		$dir_osencoded = dol_osencode($dir);
 		if ($handle = opendir("$dir_osencoded"))
 		{
 			while (false !== ($item = readdir($handle)))
 			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+				if (!utf8_check($item)) $item = utf8_encode($item); // should be useless
 
 				if ($item != "." && $item != "..")
 				{
-					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
+					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
 					{
-						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
+						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
 					}
 					else
 					{
-						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
+						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
 						if ($result) $countdeleted++;
 					}
@@ -1264,7 +1264,7 @@ 
 
 			if (empty($onlysub))
 			{
-				$result=dol_delete_dir($dir, $nophperrors);
+				$result = dol_delete_dir($dir, $nophperrors);
 				$count++;
 				if ($result) $countdeleted++;
 			}
@@ -1285,7 +1285,7 @@ 
  */
 function dol_delete_preview($object)
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	// Define parent dir of elements
 	$element = $object->element;
@@ -1296,54 +1296,54 @@ 
 	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
 	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
 	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
 
 	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
 
 	$refsan = dol_sanitizeFileName($object->ref);
-	$dir = $dir . "/" . $refsan ;
-	$filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png";
-	$filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png";
-	$filepreviewold = $dir . "/" . $refsan . ".pdf.png";
+	$dir = $dir."/".$refsan;
+	$filepreviewnew = $dir."/".$refsan.".pdf_preview.png";
+	$filepreviewnewbis = $dir."/".$refsan.".pdf_preview-0.png";
+	$filepreviewold = $dir."/".$refsan.".pdf.png";
 
 	// For new preview files
 	if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
 	{
-		if (! dol_delete_file($filepreviewnew,1))
+		if (!dol_delete_file($filepreviewnew, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewnew);
 			return 0;
 		}
 	}
 	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
 	{
-		if (! dol_delete_file($filepreviewnewbis,1))
+		if (!dol_delete_file($filepreviewnewbis, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewnewbis);
 			return 0;
 		}
 	}
 	// For old preview files
 	if (file_exists($filepreviewold) && is_writable($filepreviewold))
 	{
-		if (! dol_delete_file($filepreviewold,1))
+		if (!dol_delete_file($filepreviewold, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewold);
 			return 0;
 		}
 	}
 	else
 	{
-		$multiple = $filepreviewold . ".";
+		$multiple = $filepreviewold.".";
 		for ($i = 0; $i < 20; $i++)
 		{
 			$preview = $multiple.$i;
 
 			if (file_exists($preview) && is_writable($preview))
 			{
-				if ( ! dol_delete_file($preview,1) )
+				if (!dol_delete_file($preview, 1))
 				{
-					$object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
+					$object->error = $langs->trans("ErrorFailedToOpenFile", $preview);
 					return 0;
 				}
 			}
@@ -1366,10 +1366,10 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0; // By default, no metafile.
 
 	// Define parent dir of elements
-	$element=$object->element;
+	$element = $object->element;
 
 	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
 	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
@@ -1377,17 +1377,17 @@ 
 	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
 	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
 	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
 
 	if ($dir)
 	{
 		$object->fetch_thirdparty();
 
 		$objectref = dol_sanitizeFileName($object->ref);
-		$dir = $dir . "/" . $objectref;
-		$file = $dir . "/" . $objectref . ".meta";
+		$dir = $dir."/".$objectref;
+		$file = $dir."/".$objectref.".meta";
 
-		if (! is_dir($dir))
+		if (!is_dir($dir))
 		{
 			dol_mkdir($dir);
 		}
@@ -1395,29 +1395,29 @@ 
 		if (is_dir($dir))
 		{
 			$nblignes = count($object->lines);
-			$client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
-			$meta = "REFERENCE=\"" . $object->ref . "\"
-			DATE=\"" . dol_print_date($object->date,'') . "\"
-			NB_ITEMS=\"" . $nblignes . "\"
-			CLIENT=\"" . $client . "\"
-			AMOUNT_EXCL_TAX=\"" . $object->total_ht . "\"
-			AMOUNT=\"" . $object->total_ttc . "\"\n";
-
-			for ($i = 0 ; $i < $nblignes ; $i++)
+			$client = $object->thirdparty->name." ".$object->thirdparty->address." ".$object->thirdparty->zip." ".$object->thirdparty->town;
+			$meta = "REFERENCE=\"".$object->ref."\"
+			DATE=\"" . dol_print_date($object->date, '')."\"
+			NB_ITEMS=\"" . $nblignes."\"
+			CLIENT=\"" . $client."\"
+			AMOUNT_EXCL_TAX=\"" . $object->total_ht."\"
+			AMOUNT=\"" . $object->total_ttc."\"\n";
+
+			for ($i = 0; $i < $nblignes; $i++)
 			{
 				//Pour les articles
-				$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
-				ITEM_" . $i . "_AMOUNT_WO_TAX=\"" . $object->lines[$i]->total_ht . "\"
-				ITEM_" . $i . "_VAT=\"" .$object->lines[$i]->tva_tx . "\"
-				ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\"
+				$meta .= "ITEM_".$i."_QUANTITY=\"".$object->lines[$i]->qty."\"
+				ITEM_" . $i."_AMOUNT_WO_TAX=\"".$object->lines[$i]->total_ht."\"
+				ITEM_" . $i."_VAT=\"".$object->lines[$i]->tva_tx."\"
+				ITEM_" . $i."_DESCRIPTION=\"".str_replace("\r\n", "", nl2br($object->lines[$i]->desc))."\"
 				";
 			}
 		}
 
-		$fp = fopen($file,"w");
-		fputs($fp,$meta);
+		$fp = fopen($file, "w");
+		fputs($fp, $meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		return 1;
@@ -1440,26 +1440,26 @@ 
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
-function dol_init_file_process($pathtoscan='', $trackid='')
+function dol_init_file_process($pathtoscan = '', $trackid = '')
 {
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
+	$listofpaths = array();
+	$listofnames = array();
+	$listofmimes = array();
 
 	if ($pathtoscan)
 	{
-		$listoffiles=dol_dir_list($pathtoscan,'files');
-		foreach($listoffiles as $key => $val)
+		$listoffiles = dol_dir_list($pathtoscan, 'files');
+		foreach ($listoffiles as $key => $val)
 		{
-			$listofpaths[]=$val['fullname'];
-			$listofnames[]=$val['name'];
-			$listofmimes[]=dol_mimetype($val['name']);
+			$listofpaths[] = $val['fullname'];
+			$listofnames[] = $val['name'];
+			$listofmimes[] = dol_mimetype($val['name']);
 		}
 	}
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-	$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-	$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+	$_SESSION["listofpaths".$keytoavoidconflict] = join(';', $listofpaths);
+	$_SESSION["listofnames".$keytoavoidconflict] = join(';', $listofnames);
+	$_SESSION["listofmimes".$keytoavoidconflict] = join(';', $listofmimes);
 }
 
 
@@ -1478,13 +1478,13 @@ 
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
  * @return	int                             <=0 if KO, >0 if OK
  */
-function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='', $generatethumbs=1)
+function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1)
 {
-	global $db,$user,$conf,$langs;
+	global $db, $user, $conf, $langs;
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (!empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
 		if (dol_mkdir($upload_dir) >= 0)
@@ -1503,13 +1503,13 @@ 
 			for ($i = 0; $i < $nbfile; $i++)
 			{
 				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull=$upload_dir . "/" . $TFile['name'][$i];
-				$destfile=$TFile['name'][$i];
+				$destfull = $upload_dir."/".$TFile['name'][$i];
+				$destfile = $TFile['name'][$i];
 
 				if ($savingdocmask)
 				{
-					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
+					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
 				}
 
 				// dol_sanitizeFileName the file name and lowercase extension
@@ -1570,7 +1570,7 @@ 
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+					else if (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
@@ -1587,7 +1587,7 @@ 
 			}
 		}
 	} elseif ($link) {
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 		$linkObject = new Link($db);
 		$linkObject->entity = $conf->entity;
 		$linkObject->url = $link;
@@ -1622,33 +1622,33 @@ 
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
-function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=1,$trackid='')
+function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletefile = 1, $trackid = '')
 {
-	global $db,$user,$conf,$langs,$_FILES;
+	global $db, $user, $conf, $langs, $_FILES;
 
-	$keytodelete=$filenb;
+	$keytodelete = $filenb;
 	$keytodelete--;
 
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	$listofpaths = array();
+	$listofnames = array();
+	$listofmimes = array();
+	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 
 	if ($keytodelete >= 0)
 	{
-		$pathtodelete=$listofpaths[$keytodelete];
-		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		$pathtodelete = $listofpaths[$keytodelete];
+		$filetodelete = $listofnames[$keytodelete];
+		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file
+		else $result = 0;
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
 			{
 				$langs->load("other");
-				setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+				setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 			}
 			if (empty($donotupdatesession))
 			{
@@ -1674,29 +1674,29 @@ 
  *  @param		int		$setsharekey	Set also the share key
  *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
  */
-function addFileIntoDatabaseIndex($dir, $file, $fullpathorig='', $mode='uploaded', $setsharekey=0)
+function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0)
 {
 	global $db, $user;
 
 	$result = 0;
 
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 	{
 		$filename = basename($file);
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
+		$ecmfile = new EcmFiles($db);
 		$ecmfile->filepath = $rel_dir;
 		$ecmfile->filename = $filename;
-		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
+		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file)); // MD5 of file content
 		$ecmfile->fullpath_orig = $fullpathorig;
 		$ecmfile->gen_or_uploaded = $mode;
-		$ecmfile->description = '';    // indexed content
-		$ecmfile->keyword = '';        // keyword content
+		$ecmfile->description = ''; // indexed content
+		$ecmfile->keyword = ''; // keyword content
 		if ($setsharekey)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -1722,7 +1722,7 @@ 
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
  *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
  */
-function deleteFilesIntoDatabaseIndex($dir, $file, $mode='uploaded')
+function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 {
 	global $conf, $db, $user;
 
@@ -1736,32 +1736,32 @@ 
 
 	$db->begin();
 
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
 	$filename = basename($file);
 	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-	if (! $error)
+	if (!$error)
 	{
-		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
-		$sql.= ' WHERE entity = '.$conf->entity;
-		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files';
+		$sql .= ' WHERE entity = '.$conf->entity;
+		$sql .= " AND filepath = '".$db->escape($rel_dir)."'";
+		if ($file) $sql .= " AND filename = '".$db->escape($file)."'";
+		if ($mode) $sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";
 
 		$resql = $db->query($sql);
 		if (!$resql)
 		{
 			$error++;
-			dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$db->lasterror(), LOG_ERR);
 		}
 	}
 
 	// Commit or rollback
 	if ($error) {
 		$db->rollback();
-		return - 1 * $error;
+		return -1 * $error;
 	} else {
 		$db->commit();
 		return 1;
@@ -1778,16 +1778,16 @@ 
  *  @param	string	$fileoutput	Output filename
  *  @return	int					<0 if KO, 0=Nothing done, >0 if OK
  */
-function dol_convert_file($fileinput, $ext='png', $fileoutput='')
+function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '')
 {
 	global $langs;
 
 	if (class_exists('Imagick'))
 	{
-		$image=new Imagick();
+		$image = new Imagick();
 		try {
 			$ret = $image->readImage($fileinput);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
 			return 0;
 		}
@@ -1796,11 +1796,11 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) $fileoutput = $fileinput.".".$ext;
 
 				$count = $image->getNumberImages();
 
-				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
+				if (!dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 					$ret = $image->writeImages($fileoutput, true);
 				}
@@ -1836,20 +1836,20 @@ 
  * @param 	string	$mode			'gz' or 'bz' or 'zip'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_file($inputfile, $outputfile, $mode="gz")
+function dol_compress_file($inputfile, $outputfile, $mode = "gz")
 {
-	$foundhandler=0;
+	$foundhandler = 0;
 
 	try
 	{
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
+		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }
+		elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }
 		elseif ($mode == 'zip')
 		{
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
-				$foundhandler=1;
+				$foundhandler = 1;
 
 				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 				$archive = new PclZip($outputfile);
@@ -1868,7 +1868,7 @@ 
 		}
 		else
 		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
 		}
 	}
@@ -1876,8 +1876,8 @@ 
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+		$errormsg = $langs->trans("ErrorFailedToWriteInDir");
 		return -1;
 	}
 }
@@ -1889,7 +1889,7 @@ 
  * @param 	string	$outputdir		Target dir name
  * @return 	array					array('error'=>'Error code') or array() if no error
  */
-function dol_uncompress($inputfile,$outputdir)
+function dol_uncompress($inputfile, $outputdir)
 {
 	global $langs;
 
@@ -1898,20 +1898,20 @@ 
 		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
 		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 		$archive = new PclZip($inputfile);
-		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
+		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
+		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
 		else
 		{
-			$ok=1; $errmsg='';
+			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
-			foreach($result as $key => $val)
+			foreach ($result as $key => $val)
 			{
 				if ($val['status'] == 'path_creation_fail')
 				{
 					$langs->load("errors");
-					$ok=0;
-					$errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
+					$ok = 0;
+					$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);
 					break;
 				}
 			}
@@ -1950,24 +1950,24 @@ 
  * @param 	string	$mode			'zip'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_dir($inputdir, $outputfile, $mode="zip")
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
 {
-	$foundhandler=0;
+	$foundhandler = 0;
 
 	dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
 
-	if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
+	if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile)))
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
 		return -3;
 	}
 
 	try
 	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
+		if ($mode == 'gz') { $foundhandler = 0; }
+		elseif ($mode == 'bz') { $foundhandler = 0; }
 		elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
@@ -1983,7 +1983,7 @@ 
             else*/
 			if (class_exists('ZipArchive'))
 			{
-				$foundhandler=1;
+				$foundhandler = 1;
 
 				// Initialize archive object
 				$zip = new ZipArchive();
@@ -2017,9 +2017,9 @@ 
 			}
 		}
 
-		if (! $foundhandler)
+		if (!$foundhandler)
 		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
 		}
 		else
@@ -2033,7 +2033,7 @@ 
 		$langs->load("errors");
 		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 		dol_syslog($e->getMessage(), LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
 		return -1;
 	}
 }
@@ -2050,9 +2050,9 @@ 
  * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  * @return	string						Full path to most recent file
  */
-function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false,$mode='')
+function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
 {
-	$tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
+	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
 	return $tmparray[0];
 }
 
@@ -2068,275 +2068,275 @@ 
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
+function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser = '', $refname = '', $mode = 'read')
 {
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (!is_object($fuser)) $fuser = $user;
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
 	if (empty($entity))
 	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
+		if (empty($conf->multicompany->enabled)) $entity = 1;
+		else $entity = 0;
 	}
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
-	$accessallowed=0;
-	$sqlprotectagainstexternals='';
-	$ret=array();
+	$accessallowed = 0;
+	$sqlprotectagainstexternals = '';
+	$ret = array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) $refname = basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
 
 	// Define possible keys to use for permission check
-	$lire='lire'; $read='read'; $download='download';
+	$lire = 'lire'; $read = 'read'; $download = 'download';
 	if ($mode == 'write')
 	{
-		$lire='creer'; $read='write'; $download='upload';
+		$lire = 'creer'; $read = 'write'; $download = 'upload';
 	}
 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
 		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		$accessallowed=1;
-		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
-		$accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
-		$original_file=$dolibarr_main_data_root.'/'.$original_file;
+		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+		$original_file = $dolibarr_main_data_root.'/'.$original_file;
 	}
 	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
 		// Dir for custom dirs
-		$tmp=explode(',', $dolibarr_main_document_root_alt);
+		$tmp = explode(',', $dolibarr_main_document_root_alt);
 		$dirins = $tmp[0];
 
-		$accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
-		$original_file=$dirins.'/'.$original_file;
+		$accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
+		$original_file = $dirins.'/'.$original_file;
 	}
 	// Wrapping for some images
 	elseif (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;
 	}
 	// Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->user->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->user->dir_output.'/'.$original_file;
 	}
 	// Wrapping for members photos
 	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+		$original_file = $conf->propal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
+		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
+		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
+		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
-		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
+		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
-		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
+		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
+		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->dir_temp.'/'.$original_file;
+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+		$original_file = $conf->propal->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_temp.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->commande->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_temp.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->facture->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
-		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
+		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
+		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
-		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
+		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
+		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
-		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
+		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
+		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
+	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
-		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
+		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
-		$original_file=$conf->tax->dir_output.'/'.$original_file;
+		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
+		$original_file = $conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
+		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
 		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
-		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
+		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
+		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
-		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
+		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->stock->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->stock->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les graph fournisseurs
 	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les graph des produits
 	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les code barre
 	elseif ($modulepart == 'barcode')
 	{
-		$accessallowed=1;
+		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
-		$original_file='';
+		$original_file = '';
 	}
 	// Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour le scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 	// Wrapping pour les images fckeditor
 	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for users
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
-		$canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-		if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
-		if ($canreaduser || preg_match('/^specimen/i',$original_file))
+		$canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
+		if ($fuser->id == (int) $refname) { $canreaduser = 1; } // A user can always read its own card
+		if ($canreaduser || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->user->dir_output.'/'.$original_file;
+		$original_file = $conf->user->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
+		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
 	}
 
@@ -2346,247 +2346,247 @@ 
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		if ($fuser->rights->societe->{$lire})
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
+		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
 	}
 
 	// Wrapping for invoices
 	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		$original_file = $conf->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_invoices')
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_expensereport')
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_interventions')
 	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les deplacements et notes de frais
 	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->deplacement->dir_output.'/'.$original_file;
+		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les propales
 	else if ($modulepart == 'propal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
+		$original_file = $conf->propal->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les commandes
 	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		$original_file = $conf->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les projets
 	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 
 	// Wrapping pour les commandes fournisseurs
 	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les factures fournisseurs
 	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'supplier_payment')
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
 	}
 
 	// Wrapping for accounting exports
 	else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
 	{
-		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->accounting->dir_output.'/'.$original_file;
+		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les expedition
 	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expedition->dir_output."/sending/".$original_file;
+		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
 	}
 	// Wrapping pour les bons de livraison
 	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expedition->dir_output."/receipt/".$original_file;
+		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
 	}
 
 	// Wrapping pour les actions
 	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les actions
 	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
 	}
@@ -2595,54 +2595,54 @@ 
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
+		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
 	}
 
 	// Wrapping pour les contrats
 	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
+		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	}
 
 	// Wrapping pour les dons
 	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->don->dir_output.'/'.$original_file;
+		$original_file = $conf->don->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les dons
 	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
 	{
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->resource->dir_output.'/'.$original_file;
+		$original_file = $conf->resource->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 
-		$original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
+		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
 	}
 
 	// Wrapping for bank
@@ -2650,9 +2650,9 @@ 
 	{
 		if ($fuser->rights->banque->{$lire})
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->bank->dir_output.'/'.$original_file;
+		$original_file = $conf->bank->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for export module
@@ -2660,62 +2660,62 @@ 
 	{
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
-		$accessallowed=1;
-		$original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
 	// Wrapping for import module
 	else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->import->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->import->dir_temp.'/'.$original_file;
 	}
 
 	// Wrapping pour l'editeur wysiwyg
 	else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_output.'/'.$original_file;
+		if ($fuser->admin) $accessallowed = 1;
+		$original_file = $conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_temp.'/'.$original_file;
+		if ($fuser->admin) $accessallowed = 1;
+		$original_file = $conf->admin->dir_temp.'/'.$original_file;
 	}
 
 	// Wrapping pour BitTorrent
 	else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
 	{
-		$accessallowed=1;
-		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
-		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
+		$accessallowed = 1;
+		$dir = 'files';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
+		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
 	// Wrapping pour Foundation module
 	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for Scanner
 	else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
 	// GENERIC Wrapping
@@ -2725,76 +2725,76 @@ 
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) $accessallowed = 1; // If user is admin
 
 		// Define $accessallowed
-		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		else if (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
 		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		else if (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
 		}
 		else
 		{
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
 
-			$perm=GETPOST('perm');
-			$subperm=GETPOST('subperm');
+			$perm = GETPOST('perm');
+			$subperm = GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+				if (($perm && !$subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed = 1;
+				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;
 			}
 			else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;
+				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
 
 		// For modules who wants to manage different levels of permissions for documents
 		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (! empty($conf->global->$subPermCategoryConstName))
+		if (!empty($conf->global->$subPermCategoryConstName))
 		{
 			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
+			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
 			{
-				$accessallowed=1;
+				$accessallowed = 1;
 			}
 		}
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (!empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
@@ -2820,8 +2820,8 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
-	$cachefile = $directory . $filename;
+	if (!dol_is_dir($directory)) dol_mkdir($directory);
+	$cachefile = $directory.$filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
 }
@@ -2837,8 +2837,8 @@ 
 function dol_cache_refresh($directory, $filename, $cachetime)
 {
 	$now = dol_now();
-	$cachefile = $directory . $filename;
-	$refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
+	$cachefile = $directory.$filename;
+	$refresh = !file_exists($cachefile) || ($now - $cachetime) > dol_filemtime($cachefile);
 	return $refresh;
 }
 
@@ -2851,7 +2851,7 @@ 
  */
 function dol_readcachefile($directory, $filename)
 {
-	$cachefile = $directory . $filename;
+	$cachefile = $directory.$filename;
 	$object = unserialize(file_get_contents($cachefile));
 	return $object;
 }

Braces +491 added lines, -257 removed lines

@@ -97,16 +97,21 @@ 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (! is_dir($newpath)) {
+			return array();
+		}
 
 		if ($dir = opendir($newpath))
 		{
 			$filedate='';
 			$filesize='';
 
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+			while (false !== ($file = readdir($dir))) {
+				// $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+				if (! utf8_check($file)) $file=utf8_encode($file);
+			}
+			// To be sure data is stored in utf8 in memory
 				$fullpathfile=($newpath?$newpath.'/':'').$file;
 
 				$qualified=1;
@@ -116,8 +121,9 @@ 
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+				} else if ($excludefilter) {
+					$excludefilterarray[]=$excludefilter;
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
 				// Check if file is qualified
 				foreach($excludefilterarray as $filt)
 				{
@@ -136,12 +142,18 @@ 
 						// Add entry into file_list array
 						if (($types=="directories") || ($types=="all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') {
+								$filedate=dol_filemtime($path."/".$file);
+							}
+							if ($loadsize || $sortcriteria == 'size') {
+								$filesize=dol_filesize($path."/".$file);
+							}
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+								// We do not search key $filter into all $path, only into $file part
 							{
 								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+							}
 								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
@@ -161,16 +173,21 @@ 
 						{
 							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file));
 						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					} else if (! $isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') {
+							$filedate=dol_filemtime($path."/".$file);
+						}
+						if ($loadsize || $sortcriteria == 'size') {
+							$filesize=dol_filesize($path."/".$file);
+						}
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+							// We do not search key $filter into $path, only into $file
 						{
 							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+						}
 							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
@@ -197,12 +214,16 @@ 
 					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 				}
 				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+				if ($sortorder) {
+					array_multisort($myarray, $sortorder, $file_list);
+				}
 			}
 		}
 	}
 
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {
+		$file_list = array_merge($file_list, $hookmanager->resArray);
+	}
 
 	return $file_list;
 }
@@ -227,7 +248,9 @@ 
 
 	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
 	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
+	if ($mode) {
+		$sql.=", description";
+	}
 	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql.=" WHERE filepath = '".$db->escape($path)."'";
 	$sql.=" AND entity = ".$conf->entity;
@@ -275,12 +298,13 @@ 
 				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 			}
 			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+			if ($sortorder) {
+				array_multisort($myarray, $sortorder, $file_list);
+			}
 		}
 
 		return $file_list;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 		return array();
@@ -326,16 +350,21 @@ 
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (! $found) {
+			// This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['position']='999999';
+		}
+		// File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover']=0;
 			$filearray[$key]['acl']='';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+				// If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+			}
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile=new EcmFiles($db);
 
@@ -356,13 +385,11 @@ 
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
+				} else
 				{
 					$filearray[$key]['rowid']=$result;
 				}
-			}
-			else
+			} else
 			{
 				$filearray[$key]['rowid']=0;     // Should not happened
 			}
@@ -387,22 +414,27 @@ 
 
 	$sortorder=strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; } else { $retup=1; $retdown=-1; }
 
 	if ($sortfield == 'name')
 	{
-		if ($a->name == $b->name) return 0;
+		if ($a->name == $b->name) {
+			return 0;
+		}
 		return ($a->name < $b->name) ? $retup : $retdown;
 	}
 	if ($sortfield == 'date')
 	{
-		if ($a->date == $b->date) return 0;
+		if ($a->date == $b->date) {
+			return 0;
+		}
 		return ($a->date < $b->date) ? $retup : $retdown;
 	}
 	if ($sortfield == 'size')
 	{
-		if ($a->size == $b->size) return 0;
+		if ($a->size == $b->size) {
+			return 0;
+		}
 		return ($a->size < $b->size) ? $retup : $retdown;
 	}
 }
@@ -417,9 +449,12 @@ 
 function dol_is_dir($folder)
 {
 	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
-}
+	if (is_dir($newfolder)) {
+		return true;
+	} else {
+		return false;
+	}
+	}
 
 /**
  * Return if path is a file
@@ -444,7 +479,9 @@ 
 	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
 	foreach($tmpprot as $prot)
 	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
+		if (preg_match('/^'.$prot.':/i',$url)) {
+			return true;
+		}
 	}
 	return false;
 }
@@ -466,15 +503,21 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach($name_array as $temp) {
+			$folder_content .= $temp;
+		}
 
 		closedir($handle);
 
-		if ($folder_content == "...") return true;
-		else return false;
+		if ($folder_content == "...") {
+			return true;
+		} else {
+			return false;
+		}
+	} else {
+		return true;
 	}
-	else
-	return true; // Dir does not exists
+	// Dir does not exists
 }
 
 /**
@@ -497,11 +540,12 @@ 
 		{
 			$line=fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (! $line === false) {
+				$nb++;
+			}
 		}
 		fclose($fp);
-	}
-	else
+	} else
 	{
 		$nb=-1;
 	}
@@ -551,11 +595,17 @@ 
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+	if (empty($srcfile)) {
+		return -1;
+	}
+	if (empty($destfile)) {
+		$destfile=$srcfile;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+	if (($destfile != $srcfile) && $destexists) {
+		return 0;
+	}
 
 	$tmpdestfile=$destfile.'.tmp';
 
@@ -592,10 +642,14 @@ 
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+		$newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+		// This should no happen
 	{
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -637,10 +691,14 @@ 
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+		return -1;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	if (! $overwriteifexists && $destexists) {
+		return 0;
+	}
 
 	$newpathofsrcfile=dol_osencode($srcfile);
 	$newpathofdestfile=dol_osencode($destfile);
@@ -664,10 +722,14 @@ 
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+		$newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+		// This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -695,7 +757,9 @@ 
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+		return -1;
+	}
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
@@ -705,7 +769,9 @@ 
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+			$dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		}
 		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
@@ -725,8 +791,7 @@ 
 				{
 					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-				}
-				else
+				} else
 				{
 					$newfile = $file;
 					// Replace destination filename with a new one
@@ -743,18 +808,18 @@ 
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
+				} else
 				{
 					$result=$tmpresult;
 				}
-				if ($result < 0) break;
+				if ($result < 0) {
+					break;
+				}
 
 			}
 		}
 		closedir($dir_handle);
-	}
-	else
+	} else
 	{
 		// Source directory does not exists
 		$result = -2;
@@ -821,8 +886,9 @@ 
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+			} else {
+				dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -831,9 +897,11 @@ 
 			// Rename entry into ecm database
 			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
 			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+				// If not a tmp file
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+			}
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
 				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
 
@@ -842,16 +910,20 @@ 
 
 				$ecmfiletarget=new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+				if ($resultecmtarget > 0) {
+					// An entry for target name already exists for target, we delete it, a new one will be created.
 				{
 					$ecmfiletarget->delete($user);
 				}
+				}
 
 				$ecmfile=new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+				if ($resultecm > 0) {
+					// If an entry was found for src file, we use it to move entry
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -859,10 +931,11 @@ 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0) {
+					// If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -879,18 +952,22 @@ 
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result=true;
-				else $result = false;
+				if ($resultecm > 0) {
+					$result=true;
+				} else {
+					$result = false;
+				}
 			}
 		}
 
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		if (empty($newmask)) {
+			$newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		}
 		$newmaskdec=octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
@@ -934,9 +1011,11 @@ 
 		}
 		$antivir=new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
+		if ($result < 0) {
+			// If virus or error, we stop here
 		{
 			$reterrors=$antivir->errors;
+		}
 			return $reterrors;
 		}
 	}
@@ -1044,13 +1123,17 @@ 
 		}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
+	if ($reshook < 0) {
+		// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
 	}
-	elseif (empty($reshook))
+		if (empty($errmsg)) {
+			$errmsg = 'ErrorReturnedBySomeHooks';
+		}
+		// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		return $errmsg;
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded=dol_osencode($src_file);
@@ -1077,11 +1160,12 @@ 
 		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+				@chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			}
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1;	// Success
-		}
-		else
+		} else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3;	// Unknown error
@@ -1134,12 +1218,13 @@ 
 		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+	if (empty($nohook) && $reshook != 0) {
+		// reshook = 0 to do standard actions, 1 = ok, -1 = ko
 	{
 		if ($reshook < 0) return false;
-		return true;
 	}
-	else
+		return true;
+	} else
 	{
 		$error=0;
 
@@ -1155,17 +1240,22 @@ 
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) {
+						$ok=@unlink($filename);
+					} else {
+						$ok=unlink($filename);
+					}
 					if ($ok)
 					{
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
 						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {
+							// If not a tmp file
 						{
 							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+						}
 
 							dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
 							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
@@ -1180,21 +1270,28 @@ 
 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							}
 						}
+					} else {
+						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
 					// If error because of not exists, we must should return true and we should return false if this is a permission problem
 				}
+			} else {
+				dol_syslog("No files to delete found", LOG_DEBUG);
 			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			if ($nophperrors) {
+				$ok=@unlink($file_osencoded);
+			} else {
+				$ok=unlink($file_osencoded);
+			}
+			if ($ok) {
+				dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+			} else {
+				dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			}
 		}
 
 		return $ok;
@@ -1244,19 +1341,23 @@ 
 		{
 			while (false !== ($item = readdir($handle)))
 			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+				if (! utf8_check($item)) {
+					$item=utf8_encode($item);
+				}
+				// should be useless
 
 				if ($item != "." && $item != "..")
 				{
 					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
 					{
 						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
+					} else
 					{
 						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
-						if ($result) $countdeleted++;
+						if ($result) {
+							$countdeleted++;
+						}
 					}
 				}
 			}
@@ -1266,7 +1367,9 @@ 
 			{
 				$result=dol_delete_dir($dir, $nophperrors);
 				$count++;
-				if ($result) $countdeleted++;
+				if ($result) {
+					$countdeleted++;
+				}
 			}
 		}
 	}
@@ -1290,15 +1393,25 @@ 
 	// Define parent dir of elements
 	$element = $object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+		$dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($object->element == 'invoice_supplier') {
+		$dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($object->element == 'project') {
+		$dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+		$dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+		$dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+		$dir = $conf->ficheinter->dir_output;
+	} else {
+		$dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+	if (empty($dir)) {
+		return 'ErrorObjectNoSupportedByFunction';
+	}
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
@@ -1331,8 +1444,7 @@ 
 			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		$multiple = $filepreviewold . ".";
 		for ($i = 0; $i < 20; $i++)
@@ -1366,18 +1478,29 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+		return 0;
+	}
+	// By default, no metafile.
 
 	// Define parent dir of elements
 	$element=$object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+		$dir = $conf->fournisseur->dir_output.'/commande';
+	} elseif ($object->element == 'invoice_supplier') {
+		$dir = $conf->fournisseur->dir_output.'/facture';
+	} elseif ($object->element == 'project') {
+		$dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+		$dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+		$dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+		$dir = $conf->ficheinter->dir_output;
+	} else {
+		$dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
 	if ($dir)
 	{
@@ -1417,12 +1540,12 @@ 
 		$fp = fopen($file,"w");
 		fputs($fp,$meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
-		@chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return 1;
-	}
-	else
+	} else
 	{
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
@@ -1484,9 +1607,11 @@ 
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (! empty($_FILES[$varfiles])) {
+		// For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+	}
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$TFile = $_FILES[$varfiles];
@@ -1520,9 +1645,11 @@ 
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+				if (is_numeric($resupload) && $resupload > 0) {
+					// $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+				}
 
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -1562,19 +1689,20 @@ 
 					}
 
 					$nbok++;
-				}
-				else
+				} else
 				{
 					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
+					if ($resupload < 0) {
+						// Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+					} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+						// Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
-					else	// Known error
+					} else	// Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1601,8 +1729,7 @@ 
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
@@ -1633,16 +1760,27 @@ 
 	$listofnames=array();
 	$listofmimes=array();
 	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		$listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		$listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		$listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	if ($keytodelete >= 0)
 	{
 		$pathtodelete=$listofpaths[$keytodelete];
 		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		if (empty($donotdeletefile)) {
+			$result = dol_delete_file($pathtodelete,1);
+		}
+		// The delete of ecm database is inside the function dol_delete_file
+		else {
+			$result=0;
+		}
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
@@ -1682,9 +1820,11 @@ 
 
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
 
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+		// If not a tmp dir
 	{
 		$filename = basename($file);
+	}
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -1747,8 +1887,12 @@ 
 		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
 		$sql.= ' WHERE entity = '.$conf->entity;
 		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		if ($file) {
+			$sql.= " AND filename = '" . $db->escape($file) . "'";
+		}
+		if ($mode) {
+			$sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		}
 
 		$resql = $db->query($sql);
 		if (!$resql)
@@ -1796,32 +1940,33 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) {
+					$fileoutput=$fileinput.".".$ext;
+				}
 
 				$count = $image->getNumberImages();
 
 				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 					$ret = $image->writeImages($fileoutput, true);
-				}
-				else
+				} else
 				{
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
+				if ($ret) {
+					return $count;
+				} else {
+					return -3;
+				}
+			} else
 			{
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		return 0;
 	}
@@ -1843,9 +1988,7 @@ 
 	try
 	{
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
@@ -1865,14 +2008,12 @@ 
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -1900,8 +2041,9 @@ 
 		$archive = new PclZip($inputfile);
 		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
+		if (! is_array($result) && $result <= 0) {
+			return array('error'=>$archive->errorInfo(true));
+		} else
 		{
 			$ok=1; $errmsg='';
 			// Loop on each file to check result for unzipping file
@@ -1916,8 +2058,11 @@ 
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+				return array();
+			} else {
+				return array('error'=>$errmsg);
+			}
 		}
 	}
 
@@ -1931,8 +2076,7 @@ 
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else
+		} else
 		{
 			return array('error'=>'ErrUnzipFails');
 		}
@@ -1966,9 +2110,7 @@ 
 
 	try
 	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=0; } elseif ($mode == 'bz') { $foundhandler=0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
@@ -2021,13 +2163,11 @@ 
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2073,13 +2213,20 @@ 
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (! is_object($fuser)) {
+		$fuser=$user;
+	}
 
-	if (empty($modulepart)) return 'ErrorBadParameter';
+	if (empty($modulepart)) {
+		return 'ErrorBadParameter';
+	}
 	if (empty($entity))
 	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
+		if (empty($conf->multicompany->enabled)) {
+			$entity=1;
+		} else {
+			$entity=0;
+		}
 	}
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
@@ -2088,7 +2235,9 @@ 
 	$ret=array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) {
+		$refname=basename(dirname($original_file)."/");
+	}
 
 	$relative_original_file = $original_file;
 
@@ -2102,7 +2251,9 @@ 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		$accessallowed=1;
 		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
@@ -2143,132 +2294,176 @@ 
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->propal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+		if ($fuser->rights->ficheinter->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+		if ($fuser->rights->contrat->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+		if ($fuser->rights->supplier_proposal->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expensereport->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->propal->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->categorie->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -2331,7 +2526,9 @@ 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
@@ -2343,7 +2540,9 @@ 
 	// Wrapping for contact
 	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire})
 		{
 			$accessallowed=1;
@@ -2369,64 +2568,56 @@ 
 			$accessallowed=1;
 		}
 		$original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
+	} else if ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
+	} else if ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
+	} else if ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
+	} else if ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
+	} else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
+	} else if ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
+	} else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2488,8 +2679,7 @@ 
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2538,8 +2728,11 @@ 
 		{
 			$accessallowed=1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) {
+			$original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		} else {
+			$original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		}
 	}
 
 	// Wrapping for accounting exports
@@ -2594,13 +2787,18 @@ 
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->product->enabled)) {
+			$original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+		} elseif (! empty($conf->service->enabled)) {
+			$original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les contrats
@@ -2681,14 +2879,18 @@ 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_temp.'/'.$original_file;
 	}
 
@@ -2697,7 +2899,9 @@ 
 	{
 		$accessallowed=1;
 		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') {
+			$dir='torrents';
+		}
 		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
@@ -2725,45 +2929,62 @@ 
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i',$original_file)) {
+			$accessallowed=1;
+		}
+		// If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) {
+			$accessallowed=1;
+		}
+		// If user is admin
 
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+				$accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+				$accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+				$accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else
+		} else
 		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+			if (empty($conf->$modulepart->dir_output)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 
@@ -2771,12 +2992,15 @@ 
 			$subperm=GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) {
+					$accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
+			} else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) {
+					$accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2794,11 +3018,13 @@ 
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (! empty($conf->global->$sqlProtectConstName)) {
+			// If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
+		}
 	}
 
 	$ret = array(
@@ -2820,7 +3046,9 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
+	if (! dol_is_dir($directory)) {
+		dol_mkdir($directory);
+	}
 	$cachefile = $directory . $filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
@@ -2874,9 +3102,11 @@ 
 
 	$exclude = 'install';
 
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
+	foreach ($dir->md5file as $file) {
+		// $file is a simpleXMLElement
 	{
 		$filename = $path.$file['name'];
+	}
 		$file_list['insignature'][] = $filename;
 		$expectedmd5 = (string) $file;
 
@@ -2885,27 +3115,31 @@ 
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
-		}
-		else
+		} else
 		{
 			$md5_local = md5_file($pathref.'/'.$filename);
 
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
+			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php') {
+				// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
 			}
-			else
+			} else
 			{
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				if ($md5_local != $expectedmd5) {
+					$file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				}
 				$checksumconcat[] = $md5_local;
 			}
 		}
 	}
 
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
+	foreach ($dir->dir as $subdir) {
+		// $subdir['name'] is  '' or '/accountancy/admin' for example
 	{
 		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
 	}
+	}
 
 	return $file_list;
 }

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);
 

Spacing +238 added lines, -238 removed lines

@@ -26,14 +26,14 @@ 
  *		\brief      Build conf file on disk
  */
 
-define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
+define('DONOTLOADCONF', 1); // To avoid loading conf by file inc.php
 
 include 'inc.php';
 
 global $langs;
 
-$action=GETPOST('action','alpha');
-$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto');
+$action = GETPOST('action', 'alpha');
+$setuplang = (GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : 'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -43,39 +43,39 @@ 
 // Dolibarr pages directory
 $main_dir = GETPOST('main_dir');
 // Directory for generated documents (invoices, orders, ecm, etc...)
-$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : $main_dir . '/documents';
+$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : $main_dir.'/documents';
 // Dolibarr root URL
 $main_url = GETPOST('main_url');
 // Database login informations
-$userroot=GETPOST('db_user_root');
-$passroot=GETPOST('db_pass_root');
+$userroot = GETPOST('db_user_root');
+$passroot = GETPOST('db_pass_root');
 // Database server
-$db_type=GETPOST('db_type','alpha');
-$db_host=GETPOST('db_host','alpha');
-$db_name=GETPOST('db_name','alpha');
-$db_user=GETPOST('db_user','alpha');
-$db_pass=GETPOST('db_pass');
-$db_port=GETPOST('db_port','int');
-$db_prefix=GETPOST('db_prefix','alpha');
-$db_create_database = GETPOST('db_create_database','none');
-$db_create_user = GETPOST('db_create_user','none');
+$db_type = GETPOST('db_type', 'alpha');
+$db_host = GETPOST('db_host', 'alpha');
+$db_name = GETPOST('db_name', 'alpha');
+$db_user = GETPOST('db_user', 'alpha');
+$db_pass = GETPOST('db_pass');
+$db_port = GETPOST('db_port', 'int');
+$db_prefix = GETPOST('db_prefix', 'alpha');
+$db_create_database = GETPOST('db_create_database', 'none');
+$db_create_user = GETPOST('db_create_user', 'none');
 // Force https
-$main_force_https = ((GETPOST("main_force_https",'alpha') && (GETPOST("main_force_https",'alpha') == "on" || GETPOST("main_force_https",'alpha') == 1)) ? '1' : '0');
+$main_force_https = ((GETPOST("main_force_https", 'alpha') && (GETPOST("main_force_https", 'alpha') == "on" || GETPOST("main_force_https", 'alpha') == 1)) ? '1' : '0');
 // Use alternative directory
-$main_use_alt_dir = ((GETPOST("main_use_alt_dir",'alpha') == '' || (GETPOST("main_use_alt_dir",'alpha') == "on" || GETPOST("main_use_alt_dir",'alpha') == 1)) ? '' : '//');
+$main_use_alt_dir = ((GETPOST("main_use_alt_dir", 'alpha') == '' || (GETPOST("main_use_alt_dir", 'alpha') == "on" || GETPOST("main_use_alt_dir", 'alpha') == 1)) ? '' : '//');
 // Alternative root directory name
-$main_alt_dir_name = ((GETPOST("main_alt_dir_name",'alpha') && GETPOST("main_alt_dir_name",'alpha') != '') ? GETPOST("main_alt_dir_name",'alpha') : 'custom');
+$main_alt_dir_name = ((GETPOST("main_alt_dir_name", 'alpha') && GETPOST("main_alt_dir_name", 'alpha') != '') ? GETPOST("main_alt_dir_name", 'alpha') : 'custom');
 
-session_start();    // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
+session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
 
 // Save a flag to tell to restore input value if we do back
-$_SESSION['dol_save_pass']=$db_pass;
+$_SESSION['dol_save_pass'] = $db_pass;
 //$_SESSION['dol_save_passroot']=$passroot;
 
 // Now we load forced value from install.forced.php file.
-$useforcedwizard=false;
-$forcedfile="./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
+$useforcedwizard = false;
+$forcedfile = "./install.forced.php";
+if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php";
 if (@file_exists($forcedfile)) {
 	$useforcedwizard = true;
 	include_once $forcedfile;
@@ -140,13 +140,13 @@ 
 
 dolibarr_install_syslog("--- step1: entering step1.php page");
 
-pHeader($langs->trans("ConfigurationFile"),"step2");
+pHeader($langs->trans("ConfigurationFile"), "step2");
 
 // Test if we can run a first install process
-if (! is_writable($conffile))
+if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
-    pFooter(1,$setuplang,'jscheckparam');
+    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+    pFooter(1, $setuplang, 'jscheckparam');
     exit;
 }
 
@@ -155,65 +155,65 @@ 
 $is_sqlite = false;
 if (empty($db_type))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseType")).'</div>';
+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).'</div>';
     $error++;
 } else {
-	$is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3' );
+	$is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3');
 }
-if (empty($db_host) && ! $is_sqlite)
+if (empty($db_host) && !$is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Server")).'</div>';
+    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>';
+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).'</div>';
     $error++;
 }
-if (empty($db_user)  && ! $is_sqlite)
+if (empty($db_user) && !$is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'</div>';
+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).'</div>';
     $error++;
 }
-if (! empty($db_port) && ! is_numeric($db_port))
+if (!empty($db_port) && !is_numeric($db_port))
 {
-    print '<div class="error">'.$langs->trans("ErrorBadValueForParameter",$db_port,$langs->transnoentities("Port")).'</div>';
+    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))
+if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix))
 {
-	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter",$db_prefix,$langs->transnoentities("DatabasePrefix")).'</div>';
+	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_prefix, $langs->transnoentities("DatabasePrefix")).'</div>';
 	$error++;
 }
 
 
 // Remove last / into dans main_dir
-if (substr($main_dir, dol_strlen($main_dir) -1) == "/")
+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) == "/")
+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 (!$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 '<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 '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user).'</div>';
             print '<br>';
             print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
             print $langs->trans("ErrorGoBackAndCorrectParameters");
@@ -222,39 +222,39 @@ 
 
         // If we need root access
         if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
-            $databasefortest=$db_name;
+            $databasefortest = $db_name;
             if (!empty($db_create_database)) {
                 if ($db_type == 'mysql' || $db_type == 'mysqli')
                 {
-                    $databasefortest='mysql';
+                    $databasefortest = 'mysql';
                 }
                 elseif ($db_type == 'pgsql')
                 {
-                    $databasefortest='postgres';
+                    $databasefortest = 'postgres';
                 }
                 else
                 {
-                    $databasefortest='master';
+                    $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);
+            $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);
+            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 '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';
                 print '<br>';
-                if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
+                if (!$db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
                 print $langs->trans("ErrorGoBackAndCorrectParameters");
                 $error++;
-            } elseif ($db->error && ! (! empty($db_create_database) && $db->connected)) {
+            } 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>';
+                if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                 //print '<a href="#" onClick="javascript: history.back();">';
                 print $langs->trans("ErrorGoBackAndCorrectParameters");
                 //print '</a>';
@@ -263,12 +263,12 @@ 
         }
         // 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);
+            $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>';
+                if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                 //print '<a href="#" onClick="javascript: history.back();">';
                 print $langs->trans("ErrorGoBackAndCorrectParameters");
                 //print '</a>';
@@ -279,7 +279,7 @@ 
     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 '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
         //print '<a href="#" onClick="javascript: history.back();">';
         print $langs->trans("ErrorGoBackAndCorrectParameters");
         //print '</a>';
@@ -290,15 +290,15 @@ 
 else
 {
     if (isset($db)) print $db->lasterror();
-    if (isset($db) && ! $db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+    if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
     print $langs->trans("ErrorGoBackAndCorrectParameters");
     $error++;
 }
 
-if (! $error && $db->connected)
+if (!$error && $db->connected)
 {
-    if (! empty($db_create_database)) {
-        $result=$db->select_db($db_name);
+    if (!empty($db_create_database)) {
+        $result = $db->select_db($db_name);
         if ($result)
         {
             print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
@@ -310,19 +310,19 @@ 
 }
 
 // Define $defaultCharacterSet and $defaultDBSortingCollation
-if (! $error && $db->connected)
+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;
+        $defaultCharacterSet = $db->forcecharset;
+    	$defaultDBSortingCollation = $db->forcecollate;
     }
     else	// If already created, we take current value
     {
-        $defaultCharacterSet=$db->getDefaultCharacterSetDatabase();
-        $defaultDBSortingCollation=$db->getDefaultCollationDatabase();
+        $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)
@@ -335,22 +335,22 @@ 
 
     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);
+    $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")
+if (!$error && $db->connected && $action == "set")
 {
     umask(0);
     if (is_array($_POST))
     {
-        foreach($_POST as $key => $value)
+        foreach ($_POST as $key => $value)
         {
-            if (! preg_match('/^db_pass/i', $key)) {
-    			dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
+            if (!preg_match('/^db_pass/i', $key)) {
+    			dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
     		}
         }
     }
@@ -360,15 +360,15 @@ 
     print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
     // Check parameter main_dir
-    if (! $error)
+    if (!$error)
     {
-        if (! is_dir($main_dir))
+        if (!is_dir($main_dir))
         {
-            dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");
+            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("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");
@@ -377,43 +377,43 @@ 
         }
     }
 
-    if (! $error)
+    if (!$error)
     {
-        dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");
+        dolibarr_install_syslog("step1: directory '".$main_dir."' exists");
     }
 
 
     // Create subdirectory main_data_dir
-    if (! $error)
+    if (!$error)
     {
         // Create directory for documents
-        if (! is_dir($main_data_dir))
+        if (!is_dir($main_data_dir))
         {
             dol_mkdir($main_data_dir);
         }
 
-        if (! is_dir($main_data_dir))
+        if (!is_dir($main_data_dir))
         {
-            print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$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>';
+            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))
+            $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');
+                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");
+                    fwrite($handlehtaccess, 'Order allow,deny'."\n");
+                    fwrite($handlehtaccess, 'Deny from all'."\n");
 
                     fclose($handlehtaccess);
                     dolibarr_install_syslog("step1: .htaccess file created");
@@ -421,7 +421,7 @@ 
             }
 
             // Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification
-            $dir=array();
+            $dir = array();
             $dir[] = $main_data_dir."/mycompany";
             $dir[] = $main_data_dir."/medias";
             $dir[] = $main_data_dir."/users";
@@ -432,12 +432,12 @@ 
             $dir[] = $main_data_dir."/doctemplates";
 
             // Boucle sur chaque repertoire de dir[] pour les creer s'ils nexistent pas
-            $num=count($dir);
+            $num = count($dir);
             for ($i = 0; $i < $num; $i++)
             {
                 if (is_dir($dir[$i]))
                 {
-                    dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
+                    dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
                 }
                 else
                 {
@@ -452,7 +452,7 @@ 
                     }
                     else
                     {
-                        dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
+                        dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
                     }
                 }
             }
@@ -460,25 +460,25 @@ 
             require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
             // Copy directory medias
-            $srcroot=$main_dir.'/install/medias';
-            $destroot=$main_data_dir.'/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 "<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>';
+                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(
+            	$srcroot = $main_dir.'/install/doctemplates';
+            	$destroot = $main_data_dir.'/doctemplates';
+            	$docs = array(
             		'contracts' => 'contract',
             		'invoices' => 'invoice',
             		'orders' => 'order',
@@ -493,17 +493,17 @@ 
             		'users' => 'user',
             		'usergroups' => 'usergroups',
             	);
-            	foreach($docs as $cursordir => $cursorfile)
+            	foreach ($docs as $cursordir => $cursorfile)
             	{
-            		$src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
-            		$dirodt=$destroot.'/'.$cursordir;
-            		$dest=$dirodt.'/template_'.$cursorfile.'.odt';
+            		$src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
+            		$dirodt = $destroot.'/'.$cursordir;
+            		$dest = $dirodt.'/template_'.$cursorfile.'.odt';
 
             		dol_mkdir($dirodt);
-            		$result=dol_copy($src,$dest,0,0);
+            		$result = dol_copy($src, $dest, 0, 0);
             		if ($result < 0)
             		{
-            			print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile',$src,$dest).'</td></tr>';
+            			print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile', $src, $dest).'</td></tr>';
             		}
             	}
             }
@@ -511,10 +511,10 @@ 
     }
 
     // Table prefix
-    $main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
+    $main_db_prefix = (!empty($db_prefix) ? $db_prefix : 'llx_');
 
     // Write conf file on disk
-    if (! $error)
+    if (!$error)
     {
         // Save old conf file on disk
         if (file_exists("$conffile"))
@@ -525,11 +525,11 @@ 
             @dol_copy($conffile, $conffile.'.old', '0400');
         }
 
-        $error+=write_conf_file($conffile);
+        $error += write_conf_file($conffile);
     }
 
     // Create database and admin user database
-    if (! $error)
+    if (!$error)
     {
         // We reload configuration file
         conf($dolibarr_main_document_root);
@@ -541,26 +541,26 @@ 
 
         // 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);
+            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;
+            $databasefortest = $conf->db->name;
             if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
             {
-                $databasefortest='mysql';
+                $databasefortest = 'mysql';
             }
             else if ($conf->db->type == 'pgsql')
             {
-                $databasefortest='postgres';
+                $databasefortest = 'postgres';
             }
             else if ($conf->db->type == 'mssql')
             {
-                $databasefortest='master';
+                $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);
+            $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
 
             if ($db->error)
             {
@@ -568,20 +568,20 @@ 
                 $error++;
             }
 
-            if (! $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);
+                    $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')))
+                        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);
+                            $resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
                         }
                     }
 
@@ -631,7 +631,7 @@ 
 
                     // Affiche aide diagnostique
                     print '<tr><td colspan="2"><br>';
-                    print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot);
+                    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>';
@@ -645,13 +645,13 @@ 
 
         // 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);
+            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);
+                $result = $newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
 
                 if ($result)
                 {
@@ -662,9 +662,9 @@ 
                     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);
+                    $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);
@@ -674,13 +674,13 @@ 
                 {
                     // Affiche aide diagnostique
                     print '<tr><td colspan="2"><br>';
-                    print $langs->trans("ErrorFailedToCreateDatabase",$dolibarr_main_db_name).'<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);
+                    dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
                     $error++;
                 }
                 $newdb->close();
@@ -695,7 +695,7 @@ 
 
                 // Affiche aide diagnostique
                 print '<tr><td colspan="2"><br>';
-                print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot);
+                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>';
@@ -707,16 +707,16 @@ 
 
 
         // We test access with dolibarr database user (not admin)
-        if (! $error)
+        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);
+            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);
+            $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");
+                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;
@@ -727,7 +727,7 @@ 
                 // 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");
+                    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;
@@ -739,7 +739,7 @@ 
                 }
                 else
                 {
-                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);
+                    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;
@@ -749,7 +749,7 @@ 
 
                     // Affiche aide diagnostique
                     print '<tr><td colspan="2"><br>';
-                    print $langs->trans('CheckThatDatabasenameIsCorrect',$dolibarr_main_db_name).'<br>';
+                    print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name).'<br>';
                     print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
                     print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                     print '</td></tr>';
@@ -759,7 +759,7 @@ 
             }
             else
             {
-                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);
+                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;
@@ -769,7 +769,7 @@ 
 
                 // 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("ErrorConnection", $conf->db->host, $conf->db->name, $conf->db->user);
                 print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
                 print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                 print '</td></tr>';
@@ -802,7 +802,7 @@ 
 
 dolibarr_install_syslog("--- step1: end");
 
-pFooter($error?1:0,$setuplang,'jsinfo',1);
+pFooter($error ? 1 : 0, $setuplang, 'jsinfo', 1);
 
 
 /**
@@ -812,10 +812,10 @@ 
  *  @param	string		$main_dir		Full path name to main.inc.php file
  *  @return	void
  */
-function write_main_file($mainfile,$main_dir)
+function write_main_file($mainfile, $main_dir)
 {
     $fp = @fopen("$mainfile", "w");
-    if($fp)
+    if ($fp)
     {
         clearstatcache();
         fputs($fp, '<?php'."\n");
@@ -833,10 +833,10 @@ 
  *  @param	string		$main_dir		Full path name to master.inc.php file
  *  @return	void
  */
-function write_master_file($masterfile,$main_dir)
+function write_master_file($masterfile, $main_dir)
 {
     $fp = @fopen("$masterfile", "w");
-    if($fp)
+    if ($fp)
     {
         clearstatcache();
         fputs($fp, '<?php'."\n");
@@ -855,13 +855,13 @@ 
  */
 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 $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;
@@ -869,154 +869,154 @@ 
     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;
+    $error = 0;
 
-    $key = md5(uniqid(mt_rand(),TRUE)); // Generate random hash
+    $key = md5(uniqid(mt_rand(), TRUE)); // Generate random hash
 
     $fp = fopen("$conffile", "w");
-    if($fp)
+    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, '<?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_url_root=\''.str_replace("'", "\'", ($main_url)).'\';');
+        fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'","\'",($main_dir)).'\';');
-        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_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, $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)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_data_root=\''.str_replace("'", "\'", ($main_data_dir)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_host=\''.str_replace("'","\'",($db_host)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_host=\''.str_replace("'", "\'", ($db_host)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_port=\''.str_replace("'","\'",($db_port)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_port=\''.str_replace("'", "\'", ($db_port)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_name=\''.str_replace("'","\'",($db_name)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_name=\''.str_replace("'", "\'", ($db_name)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_prefix=\''.str_replace("'","\'",($main_db_prefix)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_prefix=\''.str_replace("'", "\'", ($main_db_prefix)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_user=\''.str_replace("'","\'",($db_user)).'\';');
-		fputs($fp,"\n");
-		fputs($fp, '$dolibarr_main_db_pass=\''.str_replace("'","\'",($db_pass)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_user=\''.str_replace("'", "\'", ($db_user)).'\';');
+		fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_db_pass=\''.str_replace("'", "\'", ($db_pass)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_type=\''.str_replace("'","\'",($db_type)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_type=\''.str_replace("'", "\'", ($db_type)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_character_set=\''.str_replace("'","\'",($db_character_set)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_character_set=\''.str_replace("'", "\'", ($db_character_set)).'\';');
+		fputs($fp, "\n");
 
-		fputs($fp, '$dolibarr_main_db_collation=\''.str_replace("'","\'",($db_collation)).'\';');
-		fputs($fp,"\n");
+		fputs($fp, '$dolibarr_main_db_collation=\''.str_replace("'", "\'", ($db_collation)).'\';');
+		fputs($fp, "\n");
 
 		/* Authentication */
 		fputs($fp, '// Authentication settings');
-        fputs($fp,"\n");
+        fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
-		fputs($fp,"\n\n");
+		fputs($fp, "\n\n");
 
         fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
-        fputs($fp,"\n");
+        fputs($fp, "\n");
 
 		fputs($fp, '// Security settings');
-        fputs($fp,"\n");
+        fputs($fp, "\n");
 
         fputs($fp, '$dolibarr_main_prod=\'0\';');
-        fputs($fp,"\n");
+        fputs($fp, "\n");
 
         fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
-		fputs($fp,"\n");
+		fputs($fp, "\n");
 
         fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
-		fputs($fp,"\n");
+		fputs($fp, "\n");
 
         fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
-        fputs($fp,"\n");
+        fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_cookie_cryptkey=\''.$key.'\';');
-		fputs($fp,"\n");
+		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
-        fputs($fp,"\n");
+        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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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, "\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");
+        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");
+        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, "\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");
 
 		fclose($fp);
 
 		if (file_exists("$conffile"))
 		{
-			include $conffile;	// On force rechargement. Ne pas mettre include_once !
+			include $conffile; // On force rechargement. Ne pas mettre include_once !
 			conf($dolibarr_main_document_root);
 
 			print "<tr><td>";

htdocs/societe/class/societe.class.php

Spacing +738 added lines, -738 removed lines

@@ -40,12 +40,12 @@ 
  */
 class Societe extends CommonObject
 {
-	public $element='societe';
+	public $element = 'societe';
 	public $table_element = 'societe';
-	public $fk_element='fk_soc';
-	public $fieldsforcombobox='nom,name_alias';
-	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
-	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+	public $fk_element = 'fk_soc';
+	public $fieldsforcombobox = 'nom,name_alias';
+	protected $childtables = array("supplier_proposal"=>'SupplierProposal', "propal"=>'Proposal', "commande"=>'Order', "facture"=>'Invoice', "facture_rec"=>'RecurringInvoiceTemplate', "contrat"=>'Contract', "fichinter"=>'Fichinter', "facture_fourn"=>'SupplierInvoice', "commande_fournisseur"=>'SupplierOrder', "projet"=>'Project', "expedition"=>'Shipment', "prelevement_lignes"=>'DirectDebitRecord'); // To test if we can delete object
+	protected $childtablesoncascade = array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
 	public $picto = 'company';
 
 	/**
@@ -64,20 +64,20 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',            'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',            'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1, 'notnull'=>1,  'index'=>1, 'position'=>20),
-		'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
-		'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		'date_creation' =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
-		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+	public $fields = array(
+		'rowid'         =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+		'note_public'   =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>60),
+		'note_private'  =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>61),
+		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+		'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
-		'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
+		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1, 'position'=>1000),
 	);
 
 
@@ -396,7 +396,7 @@ 
 	// Incoterms
 	var $fk_incoterms;
 	var $location_incoterms;
-	var $libelle_incoterms;  //Used into tooltip
+	var $libelle_incoterms; //Used into tooltip
 
 	// Multicurrency
 	var $fk_multicurrency;
@@ -424,9 +424,9 @@ 
 		$this->client = 0;
 		$this->prospect = 0;
 		$this->fournisseur = 0;
-		$this->typent_id  = 0;
-		$this->effectif_id  = 0;
-		$this->forme_juridique_code  = 0;
+		$this->typent_id = 0;
+		$this->effectif_id = 0;
+		$this->forme_juridique_code = 0;
 		$this->tva_assuj = 1;
 		$this->status = 1;
 	}
@@ -441,17 +441,17 @@ 
 	 */
 	function create(User $user)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
-		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->status)) $this->status = 0;
+		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
+		$this->nom = $this->name; // For backward compatibility
+		if (empty($this->client))      $this->client = 0;
+		if (empty($this->fournisseur)) $this->fournisseur = 0;
 		$this->import_key = trim($this->import_key);
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -463,13 +463,13 @@ 
 
 		dol_syslog(get_class($this)."::create ".$this->name);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -477,29 +477,29 @@ 
 
 		if ($result >= 0)
 		{
-			$entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+			$entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-			$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$entity.", '".$this->db->idate($now)."'";
-			$sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-			$sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-			$sql.= ", ".$this->status;
-			$sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-			$sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-			$sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-			$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-			$sql.= ", ".(int) $this->fk_multicurrency;
-			$sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
+			$sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$entity.", '".$this->db->idate($now)."'";
+			$sql .= ", ".(!empty($user->id) ? "'".$user->id."'" : "null");
+			$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
+			$sql .= ", ".$this->status;
+			$sql .= ", ".(!empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'" : "null");
+			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ", 0";
+			$sql .= ", ".(int) $this->fk_incoterms;
+			$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+			$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+			$sql .= ", ".(int) $this->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$result=$this->db->query($sql);
+			$result = $this->db->query($sql);
 			if ($result)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
-				$ret = $this->update($this->id,$user,0,1,1,'add');
+				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
 				// Ajout du commercial affecte
 				if ($this->commercial_id != '' && $this->commercial_id != -1)
@@ -515,13 +515,13 @@ 
 				if ($ret >= 0)
 				{
 					// Call trigger
-					$result=$this->call_trigger('COMPANY_CREATE',$user);
+					$result = $this->call_trigger('COMPANY_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 				}
 				else $error++;
 
-				if (! $error)
+				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
@@ -529,7 +529,7 @@ 
 				}
 				else
 				{
-					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
@@ -538,13 +538,13 @@ 
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-					$result=-1;
+					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
+					$result = -1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
-					$result=-2;
+					$this->error = $this->db->lasterror();
+					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
@@ -554,7 +554,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
 		}
 	}
@@ -569,12 +569,12 @@ 
 	function create_individual(User $user)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		$contact=new Contact($this->db);
+		$contact = new Contact($this->db);
 
 		$contact->name              = $this->name_bis;
 		$contact->firstname         = $this->firstname;
 		$contact->civility_id       = $this->civility_id;
-		$contact->socid             = $this->id;	// fk_soc
+		$contact->socid             = $this->id; // fk_soc
 		$contact->statut            = 1;
 		$contact->priv              = 0;
 		$contact->country_id        = $this->country_id;
@@ -590,7 +590,7 @@ 
 		{
 			$this->error = $contact->error;
 			$this->errors = $contact->errors;
-			dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
 		}
 
 		return $result;
@@ -607,13 +607,13 @@ 
 		global $conf, $langs, $mysoc;
 
 		$error = 0;
-		$this->errors=array();
+		$this->errors = array();
 
 		$result = 0;
-		$this->name	= trim($this->name);
-		$this->nom=$this->name; // For backward compatibility
+		$this->name = trim($this->name);
+		$this->nom = $this->name; // For backward compatibility
 
-		if (! $this->name)
+		if (!$this->name)
 		{
 			$this->errors[] = 'ErrorBadThirdPartyName';
 			$result = -2;
@@ -670,12 +670,12 @@ 
 		}
 
 		// Check for duplicate or mandatory fields defined into setup
-		$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-		foreach($array_to_check as $key)
+		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+		foreach ($array_to_check as $key)
 		{
-			$keymin=strtolower($key);
-			$i=(int) preg_replace('/[^0-9]/','',$key);
-			$vallabel=$this->$keymin;
+			$keymin = strtolower($key);
+			$i = (int) preg_replace('/[^0-9]/', '', $key);
+			$vallabel = $this->$keymin;
 
 			if ($i > 0)
 			{
@@ -694,8 +694,8 @@ 
 					// Check for mandatory prof id (but only if country is other than ours)
 					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
 					{
-						$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-						if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+						$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
+						if (!$vallabel && !empty($conf->global->$idprof_mandatory))
 						{
 							$langs->load("errors");
 							$error++;
@@ -711,7 +711,7 @@ 
 				if ($key == 'EMAIL')
 				{
 					// Check for unicity
-					if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
+					if ($vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE))
 					{
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
 						{
@@ -721,7 +721,7 @@ 
 					}
 
 					// Check for mandatory
-					if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email))
 					{
 						$langs->load("errors");
 						$error++;
@@ -748,54 +748,54 @@ 
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
 	 *      @return int  			           			<0 if KO, >=0 if OK
 	 */
-	function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+	function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
-		global $langs,$conf,$hookmanager;
+		global $langs, $conf, $hookmanager;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		if (empty($id)) $id = $this->id;
 
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Clean parameters
-		$this->id			= $id;
-		$this->name			= $this->name?trim($this->name):trim($this->nom);
-		$this->nom			= $this->name;	// For backward compatibility
+		$this->id = $id;
+		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		$this->nom = $this->name; // For backward compatibility
 		$this->name_alias = trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address?trim($this->address):trim($this->address);
-		$this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-		$this->town			= $this->town?trim($this->town):trim($this->town);
-		$this->state_id		= trim($this->state_id);
-		$this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+		$this->address		= $this->address ?trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
+		$this->town			= $this->town ?trim($this->town) : trim($this->town);
+		$this->state_id = trim($this->state_id);
+		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
-		$this->phone		= preg_replace("/\s/","",$this->phone);
-		$this->phone		= preg_replace("/\./","",$this->phone);
+		$this->phone		= preg_replace("/\s/", "", $this->phone);
+		$this->phone		= preg_replace("/\./", "", $this->phone);
 		$this->fax			= trim($this->fax);
-		$this->fax			= preg_replace("/\s/","",$this->fax);
-		$this->fax			= preg_replace("/\./","",$this->fax);
+		$this->fax			= preg_replace("/\s/", "", $this->fax);
+		$this->fax			= preg_replace("/\./", "", $this->fax);
 		$this->email		= trim($this->email);
 		$this->skype		= trim($this->skype);
-		$this->url		= $this->url?clean_url($this->url,0):'';
+		$this->url = $this->url ?clean_url($this->url, 0) : '';
 		$this->note_private 	= trim($this->note_private);
 		$this->note_public  	= trim($this->note_public);
 		$this->idprof1		= trim($this->idprof1);
 		$this->idprof2		= trim($this->idprof2);
 		$this->idprof3		= trim($this->idprof3);
 		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-		$this->prefix_comm	= trim($this->prefix_comm);
+		$this->idprof5		= (!empty($this->idprof5) ?trim($this->idprof5) : '');
+		$this->idprof6		= (!empty($this->idprof6) ?trim($this->idprof6) : '');
+		$this->prefix_comm = trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
 		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
 
 		$this->tva_assuj	= trim($this->tva_assuj);
-		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra, '');
 		if (empty($this->status)) $this->status = 0;
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -806,64 +806,64 @@ 
 		}
 
 		// Local taxes
-		$this->localtax1_assuj=trim($this->localtax1_assuj);
-		$this->localtax2_assuj=trim($this->localtax2_assuj);
+		$this->localtax1_assuj = trim($this->localtax1_assuj);
+		$this->localtax2_assuj = trim($this->localtax2_assuj);
 
-		$this->localtax1_value=trim($this->localtax1_value);
-		$this->localtax2_value=trim($this->localtax2_value);
+		$this->localtax1_value = trim($this->localtax1_value);
+		$this->localtax2_value = trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') $this->capital = price2num(trim($this->capital));
+		if (!is_numeric($this->capital)) $this->capital = ''; // '' = undef
 
-		$this->effectif_id=trim($this->effectif_id);
-		$this->forme_juridique_code=trim($this->forme_juridique_code);
+		$this->effectif_id = trim($this->effectif_id);
+		$this->forme_juridique_code = trim($this->forme_juridique_code);
 
 		//Gencod
-		$this->barcode=trim($this->barcode);
+		$this->barcode = trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
 
-		$this->code_compta=trim($this->code_compta);
-		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+		$this->code_compta = trim($this->code_compta);
+		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
-		if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+		if (!is_numeric($this->client) && !is_numeric($this->fournisseur))
 		{
 			$langs->load("errors");
 			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
 			return -1;
 		}
 
-		$customer=false;
-		if (! empty($allowmodcodeclient) && ! empty($this->client))
+		$customer = false;
+		if (!empty($allowmodcodeclient) && !empty($this->client))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
 			if (empty($this->code_compta))
 			{
-				$ret=$this->get_codecompta('customer');
+				$ret = $this->get_codecompta('customer');
 				if ($ret < 0) return -1;
 			}
 
-			$customer=true;
+			$customer = true;
 		}
 
-		$supplier=false;
-		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+		$supplier = false;
+		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
 			if (empty($this->code_compta_fournisseur))
 			{
-				$ret=$this->get_codecompta('supplier');
+				$ret = $this->get_codecompta('supplier');
 				if ($ret < 0) return -1;
 			}
 
-			$supplier=true;
+			$supplier = true;
 		}
 
 		//Web services
-		$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+		$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
 		$this->webservices_key = trim($this->webservices_key);
 
 		//Incoterms
@@ -887,174 +887,174 @@ 
 			dol_syslog(get_class($this)."::update verify ok or not done");
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-			$sql .= "nom = '" . $this->db->escape($this->name) ."'"; // Required
-			$sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-			$sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-			$sql .= ",address = '" . $this->db->escape($this->address) ."'";
+			$sql .= "nom = '".$this->db->escape($this->name)."'"; // Required
+			$sql .= ",name_alias = '".$this->db->escape($this->name_alias)."'";
+			$sql .= ",ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ",address = '".$this->db->escape($this->address)."'";
 
-			$sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-			$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
+			$sql .= ",zip = ".(!empty($this->zip) ? "'".$this->db->escape($this->zip)."'" : "null");
+			$sql .= ",town = ".(!empty($this->town) ? "'".$this->db->escape($this->town)."'" : "null");
 
-			$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-			$sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
+			$sql .= ",fk_departement = '".(!empty($this->state_id) ? $this->state_id : '0')."'";
+			$sql .= ",fk_pays = '".(!empty($this->country_id) ? $this->country_id : '0')."'";
 
-			$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-			$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-			$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-			$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-			$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
+			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
+			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
+			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+			$sql .= ",skype = ".(!empty($this->skype) ? "'".$this->db->escape($this->skype)."'" : "null");
+			$sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 
-			$sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-			$sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
+			$sql .= ",note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+			$sql .= ",note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 
-			$sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-			$sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-			$sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-			$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-			$sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-			$sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
+			$sql .= ",siren   = '".$this->db->escape($this->idprof1)."'";
+			$sql .= ",siret   = '".$this->db->escape($this->idprof2)."'";
+			$sql .= ",ape     = '".$this->db->escape($this->idprof3)."'";
+			$sql .= ",idprof4 = '".$this->db->escape($this->idprof4)."'";
+			$sql .= ",idprof5 = '".$this->db->escape($this->idprof5)."'";
+			$sql .= ",idprof6 = '".$this->db->escape($this->idprof6)."'";
 
-			$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-			$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-			$sql .= ",status = " .$this->status;
+			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
+			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
+			$sql .= ",status = ".$this->status;
 
 			// Local taxes
-			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-			if($this->localtax1_assuj==1)
+			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
+			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
+			if ($this->localtax1_assuj == 1)
 			{
-				if($this->localtax1_value!='')
+				if ($this->localtax1_value != '')
 				{
-					$sql .=",localtax1_value =".$this->localtax1_value;
+					$sql .= ",localtax1_value =".$this->localtax1_value;
 				}
-				else $sql .=",localtax1_value =0.000";
+				else $sql .= ",localtax1_value =0.000";
 
 			}
-			else $sql .=",localtax1_value =0.000";
+			else $sql .= ",localtax1_value =0.000";
 
-			if($this->localtax2_assuj==1)
+			if ($this->localtax2_assuj == 1)
 			{
-				if($this->localtax2_value!='')
+				if ($this->localtax2_value != '')
 				{
-					$sql .=",localtax2_value =".$this->localtax2_value;
+					$sql .= ",localtax2_value =".$this->localtax2_value;
 				}
-				else $sql .=",localtax2_value =0.000";
+				else $sql .= ",localtax2_value =0.000";
 
 			}
-			else $sql .=",localtax2_value =0.000";
+			else $sql .= ",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
-			$sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
-			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+			$sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
 			if (isset($this->stcomm_id))
 			{
 				$sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
 			}
-			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
+			$sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
 
-			$sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
+			$sql .= ",fk_forme_juridique = ".(!empty($this->forme_juridique_code) ? "'".$this->db->escape($this->forme_juridique_code)."'" : "null");
 
-			$sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-			$sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-			$sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-			$sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-			$sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
+			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
+			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+			$sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
 
-			$sql .= ",client = " . (! empty($this->client)?$this->client:0);
-			$sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
-			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
+			$sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
+			$sql .= ",fournisseur = ".(!empty($this->fournisseur) ? $this->fournisseur : 0);
+			$sql .= ",barcode = ".(!empty($this->barcode) ? "'".$this->db->escape($this->barcode)."'" : "null");
+			$sql .= ",default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
+			$sql .= ",logo = ".(!empty($this->logo) ? "'".$this->db->escape($this->logo)."'" : "null");
+			$sql .= ",outstanding_limit= ".($this->outstanding_limit != '' ? $this->outstanding_limit : 'null');
+			$sql .= ",order_min_amount= ".($this->order_min_amount != '' ? $this->order_min_amount : 'null');
+			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
-			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-			$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+			$sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
+			$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
 			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
+			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
 			if ($customer)
 			{
-				$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-				$sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
+				$sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
 			}
 
 			if ($supplier)
 			{
-				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+				$sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
+				$sql .= ", code_compta_fournisseur = ".(!empty($this->code_compta_fournisseur) ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
 			}
-			$sql .= ", fk_user_modif = ".(! empty($user->id)?"'".$user->id."'":"null");
+			$sql .= ", fk_user_modif = ".(!empty($user->id) ? "'".$user->id."'" : "null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
 			$sql .= ', multicurrency_code = \''.$this->db->escape($this->multicurrency_code)."'";
-			$sql .= " WHERE rowid = '" . $id ."'";
+			$sql .= " WHERE rowid = '".$id."'";
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
+				unset($this->country_code); // We clean this because it may have been changed after an update of country_id
 				unset($this->country);
 				unset($this->state_code);
 				unset($this->state);
 
 				$nbrowsaffected = $this->db->affected_rows($resql);
 
-				if (! $error && $nbrowsaffected)
+				if (!$error && $nbrowsaffected)
 				{
 					// Update information on linked member if it is an update
-					if (! $nosyncmember && ! empty($conf->adherent->enabled))
+					if (!$nosyncmember && !empty($conf->adherent->enabled))
 					{
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
 
-						$lmember=new Adherent($this->db);
-						$result=$lmember->fetch(0, 0, $this->id);
+						$lmember = new Adherent($this->db);
+						$result = $lmember->fetch(0, 0, $this->id);
 
 						if ($result > 0)
 						{
-							$lmember->societe=$this->name;
+							$lmember->societe = $this->name;
 							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
 							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-							$lmember->address=$this->address;
-							$lmember->email=$this->email;
-							$lmember->skype=$this->skype;
-							$lmember->phone=$this->phone;
+							$lmember->address = $this->address;
+							$lmember->email = $this->email;
+							$lmember->skype = $this->skype;
+							$lmember->phone = $this->phone;
 
-							$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+							$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
 							if ($result < 0)
 							{
-								$this->error=$lmember->error;
-								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+								$this->error = $lmember->error;
+								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
 						}
 						else if ($result < 0)
 						{
-							$this->error=$lmember->error;
+							$this->error = $lmember->error;
 							$error++;
 						}
 					}
 				}
 
-				$action='update';
+				$action = 'update';
 
 				// Actions on extra fields (by external module or standard code)
 				// TODO le hook fait double emploi avec le trigger !!
 				$hookmanager->initHooks(array('thirdpartydao'));
-				$parameters=array('socid'=>$this->id);
-				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('socid'=>$this->id);
+				$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
 					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 					{
-						$result=$this->insertExtraFields();
+						$result = $this->insertExtraFields();
 						if ($result < 0)
 						{
 							$error++;
@@ -1063,15 +1063,15 @@ 
 				}
 				else if ($reshook < 0) $error++;
 
-				if (! $error && $call_trigger)
+				if (!$error && $call_trigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('COMPANY_MODIFY',$user);
+					$result = $this->call_trigger('COMPANY_MODIFY', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
@@ -1103,7 +1103,7 @@ 
 		else
 	   {
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
 		}
 	}
@@ -1125,7 +1125,7 @@ 
 	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
 	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
+	function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
 	{
 		global $langs;
 		global $conf;
@@ -1180,13 +1180,13 @@ 
 		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
 		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			if ($num > 1)
 			{
-				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+				$this->error = 'Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
 			}
@@ -1196,11 +1196,11 @@ 
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
-				$this->canvas		= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->ref          = $obj->rowid;
-				$this->name 		= $obj->name;
-				$this->nom          = $obj->name;		// deprecated
+				$this->name = $obj->name;
+				$this->nom          = $obj->name; // deprecated
 				$this->name_alias = $obj->name_alias;
 				$this->ref_ext      = $obj->ref_ext;
 				$this->ref_int      = $obj->ref_int;
@@ -1210,22 +1210,22 @@ 
 				$this->user_creation     = $obj->fk_user_creat;
 				$this->user_modification = $obj->fk_user_modif;
 
-				$this->address 		= $obj->address;
+				$this->address = $obj->address;
 				$this->zip 			= $obj->zip;
 				$this->town 		= $obj->town;
 
 				$this->country_id   = $obj->country_id;
-				$this->country_code = $obj->country_id?$obj->country_code:'';
-				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
 				$this->state_id     = $obj->fk_departement;
 				$this->state_code   = $obj->state_code;
-				$this->state        = ($obj->state!='-'?$obj->state:'');
+				$this->state        = ($obj->state != '-' ? $obj->state : '');
 
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-				$this->statut_commercial = $libelle;    // libelle statut commercial
+				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);
+				$libelle = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
+				$this->stcomm_id = $obj->fk_stcomm; // id statut commercial
+				$this->statut_commercial = $libelle; // libelle statut commercial
 
 				$this->email = $obj->email;
 				$this->skype = $obj->skype;
@@ -1233,7 +1233,7 @@ 
 				$this->phone = $obj->phone;
 				$this->fax = $obj->fax;
 
-				$this->parent    = $obj->parent;
+				$this->parent = $obj->parent;
 
 				$this->idprof1		= $obj->idprof1;
 				$this->idprof2		= $obj->idprof2;
@@ -1242,7 +1242,7 @@ 
 				$this->idprof5		= $obj->idprof5;
 				$this->idprof6		= $obj->idprof6;
 
-				$this->capital   = $obj->capital;
+				$this->capital = $obj->capital;
 
 				$this->code_client = $obj->code_client;
 				$this->code_fournisseur = $obj->code_fournisseur;
@@ -1267,22 +1267,22 @@ 
 				$this->typent_code    = $obj->typent_code;
 
 				$this->effectif_id    = $obj->effectif_id;
-				$this->effectif       = $obj->effectif_id?$obj->effectif:'';
+				$this->effectif       = $obj->effectif_id ? $obj->effectif : '';
 
-				$this->forme_juridique_code= $obj->forme_juridique_code;
-				$this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+				$this->forme_juridique_code = $obj->forme_juridique_code;
+				$this->forme_juridique     = $obj->forme_juridique_code ? $obj->forme_juridique : '';
 
 				$this->fk_prospectlevel = $obj->fk_prospectlevel;
 
 				$this->prefix_comm = $obj->prefix_comm;
 
-				$this->remise_percent		= $obj->remise_client;
+				$this->remise_percent = $obj->remise_client;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
+				$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->fk_account = $obj->fk_account;
 
 				$this->client      = $obj->client;
 				$this->fournisseur = $obj->fournisseur;
@@ -1299,7 +1299,7 @@ 
 
 				$this->outstanding_limit		= $obj->outstanding_limit;
 				$this->order_min_amount			= $obj->order_min_amount;
-				$this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
+				$this->supplier_order_min_amount = $obj->supplier_order_min_amount;
 
 				// multiprix
 				$this->price_level = $obj->price_level;
@@ -1330,12 +1330,12 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level = 1;
 
 		return $result;
 	}
@@ -1352,7 +1352,7 @@ 
 	 * 	@param		string		$clause		Clause for filters
 	 * 	@return		array|int				<0 if KO, array of thirdparties object if OK
 	 */
-	function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
+	function searchByName($name, $type = '0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
 	{
 		$thirdparties = array();
 
@@ -1361,23 +1361,23 @@ 
 		// Check parameter
 		if (empty($name))
 		{
-			$this->errors[]='ErrorBadValueForParameter';
+			$this->errors[] = 'ErrorBadValueForParameter';
 			return -1;
 		}
 
 		// Generation requete recherche
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE entity IN (".getEntity('category').")";
-		if (! empty($type))
+		$sql .= " WHERE entity IN (".getEntity('category').")";
+		if (!empty($type))
 		{
 			if ($type == 1 || $type == 2)
-				$sql.= " AND client = ".$type;
+				$sql .= " AND client = ".$type;
 			elseif ($type == 3)
-				$sql.= " AND fournisseur = 1";
+				$sql .= " AND fournisseur = 1";
 		}
-		if (! empty($name))
+		if (!empty($name))
 		{
-			if (! $exact)
+			if (!$exact)
 			{
 				if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
 				{
@@ -1388,28 +1388,28 @@ 
 					$name = '%'.$name.'%';
 				}
 			}
-			$sql.= " AND ";
-			if (is_array($filters) && ! empty($filters))
-				$sql.= "(";
+			$sql .= " AND ";
+			if (is_array($filters) && !empty($filters))
+				$sql .= "(";
 			if ($similar)
 			{
 				// For test similitude (string inside name into database, or name into database inside string)
 				// Do not use this. Not compatible with other database.
-				$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
+				$sql .= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
 			}
 			else
 			{
-				if (! $case)
-					$sql.= "nom LIKE '".$this->db->escape($name)."'";
+				if (!$case)
+					$sql .= "nom LIKE '".$this->db->escape($name)."'";
 				else
-					$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+					$sql .= "nom LIKE BINARY '".$this->db->escape($name)."'";
 			}
 		}
-		if (is_array($filters) && ! empty($filters))
+		if (is_array($filters) && !empty($filters))
 		{
-			foreach($filters as $field => $value)
+			foreach ($filters as $field => $value)
 			{
-				if (! $exact)
+				if (!$exact)
 				{
 					if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
 					{
@@ -1420,16 +1420,16 @@ 
 						$value = '%'.$value.'%';
 					}
 				}
-				if (! $case)
-					$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+				if (!$case)
+					$sql .= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
 				else
-					$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+					$sql .= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
 			}
-			if (! empty($name))
-				$sql.= ")";
+			if (!empty($name))
+				$sql .= ")";
 		}
 
-		$res  = $this->db->query($sql);
+		$res = $this->db->query($sql);
 		if ($res)
 		{
 			while ($rec = $this->db->fetch_array($res))
@@ -1443,7 +1443,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1456,15 +1456,15 @@ 
 	 *    @param    int		$call_trigger   0=No, 1=yes
 	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
 	 */
-	function delete($id, User $fuser=null, $call_trigger=1)
+	function delete($id, User $fuser = null, $call_trigger = 1)
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) $fuser = $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$entity=isset($this->entity)?$this->entity:$conf->entity;
+		$entity = isset($this->entity) ? $this->entity : $conf->entity;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$error = 0;
@@ -1476,15 +1476,15 @@ 
 			$this->db->begin();
 
 			// User is mandatory for trigger call
-			if (! $error && $call_trigger)
+			if (!$error && $call_trigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
+				$result = $this->call_trigger('COMPANY_DELETE', $fuser);
 				if ($result < 0) $error++;
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				$static_cat = new Categorie($this->db);
@@ -1493,11 +1493,11 @@ 
 				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
 				if ($this->client || $this->prospect)
 				{
-					$toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+					$toute_categs['customer'] = $static_cat->containing($this->id, Categorie::TYPE_CUSTOMER);
 				}
 				if ($this->fournisseur)
 				{
-					$toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+					$toute_categs['supplier'] = $static_cat->containing($this->id, Categorie::TYPE_SUPPLIER);
 				}
 
 				// Remove each "Categorie"
@@ -1512,11 +1512,11 @@ 
 
 			foreach ($this->childtablesoncascade as $tabletodelete)
 			{
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
+					$sql .= " WHERE fk_soc = ".$id;
+					if (!$this->db->query($sql))
 					{
 						$error++;
 						$this->errors[] = $this->db->lasterror();
@@ -1525,9 +1525,9 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
 			{
-				$result=$this->deleteExtraFields();
+				$result = $this->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
@@ -1536,25 +1536,25 @@ 
 			}
 
 			// Remove third party
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-				$sql.= " WHERE rowid = " . $id;
-				if (! $this->db->query($sql))
+				$sql .= " WHERE rowid = ".$id;
+				if (!$this->db->query($sql))
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 
 				// Delete directory
-				if (! empty($conf->societe->multidir_output[$entity]))
+				if (!empty($conf->societe->multidir_output[$entity]))
 				{
-					$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+					$docdir = $conf->societe->multidir_output[$entity]."/".$id;
 					if (dol_is_dir($docdir))
 					{
 						dol_delete_dir_recursive($docdir);
@@ -1583,13 +1583,13 @@ 
 	{
 		if ($this->id)
 		{
-			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			$newclient = 1;
+			if ($this->client == 2 || $this->client == 3) $newclient = 3; //If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET client = ".$newclient;
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET client = ".$newclient;
+			$sql .= " WHERE rowid = ".$this->id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->client = $newclient;
@@ -1613,10 +1613,10 @@ 
 		global $conf, $langs;
 
 		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
+		$note = trim($note);
+		if (!$note)
 		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
 			return -2;
 		}
 
@@ -1626,33 +1626,33 @@ 
 		{
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " SET remise_client = '".$this->db->escape($remise)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 
 			// Ecrit trace dans historique des remises
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-			$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
+			$sql .= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " '".$this->db->escape($note)."',";
+			$sql .= " ".$user->id;
+			$sql .= ")";
 
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 
@@ -1670,7 +1670,7 @@ 
 	 *      @param  float	$tva_tx     VAT rate
 	 *		@return	int					<0 if KO, id of discount record if OK
 	 */
-	function set_remise_except($remise, User $user, $desc, $tva_tx=0)
+	function set_remise_except($remise, User $user, $desc, $tva_tx = 0)
 	{
 		global $langs;
 
@@ -1679,14 +1679,14 @@ 
 		$desc = trim($desc);
 
 		// Check parameters
-		if (! $remise > 0)
+		if (!$remise > 0)
 		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
+			$this->error = $langs->trans("ErrorWrongValueForParameter", "1");
 			return -1;
 		}
-		if (! $desc)
+		if (!$desc)
 		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","3");
+			$this->error = $langs->trans("ErrorWrongValueForParameter", "3");
 			return -2;
 		}
 
@@ -1695,20 +1695,20 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 			$discount = new DiscountAbsolute($this->db);
-			$discount->fk_soc=$this->id;
-			$discount->amount_ht=price2num($remise,'MT');
-			$discount->amount_tva=price2num($remise*$tva_tx/100,'MT');
-			$discount->amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
-			$discount->tva_tx=price2num($tva_tx,'MT');
-			$discount->description=$desc;
-			$result=$discount->create($user);
+			$discount->fk_soc = $this->id;
+			$discount->amount_ht = price2num($remise, 'MT');
+			$discount->amount_tva = price2num($remise * $tva_tx / 100, 'MT');
+			$discount->amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
+			$discount->tva_tx = price2num($tva_tx, 'MT');
+			$discount->description = $desc;
+			$result = $discount->create($user);
 			if ($result > 0)
 			{
 				return $result;
 			}
 			else
 			{
-				$this->error=$discount->error;
+				$this->error = $discount->error;
 				return -3;
 			}
 		}
@@ -1723,19 +1723,19 @@ 
 	 * 	@param	integer	$maxvalue	Filter on max value for discount
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
+	function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue);
 		if ($result >= 0)
 		{
 			return $result;
 		}
 		else
 		{
-			$this->error=$discountstatic->error;
+			$this->error = $discountstatic->error;
 			return -1;
 		}
 	}
@@ -1750,38 +1750,38 @@ 
 	{
 		global $conf;
 
-		$reparray=array();
+		$reparray = array();
 
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 		{
-			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-			$sql.= " AND ug.entity = ".$conf->entity.")";
-			$sql.= " OR u.admin = 1)";
+			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
+			$sql .= " AND ug.entity = ".$conf->entity.")";
+			$sql .= " OR u.admin = 1)";
 		}
 		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
+			$sql .= " WHERE entity in (0, ".$conf->entity.")";
 
-		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$reparray[$i]['id']=$obj->rowid;
-				$reparray[$i]['lastname']=$obj->lastname;
-				$reparray[$i]['firstname']=$obj->firstname;
-				$reparray[$i]['email']=$obj->email;
-				$reparray[$i]['statut']=$obj->statut;
-				$reparray[$i]['entity']=$obj->entity;
-				$reparray[$i]['login']=$obj->login;
-				$reparray[$i]['photo']=$obj->photo;
+				$reparray[$i]['id'] = $obj->rowid;
+				$reparray[$i]['lastname'] = $obj->lastname;
+				$reparray[$i]['firstname'] = $obj->firstname;
+				$reparray[$i]['email'] = $obj->email;
+				$reparray[$i]['statut'] = $obj->statut;
+				$reparray[$i]['entity'] = $obj->entity;
+				$reparray[$i]['login'] = $obj->login;
+				$reparray[$i]['photo'] = $obj->photo;
 				$i++;
 			}
 			return $reparray;
@@ -1803,13 +1803,13 @@ 
 	{
 		if ($this->id)
 		{
-			$now=dol_now();
+			$now = dol_now();
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-			$sql .= " WHERE rowid = " . $this->id;
+			$sql .= " WHERE rowid = ".$this->id;
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -1819,7 +1819,7 @@ 
 			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -1841,15 +1841,15 @@ 
 		if ($this->id > 0 && $commid > 0)
 		{
 			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 			$this->db->query($sql);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " ( fk_soc, fk_user )";
-			$sql.= " VALUES (".$this->id.",".$commid.")";
+			$sql .= " ( fk_soc, fk_user )";
+			$sql .= " VALUES (".$this->id.",".$commid.")";
 
-			if (! $this->db->query($sql) )
+			if (!$this->db->query($sql))
 			{
 				dol_syslog(get_class($this)."::add_commercial Erreur");
 			}
@@ -1870,7 +1870,7 @@ 
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
 			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			if (! $this->db->query($sql) )
+			if (!$this->db->query($sql))
 			{
 				dol_syslog(get_class($this)."::del_commercial Erreur");
 			}
@@ -1888,162 +1888,162 @@ 
 	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *		@return	string					          String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-		$name=$this->name?$this->name:$this->nom;
+		$name = $this->name ? $this->name : $this->nom;
 
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
-			if (($this->client) && (! empty ( $this->code_client ))
+			if (($this->client) && (!empty ($this->code_client))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
 				)
 			)
-			$code = $this->code_client . ' - ';
+			$code = $this->code_client.' - ';
 
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+			if (($this->fournisseur) && (!empty ($this->code_fournisseur))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
 				)
 			)
-			$code .= $this->code_fournisseur . ' - ';
+			$code .= $this->code_fournisseur.' - ';
 
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-				$name =$code.' '.$name;
+				$name = $code.' '.$name;
 			else
-				$name =$code;
+				$name = $code;
 		}
 
 		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
-		$result=''; $label='';
-		$linkstart=''; $linkend='';
+		$result = ''; $label = '';
+		$linkstart = ''; $linkend = '';
 
-		if (! empty($this->logo) && class_exists('Form'))
+		if (!empty($this->logo) && class_exists('Form'))
 		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label.= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip">';
+			$label .= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+			$label .= '</div><div style="clear: both;"></div>';
 		}
 
-		$label.= '<div class="centpercent">';
+		$label .= '<div class="centpercent">';
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
 		{
-		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+		   $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		}
 		else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowProspect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		}
 		else if ($option == 'supplier')
 		{
-			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
 		}
 		else if ($option == 'agenda')
 		{
-			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
 		}
 		else if ($option == 'project')
 		{
-			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowProject").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
 		}
 		else if ($option == 'margin')
 		{
-			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowMargin").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
 		}
 		else if ($option == 'contact')
 		{
-			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowContacts").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
 		}
 		else if ($option == 'ban')
 		{
-			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowBan").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$this->id;
 		}
 
 		// By default
 		if (empty($linkstart))
 		{
-			$label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowCompany").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
 
-		if (! empty($this->name))
+		if (!empty($this->name))
 		{
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
+			if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+			$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
 		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($this->code_client) && $this->client)
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && $this->client)
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		if (!empty($this->country_code))
+			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
+		if (!empty($this->tva_intra))
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
+		if (!empty($this->code_client) && $this->client)
+			$label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
+		if (!empty($this->code_fournisseur) && $this->fournisseur)
+			$label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
+		if (!empty($conf->accounting->enabled) && $this->client)
+			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		if (!empty($conf->accounting->enabled) && $this->fournisseur)
+			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 
-		$label.= '</div>';
+		$label .= '</div>';
 
 		// Add type of canvas
-		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+		$linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
 		// Add param to save lastsearch_values or not
-		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
-		$linkstart.='"';
+		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+		if ($add_save_lastsearch_values) $linkstart .= '&save_lastsearch_values=1';
+		$linkstart .= '"';
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowCompany");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowCompany");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip refurl"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip refurl"';
 
-		 	if (! is_object($hookmanager))
+		 	if (!is_object($hookmanager))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-				$hookmanager=new HookManager($this->db);
+				$hookmanager = new HookManager($this->db);
 			}
 			$hookmanager->initHooks(array('societedao'));
-			$parameters=array('id'=>$this->id);
-			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('id'=>$this->id);
+			$reshook = $hookmanager->executeHooks('getnomurltooltip', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 		}
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		global $user;
-		if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+		if (!$user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
 		{
-			$linkstart='';
-			$linkend='';
+			$linkstart = '';
+			$linkend = '';
 		}
 
-		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
-		$result.=$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($name, $maxlen) : $name);
+		$result .= $linkend;
 
 		return $result;
 	}
@@ -2054,9 +2054,9 @@ 
 	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *    @return   string        		Libelle
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
 	/**
@@ -2066,45 +2066,45 @@ 
 	 *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string          		Libelle du statut
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		global $langs;
 		$langs->load('companies');
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			if ($statut==1) return $langs->trans("InActivity");
+			if ($statut == 0) return $langs->trans("ActivityCeased");
+			if ($statut == 1) return $langs->trans("InActivity");
 		}
 		if ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			if ($statut==1) return $langs->trans("InActivity");
+			if ($statut == 0) return $langs->trans("ActivityCeased");
+			if ($statut == 1) return $langs->trans("InActivity");
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			if ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			if ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			if ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			if ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 		if ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			if ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 	}
 
@@ -2114,15 +2114,15 @@ 
 	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
 	 *    @return     array       					Array of contacts emails
 	 */
-	function thirdparty_and_contact_email_array($addthirdparty=0)
+	function thirdparty_and_contact_email_array($addthirdparty = 0)
 	{
 		global $langs;
 
-		$contact_emails = $this->contact_property_array('email',1);
+		$contact_emails = $this->contact_property_array('email', 1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
-			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
+			if (empty($this->name)) $this->name = $this->nom;
+			$contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
 		return $contact_emails;
@@ -2139,11 +2139,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (!empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) $this->name = $this->nom;
 			// TODO: Tester si tel non deja present dans tableau contact
-			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
+			$contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
 		}
 		return $contact_phone;
 	}
@@ -2155,7 +2155,7 @@ 
 	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
 	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
 	 */
-	function contact_property_array($mode='email', $hidedisabled=0)
+	function contact_property_array($mode = 'email', $hidedisabled = 0)
 	{
 		global $langs;
 
@@ -2163,45 +2163,45 @@ 
 
 
 		$sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE fk_soc = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql .= " WHERE fk_soc = ".$this->id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
 			if ($nump)
 			{
-				$sepa="("; $sepb=")";
+				$sepa = "("; $sepb = ")";
 				if ($mode == 'email')
 				{
 					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa="<"; $sepb=">";
+					$sepa = "<"; $sepb = ">";
 				}
 				$i = 0;
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') $property = $obj->email;
+					else if ($mode == 'mobile') $property = $obj->phone_mobile;
+					else $property = $obj->$mode;
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') $property = $langs->transnoentitiesnoconv("NoEMail");
+							else if ($mode == 'mobile') $property = $langs->transnoentitiesnoconv("NoMobilePhone");
 						}
 
 						if (!empty($obj->poste))
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 						else
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
 					$i++;
@@ -2226,7 +2226,7 @@ 
 		$contacts = array();
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2236,7 +2236,7 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
 					$i++;
 				}
 			}
@@ -2255,11 +2255,11 @@ 
 	 */
 	function contact_array_objects()
 	{
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contacts = array();
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2290,17 +2290,17 @@ 
 	 *  @param  string	$mode       'email' or 'mobile'
 	 *  @return string  			Email of contact with format: "Full name <email>"
 	 */
-	function contact_get_property($rowid,$mode)
+	function contact_get_property($rowid, $mode)
 	{
-		$contact_property='';
+		$contact_property = '';
 
 		if (empty($rowid)) return '';
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE rowid = '".$rowid."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql .= " WHERE rowid = '".$rowid."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2328,12 +2328,12 @@ 
 	 *	@param	string	$mode	'label' or 'rum' or 'format'
 	 *  @return	string			Bank number
 	 */
-	function display_rib($mode='label')
+	function display_rib($mode = 'label')
 	{
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
 		$bac = new CompanyBankAccount($this->db);
-		$bac->fetch(0,$this->id);
+		$bac->fetch(0, $this->id);
 
 		if ($mode == 'label')
 		{
@@ -2343,7 +2343,7 @@ 
 		{
 			if (empty($bac->rum))
 			{
-				require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 				$prelevement = new BonPrelevement($this->db);
 				$bac->fetch_thirdparty();
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
@@ -2365,7 +2365,7 @@ 
 	 */
 	function get_all_rib()
 	{
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE fk_soc = ".$this->id;
 		$result = $this->db->query($sql);
 		if (!$result) {
@@ -2394,22 +2394,22 @@ 
 	 *	@param	int			$type		Should be 0 to say customer
 	 *  @return void
 	 */
-	function get_codeclient($objsoc=0,$type=0)
+	function get_codeclient($objsoc = 0, $type = 0)
 	{
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 			$mod = new $module();
 
-			$this->code_client = $mod->getNextValue($objsoc,$type);
+			$this->code_client = $mod->getNextValue($objsoc, $type);
 			$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
 
 			dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
@@ -2424,22 +2424,22 @@ 
 	 *	@param	int			$type		Should be 1 to say supplier
 	 *  @return void
 	 */
-	function get_codefournisseur($objsoc=0,$type=1)
+	function get_codefournisseur($objsoc = 0, $type = 1)
 	{
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 			$mod = new $module();
 
-			$this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+			$this->code_fournisseur = $mod->getNextValue($objsoc, $type);
 
 			dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 		}
@@ -2454,23 +2454,23 @@ 
 	function codeclient_modifiable()
 	{
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+			if ($mod->code_modifiable_null && !$this->code_client) return 1;
 			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
 		else
@@ -2488,23 +2488,23 @@ 
 	function codefournisseur_modifiable()
 	{
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+			if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
 			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
 		else
@@ -2526,14 +2526,14 @@ 
 	function check_codeclient()
 	{
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
@@ -2561,14 +2561,14 @@ 
 	function check_codefournisseur()
 	{
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
@@ -2596,20 +2596,20 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
 		{
-			$file='';
-			$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			$file = '';
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
 				if (file_exists(DOL_DOCUMENT_ROOT.'/'.$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php"))
 				{
-					$file=$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
+					$file = $dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
 					break;
 				}
 			}
 
-			if (! empty($file))
+			if (!empty($file))
 			{
 				dol_include_once($file);
 
@@ -2650,10 +2650,10 @@ 
 		if ($this->id)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET parent = ".($id > 0 ? $id : "null");
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET parent = ".($id > 0 ? $id : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->parent = $id;
@@ -2677,28 +2677,28 @@ 
 	{
 		global $conf;
 
-	 	switch($idprof)
+	 	switch ($idprof)
 		{
 			case 1:
-				$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
 				break;
 			case 2:
-				$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
 				break;
 			case 3:
-				$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
 				break;
 			case 4:
-				$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
 				break;
 			case 5:
-				$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
 				break;
 			case 6:
-				$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
 				break;
 			default:
-				$ret=false;
+				$ret = false;
 		}
 
 		return $ret;
@@ -2712,39 +2712,39 @@ 
 	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
 	 *    @return   boolean				True if exists, False if not
 	 */
-	function id_prof_exists($idprof, $value, $socid=0)
+	function id_prof_exists($idprof, $value, $socid = 0)
 	{
 		$field = $idprof;
 
-	 	switch($idprof)	// For backward compatibility
+	 	switch ($idprof)	// For backward compatibility
 		{
 			case '1':
 			case 'idprof1':
-				$field="siren";
+				$field = "siren";
 				break;
 			case '2':
 			case 'idprof2':
-				$field="siret";
+				$field = "siret";
 				break;
 			case '3':
 			case 'idprof3':
-				$field="ape";
+				$field = "ape";
 				break;
 			case '4':
 			case 'idprof4':
-				$field="idprof4";
+				$field = "idprof4";
 				break;
 			case '5':
-				$field="idprof5";
+				$field = "idprof5";
 				break;
 			case '6':
-				$field="idprof6";
+				$field = "idprof6";
 				break;
 	 	}
 
 		 //Verify duplicate entries
-		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+		if ($socid) $sql .= " AND rowid <> ".$socid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2770,36 +2770,36 @@ 
 	 *  @return int             			<=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
-	function id_prof_check($idprof,$soc)
+	function id_prof_check($idprof, $soc)
 	{
 		global $conf;
 
-		$ok=1;
+		$ok = 1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
 		{
-			$chaine=trim($this->idprof1);
-			$chaine=preg_replace('/(\s)/','',$chaine);
+			$chaine = trim($this->idprof1);
+			$chaine = preg_replace('/(\s)/', '', $chaine);
 
 			if (dol_strlen($chaine) != 9) return -1;
 
 			$sum = 0;
 
-			for ($i = 0 ; $i < 10 ; $i = $i+2)
+			for ($i = 0; $i < 10; $i = $i + 2)
 			{
 				$sum = $sum + substr($this->idprof1, (8 - $i), 1);
 			}
 
-			for ($i = 1 ; $i < 9 ; $i = $i+2)
+			for ($i = 1; $i < 9; $i = $i + 2)
 			{
 				$ps = 2 * substr($this->idprof1, (8 - $i), 1);
 
 				if ($ps > 9)
 				{
-					$ps = substr($ps, 0,1) + substr($ps, 1, 1);
+					$ps = substr($ps, 0, 1) + substr($ps, 1, 1);
 				}
 				$sum = $sum + $ps;
 			}
@@ -2810,8 +2810,8 @@ 
 		// Verifie SIRET si pays FR
 		if ($idprof == 2 && $soc->country_code == 'FR')
 		{
-			$chaine=trim($this->idprof2);
-			$chaine=preg_replace('/(\s)/','',$chaine);
+			$chaine = trim($this->idprof2);
+			$chaine = preg_replace('/(\s)/', '', $chaine);
 
 			if (dol_strlen($chaine) != 14) return -1;
 		}
@@ -2820,11 +2820,11 @@ 
 		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
 		if ($idprof == 1 && $soc->country_code == 'ES')
 		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
+			$string = trim($this->idprof1);
+			$string = preg_replace('/(\s)/', '', $string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
+			for ($i = 0; $i < 9; $i++)
 			$num[$i] = substr($string, $i, 1);
 
 			//Check format
@@ -2841,7 +2841,7 @@ 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
 			for ($i = 1; $i < 8; $i += 2)
-			$sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+			$sum += substr((2 * $num[$i]), 0, 1) + substr((2 * $num[$i]), 1, 1);
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
@@ -2867,7 +2867,7 @@ 
 
 			//Check NIE XYZ
 			if (preg_match('/^[XYZ]{1}/', $string))
-			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
 			return 3;
 			else
 			return -3;
@@ -2887,25 +2887,25 @@ 
 	 *   @return	string          		Url or empty string if no URL known
 	 *   TODO better in a lib than into business class
 	 */
-	function id_prof_url($idprof,$thirdparty)
+	function id_prof_url($idprof, $thirdparty)
 	{
-		global $conf,$langs,$hookmanager;
+		global $conf, $langs, $hookmanager;
 
-		$url='';
+		$url = '';
 		$action = '';
 
 		$hookmanager->initHooks(array('idprofurl'));
-		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('idprof'=>$idprof, 'company'=>$thirdparty);
+		$reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+			if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
-			if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+			if ($idprof == 1 && $thirdparty->country_code == 'FR') $url = 'http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1; // See also http://avis-situation-sirene.insee.fr/
 			//if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-			if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-			if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			if ($idprof == 1 && $thirdparty->country_code == 'ES') $url = 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+			if ($idprof == 1 && $thirdparty->country_code == 'IN') $url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 
 			if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
 		}
@@ -2924,7 +2924,7 @@ 
 	 */
 	function has_projects()
 	{
-		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2950,11 +2950,11 @@ 
 	function info($id)
 	{
 		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-		$sql.= " fk_user_creat, fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.rowid = ".$id;
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.rowid = ".$id;
 
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -2966,7 +2966,7 @@ 
 				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_modif) {
@@ -2975,7 +2975,7 @@ 
 					$this->user_modification = $muser;
 				}
 
-				$this->ref			     = $obj->name;
+				$this->ref = $obj->name;
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 			}
@@ -2999,10 +2999,10 @@ 
 		global $conf;
 
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
-		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
+		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
+		if (!empty($this->tva_intra)) $isacompany = 1;
+		else if (!empty($this->typent_code) && in_array($this->typent_code, array('TE_PRIVATE'))) $isacompany = 0;
+		else if (!empty($this->typent_code) && in_array($this->typent_code, array('TE_SMALL', 'TE_MEDIUM', 'TE_LARGE', 'TE_GROUP'))) $isacompany = 1;
 
 		return $isacompany;
 	}
@@ -3016,13 +3016,13 @@ 
 	{
 		$this->SupplierCategories = array();
 		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj = $this->db->fetch_object($resql) )
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
@@ -3045,9 +3045,9 @@ 
 		if ($categorie_id > 0 && $this->id > 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
+			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
+			if ($resql = $this->db->query($sql)) return 0;
 		}
 		else
 		{
@@ -3065,44 +3065,44 @@ 
 	 *	@param	string	$socalias	Alias name of third party to force
 	 *  @return int					<0 if KO, id of created account if OK
 	 */
-	function create_from_member(Adherent $member, $socname='', $socalias='')
+	function create_from_member(Adherent $member, $socname = '', $socalias = '')
 	{
-		global $user,$langs;
+		global $user, $langs;
 
-		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		$name = $socname ? $socname : $member->societe;
+		if (empty($name)) $name = $member->getFullName($langs);
 
-		$alias = $socalias?$socalias:'';
+		$alias = $socalias ? $socalias : '';
 
 		// Positionne parametres
-		$this->nom=$name;				// TODO deprecated
-		$this->name=$name;
-		$this->name_alias=$alias;
-		$this->address=$member->address;
-		$this->zip=$member->zip;
-		$this->town=$member->town;
-		$this->country_code=$member->country_code;
-		$this->country_id=$member->country_id;
-		$this->phone=$member->phone;       // Prof phone
-		$this->email=$member->email;
-		$this->skype=$member->skype;
-
-		$this->client = 1;				// A member is a customer by default
+		$this->nom = $name; // TODO deprecated
+		$this->name = $name;
+		$this->name_alias = $alias;
+		$this->address = $member->address;
+		$this->zip = $member->zip;
+		$this->town = $member->town;
+		$this->country_code = $member->country_code;
+		$this->country_id = $member->country_id;
+		$this->phone = $member->phone; // Prof phone
+		$this->email = $member->email;
+		$this->skype = $member->skype;
+
+		$this->client = 1; // A member is a customer by default
 		$this->code_client = -1;
 		$this->code_fournisseur = -1;
 
 		$this->db->begin();
 
 		// Cree et positionne $this->id
-		$result=$this->create($user);
+		$result = $this->create($user);
 		if ($result >= 0)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-			$sql.= " SET fk_soc=".$this->id;
-			$sql.= " WHERE rowid=".$member->id;
+			$sql .= " SET fk_soc=".$this->id;
+			$sql .= " WHERE rowid=".$member->id;
 
 			dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->db->commit();
@@ -3110,7 +3110,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
@@ -3119,7 +3119,7 @@ 
 		else
 		{
 			// $this->error deja positionne
-			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
 			$this->db->rollback();
 			return $result;
@@ -3136,12 +3136,12 @@ 
 	{
 		global $langs;
 
-		$this->id=0;
-		$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
+		$this->id = 0;
+		$this->name = empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$this->address = empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+		$this->zip = empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP;
+		$this->town = empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN;
+		$this->state_id = empty($conf->global->MAIN_INFO_SOCIETE_STATE) ? '' : $conf->global->MAIN_INFO_SOCIETE_STATE;
 
 		/* Disabled: we don't want any SQL request into method setMySoc. This method set object from env only.
         If we need label, label must be loaded by output that need it from id (label depends on output language)
@@ -3152,59 +3152,59 @@ 
         }
 		*/
 
-		$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+		$this->note_private = empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOTE;
 
-		$this->nom=$this->name; 									// deprecated
+		$this->nom = $this->name; // deprecated
 
 		// We define country_id, country_code and country
-		$country_id=$country_code=$country_label='';
-		if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+		$country_id = $country_code = $country_label = '';
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		{
-			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+			$country_id = $tmp[0];
+			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
-				$country_code=$tmp[1];
-				$country_label=$tmp[2];
+				$country_code = $tmp[1];
+				$country_label = $tmp[2];
 			}
 			else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-				$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-				$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_code = getCountry($country_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_label = getCountry($country_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
 			}
 		}
-		$this->country_id=$country_id;
-		$this->country_code=$country_code;
-		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		$this->country_id = $country_id;
+		$this->country_code = $country_code;
+		$this->country = $country_label;
+		if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
 
-		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+		$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
+		$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
+		$this->url = empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? '' : $conf->global->MAIN_INFO_SOCIETE_WEB;
 		// Id prof generiques
-		$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-		$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-		$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-		$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-		$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-		$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-		$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-		$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-		$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-		$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-		$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
+		$this->idprof2 = empty($conf->global->MAIN_INFO_SIRET) ? '' : $conf->global->MAIN_INFO_SIRET;
+		$this->idprof3 = empty($conf->global->MAIN_INFO_APE) ? '' : $conf->global->MAIN_INFO_APE;
+		$this->idprof4 = empty($conf->global->MAIN_INFO_RCS) ? '' : $conf->global->MAIN_INFO_RCS;
+		$this->idprof5 = empty($conf->global->MAIN_INFO_PROFID5) ? '' : $conf->global->MAIN_INFO_PROFID5;
+		$this->idprof6 = empty($conf->global->MAIN_INFO_PROFID6) ? '' : $conf->global->MAIN_INFO_PROFID6;
+		$this->tva_intra = empty($conf->global->MAIN_INFO_TVAINTRA) ? '' : $conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA.
+		$this->managers = empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? '' : $conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+		$this->capital = empty($conf->global->MAIN_INFO_CAPITAL) ? '' : $conf->global->MAIN_INFO_CAPITAL;
+		$this->forme_juridique_code = empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) ? '' : $conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+		$this->email = empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? '' : $conf->global->MAIN_INFO_SOCIETE_MAIL;
+		$this->logo = empty($conf->global->MAIN_INFO_SOCIETE_LOGO) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO;
+		$this->logo_small = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+		$this->logo_mini = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 
 		// Define if company use vat or not
-		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+		$this->tva_assuj = $conf->global->FACTURE_TVAOPTION;
 
 		// Define if company use local taxes
-		$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-		$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+		$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on')) ? 1 : 0);
+		$this->localtax2_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on')) ? 1 : 0);
 	}
 
 	/**
@@ -3216,46 +3216,46 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$now=dol_now();
+		$now = dol_now();
 
 		// Initialize parameters
-		$this->id=0;
-		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-		$this->nom = $this->name;   // For backward compatibility
+		$this->id = 0;
+		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now, 'dayhourlog');
+		$this->nom = $this->name; // For backward compatibility
 		$this->ref_ext = 'Ref ext';
-		$this->specimen=1;
-		$this->address='21 jump street';
-		$this->zip='99999';
-		$this->town='MyTown';
-		$this->state_id=1;
-		$this->state_code='AA';
-		$this->state='MyState';
-		$this->country_id=1;
-		$this->country_code='FR';
-		$this->email='specimen@specimen.com';
-		$this->skype='tom.hanson';
-		$this->url='http://www.specimen.com';
-
-		$this->phone='0909090901';
-		$this->fax='0909090909';
-
-		$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-		$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-		$this->capital=10000;
-		$this->client=1;
-		$this->prospect=1;
-		$this->fournisseur=1;
-		$this->tva_assuj=1;
-		$this->tva_intra='EU1234567';
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
-
-		$this->idprof1='idprof1';
-		$this->idprof2='idprof2';
-		$this->idprof3='idprof3';
-		$this->idprof4='idprof4';
-		$this->idprof5='idprof5';
-		$this->idprof6='idprof6';
+		$this->specimen = 1;
+		$this->address = '21 jump street';
+		$this->zip = '99999';
+		$this->town = 'MyTown';
+		$this->state_id = 1;
+		$this->state_code = 'AA';
+		$this->state = 'MyState';
+		$this->country_id = 1;
+		$this->country_code = 'FR';
+		$this->email = 'specimen@specimen.com';
+		$this->skype = 'tom.hanson';
+		$this->url = 'http://www.specimen.com';
+
+		$this->phone = '0909090901';
+		$this->fax = '0909090909';
+
+		$this->code_client = 'CC-'.dol_print_date($now, 'dayhourlog');
+		$this->code_fournisseur = 'SC-'.dol_print_date($now, 'dayhourlog');
+		$this->capital = 10000;
+		$this->client = 1;
+		$this->prospect = 1;
+		$this->fournisseur = 1;
+		$this->tva_assuj = 1;
+		$this->tva_intra = 'EU1234567';
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+
+		$this->idprof1 = 'idprof1';
+		$this->idprof2 = 'idprof2';
+		$this->idprof3 = 'idprof3';
+		$this->idprof4 = 'idprof4';
+		$this->idprof5 = 'idprof5';
+		$this->idprof6 = 'idprof6';
 	}
 
 	/**
@@ -3264,7 +3264,7 @@ 
 	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
 	 *  @return		boolean					true or false
 	 */
-	function useLocalTax($localTaxNum=0)
+	function useLocalTax($localTaxNum = 0)
 	{
 		$sql  = "SELECT t.localtax1, t.localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3275,7 +3275,7 @@ 
 		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
@@ -3296,7 +3296,7 @@ 
 		$sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
 		dol_syslog("useNPR", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
@@ -3317,15 +3317,15 @@ 
 		$sql .= " AND r.active = 1";
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-   			return (($obj->nb > 0)?true:false);
+			$obj = $this->db->fetch_object($resql);
+   			return (($obj->nb > 0) ?true:false);
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return false;
 		}
 	}
@@ -3350,11 +3350,11 @@ 
 	{
 		global $langs;
 
-		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
 		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
 		{
-			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
 	}
@@ -3379,7 +3379,7 @@ 
 	 *  @param	string	$label		Label to use for status for added status
 	 *  @return string        		Libelle
 	 */
-	function getLibProspCommStatut($mode=0, $label='')
+	function getLibProspCommStatut($mode = 0, $label = '')
 	{
 		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
 	}
@@ -3392,18 +3392,18 @@ 
 	 *  @param	string		$label			Label to use for status for added status
 	 *  @return string       	 			Libelle du statut
 	 */
-	function LibProspCommStatut($statut, $mode=0, $label='')
+	function LibProspCommStatut($statut, $mode = 0, $label = '')
 	{
 		global $langs;
 		$langs->load('customers');
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3411,11 +3411,11 @@ 
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1);
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
@@ -3423,11 +3423,11 @@ 
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3455,13 +3455,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingProposals($mode='customer')
+	function getOutstandingProposals($mode = 'customer')
 	{
-		$table='propal';
+		$table = 'propal';
 		if ($mode == 'supplier') $table = 'supplier_proposal';
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
 		} else {
@@ -3469,21 +3469,21 @@ 
 		}
 
 		dol_syslog("getOutstandingProposals", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 			return array();
@@ -3495,13 +3495,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingOrders($mode='customer')
+	function getOutstandingOrders($mode = 'customer')
 	{
-		$table='commande';
+		$table = 'commande';
 		if ($mode == 'supplier') $table = 'commande_fournisseur';
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_order').")";
 		} else {
@@ -3509,21 +3509,21 @@ 
 		}
 
 		dol_syslog("getOutstandingOrders", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 			return array();
@@ -3535,9 +3535,9 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingBills($mode='customer')
+	function getOutstandingBills($mode = 'customer')
 	{
-		$table='facture';
+		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
@@ -3547,9 +3547,9 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
 		} else {
@@ -3557,7 +3557,7 @@ 
 		}
 
 		dol_syslog("getOutstandingBills", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
@@ -3566,21 +3566,21 @@ 
 			if ($mode == 'supplier')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-				$tmpobject=new FactureFournisseur($this->db);
+				$tmpobject = new FactureFournisseur($this->db);
 			}
 			else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$tmpobject=new Facture($this->db);
+				$tmpobject = new Facture($this->db);
 			}
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+					&& !($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
-					$outstandingTotal+= $obj->total_ht;
-					$outstandingTotalIncTax+= $obj->total_ttc;
+					$outstandingTotal += $obj->total_ht;
+					$outstandingTotalIncTax += $obj->total_ttc;
 				}
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
@@ -3591,10 +3591,10 @@ 
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
-					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+					$outstandingOpened += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 		{
@@ -3618,26 +3618,26 @@ 
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
 		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
+		$sql .= " AND fk_statut <> 0"; // Not a draft
 		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
+		$sql .= " AND fk_statut <> 3"; // Not abandonned
+		$sql .= " AND fk_statut <> 2"; // Not clasified as paid
 
 		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingAmount = 0;
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$tmpobject=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			$tmpobject = new Facture($this->db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				$paiement = $tmpobject->getSommePaiement();
 				$creditnotes = $tmpobject->getSumCreditNotesUsed();
 				$deposits = $tmpobject->getSumDepositsUsed();
-				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+				$outstandingAmount += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
 		}
@@ -3666,10 +3666,10 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut == 0) return $langs->trans("NorProspectNorCustomer");
+		if ($statut == 1) return $langs->trans("Customer");
+		if ($statut == 2) return $langs->trans("Prospect");
+		if ($statut == 3) return $langs->trans("ProspectCustomer");
 
 	}
 
@@ -3685,26 +3685,26 @@ 
 	 *  @param  null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
+		if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
 		{
 			$modelpath = "core/modules/bank/doc/";
 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
-			if (! dol_strlen($modele))
+			if (!dol_strlen($modele))
 			{
-				if (! empty($conf->global->COMPANY_ADDON_PDF))
+				if (!empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
 				}
@@ -3717,7 +3717,7 @@ 
 
 			$modelpath = "core/modules/societe/doc/";
 
-			$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
 		return $result;
@@ -3737,7 +3737,7 @@ 
 	 */
 	public function setCategories($categories, $type)
 	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 		// Decode type
 		if ($type == 'customer') {
@@ -3747,7 +3747,7 @@ 
 			$type_id = Categorie::TYPE_SUPPLIER;
 			$type_text = 'supplier';
 		} else {
-			dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
+			dol_syslog(__METHOD__.': Type '.$type.'is an unknown company category type. Done nothing.', LOG_ERR);
 			return -1;
 		}
 

Braces +564 added lines, -333 removed lines

@@ -446,15 +446,25 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
+		if (empty($this->status)) {
+			$this->status=0;
+		}
 		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+			$this->name=ucwords($this->name);
+		}
 		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->client)) {
+			$this->client=0;
+		}
+		if (empty($this->fournisseur)) {
+			$this->fournisseur=0;
+		}
 		$this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -468,8 +478,12 @@ 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this,1);
+		}
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -516,32 +530,32 @@ 
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_CREATE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
+				} else {
+					$error++;
 				}
-				else $error++;
 
 				if (! $error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
 					$result=-1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$result=-2;
@@ -550,8 +564,7 @@ 
 				return $result;
 			}
 
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -703,8 +716,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
@@ -731,7 +743,9 @@ 
 			}
 		}
 
-		if ($error) $result = -4;
+		if ($error) {
+			$result = -4;
+		}
 
 		return $result;
 	}
@@ -753,7 +767,9 @@ 
 		global $langs,$conf,$hookmanager;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		$error=0;
 
@@ -796,9 +812,13 @@ 
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -812,8 +832,13 @@ 
 		$this->localtax1_value=trim($this->localtax1_value);
 		$this->localtax2_value=trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') {
+			$this->capital=price2num(trim($this->capital));
+		}
+		if (! is_numeric($this->capital)) {
+			$this->capital = '';
+		}
+		// '' = undef
 
 		$this->effectif_id=trim($this->effectif_id);
 		$this->forme_juridique_code=trim($this->forme_juridique_code);
@@ -822,8 +847,12 @@ 
 		$this->barcode=trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this,1);
+		}
 
 		$this->code_compta=trim($this->code_compta);
 		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
@@ -843,7 +872,9 @@ 
 			if (empty($this->code_compta))
 			{
 				$ret=$this->get_codecompta('customer');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$customer=true;
@@ -856,7 +887,9 @@ 
 			if (empty($this->code_compta_fournisseur))
 			{
 				$ret=$this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$supplier=true;
@@ -926,22 +959,26 @@ 
 				if($this->localtax1_value!='')
 				{
 					$sql .=",localtax1_value =".$this->localtax1_value;
+				} else {
+					$sql .=",localtax1_value =0.000";
 				}
-				else $sql .=",localtax1_value =0.000";
 
+			} else {
+				$sql .=",localtax1_value =0.000";
 			}
-			else $sql .=",localtax1_value =0.000";
 
 			if($this->localtax2_assuj==1)
 			{
 				if($this->localtax2_value!='')
 				{
 					$sql .=",localtax2_value =".$this->localtax2_value;
+				} else {
+					$sql .=",localtax2_value =0.000";
 				}
-				else $sql .=",localtax2_value =0.000";
 
+			} else {
+				$sql .=",localtax2_value =0.000";
 			}
-			else $sql .=",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1034,8 +1071,7 @@ 
 								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 								$error++;
 							}
-						}
-						else if ($result < 0)
+						} else if ($result < 0)
 						{
 							$this->error=$lmember->error;
 							$error++;
@@ -1052,22 +1088,27 @@ 
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+						// For avoid conflicts if trigger used
 					{
 						$result=$this->insertExtraFields();
+					}
 						if ($result < 0)
 						{
 							$error++;
 						}
 					}
+				} else if ($reshook < 0) {
+					$error++;
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && $call_trigger)
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
@@ -1076,22 +1117,19 @@ 
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else
+				} else
 				{
 					$this->error = $this->db->lasterror();
 					$result = -2;
@@ -1099,8 +1137,7 @@ 
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 	   {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -1130,7 +1167,9 @@ 
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+			return -1;
+		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
@@ -1167,18 +1206,42 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($nom_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		if ($rowid) {
+			$sql .= ' AND s.rowid = '.$rowid;
+		}
+		if ($ref) {
+			$sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		}
+		if ($ref_alias) {
+			$sql .= " AND s.nom_alias = '".$this->db->escape($nom_alias)."'";
+		}
+		if ($ref_ext) {
+			$sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
+		if ($ref_int) {
+			$sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+		}
+		if ($idprof1) {
+			$sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		}
+		if ($idprof2) {
+			$sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		}
+		if ($idprof3) {
+			$sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		}
+		if ($idprof4) {
+			$sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		}
+		if ($idprof5) {
+			$sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		}
+		if ($idprof6) {
+			$sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		}
+		if ($email) {
+			$sql .= " AND s.email = '".$this->db->escape($email)."'";
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -1189,10 +1252,11 @@ 
 				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num) {
+				// $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
+			}
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
@@ -1320,22 +1384,22 @@ 
 				// Retreive all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else
+			} else
 			{
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) {
+			$this->price_level=1;
+		}
 
 		return $result;
 	}
@@ -1370,10 +1434,11 @@ 
 		$sql.= " WHERE entity IN (".getEntity('category').")";
 		if (! empty($type))
 		{
-			if ($type == 1 || $type == 2)
-				$sql.= " AND client = ".$type;
-			elseif ($type == 3)
-				$sql.= " AND fournisseur = 1";
+			if ($type == 1 || $type == 2) {
+							$sql.= " AND client = ".$type;
+			} elseif ($type == 3) {
+							$sql.= " AND fournisseur = 1";
+			}
 		}
 		if (! empty($name))
 		{
@@ -1382,27 +1447,27 @@ 
 				if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
 				{
 					$name = str_replace('*', '%', $name);
-				}
-				else
+				} else
 				{
 					$name = '%'.$name.'%';
 				}
 			}
 			$sql.= " AND ";
-			if (is_array($filters) && ! empty($filters))
-				$sql.= "(";
+			if (is_array($filters) && ! empty($filters)) {
+							$sql.= "(";
+			}
 			if ($similar)
 			{
 				// For test similitude (string inside name into database, or name into database inside string)
 				// Do not use this. Not compatible with other database.
 				$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
-			}
-			else
+			} else
 			{
-				if (! $case)
-					$sql.= "nom LIKE '".$this->db->escape($name)."'";
-				else
-					$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+				if (! $case) {
+									$sql.= "nom LIKE '".$this->db->escape($name)."'";
+				} else {
+									$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+				}
 			}
 		}
 		if (is_array($filters) && ! empty($filters))
@@ -1414,19 +1479,20 @@ 
 					if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
 					{
 						$value = str_replace('*', '%', $value);
-					}
-					else
+					} else
 					{
 						$value = '%'.$value.'%';
 					}
 				}
-				if (! $case)
-					$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
-				else
-					$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+				if (! $case) {
+									$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+				} else {
+									$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+				}
+			}
+			if (! empty($name)) {
+							$sql.= ")";
 			}
-			if (! empty($name))
-				$sql.= ")";
 		}
 
 		$res  = $this->db->query($sql);
@@ -1440,8 +1506,7 @@ 
 			}
 
 			return $thirdparties;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1460,7 +1525,9 @@ 
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) {
+			$fuser=$user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1480,7 +1547,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -1525,9 +1594,11 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+				// For avoid conflicts if trigger used
 			{
 				$result=$this->deleteExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
@@ -1562,15 +1633,15 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
+		} else {
+			dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1584,7 +1655,10 @@ 
 		if ($this->id)
 		{
 			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			if ($this->client == 2 || $this->client == 3) {
+				$newclient=3;
+			}
+			//If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql.= " SET client = ".$newclient;
 			$sql.= " WHERE rowid = " . $this->id;
@@ -1594,8 +1668,9 @@ 
 			{
 				$this->client = $newclient;
 				return 1;
+			} else {
+				return -1;
 			}
-			else return -1;
 		}
 		return 0;
 	}
@@ -1705,14 +1780,14 @@ 
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error=$discount->error;
 				return -3;
 			}
+		} else {
+			return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -1732,8 +1807,7 @@ 
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$discountstatic->error;
 			return -1;
@@ -1760,9 +1834,9 @@ 
 			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql.= " AND ug.entity = ".$conf->entity.")";
 			$sql.= " OR u.admin = 1)";
+		} else {
+					$sql.= " WHERE entity in (0, ".$conf->entity.")";
 		}
-		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -1785,8 +1859,7 @@ 
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1892,7 +1965,10 @@ 
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (! empty($conf->dol_no_mouse_hover)) {
+			$notooltip=1;
+		}
+		// Force disable tooltips
 
 		$name=$this->name?$this->name:$this->nom;
 
@@ -1902,23 +1978,28 @@ 
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
 				)
-			)
-			$code = $this->code_client . ' - ';
+			) {
+						$code = $this->code_client . ' - ';
+			}
 
 			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
 				)
-			)
-			$code .= $this->code_fournisseur . ' - ';
+			) {
+						$code .= $this->code_fournisseur . ' - ';
+			}
 
-			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-				$name =$code.' '.$name;
-			else
-				$name =$code;
+			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
+							$name =$code.' '.$name;
+			} else {
+							$name =$code;
+			}
 		}
 
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (!empty($this->name_alias)) {
+			$name .= ' ('.$this->name_alias.')';
+		}
 
 		$result=''; $label='';
 		$linkstart=''; $linkend='';
@@ -1936,38 +2017,31 @@ 
 		{
 		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		} else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
 			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		else if ($option == 'supplier')
+		} else if ($option == 'supplier')
 		{
 			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		else if ($option == 'agenda')
+		} else if ($option == 'agenda')
 		{
 			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		else if ($option == 'project')
+		} else if ($option == 'project')
 		{
 			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		else if ($option == 'margin')
+		} else if ($option == 'margin')
 		{
 			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		else if ($option == 'contact')
+		} else if ($option == 'contact')
 		{
 			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		else if ($option == 'ban')
+		} else if ($option == 'ban')
 		{
 			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$this->id;
@@ -1983,21 +2057,29 @@ 
 		if (! empty($this->name))
 		{
 			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+			if (! empty($this->name_alias)) {
+				$label.=' ('.$this->name_alias.')';
+			}
 			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
 		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($this->code_client) && $this->client)
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && $this->client)
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		if (! empty($this->country_code)) {
+					$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+		}
+		if (! empty($this->tva_intra)) {
+					$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+		}
+		if (! empty($this->code_client) && $this->client) {
+					$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+		}
+		if (! empty($this->code_fournisseur) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+		}
+		if (! empty($conf->accounting->enabled) && $this->client) {
+					$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		}
+		if (! empty($conf->accounting->enabled) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		}
 
 		$label.= '</div>';
 
@@ -2005,8 +2087,12 @@ 
 		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values=1;
+		}
+		if ($add_save_lastsearch_values) {
+			$linkstart.='&save_lastsearch_values=1';
+		}
 		$linkstart.='"';
 
 		$linkclose='';
@@ -2028,7 +2114,9 @@ 
 			$hookmanager->initHooks(array('societedao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			if ($reshook > 0) {
+				$linkclose = $hookmanager->resPrint;
+			}
 		}
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
@@ -2041,8 +2129,12 @@ 
 		}
 
 		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		if ($withpicto) {
+			$result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+			$result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		}
 		$result.=$linkend;
 
 		return $result;
@@ -2073,38 +2165,66 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			if ($statut==1) return $langs->trans("InActivity");
+			if ($statut==0) {
+				return $langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return $langs->trans("InActivity");
+			}
 		}
 		if ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			if ($statut==1) return $langs->trans("InActivity");
+			if ($statut==0) {
+				return $langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return $langs->trans("InActivity");
+			}
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut==0) {
+				return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+				return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut==0) {
+				return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+				return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			}
+			if ($statut==1) {
+				return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 		if ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+				return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			}
+			if ($statut==1) {
+				return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 	}
 
@@ -2121,7 +2241,9 @@ 
 		$contact_emails = $this->contact_property_array('email',1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) {
+				$this->name=$this->nom;
+			}
 			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
@@ -2139,9 +2261,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (! empty($this->phone)) {
+			// If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
 			if (empty($this->name)) $this->name=$this->nom;
+		}
 			// TODO: Tester si tel non deja present dans tableau contact
 			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
 		}
@@ -2182,24 +2306,30 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') {
+						$property=$obj->email;
+					} else if ($mode == 'mobile') {
+						$property=$obj->phone_mobile;
+					} else {
+						$property=$obj->$mode;
+					}
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') {
+								$property=$langs->transnoentitiesnoconv("NoEMail");
+							} else if ($mode == 'mobile') {
+								$property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							}
 						}
 
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
+						} else
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
@@ -2207,8 +2337,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2240,8 +2369,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2275,8 +2403,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2294,7 +2421,9 @@ 
 	{
 		$contact_property='';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+			return '';
+		}
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
@@ -2309,12 +2438,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
-				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+				if ($mode == 'email') {
+					$contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+				} else if ($mode == 'mobile') {
+					$contact_property = $obj->phone_mobile;
+				}
 			}
 			return $contact_property;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2338,8 +2469,7 @@ 
 		if ($mode == 'label')
 		{
 			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
+		} elseif ($mode == 'rum')
 		{
 			if (empty($bac->rum))
 			{
@@ -2349,8 +2479,7 @@ 
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 			}
 			return $bac->rum;
-		}
-		elseif ($mode == 'format')
+		} elseif ($mode == 'format')
 		{
 			return $bac->frstrecur;
 		}
@@ -2405,7 +2534,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2435,7 +2566,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2462,18 +2595,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_client) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2496,18 +2637,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_fournisseur) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2534,7 +2683,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
@@ -2542,8 +2693,7 @@ 
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2569,7 +2719,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
@@ -2577,8 +2729,7 @@ 
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2619,21 +2770,25 @@ 
 				// Defini code compta dans $mod->code
 				$result = $mod->get_code($this->db, $this, $type);
 
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+				if ($type == 'customer') {
+					$this->code_compta = $mod->code;
+				} else if ($type == 'supplier') {
+					$this->code_compta_fournisseur = $mod->code;
+				}
 
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else
+		} else
 		{
-			if ($type == 'customer') $this->code_compta = '';
-			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+			if ($type == 'customer') {
+				$this->code_compta = '';
+			} else if ($type == 'supplier') {
+				$this->code_compta_fournisseur = '';
+			}
 
 			return 0;
 		}
@@ -2658,13 +2813,13 @@ 
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
+		} else {
+			return -1;
 		}
-		else return -1;
 	}
 
 	/**
@@ -2744,22 +2899,26 @@ 
 
 		 //Verify duplicate entries
 		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		if($socid) {
+			$sql .= " AND rowid <> ".$socid;
+		}
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
 		}
 		$this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -2776,7 +2935,9 @@ 
 
 		$ok=1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			return 1;
+		}
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
@@ -2784,7 +2945,9 @@ 
 			$chaine=trim($this->idprof1);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (dol_strlen($chaine) != 9) return -1;
+			if (dol_strlen($chaine) != 9) {
+				return -1;
+			}
 
 			$sum = 0;
 
@@ -2804,7 +2967,9 @@ 
 				$sum = $sum + $ps;
 			}
 
-			if (substr($sum, -1) != 0) return -1;
+			if (substr($sum, -1) != 0) {
+				return -1;
+			}
 		}
 
 		// Verifie SIRET si pays FR
@@ -2813,7 +2978,9 @@ 
 			$chaine=trim($this->idprof2);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (dol_strlen($chaine) != 14) return -1;
+			if (dol_strlen($chaine) != 14) {
+				return -1;
+			}
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
@@ -2824,53 +2991,61 @@ 
 			$string=preg_replace('/(\s)/','',$string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
-			$num[$i] = substr($string, $i, 1);
+			for ($i = 0; $i < 9; $i ++) {
+						$num[$i] = substr($string, $i, 1);
+			}
 
 			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+						return 0;
+			}
 
 			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+						if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 			return 1;
-			else
-			return -1;
+			} else {
+						return -1;
+			}
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+			for ($i = 1; $i < 8; $i += 2) {
+						$sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+			}
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-			if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			if (preg_match('/^[KLM]{1}/', $string)) {
+						if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 			return 1;
-			else
-			return -1;
+			} else {
+						return -1;
+			}
 
 			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-			if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+						if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 			return 2;
-			else
-			return -2;
+			} else {
+						return -2;
+			}
 
 			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-			if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			if (preg_match('/^[T]{1}/', $string)) {
+						if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 			return 3;
-			else
-			return -3;
+			} else {
+						return -3;
+			}
 
 			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+			if (preg_match('/^[XYZ]{1}/', $string)) {
+						if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
 			return 3;
-			else
-			return -3;
+			} else {
+						return -3;
+			}
 
 			//Can not be verified
 			return -4;
@@ -2899,17 +3074,27 @@ 
 		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+				return '';
+			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
-			if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
+				$url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;
+			}
+			// See also http://avis-situation-sirene.insee.fr/
 			//if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-			if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-			if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
+				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+			}
+			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
+				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			}
 
-			if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
-		}
-		else
+			if ($url) {
+				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+			}
+		} else
 		{
 			return $hookmanager->resPrint;
 		}
@@ -2930,8 +3115,7 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
@@ -2982,8 +3166,7 @@ 
 
 			$this->db->free($result);
 
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -3000,9 +3183,13 @@ 
 
 		// Define if third party is treated as company (or not) when nature is unknown
 		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
-		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
+		if (! empty($this->tva_intra)) {
+			$isacompany=1;
+		} else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) {
+			$isacompany=0;
+		} else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) {
+			$isacompany=1;
+		}
 
 		return $isacompany;
 	}
@@ -3027,8 +3214,7 @@ 
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -3047,9 +3233,10 @@ 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
 			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
-		}
-		else
+			if ($resql=$this->db->query($sql)) {
+				return 0;
+			}
+		} else
 		{
 			return 0;
 		}
@@ -3070,7 +3257,9 @@ 
 		global $user,$langs;
 
 		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		if (empty($name)) {
+			$name=$member->getFullName($langs);
+		}
 
 		$alias = $socalias?$socalias:'';
 
@@ -3107,16 +3296,14 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
@@ -3162,12 +3349,13 @@ 
 		{
 			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			if (! empty($tmp[1])) {
+				// If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
 				$country_code=$tmp[1];
-				$country_label=$tmp[2];
 			}
-			else                    // For backward compatibility
+				$country_label=$tmp[2];
+			} else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3178,7 +3366,9 @@ 
 		$this->country_id=$country_id;
 		$this->country_code=$country_code;
 		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		if (is_object($langs)) {
+			$this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		}
 
 		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3270,17 +3460,22 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+		if (empty($localTaxNum)) {
+			$sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		} elseif ($localTaxNum == 1) {
+			$sql .= " AND t.localtax1_type <> '0'";
+		} elseif ($localTaxNum == 2) {
+			$sql .= " AND t.localtax2_type <> '0'";
+		}
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3300,8 +3495,9 @@ 
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3322,8 +3518,7 @@ 
 		{
 			$obj=$this->db->fetch_object($resql);
    			return (($obj->nb > 0)?true:false);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return false;
@@ -3399,36 +3594,51 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1);
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0);
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1);
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2);
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3);
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
@@ -3458,7 +3668,9 @@ 
 	function getOutstandingProposals($mode='customer')
 	{
 		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+			$table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3478,15 +3690,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+					// Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3498,7 +3712,9 @@ 
 	function getOutstandingOrders($mode='customer')
 	{
 		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+			$table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3518,15 +3734,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+					// Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3538,7 +3756,9 @@ 
 	function getOutstandingBills($mode='customer')
 	{
 		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+			$table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -3547,8 +3767,11 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+			$sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+			$sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ". $this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
@@ -3567,8 +3790,7 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
+			} else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject=new Facture($this->db);
@@ -3585,18 +3807,19 @@ 
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
 					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
+					&& $obj->fk_statut != 2) {
+					// Not classified as paid
 				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 				{
 					$paiement = $tmpobject->getSommePaiement();
+				}
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3640,9 +3863,9 @@ 
 				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
+		} else {
+					return 0;
 		}
-		else
-			return 0;
 	}
 
 	/**
@@ -3666,10 +3889,18 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut==0) {
+			return $langs->trans("NorProspectNorCustomer");
+		}
+		if ($statut==1) {
+			return $langs->trans("Customer");
+		}
+		if ($statut==2) {
+			return $langs->trans("Prospect");
+		}
+		if ($statut==3) {
+			return $langs->trans("ProspectCustomer");
+		}
 
 	}
 
@@ -3696,10 +3927,11 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			if (! $result) {
+				dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			}
 			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
+		} else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
 			if (! dol_strlen($modele))
@@ -3707,8 +3939,7 @@ 
 				if (! empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
+				} else
 				{
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;

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';
 
-    }
+	}
 }
 
 

Spacing +523 added lines, -523 removed lines

@@ -42,38 +42,38 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 $langs->load("companies");
 $langs->load("commercial");
 $langs->load("bills");
 $langs->load("banks");
 $langs->load("users");
-if (! empty($conf->categorie->enabled)) $langs->load("categories");
-if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
+if (!empty($conf->categorie->enabled)) $langs->load("categories");
+if (!empty($conf->incoterm->enabled)) $langs->load("incoterm");
+if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-$mesg=''; $error=0; $errors=array();
+$mesg = ''; $error = 0; $errors = array();
 
-$action		= (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
-$cancel		= GETPOST('cancel','alpha');
-$backtopage	= GETPOST('backtopage','alpha');
-$confirm		= GETPOST('confirm');
+$action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
+$cancel		= GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+$confirm = GETPOST('confirm');
 
-$socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if (empty($socid) && $action == 'view') $action='create';
+$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+if (empty($socid) && $action == 'view') $action = 'create';
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartycard','globalcard'));
+$hookmanager->initHooks(array('thirdpartycard', 'globalcard'));
 
-if ($action == 'view' && $object->fetch($socid)<=0)
+if ($action == 'view' && $object->fetch($socid) <= 0)
 {
 	$langs->load("errors");
 	print($langs->trans('ErrorRecordNotFound'));
@@ -82,9 +82,9 @@ 
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $object->getCanvas($socid);
-$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
+$canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
+$objcanvas = null;
+if (!empty($canvas))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
     $objcanvas = new Canvas($db, $action);
@@ -99,16 +99,16 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
     if ($cancel)
     {
-        $action='';
-        if (! empty($backtopage))
+        $action = '';
+        if (!empty($backtopage))
         {
             header("Location: ".$backtopage);
             exit;
@@ -146,7 +146,7 @@ 
 				// Recopy some data
 				$object->client = $object->client | $soc_origin->client;
 				$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-				$listofproperties=array(
+				$listofproperties = array(
 					'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
 					'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 					'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
@@ -160,7 +160,7 @@ 
 				}
 
 				// Concat some data
-				$listofproperties=array(
+				$listofproperties = array(
 				    'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
@@ -204,7 +204,7 @@ 
 				}
 
 				// Move links
-				if (! $error)
+				if (!$error)
 				{
 					$objects = array(
 						'Adherent' => '/adherents/class/adherent.class.php',
@@ -244,7 +244,7 @@ 
 				}
 
 				// External modules should update their ones too
-				if (! $error)
+				if (!$error)
 				{
 					$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
 						'soc_origin' => $soc_origin->id,
@@ -259,12 +259,12 @@ 
 				}
 
 
-				if (! $error)
+				if (!$error)
 				{
-					$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+					$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 					// Call trigger
-					$result=$object->call_trigger('COMPANY_MODIFY',$user);
+					$result = $object->call_trigger('COMPANY_MODIFY', $user);
 					if ($result < 0)
 					{
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -300,28 +300,28 @@ 
     if (GETPOST('getcustomercode'))
     {
         // We defined value code_client
-        $_POST["code_client"]="Acompleter";
+        $_POST["code_client"] = "Acompleter";
     }
 
     if (GETPOST('getsuppliercode'))
     {
         // We defined value code_fournisseur
-        $_POST["code_fournisseur"]="Acompleter";
+        $_POST["code_fournisseur"] = "Acompleter";
     }
 
-    if($action=='set_localtax1')
+    if ($action == 'set_localtax1')
     {
     	//obtidre selected del combobox
-    	$value=GETPOST('lt1');
+    	$value = GETPOST('lt1');
     	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+    	$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
-    if($action=='set_localtax2')
+    if ($action == 'set_localtax2')
     {
     	//obtidre selected del combobox
-    	$value=GETPOST('lt2');
+    	$value = GETPOST('lt2');
     	$object->fetch($socid);
-    	$res=$object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+    	$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
     }
 
     if ($action == 'update_extras') {
@@ -331,10 +331,10 @@ 
 
         // 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'));
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
         if ($ret < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
             $result = $object->insertExtraFields('COMPANY_MODIFY');
    			if ($result < 0)
@@ -348,12 +348,12 @@ 
     }
 
     // Add new or update third party
-    if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
+    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'))
+        if (!GETPOST('name'))
         {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
             $error++;
@@ -370,39 +370,39 @@ 
 
         }
 
-        if (! $error)
+        if (!$error)
         {
         		if ($action == 'update')
 	        {
-	        		$ret=$object->fetch($socid);
+	        		$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
 	        }
-			else $object->canvas=$canvas;
+			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
+	            $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');
+	            $object->name_bis = GETPOST('name', 'alpha');
+	            $object->firstname = GETPOST('firstname', 'alpha');
 	        }
 	        else
 	        {
-	            $object->name				= GETPOST('name', 'alpha');
+	            $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->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->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->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'));
@@ -413,13 +413,13 @@ 
 	        $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->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');
+	        $object->status = GETPOST('status', 'alpha');
 
 	        // Local Taxes
 	        $object->localtax1_assuj			= GETPOST('localtax1assuj_value', 'alpha');
@@ -428,16 +428,16 @@ 
 	        $object->localtax1_value			= GETPOST('lt1', 'alpha');
 	        $object->localtax2_value			= GETPOST('lt2', 'alpha');
 
-	        $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+	        $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_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->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->client = GETPOST('client', 'int');
 	        $object->fournisseur				= GETPOST('fournisseur', 'int');
 
-	        $object->commercial_id			= GETPOST('commercial_id', 'int');
+	        $object->commercial_id = GETPOST('commercial_id', 'int');
 	        $object->default_lang			= GETPOST('default_lang');
 
 	        // Webservices url/key
@@ -447,8 +447,8 @@ 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
 			{
-				$object->fk_incoterms		= GETPOST('incoterm_id', 'int');
-				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
+				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			}
 
 			// Multicurrency
@@ -458,58 +458,58 @@ 
 			}
 
 	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	        $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']);
+	        else if (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 
 	        // Check parameters
-	        if (! GETPOST('cancel','alpha'))
+	        if (!GETPOST('cancel', 'alpha'))
 	        {
-	            if (! empty($object->email) && ! isValidEMail($object->email))
+	            if (!empty($object->email) && !isValidEMail($object->email))
 	            {
 	                $langs->load("errors");
 	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail",$object->email), 'errors');
+	                setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
 	            }
-	            if (! empty($object->url) && ! isValidUrl($object->url))
+	            if (!empty($object->url) && !isValidUrl($object->url))
 	            {
 	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl",$object->url), 'errors');
+	                setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
 	            }
-	            if ($object->fournisseur && ! $conf->fournisseur->enabled)
+	            if ($object->fournisseur && !$conf->fournisseur->enabled)
 	            {
 	                $langs->load("errors");
 	                setEventMessages('', $langs->trans("ErrorSupplierModuleNotEnabled"), 'errors');
 	            }
-	            if (! empty($object->webservices_url)) {
+	            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)) {
+	                if (!isValidUrl($object->webservices_url)) {
 	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
+	                    $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;
+	            $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'];
+	            	$tmparray = getCountry($object->country_id, 'all');
+	            	$object->country_code = $tmparray['code'];
+	            	$object->country = $tmparray['label'];
 	            }
 	        }
         }
 
-        if (! $error)
+        if (!$error)
         {
             if ($action == 'add')
             {
@@ -517,8 +517,8 @@ 
 
                 $db->begin();
 
-                if (empty($object->client))      $object->code_client='';
-                if (empty($object->fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client))      $object->code_client = '';
+                if (empty($object->fournisseur)) $object->code_fournisseur = '';
 
                 $result = $object->create($user);
 
@@ -527,7 +527,7 @@ 
 					if ($object->particulier)
 					{
 						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
-						$result=$object->create_individual($user);
+						$result = $object->create_individual($user);
 						if ($result < 0)
 						{
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -564,10 +564,10 @@ 
 
                             if (@is_dir($dir))
                             {
-                                $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                                $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                                 $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                                if (! $result > 0)
+                                if (!$result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
                                 }
@@ -581,7 +581,7 @@ 
                     }
                     else
 					{
-						switch($_FILES['photo']['error'])
+						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
@@ -607,21 +607,21 @@ 
                    	$error++;
                 }
 
-                if ($result >= 0 && ! $error)
+                if ($result >= 0 && !$error)
                 {
                     $db->commit();
 
-                	if (! empty($backtopage))
+                	if (!empty($backtopage))
                 	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+                	    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;
+                    	$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;
@@ -630,7 +630,7 @@ 
                 else
                 {
                     $db->rollback();
-                    $action='create';
+                    $action = 'create';
                 }
             }
 
@@ -638,9 +638,9 @@ 
             {
             	$error = 0;
 
-                if (GETPOST('cancel','alpha'))
+                if (GETPOST('cancel', 'alpha'))
                 {
-                	if (! empty($backtopage))
+                	if (!empty($backtopage))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
@@ -653,22 +653,22 @@ 
                 }
 
                 // 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='';
+                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)
+                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))
+				if (!$error && !empty($user->rights->categorie->lire))
 				{
 					// Customer categories association
-					$categories = GETPOST( 'custcats', 'array' );
+					$categories = GETPOST('custcats', 'array');
 					$result = $object->setCategories($categories, 'customer');
 					if ($result < 0)
 					{
@@ -691,8 +691,8 @@ 
                 $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
                 if (GETPOST('deletephoto') && $object->photo)
                 {
-                    $fileimg=$dir.'/'.$object->logo;
-                    $dirthumbs=$dir.'/thumbs';
+                    $fileimg = $dir.'/'.$object->logo;
+                    $dirthumbs = $dir.'/thumbs';
                     dol_delete_file($fileimg);
                     dol_delete_dir_recursive($dirthumbs);
                 }
@@ -704,10 +704,10 @@ 
 
                         if (@is_dir($dir))
                         {
-                            $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                            $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                             $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                            if (! $result > 0)
+                            if (!$result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
                             }
@@ -717,9 +717,9 @@ 
                             	$object->addThumbs($newfile);
 
                                 // Index file in database
-                                if (! empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
+                                if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
                                 {
-                                	require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+                                	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
@@ -735,7 +735,7 @@ 
                 }
                 else
                 {
-					switch($_FILES['photo']['error'])
+					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
@@ -750,21 +750,21 @@ 
 
 
                 // Update linked member
-                if (! $error && $object->fk_soc > 0)
+                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))
+                	$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 (!$error && !count($errors))
                 {
-                	if (! empty($backtopage))
+                	if (!empty($backtopage))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
@@ -778,13 +778,13 @@ 
                 else
                 {
                     $object->id = $socid;
-                    $action= "edit";
+                    $action = "edit";
                 }
             }
         }
         else
         {
-        	$action = ($action=='add'?'create':'edit');
+        	$action = ($action == 'add' ? 'create' : 'edit');
         }
     }
 
@@ -804,7 +804,7 @@ 
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
            	$error++;
-            $action='';
+            $action = '';
         }
     }
 
@@ -812,7 +812,7 @@ 
     if ($action == 'set_thirdparty' && $user->rights->societe->creer)
     {
     	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany','int'));
+    	$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
     }
 
     // Set incoterm
@@ -823,17 +823,17 @@ 
     }
 
     // Actions to send emails
-    $id=$socid;
-    $trigger_name='COMPANY_SENTBYMAIL';
-    $paramname='socid';
-    $mode='emailfromthirdparty';
-    $trackid='thi'.$object->id;
+    $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;
+    $permissioncreate = $user->rights->societe->creer;
     include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
@@ -849,24 +849,24 @@ 
 
 if ($socid > 0 && empty($object->id))
 {
-    $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
+    $result = $object->fetch($socid);
+	if ($result <= 0) dol_print_error('', $object->error);
 }
 
-$title=$langs->trans("ThirdParty");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$langs->trans('Card');
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
     // -----------------------------------------
     // When used with CANVAS
     // -----------------------------------------
-   	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
-    $objcanvas->display_canvas($action);							// Show template
+   	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
+    $objcanvas->display_canvas($action); // Show template
 }
 else
 {
@@ -878,66 +878,66 @@ 
         /*
          *  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;
+		$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');
+        $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);
+            $module = substr($module, 0, dol_strlen($module) - 4);
         }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
         foreach ($dirsociete as $dirroot)
         {
-            $res=dol_include_once($dirroot.$module.'.php');
+            $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');
+        $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);
+            $module = substr($module, 0, dol_strlen($module) - 4);
         }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
         foreach ($dirsociete as $dirroot)
         {
-            $res=dol_include_once($dirroot.$module.'.php');
+            $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')
+        if (GETPOST("type") != 'f')
         {
-            $object->client=-1;
-            if (! empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT))  { $object->client=3; }
+            $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; }
+        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->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;
+        $object->client = GETPOST('client') ?GETPOST('client') : $object->client;
 
-        if(empty($duplicate_code_error)) {
+        if (empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('code_client', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
+	        $object->fournisseur		= GETPOST('fournisseur') ?GETPOST('fournisseur') : $object->fournisseur;
         }
 		else {
-			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
+			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->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');
@@ -951,30 +951,30 @@ 
         $object->idprof4			= GETPOST('idprof4', 'alpha');
         $object->idprof5			= GETPOST('idprof5', 'alpha');
         $object->idprof6			= GETPOST('idprof6', 'alpha');
-        $object->typent_id			= GETPOST('typent_id', 'int');
+        $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');
+        $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->localtax1_value	= GETPOST('lt1', 'int');
+        $object->localtax2_value	= GETPOST('lt2', 'int');
 
-        $object->tva_intra			= GETPOST('tva_intra', 'alpha');
+        $object->tva_intra = GETPOST('tva_intra', 'alpha');
 
-        $object->commercial_id		= GETPOST('commercial_id', 'int');
-        $object->default_lang		= GETPOST('default_lang');
+        $object->commercial_id = GETPOST('commercial_id', 'int');
+        $object->default_lang = GETPOST('default_lang');
 
-        $object->logo = (isset($_FILES['photo'])?dol_sanitizeFileName($_FILES['photo']['name']):'');
+        $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);
+        $file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
         if ($file_OK)
         {
             if (image_format_supported($_FILES['photo']['name']))
@@ -983,10 +983,10 @@ 
 
                 if (@is_dir($dir))
                 {
-                    $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                    $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
                     $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                    if (! $result > 0)
+                    if (!$result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
                     }
@@ -1000,20 +1000,20 @@ 
         }
 
         // We set country_id, country_code and country for the selected country
-        $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
+        $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'];
+            $tmparray = getCountry($object->country_id, 'all');
+            $object->country_code = $tmparray['code'];
+            $object->country = $tmparray['label'];
         }
-        $object->forme_juridique_code=GETPOST('forme_juridique_code');
+        $object->forme_juridique_code = GETPOST('forme_juridique_code');
         /* Show create form */
 
-        $linkback="";
-        print load_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png');
+        $linkback = "";
+        print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'title_companies.png');
 
-        if (! empty($conf->use_javascript_ajax))
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n".'<script type="text/javascript">';
             print '$(document).ready(function () {
@@ -1051,31 +1051,31 @@ 
             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 '<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");
+            $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');
+        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 '<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="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">';
@@ -1088,15 +1088,15 @@ 
 	    print '<tr><td class="titlefieldcreate">';
         if ($object->particulier || $private)
         {
-	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
+	        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 '<span id="TypeName" class="fieldrequired">'.fieldLabel('ThirdPartyName', 'name').'</span>';
         }
-	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+	    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
+	    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>';
 	    }
@@ -1105,11 +1105,11 @@ 
         // If javascript on, we show option individual
         if ($conf->use_javascript_ajax)
         {
-            print '<tr class="individualline"><td>'.fieldLabel('FirstName','firstname').'</td>';
+            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 '<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>';
         }
@@ -1119,130 +1119,130 @@ 
 	    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 '<tr><td class="titlefieldcreate">'.fieldLabel('ProspectCustomer', 'customerprospect', 1).'</td>';
 	    print '<td class="maxwidthonsmartphone">';
-	    $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
+	    $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>';
+        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 '<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);
+		$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);
+        $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))
+        if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
         {
             // Supplier
             print '<tr>';
-            print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td>';
+            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));
+            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 '<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);
+            $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);
+            $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 '<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))
+        if (!empty($conf->barcode->enabled))
         {
-            print '<tr><td>'.fieldLabel('Gencod','barcode').'</td>';
+            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 '<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 '<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 '<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))
+            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">';
+                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">';
+                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);
+            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 '<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 '<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))
+        if (!empty($conf->skype->enabled))
         {
-            print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
+            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 '<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>'.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;
+        $i = 1; $j = 0;
         while ($i <= 6)
         {
-            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-            if ($idprof!='-')
+            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+            if ($idprof != '-')
             {
-	            $key='idprof'.$i;
+	            $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>';
+                $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>';
@@ -1254,19 +1254,19 @@ 
         if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
 
         // Vat is used
-        print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>';
+        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 $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">'.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.=' ';
+            $s .= ' ';
 
-            if (! empty($conf->use_javascript_ajax))
+            if (!empty($conf->use_javascript_ajax))
             {
                 print "\n";
                 print '<script language="JavaScript" type="text/javascript">';
@@ -1275,12 +1275,12 @@ 
                 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);
+                $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>';
+                $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
         print $s;
@@ -1289,41 +1289,41 @@ 
 
         // 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")
+        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 '<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")
+        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 '<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")
+        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 '<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 '<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);
+        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td>';
-        print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
+        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);
+        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 '<tr><td>'.fieldLabel('JuridicalStatus', 'forme_juridique_code').'</td>';
         print '<td colspan="3" class="maxwidthonsmartphone">';
         if ($object->country_id)
         {
@@ -1336,14 +1336,14 @@ 
         print '</td></tr>';
 
         // Capital
-        print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
+        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))
+        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 '<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>';
         }
@@ -1352,9 +1352,9 @@ 
         {
             // Assign a Name
             print '<tr>';
-            print '<td>'.fieldLabel('AllocateCommercial','commercial_id').'</td>';
+            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 $form->select_dolusers((!empty($object->commercial_id) ? $object->commercial_id : $user->id), 'commercial_id', 1); // Add current user by default
             print '</td></tr>';
         }
 
@@ -1362,20 +1362,20 @@ 
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr>';
-			print '<td>'.fieldLabel('IncotermLabel','incoterm_id').'</td>';
+			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 $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))
+		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">';
+				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%");
@@ -1384,7 +1384,7 @@ 
 
 			// Supplier
 			if ($object->fournisseur) {
-				print '<tr><td class="toptd">' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . '</td><td colspan="3">';
+				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%");
@@ -1393,27 +1393,27 @@ 
 		}
 
 		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
-			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+			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
+        $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))
+        if (empty($reshook) && !empty($extrafields->attribute_label))
         {
-        	print $object->showOptionals($extrafields,'edit');
+        	print $object->showOptionals($extrafields, 'edit');
         }
 
         // Ajout du logo
         print '<tr class="hideonsmartphone">';
-        print '<td>'.fieldLabel('Logo','photoinput').'</td>';
+        print '<td>'.fieldLabel('Logo', 'photoinput').'</td>';
         print '<td colspan="3">';
         print '<input class="flat" type="file" name="photo" id="photoinput" />';
         print '</td>';
@@ -1425,7 +1425,7 @@ 
 
         print '<div class="center">';
         print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-        if (! empty($backtopage))
+        if (!empty($backtopage))
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
@@ -1433,7 +1433,7 @@ 
         else
         {
             print ' &nbsp; &nbsp; ';
-            print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+            print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
         }
         print '</div>'."\n";
 
@@ -1450,21 +1450,21 @@ 
 
         if ($socid)
         {
-        	$res=$object->fetch_optionals();
+        	$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');
+            $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);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeClient = new $module($db);
@@ -1473,15 +1473,15 @@ 
             {
                 $prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
             }
-            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+            $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);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeFournisseur = new $module($db);
@@ -1496,17 +1496,17 @@ 
             if (GETPOSTISSET('name'))
             {
                 // We overwrite with values if posted
-                $object->name					= GETPOST('name', 'alpha');
+                $object->name = GETPOST('name', 'alpha');
                 $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
-                $object->client					= GETPOST('client', 'int');
+                $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->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');
@@ -1519,15 +1519,15 @@ 
                 $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->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->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');
+                $object->status = GETPOST('status', 'int');
 
                 // Webservices url/key
                 $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -1536,32 +1536,32 @@ 
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
 				{
-					$object->fk_incoterms			= GETPOST('incoterm_id', 'int');
-					$object->location_incoterms		= GETPOST('lcoation_incoterms', 'alpha');
+					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
 
                 //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'];
+                	$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 () {
@@ -1627,7 +1627,7 @@ 
             print '<table class="border" width="100%">';
 
             // Ref/ID
-			if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
 			{
 		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
             	print $object->ref;
@@ -1635,7 +1635,7 @@ 
 			}
 
             // Name
-            print '<tr><td class="titlefieldcreate">'.fieldLabel('ThirdPartyName','name',1).'</td>';
+            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)
@@ -1643,9 +1643,9 @@ 
 	        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
+            if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
             {
-                print '<tr><td>'.fieldLabel('Prefix','prefix').'</td><td colspan="3">';
+                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)
                 {
@@ -1660,21 +1660,21 @@ 
             }
 
             // Prospect/Customer
-            print '<tr><td>'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
+            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>';
+            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 '<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);
+                $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())
@@ -1687,27 +1687,27 @@ 
                 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);
+            $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))
+            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>'.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 '<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);
+                    $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())
@@ -1720,98 +1720,98 @@ 
                     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);
+                $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+                print $form->textwithpicto('', $s, 1);
                 print '</td></tr></table>';
 
                 print '</td></tr>';
             }
 
             // Barcode
-            if (! empty($conf->barcode->enabled))
+            if (!empty($conf->barcode->enabled))
             {
-                print '<tr><td class="tdtop">'.fieldLabel('Gencod','barcode').'</td>';
+                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 '<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 '<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 '<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 '</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 '<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))
+                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">';
+                    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 '<tr><td>'.fieldLabel('State', 'state_id').'</td><td colspan="3">';
                 }
 
-                print $formcompany->select_state($object->state_id,$object->country_code);
+                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 '<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 '<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))
+            if (!empty($conf->skype->enabled))
             {
-                print '<tr><td>'.fieldLabel('Skype','skype').'</td>';
+                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 '<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>'.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;
+            $i = 1; $j = 0;
             while ($i <= 6)
             {
-                $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-                if ($idprof!='-')
+                $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+                if ($idprof != '-')
                 {
-	                $key='idprof'.$i;
+	                $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>';
+	                $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 '<td><span class="fieldrequired">'.fieldLabel($idprof, $key).'</td><td>';
 
-	                print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
+	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                     print '</td>';
                     if (($j % 2) == 1) print '</tr>';
                     $j++;
@@ -1821,69 +1821,69 @@ 
             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 '<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")
+            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 '<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 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 '<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 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")
+            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 '<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 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")
+            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 '<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 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 '<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.'">';
+            $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; ';
+                $s .= ' &nbsp; ';
 
                 if ($conf->use_javascript_ajax)
                 {
@@ -1894,12 +1894,12 @@ 
                     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);
+                    $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>';
+                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
@@ -1907,44 +1907,44 @@ 
             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 '<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>'.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 '<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 '<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))
+            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 '<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))
+			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 			{
 				// Customer
 				if ($object->prospect || $object->client) {
-					print '<tr><td>' . fieldLabel('CustomersCategoriesShort', 'custcats') . '</td>';
+					print '<tr><td>'.fieldLabel('CustomersCategoriesShort', 'custcats').'</td>';
 					print '<td colspan="3">';
 					$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, null, null, null, 1);
 					$c = new Categorie($db);
 					$cats = $c->containing($object->id, Categorie::TYPE_CUSTOMER);
-					$arrayselected=array();
+					$arrayselected = array();
 					foreach ($cats as $cat) {
 						$arrayselected[] = $cat->id;
 					}
@@ -1954,12 +1954,12 @@ 
 
 				// Supplier
 				if ($object->fournisseur) {
-					print '<tr><td>' . fieldLabel('SuppliersCategoriesShort', 'suppcats') . '</td>';
+					print '<tr><td>'.fieldLabel('SuppliersCategoriesShort', 'suppcats').'</td>';
 					print '<td colspan="3">';
 					$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
 					$c = new Categorie($db);
 					$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
-					$arrayselected=array();
+					$arrayselected = array();
 					foreach ($cats as $cat) {
 						$arrayselected[] = $cat->id;
 					}
@@ -1969,29 +1969,29 @@ 
 			}
 
 			// Multicurrency
-			if (! empty($conf->multicurrency->enabled))
+			if (!empty($conf->multicurrency->enabled))
 			{
 				print '<tr>';
-				print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+				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
+            $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))
+            if (empty($reshook) && !empty($extrafields->attribute_label))
             {
-            	print $object->showOptionals($extrafields,'edit');
+            	print $object->showOptionals($extrafields, 'edit');
             }
 
             // Webservices url/key
             if (!empty($conf->syncsupplierwebservices->enabled)) {
-                print '<tr><td>'.fieldLabel('WebServiceURL','webservices_url').'</td>';
+                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>'.fieldLabel('WebServiceKey', 'webservices_key').'</td>';
                 print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
             }
 
@@ -1999,18 +1999,18 @@ 
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr>';
-				print '<td>'.fieldLabel('IncotermLabel','incoterm_id').'</td>';
+				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 $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>'.fieldLabel('Logo', 'photoinput').'</td>';
             print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe',$object);
-            $caneditfield=1;
+            if ($object->logo) print $form->showphoto('societe', $object);
+            $caneditfield = 1;
             if ($caneditfield)
             {
                 if ($object->logo) print "<br>\n";
@@ -2043,7 +2043,7 @@ 
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals();
+        if (!empty($object->id)) $res = $object->fetch_optionals();
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -2071,11 +2071,11 @@ 
 		    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');
+        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');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
 
         print '<div class="fichecenter">';
@@ -2090,7 +2090,7 @@ 
     	print '</td></tr>';
 
     	// Supplier
-    	if (! empty($conf->fournisseur->enabled))
+    	if (!empty($conf->fournisseur->enabled))
     	{
     		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
     		print yn($object->fournisseur);
@@ -2098,10 +2098,10 @@ 
     	}
 
     	// Prefix
-        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        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 $htmllogobar; $htmllogobar = '';
             print '</tr>';
         }
 
@@ -2113,49 +2113,49 @@ 
             print $object->code_client;
             if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
             print '</td>';
-            print $htmllogobar; $htmllogobar='';
+            print $htmllogobar; $htmllogobar = '';
             print '</tr>';
         }
 
         // Supplier code
-        if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+        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 $htmllogobar; $htmllogobar = '';
             print '</tr>';
         }
 
         // Barcode
-        if (! empty($conf->barcode->enabled))
+        if (!empty($conf->barcode->enabled))
         {
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td>'.$object->barcode;
             print '</td>';
-			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
+			if ($htmllogobar) $htmllogobar .= $form->showbarcode($object);
             print $htmllogobar;
-			$htmllogobar='';
+			$htmllogobar = '';
             print '</tr>';
         }
 
         // Prof ids
-        $i=1; $j=0;
+        $i = 1; $j = 0;
         while ($i <= 6)
         {
-            $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
-            if ($idprof!='-')
+            $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;
+                $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);
+                    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>';
@@ -2177,24 +2177,24 @@ 
 
 		// 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")
+		if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 		{
-		    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+		    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 '</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)))
+		    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 '<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");
+		            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 		        }
 		        else
@@ -2203,61 +2203,61 @@ 
 		        }
 		        print '</tr></form>';
 		    }
-		    if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+		    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 '<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");
+		            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else {
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
 		    }
 		}
-		elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+		elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
 		{
-		    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+		    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)))
+		    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 '<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");
+		            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else {
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
 		        print '</tr></form>';
 
 		    }
 		}
-		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+		elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
 		{
-		    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+		    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)))
+		    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 '<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");
+		            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else {
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
@@ -2278,13 +2278,13 @@ 
 		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.'">';
+            $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; ';
+                $s .= ' &nbsp; ';
 
                 if ($conf->use_javascript_ajax)
                 {
@@ -2295,12 +2295,12 @@ 
                     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);
+                    $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>';
+                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
@@ -2314,7 +2314,7 @@ 
 
         // Type + Staff
         $arr = $formcompany->typent_array(1);
-        $object->typent= $arr[$object->typent_code];
+        $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>';
 
@@ -2327,11 +2327,11 @@ 
         print '<table class="border tableforfield" width="100%">';
 
     	// Tags / categories
-		if (! empty($conf->categorie->enabled)  && ! empty($user->rights->categorie->lire))
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 		{
 			// Customer
 			if ($object->prospect || $object->client) {
-				print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
+				print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
 				print '<td>';
 				print $form->showCategories($object->id, 'customer', 1);
 				print "</td></tr>";
@@ -2339,7 +2339,7 @@ 
 
 			// Supplier
 			if ($object->fournisseur) {
-				print '<tr><td>' . $langs->trans("SuppliersCategoriesShort") . '</td>';
+				print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 				print '<td>';
 				print $form->showCategories($object->id, 'supplier', 1);
 				print "</td></tr>";
@@ -2351,19 +2351,19 @@ 
 
         // Capital
         print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
+        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))
+        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):'');
+            $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
             print $labellang;
             print '</td></tr>';
         }
@@ -2375,7 +2375,7 @@ 
             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>';
+            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>';
@@ -2386,24 +2386,24 @@ 
 			}
 			else
 			{
-				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 $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>';
 		}
 
 		// Multicurrency
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
-			print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
+			print '<td>'.fieldLabel('Currency', 'multicurrency_code').'</td>';
 	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code,1) : '';
+	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
 			print '</td></tr>';
 		}
 
 		// Other attributes
-		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$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))
@@ -2413,16 +2413,16 @@ 
         	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>';
+        	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);
+        		$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);
+        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
         	}
         	print '</td>';
         	print '</tr>';
@@ -2432,16 +2432,16 @@ 
         include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
         // Module Adherent
-        if (! empty($conf->adherent->enabled))
+        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);
+            $adh = new Adherent($db);
+            $result = $adh->fetch('', '', $object->id);
             if ($result > 0)
             {
-                $adh->ref=$adh->getFullName($langs);
+                $adh->ref = $adh->getFullName($langs);
                 print $adh->getNomUrl(1);
             }
             else
@@ -2474,8 +2474,8 @@ 
         {
 	        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
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if (empty($reshook))
 			{
 				$at_least_one_email_contact = false;
@@ -2489,7 +2489,7 @@ 
 					}
 				}
 
-		        if (! empty($object->email) || $at_least_one_email_contact)
+		        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>';
@@ -2542,10 +2542,10 @@ 
 	            /*
 	             * 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);
 	        }
@@ -2553,7 +2553,7 @@ 
 			// Subsidiaries list
 			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
 			{
-				$result=show_subsidiaries($conf,$langs,$db,$object);
+				$result = show_subsidiaries($conf, $langs, $db, $object);
 			}
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
@@ -2561,35 +2561,35 @@ 
 			$MAXEVENT = 10;
 
 			$morehtmlright = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id.'">';
-			$morehtmlright.= $langs->trans("SeeAll");
-			$morehtmlright.= '</a>';
+			$morehtmlright .= $langs->trans("SeeAll");
+			$morehtmlright .= '</a>';
 
 			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright);		// Show all action for thirdparty
+			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
 
 			print '</div></div></div>';
 
-			if (! empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
+			if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
 			{
 				// Contacts list
 				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 				{
-					$result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+					$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 
 				// Addresses list
-				if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+				if (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
 				{
-					$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+					$result = show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 			}
 		}
 
 		// Presend form
-		$modelmail='thirdparty';
-		$defaulttopic='Information';
+		$modelmail = 'thirdparty';
+		$defaulttopic = 'Information';
 		$diroutput = $conf->societe->dir_output;
 		$trackid = 'thi'.$object->id;
 

Braces +290 added lines, -183 removed lines

@@ -42,16 +42,24 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (! empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
 
 $langs->load("companies");
 $langs->load("commercial");
 $langs->load("bills");
 $langs->load("banks");
 $langs->load("users");
-if (! empty($conf->categorie->enabled)) $langs->load("categories");
-if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
+if (! empty($conf->categorie->enabled)) {
+	$langs->load("categories");
+}
+if (! empty($conf->incoterm->enabled)) {
+	$langs->load("incoterm");
+}
+if (! empty($conf->notification->enabled)) {
+	$langs->load("mails");
+}
 
 $mesg=''; $error=0; $errors=array();
 
@@ -61,8 +69,12 @@ 
 $confirm		= GETPOST('confirm');
 
 $socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if (empty($socid) && $action == 'view') $action='create';
+if ($user->societe_id) {
+	$socid=$user->societe_id;
+}
+if (empty($socid) && $action == 'view') {
+	$action='create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -101,7 +113,9 @@ 
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -128,8 +142,7 @@ 
 			$langs->load('errors');
 			$langs->load('companies');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
-		}
-		else
+		} else
 		{
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
@@ -156,7 +169,9 @@ 
 				);
 				foreach ($listofproperties as $property)
 				{
-					if (empty($object->$property)) $object->$property = $soc_origin->$property;
+					if (empty($object->$property)) {
+						$object->$property = $soc_origin->$property;
+					}
 				}
 
 				// Concat some data
@@ -173,7 +188,9 @@ 
 				{
 					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;
+					    }
 					}
 				}
 
@@ -286,8 +303,7 @@ 
 				{
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
-				}
-				else
+				} else
 				{
 				    $langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
@@ -332,7 +348,9 @@ 
         // 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 ($ret < 0) {
+        	$error++;
+        }
 
         if (! $error)
         {
@@ -344,7 +362,9 @@ 
 			}
         }
 
-        if ($error) $action = 'edit_extras';
+        if ($error) {
+        	$action = 'edit_extras';
+        }
     }
 
     // Add new or update third party
@@ -376,20 +396,22 @@ 
 	        {
 	        		$ret=$object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas=$canvas;
+	        } else {
+				$object->canvas=$canvas;
+			}
 
-	        if (GETPOST("private") == 1)	// Ask to create a contact
+	        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
+	        } else
 	        {
 	            $object->name				= GETPOST('name', 'alpha');
 	        }
@@ -464,8 +486,11 @@ 
 				 $error++;
 			}
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        if (GETPOST('deletephoto')) {
+	        	$object->logo = '';
+	        } else if (! empty($_FILES['photo']['name'])) {
+	        	$object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        }
 
 	        // Check parameters
 	        if (! GETPOST('cancel','alpha'))
@@ -517,8 +542,12 @@ 
 
                 $db->begin();
 
-                if (empty($object->client))      $object->code_client='';
-                if (empty($object->fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client)) {
+                	$object->code_client='';
+                }
+                if (empty($object->fournisseur)) {
+                	$object->code_fournisseur='';
+                }
 
                 $result = $object->create($user);
 
@@ -570,16 +599,14 @@ 
                                 if (! $result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else
+                                } else
                                 {
                                     // Create thumbs
                                     $object->addThumbs($newfile);
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
 					{
 						switch($_FILES['photo']['error'])
 						{
@@ -593,12 +620,13 @@ 
 						}
 	                }
                     // Gestion du logo de la société
-                }
-                else
+                } 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;
 					}
@@ -613,21 +641,24 @@ 
 
                 	if (! empty($backtopage))
                 	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+                	    if (preg_match('/\?/', $backtopage)) {
+                	    	$backtopage.='&socid='.$object->id;
+                	    }
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} 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;
+                    	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
+                } else
                 {
                     $db->rollback();
                     $action='create';
@@ -644,8 +675,7 @@ 
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
@@ -653,8 +683,12 @@ 
                 }
 
                 // 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='';
+                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);
@@ -710,8 +744,7 @@ 
                             if (! $result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else
+                            } else
                             {
                             	// Create thumbs
                             	$object->addThumbs($newfile);
@@ -727,13 +760,11 @@ 
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
 					{
                         $errors[] = "ErrorBadImageFormat";
                     }
-                }
-                else
+                } else
                 {
 					switch($_FILES['photo']['error'])
 					{
@@ -768,21 +799,18 @@ 
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
-                }
-                else
+                } else
                 {
                     $object->id = $socid;
                     $action= "edit";
                 }
             }
-        }
-        else
+        } else
         {
         	$action = ($action=='add'?'create':'edit');
         }
@@ -798,8 +826,7 @@ 
         {
             header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".urlencode($object->name));
             exit;
-        }
-        else
+        } else
         {
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
@@ -850,11 +877,15 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
-}
+	if ($result <= 0) {
+		dol_print_error('',$object->error);
+	}
+	}
 
 $title=$langs->trans("ThirdParty");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title=$object->name." - ".$langs->trans('Card');
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -867,8 +898,7 @@ 
     // -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
     $objcanvas->display_canvas($action);							// Show template
-}
-else
+} else
 {
     // -----------------------------------------
     // When used in standard mode
@@ -879,8 +909,12 @@ 
          *  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;
+		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');
@@ -892,7 +926,9 @@ 
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
+            if ($res) {
+            	break;
+            }
         }
         $modCodeClient = new $module;
         // Load object modCodeFournisseur
@@ -905,7 +941,9 @@ 
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
+            if ($res) {
+            	break;
+            }
         }
         $modCodeFournisseur = new $module;
 
@@ -928,8 +966,7 @@ 
         if(empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('code_client', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
-        }
-		else {
+        } else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
 
@@ -989,8 +1026,7 @@ 
                     if (! $result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else
+                    } else
                     {
                         // Create thumbs
                         $object->addThumbs($newfile);
@@ -1078,7 +1114,9 @@ 
         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">';
+        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+        	print '<input type="hidden" name="code_auto" value="1">';
+        }
 
         dol_fiche_head(null, 'card', '', 0, '');
 
@@ -1089,17 +1127,18 @@ 
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
-        }
-        else
+        } 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
+	    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
@@ -1123,17 +1162,27 @@ 
 	    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>';
+        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);
+        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);
@@ -1147,13 +1196,17 @@ 
             print '<tr>';
             print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td>';
             $default = -1;
-            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $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);
+            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);
@@ -1191,7 +1244,9 @@ 
         // 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);
+        if ($user->admin) {
+        	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td></tr>';
 
         // State
@@ -1200,14 +1255,16 @@ 
             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
+            } 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;
+            if ($object->country_id) {
+            	print $formcompany->select_state($object->state_id,$object->country_code);
+            } else {
+            	print $countrynotdefined;
+            }
             print '</td></tr>';
         }
 
@@ -1239,19 +1296,25 @@ 
             {
 	            $key='idprof'.$i;
 
-                if (($j % 2) == 0) print '<tr>';
+                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>';
+                if (($j % 2) == 1) {
+                	print '</tr>';
+                }
                 $j++;
             }
             $i++;
         }
-        if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+        if ($j % 2 == 1) {
+        	print '<td colspan="2"></td></tr>';
+        }
 
         // Vat is used
         print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>';
@@ -1277,8 +1340,7 @@ 
                 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
+            } else
             {
                 $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
             }
@@ -1297,14 +1359,12 @@ 
             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")
+        } 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")
+        } 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);
@@ -1315,11 +1375,15 @@ 
         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);
+        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);
+        if ($user->admin) {
+        	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td></tr>';
 
         // Legal Form
@@ -1328,8 +1392,7 @@ 
         if ($object->country_id)
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else
+        } else
         {
             print $countrynotdefined;
         }
@@ -1429,8 +1492,7 @@ 
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else
+        } else
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
@@ -1438,8 +1500,7 @@ 
         print '</div>'."\n";
 
         print '</form>'."\n";
-    }
-    elseif ($action == 'edit')
+    } elseif ($action == 'edit')
     {
         /*
          * Edition
@@ -1465,7 +1526,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
             $modCodeClient = new $module($db);
             // We verified if the tag prefix is used
@@ -1482,7 +1545,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
             $modCodeFournisseur = new $module($db);
             // On verifie si la balise prefix est utilisee
@@ -1558,10 +1623,10 @@ 
 
             if($object->localtax1_assuj==0){
             	$sub=0;
-            }else{$sub=1;}
+            } else{$sub=1;}
             if($object->localtax2_assuj==0){
             	$sub2=0;
-            }else{$sub2=1;}
+            } else{$sub2=1;}
 
             print "\n".'<script type="text/javascript">';
             print '$(document).ready(function () {
@@ -1618,7 +1683,9 @@ 
             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">';
+            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');
@@ -1643,16 +1710,17 @@ 
 	        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
+            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
+                } else
                 {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
@@ -1662,9 +1730,15 @@ 
             // 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>';
+            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>';
@@ -1673,15 +1747,18 @@ 
             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);
+                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())
+            } else if ($object->codeclient_modifiable())
             {
                 print '<input type="text" name="code_client" id="customer_code" size="16" value="'.$object->code_client.'" maxlength="15">';
-            }
-            else
+            } else
             {
                 print $object->code_client;
                 print '<input type="hidden" name="code_client" value="'.$object->code_client.'">';
@@ -1706,15 +1783,18 @@ 
                 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);
+                    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())
+                } else if ($object->codefournisseur_modifiable())
                 {
                     print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-                }
-                else
+                } else
               {
                     print $object->code_fournisseur;
                     print '<input type="hidden" name="code_fournisseur" value="'.$object->code_fournisseur.'">';
@@ -1756,7 +1836,9 @@ 
             // 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);
+            if ($user->admin) {
+            	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td></tr>';
 
             // State
@@ -1765,8 +1847,7 @@ 
                 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
+                } else
                 {
                     print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
                 }
@@ -1803,22 +1884,29 @@ 
                 {
 	                $key='idprof'.$i;
 
-	                if (($j % 2) == 0) print '<tr>';
+	                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>';
+	                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>';
+                    if (($j % 2) == 1) {
+                    	print '</tr>';
+                    }
                     $j++;
                 }
                 $i++;
             }
-            if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+            if ($j % 2 == 1) {
+            	print '<td colspan="2"></td></tr>';
+            }
 
             // VAT is used
             print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td><td colspan="3">';
@@ -1849,8 +1937,7 @@ 
                 }
                 print '</td></tr>';
 
-            }
-            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+            } 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);
@@ -1862,8 +1949,7 @@ 
                 }
                 print '</td></tr>';
 
-            }
-            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+            } 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);
@@ -1896,8 +1982,7 @@ 
                     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
+                } else
                 {
                     $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
                 }
@@ -1909,11 +1994,15 @@ 
             // 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);
+            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);
+            if ($user->admin) {
+            	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td></tr>';
 
             // Juridical type
@@ -2009,13 +2098,19 @@ 
             print '<tr class="hideonsmartphone">';
             print '<td>'.fieldLabel('Logo','photoinput').'</td>';
             print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe',$object);
+            if ($object->logo) {
+            	print $form->showphoto('societe',$object);
+            }
             $caneditfield=1;
             if ($caneditfield)
             {
-                if ($object->logo) print "<br>\n";
+                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>';
+                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>';
@@ -2036,14 +2131,15 @@ 
 
             print '</form>';
         }
-    }
-    else
+    } else
     {
     	/*
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals();
+        if (!empty($object->id)) {
+        	$res=$object->fetch_optionals();
+        }
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -2098,9 +2194,11 @@ 
     	}
 
     	// Prefix
-        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        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>';
         }
@@ -2111,7 +2209,9 @@ 
             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>';
+            if ($object->check_codeclient() <> 0) {
+            	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            }
             print '</td>';
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
@@ -2123,7 +2223,9 @@ 
             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>';
+            if ($object->check_codefournisseur() <> 0) {
+            	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            }
             print '</td>';
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
@@ -2135,7 +2237,9 @@ 
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td>'.$object->barcode;
             print '</td>';
-			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
+			if ($htmllogobar) {
+				$htmllogobar.=$form->showbarcode($object);
+			}
             print $htmllogobar;
 			$htmllogobar='';
             print '</tr>';
@@ -2155,8 +2259,11 @@ 
                 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>';
+                    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>';
@@ -2196,8 +2303,7 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }
-		        else
+		        } else
 		        {
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
@@ -2213,13 +2319,12 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else{
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
 		    }
-		}
-		elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+		} 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);
@@ -2234,14 +2339,13 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else{
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
 		        print '</tr></form>';
 
 		    }
-		}
-		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+		} 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);
@@ -2257,7 +2361,7 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else{
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
@@ -2297,15 +2401,13 @@ 
                     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
+                } else
                 {
                     $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
                 }
             }
             print $s;
-        }
-        else
+        } else
         {
             print '&nbsp;';
         }
@@ -2351,8 +2453,11 @@ 
 
         // 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;';
+        if ($object->capital) {
+        	print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
+        } else {
+        	print '&nbsp;';
+        }
         print '</td></tr>';
 
         // Default language
@@ -2375,16 +2480,18 @@ 
             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;';
+            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);
-			}
-			else
+			} else
 			{
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
 			}
@@ -2413,14 +2520,15 @@ 
         	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>';
+        	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
+        	} else
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
         	}
@@ -2443,8 +2551,7 @@ 
             {
                 $adh->ref=$adh->getFullName($langs);
                 print $adh->getNomUrl(1);
-            }
-            else
+            } else
             {
                 print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
@@ -2493,8 +2600,7 @@ 
 		        {
 		        	$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
+		        } 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>';
@@ -2512,11 +2618,12 @@ 
 
 		        if ($user->rights->societe->supprimer)
 		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+		            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
+		            } 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";
 		            }