diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 448f5d15ed9..4785ab78174 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -79,7 +79,7 @@ class Documents extends DolibarrApi
 		}
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
 		$accessallowed = $check_access['accessallowed'];
@@ -94,16 +94,16 @@ class Documents extends DolibarrApi
 		}
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 			dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
 			throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
+		$file_content = file_get_contents($original_file_osencoded);
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64');
 	}
 
 
@@ -141,12 +141,12 @@ class Documents extends DolibarrApi
 		$outputlangs = $langs;
 		if ($langcode && $langs->defaultlang != $langcode)
 		{
-			$outputlangs=new Translate('', $conf);
+			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang($langcode);
 		}
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
 		$accessallowed              = $check_access['accessallowed'];
@@ -165,20 +165,20 @@ class Documents extends DolibarrApi
 		$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
 		$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
 
-		$templateused='';
+		$templateused = '';
 
 		if ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$this->invoice = new Facture($this->db);
 			$result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$templateused = $doctemplate?$doctemplate:$this->invoice->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->invoice->modelpdf;
 			$result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -187,12 +187,12 @@ class Documents extends DolibarrApi
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
 			$result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
-			$templateused = $doctemplate?$doctemplate:$this->order->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->order->modelpdf;
 			$result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -201,12 +201,12 @@ class Documents extends DolibarrApi
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
 			$result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
-			$templateused = $doctemplate?$doctemplate:$this->propal->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->propal->modelpdf;
 			$result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -216,15 +216,15 @@ class Documents extends DolibarrApi
 		}
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 			throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
+		$file_content = file_get_contents($original_file_osencoded);
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64');
 	}
 
 	/**
@@ -257,7 +257,7 @@ class Documents extends DolibarrApi
 			throw new RestException(400, 'bad value for parameter id or ref');
 		}
 
-		$id = (empty($id)?0:$id);
+		$id = (empty($id) ? 0 : $id);
 
 		if ($modulepart == 'societe' || $modulepart == 'thirdparty')
 		{
@@ -268,12 +268,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Societe($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Thirdparty not found');
 			}
 
-			$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
+			$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
 		}
 		elseif ($modulepart == 'adherent' || $modulepart == 'member')
 		{
@@ -284,12 +284,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Adherent($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Member not found');
 			}
 
-			$upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
+			$upload_dir = $conf->adherent->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'member');
 		}
 		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
@@ -300,12 +300,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Propal($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
 
-			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
+			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
 		}
 		elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
@@ -316,12 +316,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Commande($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
 
-			$upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
+			$upload_dir = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 		}
 		elseif ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
@@ -332,12 +332,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Expedition($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Shipment not found');
 			}
 
-			$upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
+			$upload_dir = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
 		}
 		elseif ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
@@ -348,12 +348,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Facture($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
+			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		}
         elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
@@ -364,8 +364,8 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Product($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Product not found');
 			}
 
@@ -380,8 +380,8 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new ActionComm($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Event not found');
 			}
 
@@ -392,9 +392,9 @@ class Documents extends DolibarrApi
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
-		$filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		if (empty($filearray)) {
-			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(! empty($object->Ref)?' or Ref '.$object->ref:'').' does not return any document.');
+			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->Ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
 		}
 
 		return $filearray;
@@ -447,7 +447,7 @@ class Documents extends DolibarrApi
         var_dump($filecontent);
         exit;*/
 
-		if(empty($modulepart))
+		if (empty($modulepart))
 		{
 			throw new RestException(400, 'Modulepart not provided.');
 		}
@@ -467,11 +467,11 @@ class Documents extends DolibarrApi
 		$entity = DolibarrApiAccess::$user->entity;
 		if ($ref)
 		{
-			$tmpreldir='';
+			$tmpreldir = '';
 
 			if ($modulepart == 'facture' || $modulepart == 'invoice')
 			{
-				$modulepart='facture';
+				$modulepart = 'facture';
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
@@ -491,11 +491,11 @@ class Documents extends DolibarrApi
 				$task_result = $object->fetch('', $ref);
 
 				// Fetching the tasks project is required because its out_dir might be a sub-directory of the project
-				if($task_result > 0)
+				if ($task_result > 0)
 				{
 					$project_result = $object->fetch_projet();
 
-					if($project_result >= 0)
+					if ($project_result >= 0)
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
@@ -516,11 +516,11 @@ class Documents extends DolibarrApi
 				throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 			}
 
-			if(is_object($object))
+			if (is_object($object))
 			{
 				$result = $object->fetch('', $ref);
 
-				if($result == 0)
+				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
 			    }
@@ -530,7 +530,7 @@ class Documents extends DolibarrApi
 				}
 			}
 
-			if (! ($object->id > 0))
+			if (!($object->id > 0))
 			{
    				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
 			}
@@ -538,7 +538,7 @@ class Documents extends DolibarrApi
 			$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
@@ -547,12 +547,12 @@ class Documents extends DolibarrApi
 		}
 		else
 		{
-			if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') $modulepart = 'facture';
 
 			$relativefile = $subdir;
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
@@ -568,8 +568,8 @@ class Documents extends DolibarrApi
 		    throw new RestException(500, 'Error while trying to create directory.');
 		}
 
-		$destfile = $upload_dir . '/' . $original_file;
-		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		$destfile = $upload_dir.'/'.$original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/'.$original_file;
 		dol_delete_file($destfiletmp);
 		//var_dump($original_file);exit;
 
@@ -577,7 +577,7 @@ class Documents extends DolibarrApi
 			throw new RestException(401, 'Directory not exists : '.dirname($destfile));
 		}
 
-		if (! $overwriteifexists && dol_is_file($destfile))
+		if (!$overwriteifexists && dol_is_file($destfile))
 		{
 			throw new RestException(500, "File with name '".$original_file."' already exists.");
 		}
@@ -595,7 +595,7 @@ class Documents extends DolibarrApi
 		}
 
 		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-		if (! $result)
+		if (!$result)
 		{
 			throw new RestException(500, "Failed to move file into '".$destfile."'");
 		}
@@ -629,7 +629,7 @@ class Documents extends DolibarrApi
 	    }
 
 	    //--- Finds and returns the document
-	    $entity=$conf->entity;
+	    $entity = $conf->entity;
 
 	    $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
 	    $accessallowed = $check_access['accessallowed'];
@@ -644,9 +644,9 @@ class Documents extends DolibarrApi
 	    }
 
 	    $filename = basename($original_file);
-	    $original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+	    $original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-	    if (! file_exists($original_file_osencoded))
+	    if (!file_exists($original_file_osencoded))
 	    {
 	        dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
 	        throw new RestException(404, 'File not found');
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 38ccb13b6b5..d5a1d87a5a0 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -75,11 +75,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'bom', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-$permissionnote=$user->rights->bom->write;	// Used by the include of actions_setnotes.inc.php
-$permissiondellink=$user->rights->bom->write;	// Used by the include of actions_dellink.inc.php
-$permissiontoadd=$user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissionnote = $user->rights->bom->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->bom->write; // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->bom->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$upload_dir = $conf->bom->multidir_output[isset($object->entity)?$object->entity:1];
+$upload_dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
@@ -521,29 +521,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-	if (! empty($object->table_element_line))
+	if (!empty($object->table_element_line))
 	{
 	    // Show object lines
 	    $result = $object->getLinesArray();
 
-	    print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#addline' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+	    print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
-    	<input type="hidden" name="id" value="' . $object->id . '">
+    	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-	    if (! empty($conf->use_javascript_ajax) && $object->status == 0) {
-	        include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+	    if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+	        include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	    }
 
 	    print '<div class="div-table-responsive-no-min">';
-	    if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+	    if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
 	    {
 	        print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	    }
 
-	    if (! empty($object->lines))
+	    if (!empty($object->lines))
 	    {
 	        $object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
 	    }
@@ -561,7 +561,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        }
 	    }
 
-	    if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+	    if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
 	    {
 	        print '</table>';
 	    }
@@ -613,11 +613,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		{
 	    			if (is_array($object->lines) && count($object->lines) > 0)
 	    			{
-	    				print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=validate">' . $langs->trans("Validate") . '</a>';
+	    				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 	    			}
 	    			else
 	    			{
-	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("AddAtLeastOneLineFirst").'">' . $langs->trans("Validate") . '</a>';
+	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("AddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    			}
 	    		}
     		}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 69583f8c555..db6462eb90a 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -68,37 +68,37 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","companies"));
+        $langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Page size for A4 format
 		$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->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 COMMANDE_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->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva COMMANDE_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
 	}
 
 
@@ -110,83 +110,83 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 	 */
     public function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors","companies"));
+        $langs->loadLangs(array("errors", "companies"));
 
 		$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="MYMODULE_MYOBJECT_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="MYMODULE_MYOBJECT_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->MYMODULE_MYOBJECT_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->MYMODULE_MYOBJECT_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
+		$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->MYMODULE_MYOBJECT_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>';
+		$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->MYMODULE_MYOBJECT_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->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->MYMODULE_MYOBJECT_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;
 	}
@@ -206,7 +206,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
     public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -215,28 +215,28 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		}
 
 		// 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->loadLangs(array("main", "dict", "companies", "bills"));
 
 		if ($conf->commande->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Commande($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
 					dol_print_error($this->db, $object->error);
@@ -244,16 +244,16 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				}
 			}
 
-			$dir = $conf->commande->multidir_output[isset($object->entity)?$object->entity:1];
+			$dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$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;
 				}
 			}
@@ -261,25 +261,25 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			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;
@@ -289,20 +289,20 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 
 				// If CUSTOMER contact defined on order, 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
-				$contactobject=null;
-				if (! empty($usecontact))
+				$contactobject = null;
+				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
@@ -311,11 +311,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				}
 				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,
@@ -324,15 +324,15 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				);
 				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='ORDER_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'ORDER_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
@@ -342,15 +342,15 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->commande->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();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
@@ -365,31 +365,31 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
 				$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_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);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) $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_objet, $array_other, $array_thirdparty_contact);
 				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
+				$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)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						if (preg_match('/logo$/', $key)) // Image
@@ -402,7 +402,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -414,7 +414,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					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;
@@ -424,22 +424,22 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					{
 						foreach ($object->lines as $line)
 						{
-							$tmparray=$this->get_substitutionarray_lines($line, $outputlangs);
+							$tmparray = $this->get_substitutionarray_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)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -449,21 +449,21 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						$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)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -471,15 +471,15 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 				// 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();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -488,27 +488,27 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error=$e->getMessage();
+                        $this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						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;
 			}
 		}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 7c4fa1ebbdc..4a0ca27870b 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -106,11 +106,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 //$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 $permissiontoread = $user->rights->mymodule->myobject->read;
-$permissiontoadd = $user->rights->mymodule->myobject->write; 	// Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->mymodule->myobject->write;		// Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->mymodule->myobject->write;	// Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->mymodule->multidir_output[isset($object->entity)?$object->entity:1];
+$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
@@ -392,29 +392,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-	if (! empty($object->table_element_line))
+	if (!empty($object->table_element_line))
 	{
     	// Show object lines
     	$result = $object->getLinesArray();
 
-    	print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#addline' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+    	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
-    	<input type="hidden" name="id" value="' . $object->id . '">
+    	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-    	if (! empty($conf->use_javascript_ajax) && $object->status == 0) {
-    	    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+    	if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+    	    include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
     	}
 
     	print '<div class="div-table-responsive-no-min">';
-    	if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+    	if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
     	{
     	    print '<table id="tablelines" class="noborder noshadow" width="100%">';
     	}
 
-    	if (! empty($object->lines))
+    	if (!empty($object->lines))
     	{
     		$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
     	}
@@ -432,7 +432,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	    }
     	}
 
-    	if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+    	if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
     	{
     	    print '</table>';
     	}
@@ -446,21 +446,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action != 'presend' && $action != 'editline') {
     	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 ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     	if (empty($reshook))
     	{
     	    // Send
-            print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
 
             // Back to draft
             if ($object->status == $object::STATUS_VALIDATED)
             {
 	            if ($permissiontoadd)
 	            {
-	            	print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=setdraft">' . $langs->trans("SetToDraft") . '</a>';
+	            	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft">'.$langs->trans("SetToDraft").'</a>';
 	            }
             }
 
@@ -493,7 +493,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		// Clone
     		if ($permissiontoadd)
     		{
-    			print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&socid=' . $object->socid . '&action=clone&object=myobject">' . $langs->trans("ToClone") . '</a>'."\n";
+    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=myobject">'.$langs->trans("ToClone").'</a>'."\n";
     		}
 
     		/*
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 7cbb7256b5f..ec838e6e7d8 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -109,7 +109,7 @@ $permissionnote = $user->rights->mrp->write; // Used by the include of actions_s
 $permissiondellink = $user->rights->mrp->write; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$upload_dir = $conf->mrp->multidir_output[isset($object->entity)?$object->entity:1];
+$upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 2b63065f72c..7758e97b4ef 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -97,7 +97,7 @@ $permissionnote = $user->rights->mrp->write; // Used by the include of actions_s
 $permissiondellink = $user->rights->mrp->write; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$upload_dir = $conf->mrp->multidir_output[isset($object->entity)?$object->entity:1];
+$upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*