Dolibarr / dolibarr

htdocs/core/modules/DolibarrModules.class.php

Spacing +39 added lines, -39 removed lines

@@ -143,7 +143,7 @@ 
 
 	const KEY_ID = 0;
 	const KEY_LABEL = 1;
-	const KEY_TYPE = 2;	// deprecated
+	const KEY_TYPE = 2; // deprecated
 	const KEY_DEFAULT = 3;
 	const KEY_FIRST_LEVEL = 4;
 	const KEY_SECOND_LEVEL = 5;
@@ -729,7 +729,7 @@ 
 				$moduleNameInConf = 'supplier_proposal';
 			}
 
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
 			return 1;
 		} else {
@@ -825,7 +825,7 @@ 
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
 			if ((float) DOL_VERSION >= 6.0) {  // @phpstan-ignore-line
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1589,7 +1589,7 @@ 
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1612,9 +1612,9 @@ 
 	public function insert_cronjobs()
 	{
 		// phpcs:enable
-		include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 		global $conf, $user;
 
@@ -1625,7 +1625,7 @@ 
 		$err = 0;
 
 		if (is_array($this->cronjobs)) {
-			dol_syslog(get_class($this) . "::insert_cronjobs", LOG_DEBUG);
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 
 			foreach ($this->cronjobs as $key => $value) {
 				$now = dol_now();
@@ -1652,7 +1652,7 @@ 
 				$test = isset($value['test']) ? $value['test'] : ''; // Line must be enabled or not (so visible or not)
 
 				// Search if cron entry already present
-				$sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "cronjob";
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
 				//$sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";
 				$sql .= " WHERE label = '".$this->db->escape($label)."'";
 				/* unique key is on label,entity so no need for this test
@@ -1672,7 +1672,7 @@ 
 					$sql .= " AND params = '" . $this->db->escape($params) . "'";
 				}
 				*/
-				$sql .= " AND entity = " . ((int) $entity); // Must be exact entity
+				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
 
 				$result = $this->db->query($sql);
 				if (!$result) {
@@ -1992,9 +1992,9 @@ 
 
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id = $this->rights[$key][self::KEY_ID];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
+					$r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_label = $this->rights[$key][self::KEY_LABEL];
-					$r_type	= $this->rights[$key][self::KEY_TYPE] ?? 'w';	// TODO deprecated
+					$r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
 					$r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
 					$r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
 					$r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -2022,7 +2022,7 @@ 
 					}
 
 					// condition to show or hide a user right (default: 1) (eg isModEnabled('anothermodule') or ($conf->global->MAIN_FEATURES_LEVEL > 0) or etc..)
-					$r_enabled	= $this->rights[$key][self::KEY_ENABLED] ?? '1';
+					$r_enabled = $this->rights[$key][self::KEY_ENABLED] ?? '1';
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -2039,10 +2039,10 @@ 
 							$sql .= ", libelle";
 							$sql .= ", module";
 							$sql .= ", module_origin";
-							$sql .= ", module_position";		// Not that module_position can be fixed eynamically when accessing page user/perms.php
+							$sql .= ", module_position"; // Not that module_position can be fixed eynamically when accessing page user/perms.php
 							$sql .= ", family";
 							$sql .= ", family_position";
-							$sql .= ", type";	// Not used yet
+							$sql .= ", type"; // Not used yet
 							$sql .= ", bydefault";
 							$sql .= ", perms";
 							$sql .= ", subperms";
@@ -2056,7 +2056,7 @@ 
 							$sql .= ", '".$this->db->escape((string) $r_module_position)."'";
 							$sql .= ", '".$this->db->escape($r_family)."'";
 							$sql .= ", '".$this->db->escape((string) $r_family_position)."'";
-							$sql .= ", '".$this->db->escape($r_type)."'";	// Not used yet
+							$sql .= ", '".$this->db->escape($r_type)."'"; // Not used yet
 							$sql .= ", ".((int) $r_default);
 							$sql .= ", '".$this->db->escape($r_perms)."'";
 							$sql .= ", '".$this->db->escape($r_subperms)."'";
@@ -2278,7 +2278,7 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
 		$sql .= " WHERE module = '".$this->db->escape($module)."'";
-		$sql .= " AND menu_handler = 'all'";	// We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
+		$sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
 		$sql .= " AND entity IN (0, ".$conf->entity.")";
 
 		dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
@@ -2462,7 +2462,7 @@ 
 						dol_delete_file($dest.'.zip');
 
 						// Compress it
-						global $errormsg;	// Used by dol_compress_dir
+						global $errormsg; // Used by dol_compress_dir
 						$errormsg = '';
 						$result = dol_compress_dir($src, $dest.'.zip', 'zip');
 						if ($result < 0) {
@@ -2662,36 +2662,36 @@ 
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
-			$return .=  $this->getVersion(1);
-			$return .=  '</span>';
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
+			$return .= $this->getVersion(1);
+			$return .= '</span>';
 		}
 
-		$return .=  '</div>
+		$return .= '</div>
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-		$return .=  '</div><br>';
-
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
-		$return .=  $codetoconfig;
-		$return .=  '</div>';
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
-		$return .=  $codeenabledisable;
-		$return .=  '</div>';
-		$return .=  '</div>';
-
-		$return .=  '
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+		$return .= '</div><br>';
+
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
+		$return .= $codetoconfig;
+		$return .= '</div>';
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
+		$return .= $codeenabledisable;
+		$return .= '</div>';
+		$return .= '</div>';
+
+		$return .= '
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
@@ -2711,7 +2711,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);
@@ -2748,7 +2748,7 @@ 
 		if (empty($conf->cache['noncompliantmodules'])) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-			$result = getURLContent(self::URL_FOR_BLACKLISTED_MODULES, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$result = getURLContent(self::URL_FOR_BLACKLISTED_MODULES, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($result['content']) && $result['http_code'] == 200) {
 				$langs->load("errors");
 

htdocs/compta/facture/card.php

Spacing +72 added lines, -72 removed lines

@@ -91,14 +91,14 @@ 
 }
 
 // General $Variables
-$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid'));    // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
+$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 $lineid = GETPOSTINT('lineid');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id')); // For backward compatibility
@@ -267,7 +267,7 @@ 
 					setEventMessages('', $warningMsgLineList, 'warnings');
 				}
 
-				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $result);
+				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
 				exit();
 			} else {
 				$langs->load("errors");
@@ -392,7 +392,7 @@ 
 		// Validation
 		$object->fetch($id);
 
-		if ((preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) &&	// empty should not happened, but when it occurs, the test save life
+		if ((preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) && // empty should not happened, but when it occurs, the test save life
 			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')								// If option enabled, we force invoice date
 		) {
 			$object->date = dol_now();
@@ -834,8 +834,8 @@ 
 			// We check if invoice has payments
 			$totalpaid = 0;
 			$sql = 'SELECT pf.amount';
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiement_facture as pf';
-			$sql .= ' WHERE pf.fk_facture = ' . ((int) $object->id);
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
 
 			$result = $db->query($sql);
 			if ($result) {
@@ -911,7 +911,7 @@ 
 					$tempTva->datev = $object->date;
 					$tempTva->datep = $object->date;
 					$tempTva->amount = $amount;
-					$tempTva->label = $langs->trans('WithholdingTax') . ' - ' . $object->ref;
+					$tempTva->label = $langs->trans('WithholdingTax').' - '.$object->ref;
 					//$tempTva->paye = 1;
 					$valid = $tempTva->getIdForLabel($tempTva->label);
 					if (!$valid) {
@@ -939,7 +939,7 @@ 
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
-					$object->fetch($object->id);	// Reload properties
+					$object->fetch($object->id); // Reload properties
 				}
 			}
 		} else {
@@ -955,7 +955,7 @@ 
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
-				$object->fetch($object->id);	// Reload properties
+				$object->fetch($object->id); // Reload properties
 			}
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
@@ -1156,7 +1156,7 @@ 
 					// Set invoice as paid
 					$result = $object->setPaid($user);
 					if ($result >= 0) {
-						$object->fetch($object->id);	// Reload properties
+						$object->fetch($object->id); // Reload properties
 						$db->commit();
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -1207,7 +1207,7 @@ 
 			$error++;
 		}
 
-		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
 		$date_pointoftax = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'), 'tzserver');
 
 		// Replacement invoice
@@ -1239,7 +1239,7 @@ 
 				$object->note_private		= trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->ref_customer		= GETPOST('ref_client', 'alphanohtml');
-				$object->model_pdf          = GETPOST('model', 'alphanohtml');
+				$object->model_pdf = GETPOST('model', 'alphanohtml');
 				$object->fk_project			= GETPOSTINT('projectid');
 				$object->cond_reglement_id	= GETPOSTINT('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
@@ -1300,9 +1300,9 @@ 
 				$object->note_private		= trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->ref_customer		= GETPOST('ref_client', 'alphanohtml');
-				$object->model_pdf          = GETPOST('model');
+				$object->model_pdf = GETPOST('model');
 				$object->fk_project			= GETPOSTINT('projectid');
-				$object->cond_reglement_id	= 0;		// No payment term for a credit note
+				$object->cond_reglement_id	= 0; // No payment term for a credit note
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account         = GETPOSTINT('fk_account');
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
@@ -1629,7 +1629,7 @@ 
 				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
 				$object->note_private       = trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client');
-				$object->ref_customer		= GETPOST('ref_client');
+				$object->ref_customer = GETPOST('ref_client');
 				$object->model_pdf          = GETPOST('model');
 				$object->fk_project			= GETPOSTINT('projectid');
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
@@ -1693,7 +1693,7 @@ 
 						$element = $subelement = 'expedition';
 					}
 
-					$object->origin = $origin;		// deprecated
+					$object->origin = $origin; // deprecated
 					$object->origin_type = $origin;
 					$object->origin_id = $originid;
 
@@ -1728,7 +1728,7 @@ 
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines or deposit lines");
 						$result = $srcobject->fetch($object->origin_id);
 
-						$i = -1;  // Ensure initialised for static analysis, but with invalid idx.
+						$i = -1; // Ensure initialised for static analysis, but with invalid idx.
 						// If deposit invoice - down payment with 1 line (fixed amount or percent)
 						if (GETPOST('type') == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
 							// Define the array $amountdeposit
@@ -2153,7 +2153,7 @@ 
 				if (!empty($origin) && !empty($originid)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-					$object->origin = $origin;		// deprecated
+					$object->origin = $origin; // deprecated
 					$object->origin_type = $origin;
 					$object->origin_id = $originid;
 
@@ -2179,7 +2179,7 @@ 
 						$line->fk_prev_id = $line->id;
 						$line->fetch_optionals();
 						if (getDolGlobalInt('INVOICE_USE_SITUATION') == 2) {
-							$line->situation_percent = 0;  // New situation percent must be 0 (No cumulative)
+							$line->situation_percent = 0; // New situation percent must be 0 (No cumulative)
 						} else {
 							$line->situation_percent = $line->get_prev_progress($object->id); // get good progress including credit note
 						}
@@ -2296,7 +2296,7 @@ 
 		} else {
 			$db->rollback();
 			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];		// Keep GET and POST here ?
+			$_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ?
 			$_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ?
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -2762,7 +2762,7 @@ 
 			 */
 
 			// Margin
-			$fournprice = (int) (GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');				// This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
+			$fournprice = (int) (GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : ''); // This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
 			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
 
 
@@ -2900,7 +2900,7 @@ 
 				if ($prod->price_min > $line->subprice) {
 					$price_subprice = price($line->subprice, 0, $outlangs, 1, -1, -1, 'auto');
 					$price_price_min = price($prod->price_min, 0, $outlangs, 1, -1, -1, 'auto');
-					setEventMessages($prod->ref . ' - ' . $prod->label . ' (' . $price_subprice . ' < ' . $price_price_min . ' ' . strtolower($langs->trans("MinPrice")) . ')' . "\n", null, 'warnings');
+					setEventMessages($prod->ref.' - '.$prod->label.' ('.$price_subprice.' < '.$price_price_min.' '.strtolower($langs->trans("MinPrice")).')'."\n", null, 'warnings');
 				} else {
 					setEventMessages($prod->error, $prod->errors, 'errors');
 				}
@@ -3051,7 +3051,7 @@ 
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
 
 		// Add buying price
-		$fournprice = (int) (GETPOST('fournprice') ? GETPOST('fournprice') : '');				// This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
+		$fournprice = (int) (GETPOST('fournprice') ? GETPOST('fournprice') : ''); // This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
 		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
 
 		// Prepare a price equivalent for minimum price check
@@ -3094,7 +3094,7 @@ 
 		// Define special_code for special lines
 		$special_code = GETPOSTINT('special_code');
 		if ($special_code == 3) {
-			$special_code = 0;	// Options should not exists on invoices
+			$special_code = 0; // Options should not exists on invoices
 		}
 
 		$line = new FactureLigne($db);
@@ -3548,7 +3548,7 @@ 
 
 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -3664,13 +3664,13 @@ 
 	$mode_reglement_id = GETPOSTINT('mode_reglement_id');
 	$fk_account = GETPOSTINT('fk_account');
 
-	$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+	$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
 	if (empty($dateinvoice)) {
-		$dateinvoice = (getDolGlobalString('MAIN_DO_NOT_AUTOFILL_DATE_INVOICE') ? -1 : '');		// By default '' so we will autofill date. -1 means keep empty.
+		$dateinvoice = (getDolGlobalString('MAIN_DO_NOT_AUTOFILL_DATE_INVOICE') ? -1 : ''); // By default '' so we will autofill date. -1 means keep empty.
 	}
 
 	// Load objectsrc
-	$objectsrc = null;  // Initialise
+	$objectsrc = null; // Initialise
 	//$remise_absolue = 0;
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
@@ -3754,8 +3754,8 @@ 
 				$fk_account        = (!empty($expesrc->fk_account) ? $expesrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
 
 				if (isModEnabled('multicurrency')) {
-					$currency_code 	= (!empty($expesrc->multicurrency_code) ? $expesrc->multicurrency_code : (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : $objectsrc->multicurrency_code));
-					$currency_tx 	= (!empty($expesrc->multicurrency_tx) ? $expesrc->multicurrency_tx : (!empty($soc->multicurrency_tx) ? $soc->multicurrency_tx : $objectsrc->multicurrency_tx));
+					$currency_code = (!empty($expesrc->multicurrency_code) ? $expesrc->multicurrency_code : (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : $objectsrc->multicurrency_code));
+					$currency_tx = (!empty($expesrc->multicurrency_tx) ? $expesrc->multicurrency_tx : (!empty($soc->multicurrency_tx) ? $soc->multicurrency_tx : $objectsrc->multicurrency_tx));
 				}
 
 				// replicate input reason
@@ -3853,7 +3853,7 @@ 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" id="formtocreateaction" value="add">';
-	print '<input type="hidden" name="changecompany" value="0">';	// will be set to 1 by javascript so we know post is done after a company change
+	print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
 	if ($soc->id > 0) {
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	}
@@ -4042,7 +4042,7 @@ 
 			print $form->selectarray('typestandard', $arraylist, GETPOST('typestandard', 'aZ09'), 0, 0, 0, '', 1);
 			print '</td>';*/
 			if (!getDolGlobalInt('INVOICE_DEPOSIT_INVOICE_ONLY_SAME_LINES')) {
-				print '<span class="opacitymedium marginleftonly">' . $langs->trans('PercentOfOriginalObject') . '</span>:<input class="right" placeholder="100%" type="text" id="valuestandardinvoice" name="valuestandardinvoice" size="3" value="' . (GETPOSTISSET('valuestandardinvoice') ? GETPOST('valuestandardinvoice', 'alpha') : '100%') . '"/>';
+				print '<span class="opacitymedium marginleftonly">'.$langs->trans('PercentOfOriginalObject').'</span>:<input class="right" placeholder="100%" type="text" id="valuestandardinvoice" name="valuestandardinvoice" size="3" value="'.(GETPOSTISSET('valuestandardinvoice') ? GETPOST('valuestandardinvoice', 'alpha') : '100%').'"/>';
 			}
 		}
 		print '</div></div>'."\n";
@@ -4397,8 +4397,8 @@ 
 		if ($socid > 0) {
 			print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td><td colspan="2">';
 
-			$thirdparty = $soc;	// used by object_discounts.tpl.php
-			$discount_type = 0;	// used by object_discounts.tpl.php
+			$thirdparty = $soc; // used by object_discounts.tpl.php
+			$discount_type = 0; // used by object_discounts.tpl.php
 			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode((string) (GETPOST('origin'))).'&originid='.urlencode((string) (GETPOSTINT('originid')));
 
 			// loading object_discounts.tpl.php from module core/tpl if exists
@@ -4458,7 +4458,7 @@ 
 			if (empty($retained_warranty)) {
 				if ($objectsrc !== null && property_exists($objectsrc, 'retained_warranty') && !empty($objectsrc->retained_warranty)) { // use previous situation value
 					// Facture->retained_warranty  (does not exist on Expedition)
-					$retained_warranty = $objectsrc->retained_warranty;  // @phan-suppress-current-line PhanUndeclaredProperty
+					$retained_warranty = $objectsrc->retained_warranty; // @phan-suppress-current-line PhanUndeclaredProperty
 				}
 			}
 			$retained_warranty_js_default = !empty($retained_warranty) ? $retained_warranty : getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT');
@@ -4967,7 +4967,7 @@ 
 		$nbMandated = 0;
 		foreach ($object->lines as $line) {
 			$res = $line->fetch_product();
-			if ($res  > 0) {
+			if ($res > 0) {
 				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 					$nbMandated++;
 					break;
@@ -5210,7 +5210,7 @@ 
 	}
 	// Ref customer
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_customer, $object, (int) $usercancreate, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_customer, $object, (int) $usercancreate, 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_customer, $object, (int) $usercancreate, 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
 	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
@@ -5342,7 +5342,7 @@ 
 			print '</td><td class="valuefield fieldname_type">';
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="formposinfo">';
 			print '<input type="hidden" name="action" value="setposinfo">';
-			print '<input type="hidden" name="token" value="' . newToken() . '">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			if ($action == 'editposinfo') {
 				print '<input type="text" class="maxwidth150" name="posmodule" placeholder="'.$langs->trans("POSModule").'" value="'.$object->module_source.'"> ';
 				print '<input type="text" class="maxwidth100" name="posterminal" placeholder="'.$langs->trans("Terminal").'" value="'.$object->pos_source.'">';
@@ -5705,45 +5705,45 @@ 
 		}
 		print '<tr>';
 		// Amount HT
-		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowraponall amountcard right">' . price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="nowraponall amountcard right">'.price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 			// Multicurrency Amount HT
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
 		// Amount VAT
-		print '<td>' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowraponall amountcard right">' . price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountVAT').'</td>';
+		print '<td class="nowraponall amountcard right">'.price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 			// Multicurrency Amount VAT
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		// Amount Local Taxes
 		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {
 			print '<tr>';
-			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="titlefieldmiddle">'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				$object->multicurrency_total_localtax1 = (float) price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
 
-				print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
 
 		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td class="nowraponall amountcard right">' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td class="nowraponall amountcard right">'.price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				$object->multicurrency_total_localtax2 = (float) price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
 
-				print '<td class="nowraponall amountcard right">' . price($sign * $object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowraponall amountcard right">'.price($sign * $object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
@@ -5803,11 +5803,11 @@ 
 
 		print '<tr>';
 		// Amount TTC
-		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowraponall amountcard right">' . price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountTTC').'</td>';
+		print '<td class="nowraponall amountcard right">'.price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 			// Multicurrency Amount TTC
-			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
@@ -6101,7 +6101,7 @@ 
 		if ($object->type != Facture::TYPE_CREDIT_NOTE) {
 			// Total already paid
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">';
 			if ($object->type != Facture::TYPE_DEPOSIT) {
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
@@ -6183,7 +6183,7 @@ 
 			// Partially paid or abandoned 'badcustomer'
 			if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="nowrap right">';
+				print '<td colspan="'.($nbcols + 1).'" class="nowrap right">';
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
 				print '</span>';
@@ -6198,7 +6198,7 @@ 
 			// Partially paid or abandoned 'product_returned'
 			if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="nowrap right">';
+				print '<td colspan="'.($nbcols + 1).'" class="nowrap right">';
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
 				print '</span>';
@@ -6213,7 +6213,7 @@ 
 			// Partially paid or abandoned 'abandoned'
 			if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="nowrap right">';
+				print '<td colspan="'.($nbcols + 1).'" class="nowrap right">';
 				$text = $langs->trans("HelpAbandonOther");
 				if ($object->close_note) {
 					$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
@@ -6233,7 +6233,7 @@ 
 
 			// Billed
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">';
 			print $langs->trans("Billed");
 			print '</td>';
@@ -6243,7 +6243,7 @@ 
 
 			// Remainder to pay
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">';
 			print $langs->trans('RemainderToPay');
 			if ($resteapayeraffiche < 0) {
@@ -6258,7 +6258,7 @@ 
 			// Remainder to pay Multicurrency
 			if (isModEnabled('multicurrency') && $object->multicurrency_code && ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)) {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">';
+				print '<td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">';
 				print $langs->trans('RemainderToPayMulticurrency');
 				if ($resteapayeraffiche < 0) {
@@ -6286,14 +6286,14 @@ 
 				$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
 
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td>';
+				print '<td colspan="'.($nbcols + 1).'" class="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td>';
 				//print '<td></td>';
 				print '<td class="right">'.price($billedWithRetainedWarranty).'</td>';
 				print '</tr>';
 
 				// retained warranty
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">';
+				print '<td colspan="'.($nbcols + 1).'" class="right">';
 				print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
 				print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 				print '</td>';
@@ -6308,7 +6308,7 @@ 
 
 			// Total already paid back
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right">';
+			print '<td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">'.$langs->trans('AlreadyPaidBack').'</span>';
 			print '</td>';
 			//print '<td></td>';
@@ -6317,13 +6317,13 @@ 
 
 			// Billed
 			print '<tr>';
-			print '<td colspan="'.($nbcols+1).'" class="right"><span class="opacitymedium">'.$langs->trans("Billed").'</span></td>';
+			print '<td colspan="'.($nbcols + 1).'" class="right"><span class="opacitymedium">'.$langs->trans("Billed").'</span></td>';
 			//print '<td></td>';
 			print '<td class="right">'.price($sign * $object->total_ttc).'</td>';
 			print '</tr>';
 
 			// Remainder to pay back
-			print '<tr><td colspan="'.($nbcols+1).'" class="right">';
+			print '<tr><td colspan="'.($nbcols + 1).'" class="right">';
 			print '<span class="opacitymedium">'.$langs->trans('RemainderToPayBack');
 			if ($resteapayeraffiche > 0) {
 				print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
@@ -6339,7 +6339,7 @@ 
 			// Remainder to pay back Multicurrency
 			if (isModEnabled('multicurrency') && (($object->multicurrency_code && $object->multicurrency_code != $conf->currency) || $object->multicurrency_tx != 1)) {
 				print '<tr>';
-				print '<td colspan="'.($nbcols+1).'" class="right">';
+				print '<td colspan="'.($nbcols + 1).'" class="right">';
 				print '<span class="opacitymedium">'.$langs->trans('RemainderToPayBackMulticurrency');
 				if ($resteapayeraffiche > 0) {
 					print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
@@ -6447,7 +6447,7 @@ 
 			if (isModEnabled('subtotals')) {
 				include DOL_DOCUMENT_ROOT.'/core/tpl/subtotal_ajaxrow.tpl.php';
 			} else {
-				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 			}
 		}
 
@@ -6510,10 +6510,10 @@ 
 						if (!$objectidnext && $object->is_last_in_cycle()) {
 							if ($usercanunvalidate) {
 								unset($params['attr']['title']);
-								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=modif&token=' . newToken(), '', true, $params);
+								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=modif&token='.newToken(), '', true, $params);
 							} else {
 								$params['attr']['title'] = $langs->trans('NotEnoughPermissions');
-								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&action=modif&token=' . newToken(), '', false, $params);
+								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=modif&token='.newToken(), '', false, $params);
 							}
 						} elseif (!$object->is_last_in_cycle()) {
 							$params['attr']['title'] = $langs->trans('NotLastInCycle');
@@ -6554,7 +6554,7 @@ 
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
-						print '<a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
 					}
 				}
 			}
@@ -6805,7 +6805,7 @@ 
 			if ($usercandelete || ($usercancreate && $isErasable == 1)) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
 				$enableDelete = false;
 				$deleteHref = '#';
-				if ($isErasable > 0 && ! $objectidnext) {
+				if ($isErasable > 0 && !$objectidnext) {
 					$deleteHref = $_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=delete&token='.newToken();
 					$enableDelete = true;
 				}

htdocs/expedition/card.php

Spacing +365 added lines, -365 removed lines

@@ -49,29 +49,29 @@ 
  * @var User $user
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/productlot.class.php';
-require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (isModEnabled("product") || isModEnabled("service")) {
-	require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
 if (isModEnabled("propal")) {
-	require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
 if (isModEnabled('productbatch')) {
-	require_once DOL_DOCUMENT_ROOT . '/product/class/productbatch.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -124,12 +124,12 @@ 
 $extrafields->fetch_name_optionals_label($objectorder->table_element_line);
 
 // Load object. Make an object->fetch
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'
 
 // Permissions / Rights
-$usercanread    =  $user->hasRight("expedition", "lire");
-$usercancreate  =  $user->hasRight("expedition", "creer");
-$usercandelete  =  $user->hasRight("expedition", "supprimer");
+$usercanread    = $user->hasRight("expedition", "lire");
+$usercancreate  = $user->hasRight("expedition", "creer");
+$usercandelete  = $user->hasRight("expedition", "supprimer");
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
 $hookmanager->initHooks(array('expeditioncard', 'globalcard'));
@@ -157,7 +157,7 @@ 
 	$permissiontoeditextra = dol_eval((string) $extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')]);
 }
 
-$upload_dir = $conf->expedition->dir_output . '/sending';
+$upload_dir = $conf->expedition->dir_output.'/sending';
 
 $editColspan = 0;
 $objectsrc = null;
@@ -207,7 +207,7 @@ 
 	if ($cancel) {
 		if ($origin_id > 0) {
 			if ($origin == 'commande') {
-				header("Location: " . DOL_URL_ROOT . '/expedition/shipment.php?id=' . ((int) $origin_id));
+				header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.((int) $origin_id));
 				exit;
 			}
 		} else {
@@ -216,10 +216,10 @@ 
 		}
 	}
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
 	// Actions to build doc
-	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Back to draft
 	if ($action == 'setdraft' && $permissiontoadd) {
@@ -228,7 +228,7 @@ 
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
 	}
@@ -239,7 +239,7 @@ 
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
 	}
@@ -260,7 +260,7 @@ 
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'editref_customer';
 		} else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
 	}
@@ -398,16 +398,16 @@ 
 			$product_batch_used = array();
 
 			for ($i = 0; $i < $num; $i++) {
-				$idl = "idl" . $i;
+				$idl = "idl".$i;
 
 				$sub_qty = array();
 				$subtotalqty = 0;
 
 				$j = 0;
 
-				$batch = "batchl" . $i . "_0";
-				$stockLocation = "ent1" . $i . "_0";
-				$qty = "qtyl" . $i;
+				$batch = "batchl".$i."_0";
+				$stockLocation = "ent1".$i."_0";
+				$qty = "qtyl".$i;
 
 				$is_batch_or_serial = 0;
 				if (!empty($objectsrc->lines[$i]->fk_product)) {
@@ -422,7 +422,7 @@ 
 				if (isModEnabled('productbatch') && $objectsrc->lines[$i]->product_tobatch) {
 					if (GETPOSTISSET($batch)) {
 						//shipment line with batch-enable product
-						$qty .= '_' . $j;
+						$qty .= '_'.$j;
 						while (GETPOSTISSET($batch)) {
 							// save line of detail into sub_qty
 							$sub_qty[$j]['q'] = price2num(GETPOST($qty, 'alpha'), 'MS'); // the qty we want to move for this stock record
@@ -441,8 +441,8 @@ 
 							}
 
 							$j++;
-							$batch = "batchl" . $i . "_" . $j;
-							$qty = "qtyl" . $i . '_' . $j;
+							$batch = "batchl".$i."_".$j;
+							$qty = "qtyl".$i.'_'.$j;
 						}
 
 							$batch_line[$i]['detail'] = $sub_qty; // array of details
@@ -456,13 +456,13 @@ 
 							// We try to set an amount
 							// Case we don't use the list of available qty for each warehouse/lot
 							// GUI does not allow this yet
-							setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse") . ' (' . $langs->trans("Line") . ' ' . GETPOSTINT($idl) . ')', null, 'errors');
+							setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse").' ('.$langs->trans("Line").' '.GETPOSTINT($idl).')', null, 'errors');
 							$error++;
 						}
 					}
 				} elseif (GETPOSTISSET($stockLocation)) {
 					//shipment line from multiple stock locations
-					$qty .= '_' . $j;
+					$qty .= '_'.$j;
 					while (GETPOSTISSET($stockLocation)) {
 						// save sub line of warehouse
 						$stockLine[$i][$j]['qty'] = price2num(GETPOST($qty, 'alpha'), 'MS');
@@ -473,8 +473,8 @@ 
 						$subtotalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 
 						$j++;
-						$stockLocation = "ent1" . $i . "_" . $j;
-						$qty = "qtyl" . $i . '_' . $j;
+						$stockLocation = "ent1".$i."_".$j;
+						$qty = "qtyl".$i.'_'.$j;
 					}
 				} else {
 					//shipment line for product with no batch management and no multiple stock location
@@ -497,7 +497,7 @@ 
 				if (isset($extrafields->attributes[$object->table_element_line]['label']) && is_array($extrafields->attributes[$object->table_element_line]['label'])) {
 					// Get extra fields
 					foreach ($extrafields->attributes[$object->table_element_line]['label'] as $key => $value) {
-						unset($_POST["options_" . $key]);
+						unset($_POST["options_".$key]);
 					}
 				}
 			}
@@ -505,7 +505,7 @@ 
 			if (($totalqty > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) && !$error) {		// There is at least one thing to ship and no error
 				$selected_subtotal_lines = GETPOST('subtotal_toselect', 'array:int');
 				for ($i = 0; $i < $num; $i++) {
-					$qty = "qtyl" . $i;
+					$qty = "qtyl".$i;
 
 					if (!isset($batch_line[$i])) {
 						// not batch mode
@@ -523,8 +523,8 @@ 
 							}
 						} else {
 							if (GETPOSTFLOAT($qty) > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
-								$ent = "entl" . $i;
-								$idl = "idl" . $i;
+								$ent = "entl".$i;
+								$idl = "idl".$i;
 								$entrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : GETPOSTINT('entrepot_id');
 								if ($entrepot_id < 0) {
 									$entrepot_id = '';
@@ -578,7 +578,7 @@ 
 			} elseif (!$error) {
 				$labelfieldmissing = $langs->transnoentitiesnoconv("QtyToShip");
 				if (isModEnabled('stock')) {
-					$labelfieldmissing .= '/' . $langs->transnoentitiesnoconv("Warehouse");
+					$labelfieldmissing .= '/'.$langs->transnoentitiesnoconv("Warehouse");
 				}
 				setEventMessages($langs->trans("ErrorFieldRequired", $labelfieldmissing), null, 'errors');
 				$error++;
@@ -594,7 +594,7 @@ 
 				$line->extraparams = $objectsrc_line->extraparams;
 				$line->setExtraParameters();
 			}
-			header("Location: card.php?id=" . $object->id);
+			header("Location: card.php?id=".$object->id);
 			exit;
 		} else {
 			$db->rollback();
@@ -609,7 +609,7 @@ 
 		if ($result > 0) {
 			$db->commit();
 
-			header("Location: " . DOL_URL_ROOT . '/delivery/card.php?action=create_delivery&token=' . newToken() . '&id=' . $result);
+			header("Location: ".DOL_URL_ROOT.'/delivery/card.php?action=create_delivery&token='.newToken().'&id='.$result);
 			exit;
 		} else {
 			$db->rollback();
@@ -662,7 +662,7 @@ 
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 		$result = $object->delete($user, 0, (bool) $also_update_stock);
 		if ($result > 0) {
-			header("Location: " . DOL_URL_ROOT . '/expedition/index.php');
+			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -699,7 +699,7 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -728,7 +728,7 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -736,7 +736,7 @@ 
 	} elseif ($action == 'confirm_sign' && $confirm == 'yes' && $user->hasRight('expedition', 'creer')) {
 		$result = $object->setSignedStatus($user, GETPOSTINT('signed_status'), 0, 'SHIPPING_MODIFY');
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -744,7 +744,7 @@ 
 	} elseif ($action == 'confirm_unsign' && $confirm == 'yes' && $user->hasRight('expedition', 'creer')) {
 		$result = $object->setSignedStatus($user, Expedition::$SIGNED_STATUSES['STATUS_NO_SIGNATURE'], 0, 'SHIPPING_MODIFY');
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -753,7 +753,7 @@ 
 		$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		$object->fetch($id);
-		$result = $object->setDeliveryDate($user, $datedelivery);	// Set the planned delivery date
+		$result = $object->setDeliveryDate($user, $datedelivery); // Set the planned delivery date
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -794,7 +794,7 @@ 
 		}
 
 		if ($object->update($user) >= 0) {
-			header("Location: card.php?id=" . $object->id);
+			header("Location: card.php?id=".$object->id);
 			exit;
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -803,7 +803,7 @@ 
 		$object->fetch($id);
 		$result = $object->setBilled();
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -811,7 +811,7 @@ 
 		$object->fetch($id);
 		$result = $object->setClosed();
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -845,7 +845,7 @@ 
 		}
 
 		if (!$error) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
@@ -875,7 +875,7 @@ 
 			if (is_array($extralabelsline)) {
 				// Get extra fields
 				foreach ($extralabelsline as $key => $value) {
-					unset($_POST["options_" . $key]);
+					unset($_POST["options_".$key]);
 				}
 			}
 
@@ -932,7 +932,7 @@ 
 					// Unset extrafield POST Data
 					if (is_array($extrafields->attributes[$object->table_element_line]['label'])) {
 						foreach ($extrafields->attributes[$object->table_element_line]['label'] as $key => $value) {
-							unset($_POST["options_" . $key]);
+							unset($_POST["options_".$key]);
 						}
 					}
 					$line->fk_product = $lines[$i]->fk_product;
@@ -940,8 +940,8 @@ 
 						// line with lot
 						foreach ($lines[$i]->detail_batch as $detail_batch) {
 							$lotStock = new Productbatch($db);
-							$batch = "batchl" . $detail_batch->fk_expeditiondet . "_" . $detail_batch->fk_origin_stock;
-							$qty = "qtyl" . $detail_batch->fk_expeditiondet . '_' . $detail_batch->id;
+							$batch = "batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
+							$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
 							$batch_id = GETPOSTINT($batch);
 							$batch_qty = GETPOSTFLOAT($qty);
 							if (!empty($batch_id)) {
@@ -977,8 +977,8 @@ 
 						}
 						// add new batch
 						$lotStock = new Productbatch($db);
-						$batch = "batchl" . $line_id . "_0";
-						$qty = "qtyl" . $line_id . "_0";
+						$batch = "batchl".$line_id."_0";
+						$qty = "qtyl".$line_id."_0";
 						$batch_id = GETPOSTINT($batch);
 						$batch_qty = GETPOSTFLOAT($qty);
 						$lineIdToAddLot = 0;
@@ -1041,8 +1041,8 @@ 
 							// line without lot
 							if ($lines[$i]->entrepot_id == 0) {
 								// single warehouse shipment line or line in several warehouses context but with warehouse not defined
-								$stockLocation = "entl" . $line_id;
-								$qty = "qtyl" . $line_id;
+								$stockLocation = "entl".$line_id;
+								$qty = "qtyl".$line_id;
 								$line->id = $line_id;
 								$line->entrepot_id = GETPOSTINT((string) $stockLocation);
 								$line->qty = GETPOSTFLOAT($qty);
@@ -1054,8 +1054,8 @@ 
 								unset($_POST[$qty]);
 							} elseif ($lines[$i]->entrepot_id > 0) {
 								// single warehouse shipment line
-								$stockLocation = "entl" . $line_id;
-								$qty = "qtyl" . $line_id;
+								$stockLocation = "entl".$line_id;
+								$qty = "qtyl".$line_id;
 								$line->id = $line_id;
 								$line->entrepot_id = GETPOSTINT($stockLocation);
 								$line->qty = GETPOSTFLOAT($qty);
@@ -1069,8 +1069,8 @@ 
 								// multi warehouse shipment lines
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 									if (!$error) {
-										$stockLocation = "entl" . $detail_entrepot->line_id;
-										$qty = "qtyl" . $detail_entrepot->line_id;
+										$stockLocation = "entl".$detail_entrepot->line_id;
+										$qty = "qtyl".$detail_entrepot->line_id;
 										$warehouse = GETPOSTINT($stockLocation);
 										if (!empty($warehouse)) {
 											$line->id = $detail_entrepot->line_id;
@@ -1088,7 +1088,7 @@ 
 									}
 								}
 							} elseif (!isModEnabled('stock') && !isModEnabled('productbatch')) { // both product batch and stock are not activated.
-								$qty = "qtyl" . $line_id;
+								$qty = "qtyl".$line_id;
 								$line->id = $line_id;
 								$line->qty = GETPOSTFLOAT($qty);
 								$line->entrepot_id = 0;
@@ -1102,7 +1102,7 @@ 
 							}
 						} else {
 							// Product no predefined
-							$qty = "qtyl" . $line_id;
+							$qty = "qtyl".$line_id;
 							$line->id = $line_id;
 							$line->qty = GETPOSTFLOAT($qty);
 							$line->entrepot_id = 0;
@@ -1145,12 +1145,12 @@ 
 					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 			} else {
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // To redisplay the form being edited
+				header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 				exit();
 			}
 		}
 	} elseif ($action == 'updateline' && $permissiontoadd && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // To redisplay the form being edited
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 		exit();
 	} elseif ($action == 'addline' && !$origin && getDolGlobalString('SHIPMENT_STANDALONE') && $usercancreate) {	// Add a new line
 		$langs->load('errors');
@@ -1351,7 +1351,7 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -1376,14 +1376,14 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
 		}
 	}
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
 	if (empty($id)) {
@@ -1393,15 +1393,15 @@ 
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SHIPMENT_TO';
 	$mode = 'emailfromshipment';
-	$trackid = 'shi' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'shi'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 /*
  * View
  */
 
-$title = $object->ref . ' - ' . $langs->trans("Card");
+$title = $object->ref.' - '.$langs->trans("Card");
 if ($action == 'create') {
 	$title = $langs->trans("NewSending");
 }
@@ -1430,7 +1430,7 @@ 
 if (!$origin && $action == 'create' && !getDolGlobalString('SHIPMENT_STANDALONE')) {
 	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
-	print '<br>'  .$langs->trans("ShipmentCreationIsDoneFromOrder");
+	print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
 	$action = '';
 	$id = '';
 	$ref = '';
@@ -1452,12 +1452,12 @@ 
 		$note_private = $object->getDefaultCreateValueFor('note_private');
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 
-		print '<form name="crea_expedition" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form name="crea_expedition" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="changecompany" value="0">';	// will be set to 1 by javascript so we know post is done after a company change
-		print '<input type="hidden" name="originid" value="' . $id . '">';
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
+		print '<input type="hidden" name="originid" value="'.$id.'">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 		print dol_get_fiche_head([]);
 
@@ -1465,11 +1465,11 @@ 
 
 		// Thirdparty
 		print '<tr>';
-		print '<td class="fieldrequired">' . $langs->trans('ThirdParty') . '</td>';
+		print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 		if ($socid > 0) {
 			print '<td>';
 			print $soc->getNomUrl(1);
-			print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+			print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 			print '</td>';
 		} else {
 			print '<td class="valuefieldcreate">';
@@ -1503,10 +1503,10 @@ 
 
 			$langs->load("projects");
 			print '<tr>';
-			print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+			print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
 			print img_picto('', 'project', 'class="pictofixedwidth"');
 			print $formproject->select_projects($soc->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'widthcentpercentminusxx');
-			print ' <a class="paddingleft" href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $soc->id) . '"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+			print ' <a class="paddingleft" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 			print '</td>';
 			print '</tr>';
 		}
@@ -1534,7 +1534,7 @@ 
 		print $langs->trans("Weight");
 		print '</td><td colspan="3">';
 		print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
-		print '<input name="weight" size="4" value="' . GETPOSTINT('weight') . '"> ';
+		print '<input name="weight" size="4" value="'.GETPOSTINT('weight').'"> ';
 		$text = $formproduct->selectMeasuringUnits("weight_units", "weight", (string) GETPOSTINT('weight_units'), 0, 2);
 		$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 		print $form->textwithpicto($text, $htmltext);
@@ -1542,12 +1542,12 @@ 
 
 		// Dim
 		print '<tr><td>';
-		print $langs->trans("Width") . ' x ' . $langs->trans("Height") . ' x ' . $langs->trans("Depth");
+		print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
 		print ' </td><td colspan="3">';
 		print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
-		print '<input name="sizeW" size="4" value="' . GETPOSTINT('sizeW') . '">';
-		print ' x <input name="sizeH" size="4" value="' . GETPOSTINT('sizeH') . '">';
-		print ' x <input name="sizeS" size="4" value="' . GETPOSTINT('sizeS') . '">';
+		print '<input name="sizeW" size="4" value="'.GETPOSTINT('sizeW').'">';
+		print ' x <input name="sizeH" size="4" value="'.GETPOSTINT('sizeH').'">';
+		print ' x <input name="sizeS" size="4" value="'.GETPOSTINT('sizeS').'">';
 		print ' ';
 		$text = $formproduct->selectMeasuringUnits("size_units", "size", (string) GETPOSTINT('size_units'), 0, 2);
 		$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
@@ -1607,7 +1607,7 @@ 
 		}
 
 		// Note Public
-		$htmltext ='';
+		$htmltext = '';
 		print '<tr>';
 		print '<td class="tdtop">';
 		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
@@ -1654,13 +1654,13 @@ 
 				$entrepot = new Entrepot($db);
 			}
 
-			print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
-			print '<input type="hidden" name="token" value="' . newToken() . '">';
+			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="add">';
-			print '<input type="hidden" name="origin" value="' . $origin . '">';
-			print '<input type="hidden" name="origin_id" value="' . $object->id . '">';
+			print '<input type="hidden" name="origin" value="'.$origin.'">';
+			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
 			if (GETPOSTINT('entrepot_id')) {
-				print '<input type="hidden" name="entrepot_id" value="' . GETPOSTINT('entrepot_id') . '">';
+				print '<input type="hidden" name="entrepot_id" value="'.GETPOSTINT('entrepot_id').'">';
 			}
 
 			print dol_get_fiche_head([]);
@@ -1690,13 +1690,13 @@ 
 				print $langs->trans('RefCustomer');
 			}
 			print '</td><td colspan="3">';
-			print '<input type="text" name="ref_customer" value="' . $object->ref_client . '" />';
+			print '<input type="text" name="ref_customer" value="'.$object->ref_client.'" />';
 			print '</td>';
 			print '</tr>';
 
 			// Thirdparty
-			print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Company') . '</td>';
-			print '<td colspan="3">' . $soc->getNomUrl(1) . '</td>';
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Company').'</td>';
+			print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
 			print '</tr>';
 
 			// Project
@@ -1710,16 +1710,16 @@ 
 				}
 				$langs->load("projects");
 				print '<tr>';
-				print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
 				print img_picto('', 'project', 'class="pictofixedwidth"');
 				print $formproject->select_projects($soc->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'widthcentpercentminusxx');
-				print ' <a class="paddingleft" href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $soc->id) . '"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+				print ' <a class="paddingleft" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				print '</td>';
 				print '</tr>';
 			}
 
 			// Date delivery planned
-			print '<tr><td>' . $langs->trans("DateDeliveryPlanned") . '</td>';
+			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td colspan="3">';
 			print img_picto('', 'action', 'class="pictofixedwidth"');
 			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
@@ -1728,7 +1728,7 @@ 
 			print '</tr>';
 
 			// Date shipment (sending)
-			print '<tr><td>' . $langs->trans("DateShipping") . '</td>';
+			print '<tr><td>'.$langs->trans("DateShipping").'</td>';
 			print '<td colspan="3">';
 			print img_picto('', 'action', 'class="pictofixedwidth"');
 			//$date_shipping = ($date_shipping ? $date_shipping : $object->date_shipping); // $date_shipping comes from GETPOST
@@ -1737,7 +1737,7 @@ 
 			print '</tr>';
 
 			// Note Public
-			print '<tr><td>' . $langs->trans("NotePublic") . '</td>';
+			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
 			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
@@ -1745,7 +1745,7 @@ 
 
 			// Note Private
 			if ($object->note_private && !$user->socid) {
-				print '<tr><td>' . $langs->trans("NotePrivate") . '</td>';
+				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
 				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
@@ -1757,7 +1757,7 @@ 
 			print $langs->trans("Weight");
 			print '</td><td colspan="3">';
 			print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
-			print '<input name="weight" size="4" value="' . GETPOSTINT('weight') . '"> ';
+			print '<input name="weight" size="4" value="'.GETPOSTINT('weight').'"> ';
 			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", (string) GETPOSTINT('weight_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
@@ -1765,12 +1765,12 @@ 
 
 			// Dim
 			print '<tr><td>';
-			print $langs->trans("Width") . ' x ' . $langs->trans("Height") . ' x ' . $langs->trans("Depth");
+			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
 			print ' </td><td colspan="3">';
 			print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
-			print '<input name="sizeW" size="4" value="' . GETPOSTINT('sizeW') . '">';
-			print ' x <input name="sizeH" size="4" value="' . GETPOSTINT('sizeH') . '">';
-			print ' x <input name="sizeS" size="4" value="' . GETPOSTINT('sizeS') . '">';
+			print '<input name="sizeW" size="4" value="'.GETPOSTINT('sizeW').'">';
+			print ' x <input name="sizeH" size="4" value="'.GETPOSTINT('sizeH').'">';
+			print ' x <input name="sizeS" size="4" value="'.GETPOSTINT('sizeS').'">';
 			print ' ';
 			$text = $formproduct->selectMeasuringUnits("size_units", "size", (string) GETPOSTINT('size_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
@@ -1778,7 +1778,7 @@ 
 			print '</td></tr>';
 
 			// Delivery method
-			print "<tr><td>" . $langs->trans("DeliveryMethod") . "</td>";
+			print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
 			print '<td colspan="3">';
 			$expe->fetch_delivery_methods();
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
@@ -1789,16 +1789,16 @@ 
 			print "</td></tr>\n";
 
 			// Tracking number
-			print "<tr><td>" . $langs->trans("TrackingNumber") . "</td>";
+			print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
 			print '<td colspan="3">';
 			print img_picto('', 'barcode', 'class="pictofixedwidth"');
-			print '<input name="tracking_number" size="20" value="' . GETPOST('tracking_number', 'alpha') . '">';
+			print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
 			print "</td></tr>\n";
 
 			// Incoterms
 			if (isModEnabled('incoterm')) {
 				print '<tr>';
-				print '<td><label for="incoterm_id">' . $form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1) . '</label></td>';
+				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
 				print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
@@ -1806,10 +1806,10 @@ 
 			}
 
 			// Document model
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 			$list = ModelePdfExpedition::liste_modeles($db);
 			if (is_countable($list) && count($list) > 1) {
-				print "<tr><td>" . $langs->trans("DefaultModel") . "</td>";
+				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
 				print img_picto('', 'pdf', 'class="pictofixedwidth"');
 				print $form->selectarray('model', $list, getDolGlobalString('EXPEDITION_ADDON_PDF'), 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx');
@@ -1818,7 +1818,7 @@ 
 
 			// Other attributes. Fields from hook formObjectOptions and Extrafields.
 			// $objectsrc is Commande|Facture
-			$objectsav = $object;	// Because Expedition is $expe and not $object that is wrongly a duplicate of $objectsrc.
+			$objectsav = $object; // Because Expedition is $expe and not $object that is wrongly a duplicate of $objectsrc.
 			$object = $expe;
 			// Propagate extrafieldsvalue from source object to shipment object
 			if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && !empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -1845,22 +1845,22 @@ 
 
 			$numAsked = count($object->lines);
 
-			print '<script type="text/javascript">' . "\n";
-			print 'jQuery(document).ready(function() {' . "\n";
+			print '<script type="text/javascript">'."\n";
+			print 'jQuery(document).ready(function() {'."\n";
 			print 'jQuery("#autofill").click(function() {';
 			$i = 0;
 			while ($i < $numAsked) {
-				print 'jQuery("#qtyl' . $i . '").val(jQuery("#qtyasked' . $i . '").val() - jQuery("#qtydelivered' . $i . '").val());' . "\n";
+				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
 				if (isModEnabled('productbatch')) {
-					print 'jQuery("#qtyl' . $i . '_' . $i . '").val(jQuery("#qtyasked' . $i . '").val() - jQuery("#qtydelivered' . $i . '").val());' . "\n";
+					print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
 				}
 				$i++;
 			}
-			print 'return false; });' . "\n";
-			print 'jQuery("#autoreset").click(function() { console.log("Reset values to 0"); jQuery(".qtyl").val(0);' . "\n";
-			print 'return false; });' . "\n";
-			print '});' . "\n";
-			print '</script>' . "\n";
+			print 'return false; });'."\n";
+			print 'jQuery("#autoreset").click(function() { console.log("Reset values to 0"); jQuery(".qtyl").val(0);'."\n";
+			print 'return false; });'."\n";
+			print '});'."\n";
+			print '</script>'."\n";
 
 			print '<br>';
 
@@ -1893,26 +1893,26 @@ 
 				}
 				print $langs->trans("Description");
 				print '</td>';
-				print '<td class="center">' . $langs->trans("QtyOrdered") . '</td>';
-				print '<td class="center">' . $langs->trans("QtyShipped") . '</td>';
-				print '<td class="center">' . $langs->trans("QtyToShip");
+				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
+				print '<td class="center">'.$langs->trans("QtyShipped").'</td>';
+				print '<td class="center">'.$langs->trans("QtyToShip");
 				if (!isModEnabled('productbatch')) {
-					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">' . img_picto($langs->trans("Autofill"), 'autofill', 'class="paddingrightonly"') . '</a>';
+					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Autofill"), 'autofill', 'class="paddingrightonly"').'</a>';
 					print ' / ';
 				} else {
 					print '<br>';
 				}
-				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">' . img_picto($langs->trans("Reset"), 'eraser') . '</span>';
+				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Reset"), 'eraser').'</span>';
 				print '</td>';
 				if (isModEnabled('stock')) {
 					if (!isModEnabled('productbatch')) {
-						print '<td class="left">' . $langs->trans("Warehouse") . ' (' . $langs->trans("Stock") . ')</td>';
+						print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
 					} else {
-						print '<td class="left">' . $langs->trans("Warehouse") . ' / ' . $langs->trans("Batch") . ' (' . $langs->trans("Stock") . ')</td>';
+						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
 				}
 				if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-					print '<td class="left">' . $langs->trans('StockEntryDate') . '</td>';
+					print '<td class="left">'.$langs->trans('StockEntryDate').'</td>';
 				}
 				print "</tr>\n";
 			}
@@ -1949,8 +1949,8 @@ 
 						$type = 1;
 					}
 
-					print '<!-- line for order line ' . $line->id . ' -->' . "\n";
-					print '<tr class="oddeven" id="row-' . $line->id . '">' . "\n";
+					print '<!-- line for order line '.$line->id.' -->'."\n";
+					print '<tr class="oddeven" id="row-'.$line->id.'">'."\n";
 
 					$qtyProdCom = $line->qty;
 					$productChildrenNb = 0;
@@ -1971,7 +1971,7 @@ 
 						//var_dump($product->stock_warehouse[1]);
 
 						print '<td>';
-						print '<a name="' . $line->id . '"></a>'; // ancre pour retourner sur la ligne
+						print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
 						// Show product and description
 						$product_static->type = $line->fk_product_type;
@@ -1984,7 +1984,7 @@ 
 						$showdescinproductdesc = getDolGlobalString('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE');
 
 						$text = $product_static->getNomUrl(1);
-						$text .= ' - ' . (!empty($line->label) ? $line->label : $line->product_label);
+						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 						$description = ($showdescinproductdesc ? '' : dol_htmlentitiesbr($line->desc));
 						$description .= empty($product->stockable_product) ? $langs->trans('StockDisabled') : $langs->trans('StockEnabled');
 						print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
@@ -1994,7 +1994,7 @@ 
 
 						// Add description in form
 						if ($showdescinproductdesc) {
-							print ($line->desc && $line->desc != $line->product_label) ? '<br>' . dol_htmlentitiesbr($line->desc) : '';
+							print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
 						}
 
 						print '</td>';
@@ -2007,10 +2007,10 @@ 
 						}
 
 						if (!empty($line->label)) {
-							$text .= ' <strong>' . $line->label . '</strong>';
+							$text .= ' <strong>'.$line->label.'</strong>';
 							print $form->textwithtooltip($text, $line->desc, 3, 0, '', (string) $i);
 						} else {
-							print $text . ' ' . nl2br($line->desc);
+							print $text.' '.nl2br($line->desc);
 						}
 
 						// Show range
@@ -2025,16 +2025,16 @@ 
 					}
 
 					// Qty
-					print '<td class="center">' . $line->qty;
-					print '<input name="qtyasked' . $indiceAsked . '" id="qtyasked' . $indiceAsked . '" type="hidden" value="' . $line->qty . '">';
-					print '' . $unit_order . '</td>';
+					print '<td class="center">'.$line->qty;
+					print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+					print ''.$unit_order.'</td>';
 
 					// Qty already shipped
 					print '<td class="center">';
 					$quantityDelivered = isset($object->expeditions[$line->id]) ? $object->expeditions[$line->id] : '';
 					print $quantityDelivered;
-					print '<input name="qtydelivered' . $indiceAsked . '" id="qtydelivered' . $indiceAsked . '" type="hidden" value="' . $quantityDelivered . '">';
-					print '' . $unit_order . '</td>';
+					print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+					print ''.$unit_order.'</td>';
 
 					// Qty to ship
 					$quantityAsked = $line->qty;
@@ -2065,19 +2065,19 @@ 
 							// Quantity to send
 							print '<td class="center">';
 							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || ($line->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES'))) {
-								if (GETPOSTINT('qtyl' . $indiceAsked)) {
-									$deliverableQty = GETPOSTINT('qtyl' . $indiceAsked);
+								if (GETPOSTINT('qtyl'.$indiceAsked)) {
+									$deliverableQty = GETPOSTINT('qtyl'.$indiceAsked);
 								}
-								print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+								print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								$qtylValue = $deliverableQty;
 								if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 									$qtylValue = '';
 								}
-								print '<input name="qtyl' . $indiceAsked . '" id="qtyl' . $indiceAsked . '" class="qtyl right" type="text" size="4" value="' . $qtylValue . '">';
+								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl right" type="text" size="4" value="'.$qtylValue.'">';
 							} else {
 								if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
-									print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
-									print '<input name="qtyl' . $indiceAsked . '" id="qtyl' . $indiceAsked . '" type="hidden" value="0">';
+									print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+									print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 								}
 
 								print $langs->trans("NA");
@@ -2089,8 +2089,8 @@ 
 								print '<td class="left">';
 								if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {   // Type of product need stock change ?
 									// Show warehouse combo list
-									$ent = "entl" . $indiceAsked;
-									$idl = "idl" . $indiceAsked;
+									$ent = "entl".$indiceAsked;
+									$idl = "idl".$indiceAsked;
 									$tmpentrepot_id = is_numeric(GETPOST($ent)) ? GETPOSTINT($ent) : $warehouse_id;
 									if ($line->fk_product > 0) {
 										print '<!-- Show warehouse selection -->';
@@ -2100,24 +2100,24 @@ 
 											$stockMin = 0;
 										}
 										if ($productChildrenNb > 0) {
-											print $formproduct->selectWarehouses($tmpentrepot_id, 'entl' . $indiceAsked, '', 1, 0, 0, '', 0, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
+											print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, 0, '', 0, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
 										} else {
 											if ($product->stockable_product == Product::ENABLED_STOCK) {
-												print $formproduct->selectWarehouses($tmpentrepot_id, 'entl' . $indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
+												print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
 											} else {
-												print img_warning() . ' ' . $langs->trans('StockDisabled');
+												print img_warning().' '.$langs->trans('StockDisabled');
 											}
 										}
 
 										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id) {
 											//print $stock.' '.$quantityToBeDelivered;
 											if ($stock < $quantityToBeDelivered) {
-												print ' ' . img_warning($langs->trans("StockTooLow")); // Stock too low for this $warehouse_id but you can change warehouse
+												print ' '.img_warning($langs->trans("StockTooLow")); // Stock too low for this $warehouse_id but you can change warehouse
 											}
 										}
 									}
 								} else {
-									print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span><input name="entl' . $indiceAsked . '" id="entl' . $indiceAsked . '" type="hidden" value="0">';
+									print '<span class="opacitymedium">('.$langs->trans("Service").')</span><input name="entl'.$indiceAsked.'" id="entl'.$indiceAsked.'" type="hidden" value="0">';
 								}
 								print '</td>';
 							}
@@ -2138,9 +2138,9 @@ 
 											$img = img_warning($langs->trans("StockTooLow"));
 										}
 										print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
-												<a href=\"" . DOL_URL_ROOT . "/product/card.php?id=" . $value['id'] . "\">" . $value['fullpath'] . "
-												</a> (" . $value['nb'] . ")</td><td class=\"center\"> " . $value['nb_total'] . "</td><td>&nbsp;</td><td>&nbsp;</td>
-												<td class=\"center\">" . $value['stock'] . " " . $img . "</td>";
+												<a href=\"" . DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+												</a> (" . $value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
+												<td class=\"center\">" . $value['stock']." ".$img."</td>";
 										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 											print '<td></td>';
 										} //StockEntrydate
@@ -2170,7 +2170,7 @@ 
 									$nbofsuggested++;
 								}
 							}
-							print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch)) {
 								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
 									//var_dump($dbatch);
@@ -2196,7 +2196,7 @@ 
 										$deliverableQty = 0;
 									}
 
-									$inputName = 'qtyl' . $indiceAsked . '_' . $subj;
+									$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 									if (GETPOSTISSET($inputName)) {
 										$deliverableQty = GETPOST($inputName, 'int');
 									}
@@ -2204,37 +2204,37 @@ 
 									$tooltipClass = $tooltipTitle = '';
 									if (!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
 										$tooltipClass = ' classfortooltip';
-										$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
+										$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 									} else {
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0;
 									}
 									$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
-									print '<!-- subj=' . $subj . '/' . $nbofsuggested . ' --><tr ' . ((($subj + 1) == $nbofsuggested) ? 'oddeven' : '') . '>';
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
 									print '<td colspan="3" ></td><td class="center">';
 									$qtylValue = $deliverableQty;
 									if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 										$qtylValue = '';
 									}
-									print '<input class="qtyl ' . $tooltipClass . ' right" title="' . $tooltipTitle . '" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '_' . $subj . '" type="text" size="4" value="' . $qtylValue . '">';
+									print '<input class="qtyl '.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$qtylValue.'">';
 									print '</td>';
 
 									print '<!-- Show details of lot -->';
 									print '<td class="left">';
 
-									print $staticwarehouse->getNomUrl(0) . ' / ';
+									print $staticwarehouse->getNomUrl(0).' / ';
 
-									print '<input name="batchl' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $dbatch->id . '">';
+									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 
 									$detail = '';
-									$detail .= $langs->trans("Batch") . ': ' . $dbatch->batch;
+									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
-										$detail .= ' - ' . $langs->trans("SellByDate") . ': ' . dol_print_date($dbatch->sellby, "day");
+										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 									}
 									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
-										$detail .= ' - ' . $langs->trans("EatByDate") . ': ' . dol_print_date($dbatch->eatby, "day");
+										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 									}
-									$detail .= ' - ' . $langs->trans("Qty") . ': ' . $dbatch->qty;
+									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 									$detail .= '<br>';
 									print $detail;
 
@@ -2245,18 +2245,18 @@ 
 									$subj++;
 									print '</td>';
 									if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-										print '<td>' . dol_print_date($dbatch->context['stock_entry_date'], 'day') . '</td>'; //StockEntrydate
+										print '<td>'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>'; //StockEntrydate
 									}
 									print '</tr>';
 								}
 							} else {
 								print '<!-- Case there is no details of lot at all -->';
 								print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
-								print '<input class="qtyl right" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '_' . $subj . '" type="text" size="4" value="0" disabled="disabled"> ';
+								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
 								print '</td>';
 
 								print '<td class="left">';
-								print img_warning() . ' ' . $langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
+								print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
 								print '</td>';
 								if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 									print '<td></td>';
@@ -2272,9 +2272,9 @@ 
 							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 								print '<td></td>';
 							} //StockEntrydate
-							print '</tr>' . "\n"; // end line and start a new one for each warehouse
+							print '</tr>'."\n"; // end line and start a new one for each warehouse
 
-							print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							$subj = 0;
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
@@ -2298,8 +2298,8 @@ 
 									$deliverableQty = min($quantityToBeDelivered, $stock);
 									$deliverableQty = max(0, $deliverableQty);
 									// Quantity to send
-									print '<!-- subj=' . $subj . '/' . $nbofsuggested . ' --><tr ' . ((($subj + 1) == $nbofsuggested) ? 'oddeven' : '') . '>';
-									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked=' . $indiceAsked . ') -->';
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
+									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
 									if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 										if (isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
@@ -2318,14 +2318,14 @@ 
 										$tooltipClass = $tooltipTitle = '';
 										if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$tooltipClass = ' classfortooltip';
-											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
+											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
 										} else {
 											$alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = 0;
 										}
 
 										$alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = $deliverableQty + $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
 
-										$inputName = 'qtyl' . $indiceAsked . '_' . $subj;
+										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOSTINT($inputName);
 										}
@@ -2333,11 +2333,11 @@ 
 										if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 											$qtylValue = '';
 										}
-										print '<input class="qtyl' . $tooltipClass . ' right" title="' . $tooltipTitle . '" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '" type="text" size="4" value="' . $qtylValue . '">';
-										print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_id . '">';
+										print '<input class="qtyl'.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$qtylValue.'">';
+										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
 									} else {
 										if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
-											print '<input name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '" type="hidden" value="0">';
+											print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 										}
 
 										print $langs->trans("NA");
@@ -2348,16 +2348,16 @@ 
 									print '<td class="left">';
 									if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 										if ($product->stockable_product == Product::ENABLED_STOCK || $productChildrenNb > 0) {
-											print $tmpwarehouseObject->getNomUrl(0) . ' ';
+											print $tmpwarehouseObject->getNomUrl(0).' ';
 											if ($productChildrenNb <= 0) {
 												print '<!-- Show details of stock -->';
-												print '(' . $stock . ')';
+												print '('.$stock.')';
 											}
 										} else {
-											print img_warning() . ' ' . $langs->trans('StockDisabled');
+											print img_warning().' '.$langs->trans('StockDisabled');
 										}
 									} else {
-										print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span>';
+										print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 									}
 									print '</td>';
 									$quantityToBeDelivered -= $deliverableQty;
@@ -2384,9 +2384,9 @@ 
 										}
 										print '<tr class"oddeven"><td>';
 										print "&nbsp; &nbsp; &nbsp; ->
-											<a href=\"" . DOL_URL_ROOT . "/product/card.php?id=" . $value['id'] . "\">" . $value['fullpath'] . "
-											</a> (" . $value['nb'] . ")</td><td class=\"center\"> " . $value['nb_total'] . "</td><td>&nbsp;</td><td>&nbsp;</td>
-											<td class=\"center\">" . $value['stock'] . " " . $img . "</td>";
+											<a href=\"" . DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+											</a> (" . $value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
+											<td class=\"center\">" . $value['stock']." ".$img."</td>";
 										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 											print '<td></td>';
 										} //StockEntrydate
@@ -2403,7 +2403,7 @@ 
 							print '</tr>'; // end line and start a new one for lot/serial
 
 							$subj = 0;
-							print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 
 							$tmpwarehouseObject = new Entrepot($db);
 							$productlotObject = new Productlot($db);
@@ -2445,7 +2445,7 @@ 
 											$deliverableQty = 0;
 										}
 
-										$inputName = 'qtyl' . $indiceAsked . '_' . $subj;
+										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOSTINT($inputName);
 										}
@@ -2453,30 +2453,30 @@ 
 										$tooltipClass = $tooltipTitle = '';
 										if (!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
 											$tooltipClass = ' classfortooltip';
-											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
+											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 										} else {
 											$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0;
 										}
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
-										print '<!-- subj=' . $subj . '/' . $nbofsuggested . ' --><tr ' . ((($subj + 1) == $nbofsuggested) ? 'oddeven' : '') . '><td colspan="3"></td><td class="center">';
+										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'><td colspan="3"></td><td class="center">';
 										$qtylValue = $deliverableQty;
 										if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 											$qtylValue = '';
 										}
-										print '<input class="qtyl right ' . $tooltipClass . '" title="' . $tooltipTitle . '" name="' . $inputName . '" id="' . $inputName . '" type="text" size="4" value="' . $qtylValue . '">';
+										print '<input class="qtyl right '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$qtylValue.'">';
 										print '</td>';
 
 										print '<td class="left">';
 
-										print $tmpwarehouseObject->getNomUrl(0) . ' / ';
+										print $tmpwarehouseObject->getNomUrl(0).' / ';
 
 										print '<!-- Show details of lot -->';
-										print '<input name="batchl' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $dbatch->id . '">';
-										print '<input name="entl' . $indiceAsked . '_'.$subj.'" type="hidden" value="' . $tmpwarehouseObject->id . '">';
+										print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
+										print '<input name="entl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$tmpwarehouseObject->id.'">';
 
 										//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
-										print $langs->trans("Batch") . ': ';
+										print $langs->trans("Batch").': ';
 										$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
 										if ($result > 0) {
 											print $productlotObject->getNomUrl(1);
@@ -2484,12 +2484,12 @@ 
 											print $langs->trans("TableLotIncompleteRunRepairWithParamStandardEqualConfirmed");
 										}
 										if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
-											print ' - ' . $langs->trans("SellByDate") . ': ' . dol_print_date($dbatch->sellby, "day");
+											print ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 										}
 										if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
-											print ' - ' . $langs->trans("EatByDate") . ': ' . dol_print_date($dbatch->eatby, "day");
+											print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 										}
-										print ' (' . $dbatch->qty . ')';
+										print ' ('.$dbatch->qty.')';
 										$quantityToBeDelivered -= $deliverableQty;
 										if ($quantityToBeDelivered < 0) {
 											$quantityToBeDelivered = 0;
@@ -2498,7 +2498,7 @@ 
 										$subj++;
 										print '</td>';
 										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-											print '<td class="left">' . dol_print_date($dbatch->context['stock_entry_date'], 'day') . '</td>';
+											print '<td class="left">'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>';
 										}
 										print '</tr>';
 									}
@@ -2525,7 +2525,7 @@ 
 								}
 								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
 								if (empty($disabled) && (!getDolGlobalInt('STOCK_DISALLOW_NEGATIVE_TRANSFER') || $product->stockable_product == Product::DISABLED_STOCK)) {
-									print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_selected_id . '">';
+									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_selected_id.'">';
 								}
 							} elseif ($line->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 								$disabled = '';
@@ -2537,7 +2537,7 @@ 
 								}
 								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$quantityToBeDelivered.'"'.($disabled ? ' '.$disabled : '').'> ';
 								if (empty($disabled) && !getDolGlobalInt('STOCK_DISALLOW_NEGATIVE_TRANSFER')) {
-									print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_selected_id . '">';
+									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_selected_id.'">';
 								}
 							} else {
 								print $langs->trans("NA");
@@ -2549,20 +2549,20 @@ 
 								if ($warehouse_selected_id > 0 && $product->stockable_product == Product::ENABLED_STOCK) {
 									$warehouseObject = new Entrepot($db);
 									$warehouseObject->fetch($warehouse_selected_id);
-									print img_warning() . ' ' . $langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
+									print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
 								} else {
 									if ($line->fk_product) {
 										if ($product->stockable_product == Product::ENABLED_STOCK) {
-											print img_warning() . ' ' . $langs->trans('StockTooLow');
+											print img_warning().' '.$langs->trans('StockTooLow');
 										} else {
-											print img_warning() . ' ' . $langs->trans('StockDisabled');
+											print img_warning().' '.$langs->trans('StockDisabled');
 										}
 									} else {
 										print '';
 									}
 								}
 							} else {
-								print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span>';
+								print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 							}
 							print '</td>';
 							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
@@ -2606,7 +2606,7 @@ 
 		}
 	}
 } elseif ($object->id > 0) {
-	'@phan-var-force Expedition $object';  // Need to force it (type overridden earlier)
+	'@phan-var-force Expedition $object'; // Need to force it (type overridden earlier)
 
 	// Edit and view mode
 
@@ -2646,7 +2646,7 @@ 
 			);
 		}
 		$formconfirm = $form->formconfirm(
-			$_SERVER['PHP_SELF'] . '?id=' . $object->id,
+			$_SERVER['PHP_SELF'].'?id='.$object->id,
 			$langs->trans('DeleteSending'),
 			$langs->trans("ConfirmDeleteSending", $object->ref),
 			'confirm_delete',
@@ -2667,7 +2667,7 @@ 
 			$title = "DeleteTitleLine";
 			$question = "ConfirmDeleteTitleLine";
 		}
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans($title), $langs->trans($question), 'confirm_delete_subtotalline', $formconfirm, 'no', 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans($title), $langs->trans($question), 'confirm_delete_subtotalline', $formconfirm, 'no', 1);
 	}
 
 	// Confirm validation
@@ -2681,13 +2681,13 @@ 
 
 		$text = $langs->trans("ConfirmValidateSending", $numref);
 		if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
-			$text .= '<br>' . img_picto('', 'movement', 'class="pictofixedwidth"') . $langs->trans("StockMovementWillBeRecorded") . '.';
+			$text .= '<br>'.img_picto('', 'movement', 'class="pictofixedwidth"').$langs->trans("StockMovementWillBeRecorded").'.';
 		} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
-			$text .= '<br>' . img_picto('', 'movement', 'class="pictofixedwidth"') . $langs->trans("StockMovementNotYetRecorded") . '.';
+			$text .= '<br>'.img_picto('', 'movement', 'class="pictofixedwidth"').$langs->trans("StockMovementNotYetRecorded").'.';
 		}
 
 		if (isModEnabled('notification')) {
-			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$text .= '<br>';
 			$text .= $notify->confirmMessage('SHIPPING_VALIDATE', $object->socid, $object);
@@ -2698,14 +2698,14 @@ 
 
 	// Confirm cancellation
 	if ($action == 'cancel') {
-		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
 	}
 
 	// Confirm sign
 	if ($action == 'sign') {
 		$text = $langs->trans('ConfirmSignShipping');
 		if (isModEnabled('notification')) {
-			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$text .= '<br>';
 			$text .= $notify->confirmMessage('SHIPPING_MODIFY', $object->socid, $object);
@@ -2715,7 +2715,7 @@ 
 			'type' 		=> 'select',
 			'name' 		=> 'signed_status',
 			'select_show_empty' => 0,
-			'label'		=> '<span class="fieldrequired">' . $langs->trans('SignStatus') . '</span>',
+			'label'		=> '<span class="fieldrequired">'.$langs->trans('SignStatus').'</span>',
 			'values'	=> $object->getSignedStatusLocalisedArray()
 		];
 		$formconfirm = $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], ['id' => $object->id]), $langs->trans('SignShipping'), $text, 'confirm_sign', $formquestion, 0, 1);
@@ -2725,7 +2725,7 @@ 
 	if ($action == 'unsign') {
 		$text = $langs->trans('ConfirmUnsignShipping');
 		if (isModEnabled('notification')) {
-			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$text .= '<br>';
 			$text .= $notify->confirmMessage('SHIPPING_MODIFY', $object->socid, $object);
@@ -2761,14 +2761,14 @@ 
 	}
 
 	// Shipment card
-	$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer shipment
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('expedition', 'creer'), 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('expedition', 'creer'), 'string' . (isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('expedition', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 
 	// Thirdparty
-	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
 	// Project
 	if ($origin && $origin_id > 0) {
@@ -2800,16 +2800,16 @@ 
 			if ($permissiontoadd) {
 				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($object->fk_project);
 					$morehtmlref .= $proj->getNomUrl(1);
 					if ($proj->title) {
-						$morehtmlref .= '<span class="opacitymedium"> - ' . dol_escape_htmltag($proj->title) . '</span>';
+						$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
 					}
 				}
 			}
@@ -2828,7 +2828,7 @@ 
 	// Linked documents
 	if (!empty($typeobject) && $typeobject == 'commande' && $object->origin_object->id && isModEnabled('order')) {
 		print '<tr><td>';
-		print $langs->trans("RefOrder") . '</td>';
+		print $langs->trans("RefOrder").'</td>';
 		print '<td>';
 		print $objectsrc->getNomUrl(1, 'commande');
 		print "</td>\n";
@@ -2836,7 +2836,7 @@ 
 	}
 	if (!empty($typeobject) && $typeobject == 'propal' && $object->origin_object->id && isModEnabled("propal")) {
 		print '<tr><td>';
-		print $langs->trans("RefProposal") . '</td>';
+		print $langs->trans("RefProposal").'</td>';
 		print '<td>';
 		print $objectsrc->getNomUrl(1, 'expedition');
 		print "</td>\n";
@@ -2844,8 +2844,8 @@ 
 	}
 
 	// Date creation
-	print '<tr><td class="titlefieldmiddle">' . $langs->trans("DateCreation") . '</td>';
-	print '<td>' . dol_print_date($object->date_creation, "dayhour") . "</td>\n";
+	print '<tr><td class="titlefieldmiddle">'.$langs->trans("DateCreation").'</td>';
+	print '<td>'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
 	print '</tr>';
 
 	// Delivery date planned
@@ -2854,16 +2854,16 @@ 
 	print $langs->trans('DateDeliveryPlanned');
 	print '</td>';
 	if ($action != 'editdate_livraison') {
-		print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editdate_livraison&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetDeliveryDate'), 1) . '</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editdate_livraison') {
-		print '<form name="setdate_livraison" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
 		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
-		print '<input type="submit" class="button button-edit smallpaddingimp" value="' . $langs->trans('Modify') . '">';
+		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
@@ -2877,16 +2877,16 @@ 
 	print $langs->trans('DateShipping');
 	print '</td>';
 	if ($action != 'editdate_shipping') {
-		print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editdate_shipping&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetShippingDate'), 1) . '</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_shipping&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editdate_shipping') {
-		print '<form name="setdate_shipping" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form name="setdate_shipping" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_shipping">';
 		print $form->selectDate($object->date_shipping ? $object->date_shipping : -1, 'ship_', 1, 1, 0, "setdate_shipping", 1, 0);
-		print '<input type="submit" class="button button-edit smallpaddingimp" value="' . $langs->trans('Modify') . '">';
+		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		print $object->date_shipping ? dol_print_date($object->date_shipping, 'dayhour') : '&nbsp;';
@@ -2900,24 +2900,24 @@ 
 	print '</td><td>';
 
 	if ($action == 'edittrueWeight') {
-		print '<form name="settrueweight" action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+		print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 		print '<input name="action" value="settrueWeight" type="hidden">';
-		print '<input name="id" value="' . $object->id . '" type="hidden">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
-		print '<input id="trueWeight" name="trueWeight" value="' . $object->trueWeight . '" type="text" class="width50 valignmiddle">';
+		print '<input name="id" value="'.$object->id.'" type="hidden">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text" class="width50 valignmiddle">';
 		print $formproduct->selectMeasuringUnits("weight_units", "weight", (string) $object->weight_units, 0, 2, 'maxwidth125 valignmiddle');
-		print ' <input class="button smallpaddingimp valignmiddle" name="modify" value="' . $langs->trans("Modify") . '" type="submit">';
-		print ' <input class="button button-cancel smallpaddingimp valignmiddle" name="cancel" value="' . $langs->trans("Cancel") . '" type="submit">';
+		print ' <input class="button smallpaddingimp valignmiddle" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+		print ' <input class="button button-cancel smallpaddingimp valignmiddle" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 		print '</form>';
 	} else {
 		print $object->trueWeight;
-		print ($object->trueWeight && $object->weight_units != '') ? ' ' . measuringUnitString(0, "weight", $object->weight_units) : '';
+		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 	}
 
 	// Calculated
 	if ($totalWeight > 0) {
 		if (!empty($object->trueWeight)) {
-			print ' (' . $langs->trans("SumOfProductWeights") . ': ';
+			print ' ('.$langs->trans("SumOfProductWeights").': ';
 		}
 		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, getDolGlobalInt('MAIN_WEIGHT_DEFAULT_ROUND', -1), getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT', 'no'));
 		if (!empty($object->trueWeight)) {
@@ -2927,34 +2927,34 @@ 
 	print '</td></tr>';
 
 	// Width
-	print '<tr><td>' . $form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('expedition', 'creer'));
-	print ($object->trueWidth && $object->width_units != '') ? ' ' . measuringUnitString(0, "size", $object->width_units) : '';
+	print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : '';
 	print '</td></tr>';
 
 	// Height
-	print '<tr><td>' . $form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	if ($action == 'edittrueHeight') {
-		print '<form name="settrueHeight" action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+		print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 		print '<input name="action" value="settrueHeight" type="hidden">';
-		print '<input name="id" value="' . $object->id . '" type="hidden">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
-		print '<input id="trueHeight" name="trueHeight" value="' . $object->trueHeight . '" type="text" class="width50">';
+		print '<input name="id" value="'.$object->id.'" type="hidden">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text" class="width50">';
 		print $formproduct->selectMeasuringUnits("size_units", "size", $object->size_units, 0, 2);
-		print ' <input class="button smallpaddingimp" name="modify" value="' . $langs->trans("Modify") . '" type="submit">';
-		print ' <input class="button button-cancel smallpaddingimp" name="cancel" value="' . $langs->trans("Cancel") . '" type="submit">';
+		print ' <input class="button smallpaddingimp" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+		print ' <input class="button button-cancel smallpaddingimp" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 		print '</form>';
 	} else {
 		print $object->trueHeight;
-		print ($object->trueHeight && $object->height_units != '') ? ' ' . measuringUnitString(0, "size", $object->height_units) : '';
+		print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 	}
 
 	print '</td></tr>';
 
 	// Depth
-	print '<tr><td>' . $form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('expedition', 'creer'));
-	print ($object->trueDepth && $object->depth_units != '') ? ' ' . measuringUnitString(0, "size", $object->depth_units) : '';
+	print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : '';
 	print '</td></tr>';
 
 	// Volume
@@ -2973,12 +2973,12 @@ 
 		if ($volumeUnit < 50) {
 			print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), getDolGlobalString('MAIN_VOLUME_DEFAULT_UNIT', 'no'));
 		} else {
-			print $calculatedVolume . ' ' . measuringUnitString(0, "volume", $volumeUnit);
+			print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 	}
 	if ($totalVolume > 0) {
 		if ($calculatedVolume) {
-			print ' (' . $langs->trans("SumOfProductVolumes") . ': ';
+			print ' ('.$langs->trans("SumOfProductVolumes").': ';
 		}
 		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), getDolGlobalString('MAIN_VOLUME_DEFAULT_UNIT', 'no'));
 		//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
@@ -2991,7 +2991,7 @@ 
 
 	// Other attributes
 	//$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
@@ -3008,33 +3008,33 @@ 
 	print '</td>';
 
 	if ($action != 'editshipping_method_id' && $permissiontoadd) {
-		print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editshipping_method_id&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetSendingMethod'), 1) . '</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editshipping_method_id') {
-		print '<form name="setshipping_method_id" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setshipping_method_id">';
 		$object->fetch_delivery_methods();
 		print $form->selectarray("shipping_method_id", $object->meths, $object->shipping_method_id, 1, 0, 0, "", 1);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-edit smallpaddingimp" value="' . $langs->trans('Modify') . '">';
+		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		if ($object->shipping_method_id > 0) {
 			// Get code using getLabelFromKey
 			$code = $langs->getLabelFromKey($db, (string) $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
-			print $langs->trans("SendingMethod" . strtoupper($code));
+			print $langs->trans("SendingMethod".strtoupper($code));
 		}
 	}
 	print '</td>';
 	print '</tr>';
 
 	// Tracking Number
-	print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->hasRight('expedition', 'creer'), 'safehtmlstring', $object->tracking_number);
 	print '</td></tr>';
 
@@ -3045,7 +3045,7 @@ 
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
 		if ($permissiontoadd) {
-			print '<a class="editfielda" href="' . DOL_URL_ROOT . '/expedition/card.php?id=' . $object->id . '&action=editincoterm&token=' . newToken() . '">' . img_edit() . '</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
 		}
@@ -3055,7 +3055,7 @@ 
 		if ($action != 'editincoterm') {
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		} else {
-			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
 	}
@@ -3132,11 +3132,11 @@ 
 	// Lines of products of origin
 	if (!empty($object->origin) && $object->origin_id > 0) {
 		if ($action == 'editline') {
-			print '	<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
-			<input type="hidden" name="token" value="' . newToken() . '">
+			print '	<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" method="POST">
+			<input type="hidden" name="token" value="' . newToken().'">
 			<input type="hidden" name="action" value="updateline">
 			<input type="hidden" name="mode" value="">
-			<input type="hidden" name="id" value="' . $object->id . '">
+			<input type="hidden" name="id" value="' . $object->id.'">
 			';
 		}
 		print '<br>';
@@ -3150,11 +3150,11 @@ 
 			print '<td width="5" class="center linecolnum">&nbsp;</td>';
 		}
 		// Product/Service
-		print '<td  class="linecoldescription" >' . $langs->trans("Products") . '</td>';
+		print '<td  class="linecoldescription" >'.$langs->trans("Products").'</td>';
 		// Qty
-		print '<td class="center linecolqty">' . $langs->trans("QtyOrdered") . '</td>';
+		print '<td class="center linecolqty">'.$langs->trans("QtyOrdered").'</td>';
 		if ($origin_id > 0) {
-			print '<td class="center linecolqtyinothershipments">' . $langs->trans("QtyInOtherShipments") . '</td>';
+			print '<td class="center linecolqtyinothershipments">'.$langs->trans("QtyInOtherShipments").'</td>';
 		}
 		if ($action == 'editline') {
 			$editColspan = 3;
@@ -3164,35 +3164,35 @@ 
 			if (!isModEnabled('productbatch')) {
 				$editColspan--;
 			}
-			print '<td class="center linecoleditlineotherinfo" colspan="' . $editColspan . '">';
+			print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
 			if ($object->status <= 1) {
 				print $langs->trans("QtyToShip");
 			} else {
 				print $langs->trans("QtyShipped");
 			}
 			if (isModEnabled('stock')) {
-				print ' - ' . $langs->trans("WarehouseSource");
+				print ' - '.$langs->trans("WarehouseSource");
 			}
 			if (isModEnabled('productbatch')) {
-				print ' - ' . $langs->trans("Batch");
+				print ' - '.$langs->trans("Batch");
 			}
 			print '</td>';
 		} else {
 			if ($object->status <= 1) {
-				print '<td class="center linecolqtytoship">' . $langs->trans("QtyToShip") . '</td>';
+				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
 			} else {
-				print '<td class="center linecolqtyshipped">' . $langs->trans("QtyShipped") . '</td>';
+				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 			}
 			if (isModEnabled('stock')) {
-				print '<td class="left linecolwarehousesource">' . $langs->trans("WarehouseSource") . '</td>';
+				print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
 			}
 
 			if (isModEnabled('productbatch')) {
-				print '<td class="left linecolbatch">' . $langs->trans("Batch") . '</td>';
+				print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
 			}
 		}
-		print '<td class="center linecolweight">' . $langs->trans("CalculatedWeight") . '</td>';
-		print '<td class="center linecolvolume">' . $langs->trans("CalculatedVolume") . '</td>';
+		print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
+		print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
 		//print '<td class="center">'.$langs->trans("Size").'</td>';
 		if ($object->status == 0) {
 			print '<td class="linecoledit"></td>';
@@ -3227,13 +3227,13 @@ 
 			//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
 			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch';
 			$sql .= ', p.description as product_desc';
-			$sql .= " FROM " . MAIN_DB_PREFIX . "expeditiondet as ed";
-			$sql .= ", " . MAIN_DB_PREFIX . "expedition as e";
-			$sql .= ", " . MAIN_DB_PREFIX . $origin . "det as obj";
+			$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+			$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
 			//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON obj.fk_product = p.rowid";
-			$sql .= " WHERE e.entity IN (" . getEntity('expedition') . ")";
-			$sql .= " AND obj.fk_" . $origin . " = " . ((int) $origin_id);
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+			$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
 			$sql .= " AND obj.rowid = ed.fk_elementdet";
 			$sql .= " AND ed.fk_expedition = e.rowid";
 			//if ($filter) $sql.= $filter;
@@ -3279,12 +3279,12 @@ 
 			}
 
 			if (empty($reshook) && $lines[$i]->product_type != "9") {
-				print '<!-- origin line id = ' . $lines[$i]->origin_line_id . ' -->'; // id of order line
-				print '<tr class="oddeven" id="row-' . $lines[$i]->id . '" data-id="' . $lines[$i]->id . '" data-element="' . $lines[$i]->element . '" >';
+				print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+				print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
 				// #
 				if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
-					print '<td class="center linecolnum">' . ($i + 1) . '</td>';
+					print '<td class="center linecolnum">'.($i + 1).'</td>';
 				}
 
 				// Predefined product or service
@@ -3329,12 +3329,12 @@ 
 					$product_static->stockable_product = $lines[$i]->stockable_product;
 
 					$text = $product_static->getNomUrl(1);
-					$text .= ' - ' . $label;
+					$text .= ' - '.$label;
 					$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
 					print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
 					print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
 					if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
-						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>' . dol_htmlentitiesbr($lines[$i]->description) : '';
+						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
 					print "</td>\n";
 				} else {
@@ -3346,10 +3346,10 @@ 
 					}
 
 					if (!empty($lines[$i]->label)) {
-						$text .= ' <strong>' . $lines[$i]->label . '</strong>';
+						$text .= ' <strong>'.$lines[$i]->label.'</strong>';
 						print $form->textwithtooltip($text, $lines[$i]->description, 3, 0, '', (string) $i);
 					} else {
-						print $text . ' ' . nl2br($lines[$i]->description);
+						print $text.' '.nl2br($lines[$i]->description);
 					}
 
 					print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
@@ -3362,7 +3362,7 @@ 
 				}
 
 				// Qty ordered
-				print '<td class="center linecolqty">' . $lines[$i]->qty_asked . ' ' . $unit_order . '</td>';
+				print '<td class="center linecolqty">'.$lines[$i]->qty_asked.' '.$unit_order.'</td>';
 
 				// Qty in other shipments (with shipment and warehouse used)
 				if ($origin_id > 0) {
@@ -3383,8 +3383,8 @@ 
 								}
 								$shipment_static->fetch($shipmentline_var['shipment_id']);
 								$htmltooltip .= $shipment_static->getNomUrl(1, '', 0, 0, 1);
-								$htmltooltip .= ' - ' . $shipmentline_var['qty_shipped'];
-								$htmltooltip .= ' - ' . $langs->trans("DateValidation") . ' : ' . (empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+								$htmltooltip .= ' - '.$shipmentline_var['qty_shipped'];
+								$htmltooltip .= ' - '.$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
 								/*if (isModEnabled('stock') && $shipmentline_var['warehouse'] > 0) {
 									$warehousestatic->fetch($shipmentline_var['warehouse']);
 									$htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
@@ -3394,39 +3394,39 @@ 
 								$qtyalreadysent += $shipmentline_var['qty_shipped'];
 							}
 							if ($j) {
-								$htmltooltip = $langs->trans("QtyInOtherShipments") . '...<br><br>' . $htmltooltip . '<br><input type="submit" name="dummyhiddenbuttontogetfocus" style="display:none" autofocus>';
+								$htmltooltip = $langs->trans("QtyInOtherShipments").'...<br><br>'.$htmltooltip.'<br><input type="submit" name="dummyhiddenbuttontogetfocus" style="display:none" autofocus>';
 							}
 						}
 					}
-					print $form->textwithpicto((string) $qtyalreadysent, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip' . $lines[$i]->id);
+					print $form->textwithpicto((string) $qtyalreadysent, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip'.$lines[$i]->id);
 					print '</td>';
 				}
 
 				if ($action == 'editline' && $lines[$i]->id == $line_id) {
 					// edit mode
-					print '<td colspan="' . $editColspan . '" class="center"><table class="nobordernopadding centpercent">';
+					print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding centpercent">';
 					if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
 						print '<!-- case edit 1 -->';
 						$line = new ExpeditionLigne($db);
 						foreach ($lines[$i]->detail_batch as $detail_batch) {
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl right" name="qtyl' . $detail_batch->fk_expeditiondet . '_' . $detail_batch->id . '" id="qtyl' . $line_id . '_' . $detail_batch->id . '" type="text" size="4" value="' . $detail_batch->qty . '"></td>';
+							print '<td><input class="qtyl right" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
 							// Batch number management
 							if ($lines[$i]->entrepot_id == 0) {
 								// only show lot numbers from src warehouse when shipping from multiple warehouses
 								$line->fetch($detail_batch->fk_expeditiondet);
 							}
 							$entrepot_id = !empty($detail_batch->entrepot_id) ? $detail_batch->entrepot_id : $lines[$i]->entrepot_id;
-							print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl' . $detail_batch->fk_expeditiondet . '_' . $detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id) . '</td>';
+							print '<td>'.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).'</td>';
 							print '</tr>';
 						}
 						// add a 0 qty lot row to be able to add a lot
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl" name="qtyl' . $line_id . '_0" id="qtyl' . $line_id . '_0" type="text" size="4" value="0"></td>';
+						print '<td><input class="qtyl" name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0"></td>';
 						// Batch number management
-						print '<td>' . $formproduct->selectLotStock('', 'batchl' . $line_id . '_0', '', 1, 0, $lines[$i]->fk_product) . '</td>';
+						print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 						print '</tr>';
 					} elseif (isModEnabled('stock')) {
 						if ($lines[$i]->fk_product > 0) {
@@ -3434,13 +3434,13 @@ 
 								print '<!-- case edit 2 -->';
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '">' . $unit_order . '</td>';
+								print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 								// Warehouse source
-								print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl' . $line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200') . '</td>';
+								print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200').'</td>';
 								// Batch number management
 								print '<td>';
 								if (isModEnabled('productbatch')) {
-									print ' - ' . $langs->trans("NA");
+									print ' - '.$langs->trans("NA");
 								}
 								print '</td>';
 								print '</tr>';
@@ -3449,13 +3449,13 @@ 
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 									print '<tr>';
 									// Qty to ship or shipped
-									print '<td><input class="qtyl right" name="qtyl' . $detail_entrepot->line_id . '" id="qtyl' . $detail_entrepot->line_id . '" type="text" size="4" value="' . $detail_entrepot->qty_shipped . '">' . $unit_order . '</td>';
+									print '<td><input class="qtyl right" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
 									// Warehouse source
-									print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl' . $detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200') . '</td>';
+									print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200').'</td>';
 									// Batch number management
 									print '<td>';
 									if (isModEnabled('productbatch')) {
-										print ' - ' . $langs->trans("NA");
+										print ' - '.$langs->trans("NA");
 									}
 									print '</td>';
 									print '</tr>';
@@ -3464,19 +3464,19 @@ 
 								print '<!-- case edit 4 -->';
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '"></td>';
-								print '<td><span class="opacitymedium">(' . $langs->trans("Service") . ')</span></td>';
+								print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+								print '<td><span class="opacitymedium">('.$langs->trans("Service").')</span></td>';
 								print '<td></td>';
 								print '</tr>';
 							} else {
 								print '<!-- case edit 5 -->';
-								print '<tr><td colspan="3">' . $langs->trans("ErrorStockIsNotEnough") . '</td></tr>';
+								print '<tr><td colspan="3">'.$langs->trans("ErrorStockIsNotEnough").'</td></tr>';
 							}
 						} else {
 							print '<!-- case edit 6 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '">' . $unit_order . '</td>';
+							print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 							// Warehouse source
 							print '<td></td>';
 							// Batch number management
@@ -3487,7 +3487,7 @@ 
 						print '<!-- case edit 7 -->';
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '"></td>';
+						print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
 						// Warehouse source
 						print '<td></td>';
 						// Batch number management
@@ -3498,13 +3498,13 @@ 
 					print '</table></td>';
 				} else {
 					// Qty to ship or shipped
-					print '<td class="linecolqtytoship center">' . $lines[$i]->qty_shipped . ' ' . $unit_order . '</td>';
+					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.' '.$unit_order.'</td>';
 
 					// Warehouse source
 					if (isModEnabled('stock')) {
 						print '<td class="linecolwarehousesource tdoverflowmax200">';
 						if ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
-							print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span>';
+							print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 						} elseif ($lines[$i]->entrepot_id > 0 && $lines[$i]->stockable_product == Product::ENABLED_STOCK) {
 							$warehouse_id = $lines[$i]->entrepot_id;
 							if (!isset($conf->cache['warehouse'][$warehouse_id])) {
@@ -3527,10 +3527,10 @@ 
 									} else {
 										$warehouse = $conf->cache['warehouse'][$warehouse_id];
 									}
-									$detail .= $langs->trans("DetailWarehouseFormat", $warehouse->label, $detail_entrepot->qty_shipped) . '<br>';
+									$detail .= $langs->trans("DetailWarehouseFormat", $warehouse->label, $detail_entrepot->qty_shipped).'<br>';
 								}
 							}
-							print $form->textwithtooltip(img_picto('', 'object_stock') . ' ' . $langs->trans("DetailWarehouseNumber"), $detail);
+							print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"), $detail);
 						} elseif (count($lines[$i]->detail_children ?? []) > 1) {
 							$detail = '';
 							foreach ($lines[$i]->detail_children as $child_product_id => $child_stock_list) {
@@ -3544,7 +3544,7 @@ 
 									} else {
 										$child_product = $conf->cache['product'][$child_product_id];
 									}
-									$child_product_label = $child_product->ref . ' ' . $child_product->label;
+									$child_product_label = $child_product->ref.' '.$child_product->label;
 
 									// get warehouse from cache
 									if (!isset($conf->cache['warehouse'][$warehouse_id])) {
@@ -3554,10 +3554,10 @@ 
 									} else {
 										$child_warehouse = $conf->cache['warehouse'][$warehouse_id];
 									}
-									$detail .= $langs->trans('DetailChildrenFormat', $child_product_label, $child_warehouse->label, price2num($total_qty, 'MS')) . '<br>';
+									$detail .= $langs->trans('DetailChildrenFormat', $child_product_label, $child_warehouse->label, price2num($total_qty, 'MS')).'<br>';
 								}
 							}
-							print $form->textwithtooltip(img_picto('', 'object_stock') . ' ' . $langs->trans('DetailWarehouseNumber'), $detail);
+							print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans('DetailWarehouseNumber'), $detail);
 						}
 						print '</td>';
 					}
@@ -3570,17 +3570,17 @@ 
 							if ($lines[$i]->product_tobatch) {
 								$detail = '';
 								foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
-									$detail .= $langs->trans("Batch") . ': ' . $dbatch->batch;
+									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
-										$detail .= ' - ' . $langs->trans("SellByDate") . ': ' . dol_print_date($dbatch->sellby, "day");
+										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 									}
 									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
-										$detail .= ' - ' . $langs->trans("EatByDate") . ': ' . dol_print_date($dbatch->eatby, "day");
+										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 									}
-									$detail .= ' - ' . $langs->trans("Qty") . ': ' . $dbatch->qty;
+									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 									$detail .= '<br>';
 								}
-								print $form->textwithtooltip(img_picto('', 'object_barcode') . ' ' . $langs->trans("DetailBatchNumber"), $detail);
+								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
 							} else {
 								print $langs->trans("NA");
 							}
@@ -3594,7 +3594,7 @@ 
 				// Weight
 				print '<td class="center linecolweight">';
 				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
-					print $lines[$i]->weight * $lines[$i]->qty_shipped . ' ' . measuringUnitString(0, "weight", $lines[$i]->weight_units);
+					print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
 				} else {
 					print '&nbsp;';
 				}
@@ -3603,7 +3603,7 @@ 
 				// Volume
 				print '<td class="center linecolvolume">';
 				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
-					print $lines[$i]->volume * $lines[$i]->qty_shipped . ' ' . measuringUnitString(0, "volume", $lines[$i]->volume_units);
+					print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
 				} else {
 					print '&nbsp;';
 				}
@@ -3614,11 +3614,11 @@ 
 
 				if ($action == 'editline' && $lines[$i]->id == $line_id) {
 					print '<td class="center" colspan="2" valign="middle">';
-					print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="' . $langs->trans("Save") . '"><br>';
-					print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+					print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
+					print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 					print '</td>';
 				} elseif ($object->status == Expedition::STATUS_DRAFT) {
-					$edit_url = $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=editline&token=' . newToken() . '&lineid=' . $lines[$i]->id;
+					$edit_url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id;
 					if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
 						$product_id = $lines[$i]->fk_product;
 						if (!isset($conf->cache['product'][$product_id])) {
@@ -3630,16 +3630,16 @@ 
 						}
 
 						if ($product->hasFatherOrChild(1)) {
-							$edit_url = dol_buildpath('/expedition/dispatch.php?id=' . $object->id, 1);
+							$edit_url = dol_buildpath('/expedition/dispatch.php?id='.$object->id, 1);
 						}
 					}
 
 					// edit-delete buttons
 					print '<td class="linecoledit center">';
-					print '<a class="editfielda reposition" href="' . $edit_url . '">' . img_edit() . '</a>';
+					print '<a class="editfielda reposition" href="'.$edit_url.'">'.img_edit().'</a>';
 					print '</td>';
 					print '<td class="linecoldelete" width="10">';
-					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=deleteline&token=' . newToken() . '&lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 					print '</td>';
 
 					// Display lines extrafields
@@ -3685,7 +3685,7 @@ 
 		}
 		// TODO Show also lines ordered but not delivered
 		if (empty($num_prod)) {
-			print '<tr><td colspan="8"><span class="opacitymedium">' . $langs->trans("NoLineGoOnTabToAddSome", $langs->transnoentitiesnoconv("ShipmentDistribution")) . '</span></td></tr>';
+			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("NoLineGoOnTabToAddSome", $langs->transnoentitiesnoconv("ShipmentDistribution")).'</span></td></tr>';
 		}
 
 		print "</table>\n";
@@ -3714,21 +3714,21 @@ 
 				if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
 					|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate'))
 				) {
-					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"] . '?action=valid&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'] . '#', '', false);
+					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
 			// 0=draft, 1=validated/delivered, 2=closed/delivered
 			if ($object->status == Expedition::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 				if ($user->hasRight('expedition', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"] . '?action=setdraft&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 			if ($object->status == Expedition::STATUS_CLOSED) {
 				if ($user->hasRight('expedition', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"] . '?action=reopen&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 
@@ -3736,9 +3736,9 @@ 
 			if (empty($user->socid)) {
 				if ($object->status > 0) {
 					if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('expedition', 'shipping_advance', 'send')) {
-						print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER["PHP_SELF"] . '?action=presend&token=' . newToken() . '&id=' . $object->id . '&mode=init#formmailbeforetitle', '');
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 					} else {
-						print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER['PHP_SELF'] . '#', '', false);
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER['PHP_SELF'].'#', '', false);
 					}
 				}
 			}
@@ -3746,15 +3746,15 @@ 
 			// This is just to generate a delivery receipt when option to do this is on
 			//var_dump($object->linkedObjectsIds['delivery']);
 			if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED) && $user->hasRight('expedition', 'delivery', 'creer') && empty($object->linkedObjectsIds['delivery'])) {
-				print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"] . '?action=create_delivery&token=' . newToken() . '&id=' . $object->id, '');
+				print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"].'?action=create_delivery&token='.newToken().'&id='.$object->id, '');
 			}
 
 			// Sign (to set to status "Signed" without using the online signature page)
 			if ($object->status > Expedition::STATUS_DRAFT) {
 				if ($object->signed_status != Expedition::$SIGNED_STATUSES['STATUS_SIGNED_ALL']) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=sign&token=' . newToken() . '">' . $langs->trans("SignShipping") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sign&token='.newToken().'">'.$langs->trans("SignShipping").'</a></div>';
 				} else {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unsign&token=' . newToken() . '">' . $langs->trans("UnsignShipping") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unsign&token='.newToken().'">'.$langs->trans("UnsignShipping").'</a></div>';
 				}
 			}
 
@@ -3762,7 +3762,7 @@ 
 			if (isModEnabled('invoice') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED)) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
-						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT . '/compta/facture/card.php?action=create&origin=' . $object->element . '&originid=' . $object->id . '&socid=' . $object->socid, '');
+						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid, '');
 					}
 				}
 			}
@@ -3771,22 +3771,22 @@ 
 			if ($object->status == Expedition::STATUS_VALIDATED) {
 				if ($user->hasRight('expedition', 'creer') && $object->status > 0) {
 					if (!$object->billed && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
-						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"] . '?action=classifybilled&token=' . newToken() . '&id=' . $object->id, '');
+						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifybilled&token='.newToken().'&id='.$object->id, '');
 					}
-					print dolGetButtonAction('', $langs->trans("Close"), 'default', $_SERVER["PHP_SELF"] . '?action=classifyclosed&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans("Close"), 'default', $_SERVER["PHP_SELF"].'?action=classifyclosed&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 
 			// Cancel
 			if ($object->status == Expedition::STATUS_VALIDATED) {
 				if ($user->hasRight('expedition', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"] . '?action=cancel&token=' . newToken() . '&id=' . $object->id . '&mode=init#formmailbeforetitle', '');
+					print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 				}
 			}
 
 			// Delete
 			if ($user->hasRight('expedition', 'supprimer')) {
-				print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"] . '?action=delete&token=' . newToken() . '&id=' . $object->id, '');
+				print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 			}
 		}
 
@@ -3802,9 +3802,9 @@ 
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 
 		$objectref = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->expedition->dir_output . "/sending/" . $objectref;
+		$filedir = $conf->expedition->dir_output."/sending/".$objectref;
 
-		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
 		$genallowed = $user->hasRight('expedition', 'lire');
 		$delallowed = $user->hasRight('expedition', 'creer');
@@ -3825,20 +3825,20 @@ 
 
 		if ($object->statut != Expedition::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/signature.lib.php';
-			print showOnlineSignatureUrl('expedition', $object->ref, $object) . '<br>';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
+			print showOnlineSignatureUrl('expedition', $object->ref, $object).'<br>';
 		}
 
 		print '</div><div class="fichehalfright">';
 
 
 		// 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);
 
 		//button to go to messaging from the events box
 		$MAXEVENT = 10;
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT.'/expedition/messaging.php?id='.$object->id);
 
 		$somethingshown = $formactions->showactions($object, 'shipping', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter);
 		print '</div></div>';
@@ -3857,10 +3857,10 @@ 
 	// Presend form
 	$modelmail = 'shipping_send';
 	$defaulttopic = 'SendShippingRef';
-	$diroutput = $conf->expedition->dir_output . '/sending';
-	$trackid = 'shi' . $object->id;
+	$diroutput = $conf->expedition->dir_output.'/sending';
+	$trackid = 'shi'.$object->id;
 
-	include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page

htdocs/societe/card.php

Spacing +68 added lines, -68 removed lines

@@ -161,10 +161,10 @@ 
 }
 
 // Permissions
-$permissiontoread 	= $user->hasRight('societe', 'lire');
-$permissiontoadd 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoread = $user->hasRight('societe', 'lire');
+$permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->hasRight('societe', 'supprimer') || ($permissiontoadd && isset($object->status) && $object->status == 0);
-$permissionnote 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink 	= $user->hasRight('societe', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontoeditextra = $permissiontoadd;
 if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')])) {
@@ -172,7 +172,7 @@ 
 	$permissiontoeditextra = dol_eval((string) $extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')]);
 }
 
-$upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
+$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
 $result = restrictedArea($user, 'societe', $object->id, '&societe', '', 'fk_soc', 'rowid', 0);
@@ -201,7 +201,7 @@ 
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT.'/societe/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__') . (!empty($canvas) ? "&canvas=" . $canvas : "");
+				$backtopage = DOL_URL_ROOT.'/societe/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__').(!empty($canvas) ? "&canvas=".$canvas : "");
 			}
 		}
 	}
@@ -219,7 +219,7 @@ 
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $permissiontoadd) {
 		$soc_origin_id = GETPOSTINT('soc_origin');
-		$soc_origin = new Societe($db);		// The thirdparty that we will delete
+		$soc_origin = new Societe($db); // The thirdparty that we will delete
 
 		if ($soc_origin_id <= 0) {
 			$langs->load('errors');
@@ -267,7 +267,7 @@ 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
 		$object->fetch($socid);
 
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -323,7 +323,7 @@ 
 		if (!$error) {
 			if ($action == 'update') {	// Test on permission not required here
 				$ret = $object->fetch($socid);
-				$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+				$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 			} else {
 				$object->canvas = $canvas;
 			}
@@ -333,21 +333,21 @@ 
 
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
-				$object->civility_code		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
+				$object->civility_code = GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
 				// Add non official properties
-				$object->name_bis			= GETPOST('name', 'alphanohtml');
-				$object->firstname			= GETPOST('firstname', 'alphanohtml');
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
 			} else {
-				$object->name				= GETPOST('name', 'alphanohtml');
+				$object->name = GETPOST('name', 'alphanohtml');
 			}
 			$object->entity					= ((GETPOSTISSET('entity') && GETPOST('entity') != '') ? GETPOSTINT('entity') : $conf->entity);
-			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
 			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOSTINT('parent_company_id') : $object->parent;
 			$object->address				= GETPOST('address', 'alphanohtml');
-			$object->zip					= GETPOST('zipcode', 'alphanohtml');
-			$object->town					= GETPOST('town', 'alphanohtml');
-			$object->country_id				= GETPOSTINT('country_id');
-			$object->state_id				= GETPOSTINT('state_id');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOSTINT('country_id');
+			$object->state_id = GETPOSTINT('state_id');
 
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
@@ -359,10 +359,10 @@ 
 			}
 
 			$object->phone					= GETPOST('phone', 'alpha');
-			$object->phone_mobile 			= (string) GETPOST("phone_mobile", 'alpha');
+			$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'email'));
-			$object->no_email 				= GETPOSTINT("no_email");
+			$object->no_email = GETPOSTINT("no_email");
 			$object->url					= trim(GETPOST('url', 'url'));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -372,13 +372,13 @@ 
 			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
 			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
 			$object->code_client			= GETPOSTISSET('customer_code') ? GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-			$object->code_fournisseur		= GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
-			$object->capital				= GETPOST('capital');	// Can be null or 0 or a float value
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ? GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->capital				= GETPOST('capital'); // Can be null or 0 or a float value
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
 			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
 			$object->tva_assuj				= GETPOSTINT('assujtva_value');
-			$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+			$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 			$object->status = GETPOSTINT('status');
 
 			// Local Taxes
@@ -388,11 +388,11 @@ 
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-			$object->forme_juridique_code	= GETPOSTINT('forme_juridique_code');
-			$object->birth				= dol_mktime(0, 0, 0, GETPOSTINT('birthmonth'), GETPOSTINT('birthday'), GETPOSTINT('birthyear'));
+			$object->forme_juridique_code = GETPOSTINT('forme_juridique_code');
+			$object->birth = dol_mktime(0, 0, 0, GETPOSTINT('birthmonth'), GETPOSTINT('birthday'), GETPOSTINT('birthyear'));
 
 			$object->effectif_id			= GETPOSTINT('effectif_id');
-			$object->typent_id				= GETPOSTINT('typent_id');
+			$object->typent_id = GETPOSTINT('typent_id');
 
 			$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
 
@@ -401,8 +401,8 @@ 
 			$prospect = (GETPOSTINT('prospect') > 0 ? 2 : 0);
 			$prospectcustomer = $customer + $prospect;
 
-			$object->client					= $prospectcustomer;
-			$object->fournisseur			= (GETPOSTINT('supplier') > 0 ? 1 : 0);
+			$object->client = $prospectcustomer;
+			$object->fournisseur = (GETPOSTINT('supplier') > 0 ? 1 : 0);
 
 			if ($action == 'add') {		// Test on permission already done
 				// for prospect, customer or supplier
@@ -422,7 +422,7 @@ 
 					}
 
 					if ($object->fournisseur > 0) {
-						$object->cond_reglement_supplier_id	= $paymentTermId;
+						$object->cond_reglement_supplier_id = $paymentTermId;
 
 						$filterPaymentTypeIdArr = array(1, 2, 3); // allow payment type for supplier (filter is "DBIT" in "Form::select_types_paiements()" method)
 						if (!empty($form->cache_types_paiements[$paymentTypeId]) && isset($form->cache_types_paiements[$paymentTypeId]['type']) && in_array($form->cache_types_paiements[$paymentTypeId]['type'], $filterPaymentTypeIdArr)) {
@@ -432,15 +432,15 @@ 
 				}
 			}
 
-			$object->commercial_id			= GETPOSTINT('commercial_id');
-			$object->default_lang			= GETPOST('default_lang');
+			$object->commercial_id = GETPOSTINT('commercial_id');
+			$object->default_lang = GETPOST('default_lang');
 
 			// Webservices url/key
 			$object->webservices_url		= GETPOST('webservices_url', 'url');
 			$object->webservices_key		= GETPOST('webservices_key', 'password');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$accountancy_code_sell		= GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
@@ -449,7 +449,7 @@ 
 				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$accountancy_code_buy		= GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
@@ -835,7 +835,7 @@ 
 	// Delete third party
 	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('societe', 'supprimer')) {
 		$object->fetch($socid);
-		$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 		$result = $object->delete($socid, $user);
 
 		if ($result > 0) {
@@ -913,7 +913,7 @@ 
 				} else {
 					$db->commit();
 					$db->close();
-					header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 					exit;
 				}
 			} else {
@@ -1102,12 +1102,12 @@ 
 		$object->fax = GETPOST('fax', 'alpha');
 		$object->email = GETPOST('email', 'email');
 		$object->url = GETPOST('url', 'url');
-		$object->capital = GETPOST('capital');	// can be null or 0 or a float value
+		$object->capital = GETPOST('capital'); // can be null or 0 or a float value
 		$paymentTermId = GETPOSTINT('cond_reglement_id'); // can be set by default values on create page and not already in get or post variables
 		if (empty($paymentTermId) && !GETPOSTISSET('cond_reglement_id')) {
 			$paymentTermId = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TERM_ID');
 		}
-		$object->cond_reglement_id	= $paymentTermId;
+		$object->cond_reglement_id = $paymentTermId;
 		$paymentTypeId = GETPOSTINT('mode_reglement_id'); // can be set by default values on create page and not already in get or post variables
 		if (empty($paymentTypeId) && !GETPOSTISSET('mode_reglement_id')) {
 			$paymentTypeId = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TYPE_ID');
@@ -1125,7 +1125,7 @@ 
 		$object->civility_id = GETPOST('civility_id', 'alpha');
 
 		$object->tva_assuj = GETPOSTINT('assujtva_value');
-		$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+		$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 		$object->status = GETPOSTINT('status');
 
 		//Local Taxes
@@ -1141,7 +1141,7 @@ 
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
-			$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 			if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 				$object->accountancy_code_sell = '';
@@ -1276,7 +1276,7 @@ 
 
 			print '<script type="text/javascript">';
 			print '$(document).ready(function () {
-					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1') . ';
+					var canHaveCustomerCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1').';
 
 					init_customer_categ();
 			  		$("#prospectinput, #customerinput").change(function() {
@@ -1350,7 +1350,7 @@ 
 			print '</td><td colspan="3">';
 
 			print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus" spellcheck="false">';
-			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300');	// For some countries that need the company name in 2 languages
+			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages
 			// This implementation of the feature to search already existing company has been disabled. It must be implemented by keeping the "input text" and we must call the search ajax societe/ajax/ajaxcompanies.php
 			// on a keydown of the input. We should show data about a duplicate found if we found less than 5 answers into a div under the input.
 			/*
@@ -1469,8 +1469,8 @@ 
 
 			// Prospect/Customer/Supplier
 			$selected = $object->client;
-			$selectedcustomer = ((getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==1 && GETPOST("type", 'aZ') != 'p' && GETPOST("type", 'aZ') != 'f') || (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==3 && GETPOST("type", 'aZ') != 'p' && GETPOST("type", 'aZ') != 'f') ? 1 : 0);
-			$selectedprospect = ((getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==2 && GETPOST("type", 'aZ') != 'c' && GETPOST("type", 'aZ') != 'f') || (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')==3 && GETPOST("type", 'aZ') != 'c' && GETPOST("type", 'aZ') != 'f') ? 1 : 0);
+			$selectedcustomer = ((getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 1 && GETPOST("type", 'aZ') != 'p' && GETPOST("type", 'aZ') != 'f') || (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 3 && GETPOST("type", 'aZ') != 'p' && GETPOST("type", 'aZ') != 'f') ? 1 : 0);
+			$selectedprospect = ((getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 2 && GETPOST("type", 'aZ') != 'c' && GETPOST("type", 'aZ') != 'f') || (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT') == 3 && GETPOST("type", 'aZ') != 'c' && GETPOST("type", 'aZ') != 'f') ? 1 : 0);
 			switch ($selected) {
 				case 1:
 					$selectedcustomer = 1;
@@ -1723,7 +1723,7 @@ 
 					print '<td></td>';
 					print '<td></td>';
 				}
-				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
+				print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email').' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
 				print '<td class="individualline" '.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 				print '</tr>';
 			}
@@ -1771,7 +1771,7 @@ 
 			// Vat is used
 			print '<tr><td><label for="assujtva_value">'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</label></td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.(GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"').' value="1">'; // Assujeti par default en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1812,7 +1812,7 @@ 
 
 			// VAT reverse charge by default
 			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-				print '<tr><td><label for="vat_reverse_charge">' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</label></td><td colspan="3">';
+				print '<tr><td><label for="vat_reverse_charge">'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</label></td><td colspan="3">';
 				print '<input type="checkbox" name="vat_reverse_charge" id="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 				print '</td></tr>';
 			}
@@ -1821,21 +1821,21 @@ 
 			// 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 '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
 				print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			} elseif ($mysoc->localtax1_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			} elseif ($mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? 'checked="checked"' : '').' value="1">';
 				print '</td></tr>';
 			}
 
@@ -2114,7 +2114,7 @@ 
 				$prefixSupplierIsUsed = false;
 			}
 
-			$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 			if (GETPOSTISSET('name')) {
 				// We overwrite with values if posted
@@ -2142,12 +2142,12 @@ 
 				}
 
 				$object->phone					= GETPOST('phone', 'alpha');
-				$object->phone_mobile			= (string) GETPOST('phone_mobile', 'alpha');
+				$object->phone_mobile = (string) GETPOST('phone_mobile', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'email');
-				$object->no_email				= GETPOSTINT("no_email");
+				$object->no_email = GETPOSTINT("no_email");
 				$object->url					= GETPOST('url', 'url');
-				$object->capital				= GETPOST('capital');	// Can be null or 0 or a float value
+				$object->capital				= GETPOST('capital'); // Can be null or 0 or a float value
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
 				$object->idprof2				= GETPOST('idprof2', 'alphanohtml');
 				$object->idprof3				= GETPOST('idprof3', 'alphanohtml');
@@ -2161,16 +2161,16 @@ 
 				$object->default_lang = GETPOST('default_lang', 'alpha');
 
 				$object->tva_assuj				= GETPOSTINT('assujtva_value');
-				$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
+				$object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-				$object->status =				GETPOSTINT('status');
+				$object->status = GETPOSTINT('status');
 
 				// Webservices url/key
 				$object->webservices_url        = GETPOST('webservices_url', 'url');
 				$object->webservices_key        = GETPOST('webservices_key', 'password');
 
 				if (GETPOSTISSET('accountancy_code_sell')) {
-					$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+					$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 
 					if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 						$object->accountancy_code_sell = '';
@@ -2179,7 +2179,7 @@ 
 					}
 				}
 				if (GETPOSTISSET('accountancy_code_buy')) {
-					$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+					$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 
 					if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 						$object->accountancy_code_buy = '';
@@ -2261,7 +2261,7 @@ 
     				}
     			});
 
-				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0') . ';
+				var canHaveCustomerCategoryIfNotCustomerProspect = ' . (getDolGlobalInt('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '1' : '0').';
 
 				init_customer_categ();
 	  			$("#prospectinput, #customerinput").change(function() {
@@ -2433,7 +2433,7 @@ 
 					$colspan = 3;
 				}
 
-				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"': '').'>';
+				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 				print '<table class="nobordernopadding"><tr><td>';
 				$tmpcode = $object->code_client ?? '';
 				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
@@ -2450,7 +2450,7 @@ 
 					print '</tr><tr>';
 				}
 
-				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"': '').'>';
+				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 
 				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 					print '<table class="nobordernopadding"><tr><td>';
@@ -2631,14 +2631,14 @@ 
 
 				// VAT is used
 				print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . ($object->tva_assuj ? 'checked="checked"' : '') . ' value="1">';
+				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" '.($object->tva_assuj ? 'checked="checked"' : '').' value="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>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(1)) {
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(1, (float) $object->localtax1_value, "lt1");
@@ -2647,7 +2647,7 @@ 
 					print '</td>';
 					print '</tr><tr>';
 					print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1"></td></tr>';
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1"></td></tr>';
 					if (!isOnlyOneLocalTax(2)) {
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(2, (float) $object->localtax2_value, "lt2");
@@ -2656,7 +2656,7 @@ 
 					print '</td></tr>';
 				} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
-					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" ' . ($object->localtax1_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax1assuj_value" name="localtax1assuj_value" type="checkbox" '.($object->localtax1_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(1)) {
 						print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(1, (float) $object->localtax1_value, "lt1");
@@ -2665,7 +2665,7 @@ 
 					print '</td></tr>';
 				} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1") {
 					print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
-					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" ' . ($object->localtax2_assuj ? 'checked="checked"' : '') . ' value="1">';
+					print '<input id="localtax2assuj_value" name="localtax2assuj_value" type="checkbox" '.($object->localtax2_assuj ? 'checked="checked"' : '').' value="1">';
 					if (!isOnlyOneLocalTax(2)) {
 						print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 						$formcompany->select_localtax(2, (float) $object->localtax2_value, "lt2");
@@ -2676,7 +2676,7 @@ 
 
 				// VAT reverse charge by default
 				if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-					print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
+					print '<tr><td>'.$form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0).'</td><td colspan="3">';
 					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 					print '</td></tr>';
 				}
@@ -2848,7 +2848,7 @@ 
 					$maxfilesizearray = getMaxFileSizeArray();
 					$maxmin = $maxfilesizearray['maxmin'];
 					if ($maxmin > 0) {
-						print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+						print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 					}
 					print '<input type="file" class="flat" name="photo" id="photoinput">';
 					print '</td></tr>';
@@ -3105,7 +3105,7 @@ 
 					print '<tr><td>';
 					print $form->textwithpicto($langs->trans('VATReverseChargeByDefault'), $langs->trans('VATReverseChargeByDefaultDesc'));
 					print '</td><td>';
-					print '<input type="checkbox" name="vat_reverse_charge" ' . ($object->vat_reverse_charge == '1' ? ' checked' : '') . ' disabled>';
+					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').' disabled>';
 					print '</td>';
 					print '</tr>';
 				}

htdocs/install/upgrade2.php

Spacing +17 added lines, -17 removed lines

@@ -308,7 +308,7 @@ 
 			$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
 		}
 
-		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;		// Add also log into conf->logbuffer.
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1; // Add also log into conf->logbuffer.
 
 		$versiontoarray = array();
 		$versionranarray = array();
@@ -775,7 +775,7 @@ 
 
 	if (!$error) {
 		// Set constant to ask to remake a new ping to inform about upgrade (if ping was already done and OK)
-		$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";	// This should be useless now because constant is uniqueid+' v'+version
+		$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'"; // This should be useless now because constant is uniqueid+' v'+version
 		$db->query($sql, 1);
 	}
 
@@ -4373,7 +4373,7 @@ 
 
 	if (!is_object($user)) {
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-		$user = new User($db);	// To avoid error during migration
+		$user = new User($db); // To avoid error during migration
 	}
 
 	dolibarr_install_syslog("upgrade2::migrate_reload_modules force=".$force.", listofmodule=".implode(',', array_keys($listofmodule)), LOG_NOTICE);
@@ -4544,7 +4544,7 @@ 
 
 	if (!is_object($user)) {
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-		$user = new User($db);	// To avoid error during migration
+		$user = new User($db); // To avoid error during migration
 	}
 
 	print '<tr><td colspan="4">';
@@ -4555,7 +4555,7 @@ 
 	$resql = $db->query($sql);
 
 	if ($resql) {
-		$modulepart="product_batch";
+		$modulepart = "product_batch";
 
 		$lot = new Productlot($db);
 
@@ -4569,7 +4569,7 @@ 
 
 			if ($dir) {
 				$lot->id = (int) $obj->rowid;
-				$lot->ref = (string) $obj->rowid;		// No ref for the moment
+				$lot->ref = (string) $obj->rowid; // No ref for the moment
 				$lot->batch = $obj->batch;
 				$lot->entity = $obj->entity;
 				$lot->fk_product = $obj->fk_product;
@@ -4577,10 +4577,10 @@ 
 				$savref = $lot->ref;
 
 				$lot->ref = $obj->batch;
-				$origin = $dir . '/' . get_exdir(0, 0, 0, 1, $lot, $modulepart);
+				$origin = $dir.'/'.get_exdir(0, 0, 0, 1, $lot, $modulepart);
 
-				$lot->ref = $savref;		// So restore the id
-				$destin = $dir . '/' . get_exdir(0, 0, 0, 1, $lot, $modulepart);
+				$lot->ref = $savref; // So restore the id
+				$destin = $dir.'/'.get_exdir(0, 0, 0, 1, $lot, $modulepart);
 
 				//var_dump($origin.' -> '.$destin.' '.$lot->batch.' dir origin is '.dol_is_dir($origin));exit;
 
@@ -5357,7 +5357,7 @@ 
 				$error++;
 			}
 
-			$current_contract =  $obj->cid;
+			$current_contract = $obj->cid;
 		}
 	} else {
 		$error++;
@@ -5392,7 +5392,7 @@ 
 	print '<tr class="trforrunsql"><td colspan="4">';
 	print '<b>'.$langs->trans('InvoiceExportModelsMigration')."</b>: \n";
 
-	if (! $migrationNeeded) {
+	if (!$migrationNeeded) {
 		print $langs->trans("AlreadyDone");
 		print '</td></tr>';
 		dolibarr_set_const($db, 'MIGRATION_FLAG_INVOICE_MODELS_V20', 1, 'chaine', 0, 'To flag the upgrade of invoice template has been set', 0);
@@ -5406,7 +5406,7 @@ 
 
 	$resql1 = $db->query($sql1);
 
-	if (! $resql1) {
+	if (!$resql1) {
 		dol_print_error($db);
 		$db->rollback();
 		print '</td></tr>';
@@ -5423,7 +5423,7 @@ 
 
 	$resql2 = $db->query($sql2);
 
-	if (! $resql2) {
+	if (!$resql2) {
 		dol_print_error($db);
 		$db->rollback();
 		print '</td></tr>';
@@ -5480,7 +5480,7 @@ 
 
 		$resql = $db->query($sql);
 
-		require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 		$bookkeeping = new BookKeeping($db);
 		if ($resql) {
 			while ($obj = $db->fetch_object($resql)) {
@@ -5622,9 +5622,9 @@ 
 	$hmac_encoded_secret_key = getDolGlobalString('BLOCKEDLOG_HMAC_KEY');
 	if (empty($hmac_encoded_secret_key)) {
 		// Add key
-		$hmac_secret_key = 'BLOCKEDLOGHMAC'.getRandomPassword(true);		// This is using random_int for 32 chars
+		$hmac_secret_key = 'BLOCKEDLOGHMAC'.getRandomPassword(true); // This is using random_int for 32 chars
 
-		$result = dolibarr_set_const($db, 'BLOCKEDLOG_HMAC_KEY', $hmac_secret_key, 'chaine', 0, 'The secret key for HMAC used for blockedlog record', 0);	// Will encrypt the value using dolCrypt and store it.
+		$result = dolibarr_set_const($db, 'BLOCKEDLOG_HMAC_KEY', $hmac_secret_key, 'chaine', 0, 'The secret key for HMAC used for blockedlog record', 0); // Will encrypt the value using dolCrypt and store it.
 
 		if ($result < 0) {
 			dol_print_error($db);
@@ -5639,7 +5639,7 @@ 
 		// Decode the HMAC key
 		$hmac_secret_key = dolDecrypt($hmac_encoded_secret_key);
 
-		if (! preg_match('/^BLOCKEDLOGHMAC/', $hmac_secret_key)) {
+		if (!preg_match('/^BLOCKEDLOGHMAC/', $hmac_secret_key)) {
 			print 'Error: Failed to decode the crypted value of the parameter BLOCKEDLOG_HMAC_KEY using the $dolibarr_main_crypt_key. A value was found in config parameters in database but decoding failed. May be the database data were restored onto another environment and the coding/decoding key $dolibarr_main_dolcrypt_key was not restored with the same value in conf.php file.';
 			print 'Restore the value of $dolibarr_main_crypt_key that was used for encryption in database and restart the migration.';
 			print 'If you don\'t use the Unalterable Log module, you can also remove the BLOCKEDLOG_HMAC_KEY entry from llx_const table. If you use the Unalterable Log, this is not possible because this will invalidate all past record.';

htdocs/fichinter/card.php

Spacing +14 added lines, -14 removed lines

@@ -49,8 +49,8 @@ 
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
-if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
-	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').'.php';
+if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".getDolGlobalString('FICHEINTER_ADDON').".php")) {
+	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".getDolGlobalString('FICHEINTER_ADDON').'.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -68,7 +68,7 @@ 
 
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$ref_client	= GETPOST('ref_client', 'alpha');
+$ref_client = GETPOST('ref_client', 'alpha');
 $socid = GETPOSTINT('socid');
 $contratid = GETPOSTINT('contratid');
 $action = GETPOST('action', 'alpha');
@@ -241,7 +241,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -266,7 +266,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -291,7 +291,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -387,7 +387,7 @@ 
 
 					$classname = ucfirst($subelement);
 					$srcobject = new $classname($db);
-					'@phan-var-force Commande|Propal|Contrat $srcobject';  // Can be other class, but CommonObject is too generic
+					'@phan-var-force Commande|Propal|Contrat $srcobject'; // Can be other class, but CommonObject is too generic
 					/** @var Commande|Propal|Contrat $srcobject */
 
 					dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
@@ -868,7 +868,7 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -1195,7 +1195,7 @@ 
 	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="create">';		// We go back to create action
+		print '<input type="hidden" name="action" value="create">'; // We go back to create action
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 		print dol_get_fiche_head([]);
@@ -1593,13 +1593,13 @@ 
 						$line_options = is_array($line_options) ? $line_options['subtotal'] : array();
 						print '<td colspan="3" ><strong>'.dol_htmlentitiesbr($objp->description).'</strong>';
 						if (array_key_exists('titleshowuponpdf', $line_options)) {
-							echo '&nbsp;' . img_picto($langs->trans("ShowUPOnPDF"), 'invoicing');
+							echo '&nbsp;'.img_picto($langs->trans("ShowUPOnPDF"), 'invoicing');
 						}
 						if (array_key_exists('titleshowtotalexludingvatonpdf', $line_options)) {
-							echo '&nbsp; <span title="' . $langs->trans("ShowTotalExludingVATOnPDF") . '">%</span>';
+							echo '&nbsp; <span title="'.$langs->trans("ShowTotalExludingVATOnPDF").'">%</span>';
 						}
 						if (array_key_exists('titleforcepagebreak', $line_options)) {
-							echo '&nbsp;' . img_picto($langs->trans("ForcePageBreak"), 'file');
+							echo '&nbsp;'.img_picto($langs->trans("ForcePageBreak"), 'file');
 						}
 						print "</td>";
 					} else {
@@ -1955,9 +1955,9 @@ 
 				// Sign
 				if ($object->status > Fichinter::STATUS_DRAFT) {
 					if ($object->signed_status != Fichinter::$SIGNED_STATUSES['STATUS_SIGNED_ALL']) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=sign&token=' . newToken() . '">' . $langs->trans("InterventionSign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sign&token='.newToken().'">'.$langs->trans("InterventionSign").'</a></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unsign&token=' . newToken() . '">' . $langs->trans("InterventionUnsign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unsign&token='.newToken().'">'.$langs->trans("InterventionUnsign").'</a></div>';
 					}
 				}
 

htdocs/ticket/card.php

Spacing +48 added lines, -48 removed lines

@@ -180,31 +180,31 @@ 
 		$search_agenda_label = '';
 	}
 
-	$backurlforlist = DOL_URL_ROOT . '/ticket/list.php';
+	$backurlforlist = DOL_URL_ROOT.'/ticket/list.php';
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT . '/ticket/card.php?id=' . ((!empty($id) && $id > 0) ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/ticket/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
 	}
 
 	if ($cancel) {
 		if (!empty($backtopageforcancel)) {
-			header("Location: " . $backtopageforcancel);
+			header("Location: ".$backtopageforcancel);
 			exit;
 		} elseif (!empty($backtopage)) {
-			header("Location: " . $backtopage);
+			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = 'view';
 	}
 
 	if ((($action == 'add' && GETPOST('save', 'alpha')) || ($action == 'update' && $object->status < Ticket::STATUS_CLOSED)) && $permissiontoadd) {
-		$ifErrorAction = ($action == 'add' ? 'create' : 'edit');	// Test on permission not required here
+		$ifErrorAction = ($action == 'add' ? 'create' : 'edit'); // Test on permission not required here
 		if ($action == 'add') {		// Test on permission already done
 			$object->track_id = null;
 		}
@@ -337,7 +337,7 @@ 
 
 				if (!$error) {
 					// File transfer
-					$object->copyFilesForTicket('');        // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was ''
+					$object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was ''
 				}
 			}
 			if (!$error) {
@@ -347,13 +347,13 @@ 
 					if (empty($id)) {
 						$url = $backtopage;
 					} else {
-						$url = 'card.php?track_id=' . urlencode($object->track_id);
+						$url = 'card.php?track_id='.urlencode($object->track_id);
 					}
 				} else {
-					$url = 'card.php?track_id=' . urlencode($object->track_id);
+					$url = 'card.php?track_id='.urlencode($object->track_id);
 				}
 
-				header("Location: " . $url);
+				header("Location: ".$url);
 				exit;
 			} else {
 				$db->rollback();
@@ -371,7 +371,7 @@ 
 		if ($object->markAsRead($user) > 0) {
 			setEventMessages($langs->trans('TicketMarkedAsRead'), null, 'mesgs');
 
-			header("Location: card.php?track_id=" . $object->track_id);
+			header("Location: card.php?track_id=".$object->track_id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -427,7 +427,7 @@ 
 			$object->fetch_user($usertoassign);
 
 			setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
-			header("Location: card.php?track_id=" . $object->track_id);
+			header("Location: card.php?track_id=".$object->track_id);
 			exit;
 		} else {
 			array_push($object->errors, $object->error);
@@ -444,10 +444,10 @@ 
 			if (!empty($backtopage)) {
 				$url = $backtopage;
 			} else {
-				$url = 'card.php?track_id=' . urlencode($object->track_id);
+				$url = 'card.php?track_id='.urlencode($object->track_id);
 			}
 
-			header("Location: " . $url);
+			header("Location: ".$url);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -464,8 +464,8 @@ 
 		if ($object->close($user, ($action == "confirm_abandon" ? 1 : 0))) {	// Test on pemrission already done
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
 
-			$url = 'card.php?track_id=' . GETPOST('track_id', 'alpha');
-			header("Location: " . $url);
+			$url = 'card.php?track_id='.GETPOST('track_id', 'alpha');
+			header("Location: ".$url);
 			exit;
 		} else {
 			$action = '';
@@ -480,10 +480,10 @@ 
 
 			$object->close($user);
 
-			setEventMessages('<div class="confirm">' . $langs->trans('TicketMarkedAsClosed') . '</div>', null, 'mesgs');
+			setEventMessages('<div class="confirm">'.$langs->trans('TicketMarkedAsClosed').'</div>', null, 'mesgs');
 
-			$url = 'card.php?track_id=' . GETPOST('track_id', 'alpha');
-			header("Location: " . $url);
+			$url = 'card.php?track_id='.GETPOST('track_id', 'alpha');
+			header("Location: ".$url);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -495,7 +495,7 @@ 
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$newid = $object->createFromClone($user, $object->id);
 			if ($newid > 0) {
-				header("Location: " . DOL_URL_ROOT . "/ticket/card.php?id=".$newid);
+				header("Location: ".DOL_URL_ROOT."/ticket/card.php?id=".$newid);
 				exit;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -507,12 +507,12 @@ 
 	if ($action == 'confirm_delete_ticket' && GETPOST('confirm', 'alpha') == "yes" && $permissiontodelete) {
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			if ($object->delete($user) > 0) {
-				setEventMessages('<div class="confirm">' . $langs->trans('TicketDeletedSuccess') . '</div>', null, 'mesgs');
-				header("Location: " . DOL_URL_ROOT . "/ticket/list.php");
+				setEventMessages('<div class="confirm">'.$langs->trans('TicketDeletedSuccess').'</div>', null, 'mesgs');
+				header("Location: ".DOL_URL_ROOT."/ticket/list.php");
 				exit;
 			} else {
 				$langs->load("errors");
-				$mesg = '<div class="error">' . $langs->trans($object->error) . '</div>';
+				$mesg = '<div class="error">'.$langs->trans($object->error).'</div>';
 				$action = '';
 			}
 		}
@@ -522,8 +522,8 @@ 
 	if ($action == 'set_thirdparty' && $user->hasRight('ticket', 'write')) {
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$result = $object->setCustomer(GETPOSTINT('editcustomer'));
-			$url = $_SERVER["PHP_SELF"] . '?track_id=' . GETPOST('track_id', 'alpha');
-			header("Location: " . $url);
+			$url = $_SERVER["PHP_SELF"].'?track_id='.GETPOST('track_id', 'alpha');
+			header("Location: ".$url);
 			exit();
 		}
 	}
@@ -533,8 +533,8 @@ 
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$result = $object->setProgression(GETPOSTINT('progress'));
 
-			$url = 'card.php?track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	}
@@ -544,8 +544,8 @@ 
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$result = $object->setCategories(GETPOST('categories', 'array'));
 
-			$url = 'card.php?track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	}
@@ -569,7 +569,7 @@ 
 				}
 			}
 
-			header("Location: " . $_SERVER['PHP_SELF'] . "?track_id=" . $object->track_id);
+			header("Location: ".$_SERVER['PHP_SELF']."?track_id=".$object->track_id);
 			exit;
 		}
 	}
@@ -584,8 +584,8 @@ 
 					$res = $object->setStatut(Ticket::STATUS_NOT_READ, null, '', $triggermodname);
 				}
 				if ($res) {
-					$url = 'card.php?track_id=' . $object->track_id;
-					header("Location: " . $url);
+					$url = 'card.php?track_id='.$object->track_id;
+					header("Location: ".$url);
 					exit();
 				} else {
 					$error++;
@@ -597,16 +597,16 @@ 
 		// Categorisation dans projet
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$object->setProject($projectid);
-			$url = 'card.php?track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	} elseif ($action == 'setcontract' && $permissiontoadd) {
 		// Categorisation dans contrat
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$object->setContract(GETPOSTINT('contractid'));
-			$url = 'card.php?track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	} elseif ($action == "set_message" && $user->hasRight('ticket', 'manage')) {
@@ -637,8 +637,8 @@ 
 			//$old_status = $object->status;
 			$res = $object->setStatut($new_status);
 			if ($res) {
-				$url = 'card.php?track_id=' . $object->track_id;
-				header("Location: " . $url);
+				$url = 'card.php?track_id='.$object->track_id;
+				header("Location: ".$url);
 				exit();
 			} else {
 				$error++;
@@ -692,17 +692,17 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	$permissiondellink = $user->hasRight('ticket', 'write');
-	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
 	// Actions to build doc
-	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
 	$triggersendname = 'TICKET_SENTBYMAIL';
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_TICKET_TO'; // used to know the automatic BCC to add
-	$trackid = 'tic' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'tic'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Set $action to correct value for the case we used presend action to add a message
 	if (GETPOSTISSET('actionbis') && $action == 'presend') {	// Test on permission not required here
@@ -738,7 +738,7 @@ 
 
 	print load_fiche_titre($langs->trans('NewTicket'), '', 'ticket');
 
-	$formticket->trackid = '';		// TODO Use a unique key 'tic' to avoid conflict in upload file feature
+	$formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
@@ -771,7 +771,7 @@ 
 
 	print dol_get_fiche_head($head, 'tabTicket', $langs->trans('Ticket'), -1, 'ticket');
 
-	$formticket->trackid = $object->track_id;        // TODO Use a unique key 'tic' to avoid conflict in upload file feature
+	$formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature
 	$formticket->withfromsocid = $object->socid;
 	$formticket->withtitletopic = 1;
 	//  $formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (getDolGlobalString('TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION') ? 1 : 0));
@@ -806,7 +806,7 @@ 
 				'-3' => $langs->trans('TicketNotNotifyTiersAtClose')
 			);
 			foreach ($thirdparty_contacts as $thirdparty_contact) {
-				$contacts_select[$thirdparty_contact['id']] = $thirdparty_contact['civility'] . ' ' . $thirdparty_contact['lastname'] . ' ' . $thirdparty_contact['firstname'];
+				$contacts_select[$thirdparty_contact['id']] = $thirdparty_contact['civility'].' '.$thirdparty_contact['lastname'].' '.$thirdparty_contact['firstname'];
 			}
 
 			// Default select all or no contact
@@ -1061,8 +1061,8 @@ 
 						$morehtmlref .= $formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contract, 'contratid', 0, 1, 1, 1);
 					} else {
 						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_contrat&token='.newToken().'&id='.$object->id.'">';
-						$morehtmlref .=  img_edit($langs->trans('SetContract'));
-						$morehtmlref .=  '</a>';
+						$morehtmlref .= img_edit($langs->trans('SetContract'));
+						$morehtmlref .= '</a>';
 					}
 				} else {
 					if (!empty($object->fk_contract)) {
@@ -1504,10 +1504,10 @@ 
 				// Link to create an intervention
 				// socid is needed otherwise fichinter ask it and forgot origin after form submit :\
 				if (!$object->fk_soc && $user->hasRight("ficheinter", "creer")) {
-					print dolGetButtonAction($langs->trans('UnableToCreateInterIfNoSocid'), $langs->trans('TicketAddIntervention'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('UnableToCreateInterIfNoSocid'), $langs->trans('TicketAddIntervention'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 				if ($object->fk_soc > 0 && isset($object->status) && $object->status < Ticket::STATUS_CLOSED && $user->hasRight('ficheinter', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('TicketAddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&token='.newToken().'&socid='. $object->fk_soc.'&origin=ticket_ticket&originid='. $object->id, '');
+					print dolGetButtonAction('', $langs->trans('TicketAddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&token='.newToken().'&socid='.$object->fk_soc.'&origin=ticket_ticket&originid='.$object->id, '');
 				}
 
 				// Close ticket if status is read

htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php

Spacing +4 added lines, -4 removed lines

@@ -81,10 +81,10 @@ 
 		$errors = 0;
 		$errorforhistory = 0;
 		$static_object = new Target($this->db);
-		$target_url = $static_object->fetchAll();	// TODO Replace this with a search with filter on $action trigger to avoid to filter later.
+		$target_url = $static_object->fetchAll(); // TODO Replace this with a search with filter on $action trigger to avoid to filter later.
 
 		if (is_numeric($target_url) && $target_url < 0) {
-			dol_syslog("Error Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Error Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$this->errors = array_merge($this->errors, $static_object->errors);
 			return -1;
 		}
@@ -135,7 +135,7 @@ 
 					$nbPosts++;
 				} else {
 					$errormsg = "The WebHook for ".$action." failed to get URL ".$tmpobject->url." with httpcode=".(!empty($response['http_code']) ? $response['http_code'] : "")." curl_error_no=".(!empty($response['curl_error_no']) ? $response['curl_error_no'] : "");
-					$errorforhistory ++;
+					$errorforhistory++;
 
 					if ($tmpobject->type == Target::TYPE_BLOCKING) {
 						$errors++;
@@ -170,7 +170,7 @@ 
 		}
 
 		$dbhistory->close();
-		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id." -> nbPost=".$nbPosts);
+		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id." -> nbPost=".$nbPosts);
 
 		if (!empty($errors)) {
 			return $errors * -1;

htdocs/core/class/html.formcompany.class.php

Spacing +112 added lines, -112 removed lines

@@ -33,7 +33,7 @@ 
  *	Only common components are here.
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -57,13 +57,13 @@ 
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle as label";
-		$sql .= " FROM " . $this->db->prefix() . "c_typent";
-		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = " . (empty($mysoc->country_id) ? '0' : $mysoc->country_id) . ")";
+		$sql .= " FROM ".$this->db->prefix()."c_typent";
+		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";
 		if ($filter) {
-			$sql .= " " . $filter;
+			$sql .= " ".$filter;
 		}
 		$sql .= " ORDER by position, id";
-		dol_syslog(get_class($this) . '::typent_array', LOG_DEBUG);
+		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -106,13 +106,13 @@ 
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle as label";
-		$sql .= " FROM " . $this->db->prefix() . "c_effectif";
+		$sql .= " FROM ".$this->db->prefix()."c_effectif";
 		$sql .= " WHERE active = 1";
 		if ($filter) {
-			$sql .= " " . $filter;
+			$sql .= " ".$filter;
 		}
 		$sql .= " ORDER BY id ASC";
-		dol_syslog(get_class($this) . '::effectif_array', LOG_DEBUG);
+		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -153,13 +153,13 @@ 
 		// phpcs:enable
 		global $user, $langs;
 
-		print '<form method="post" action="' . $page . '">';
+		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectlevel">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-		dol_syslog(get_class($this) . '::form_prospect_level', LOG_DEBUG);
+		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . $this->db->prefix() . "c_prospectlevel";
+		$sql .= " FROM ".$this->db->prefix()."c_prospectlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -185,9 +185,9 @@ 
 			dol_print_error($this->db);
 		}
 		if (!empty($htmlname) && $user->admin) {
-			print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-save valignmiddle small" value="' . $langs->trans("Modify") . '">';
+		print '<input type="submit" class="button button-save valignmiddle small" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -204,13 +204,13 @@ 
 	{
 		global $user, $langs;
 
-		print '<form method="post" action="' . $page . '">';
+		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectcontactlevel">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . $this->db->prefix() . "c_prospectcontactlevel";
+		$sql .= " FROM ".$this->db->prefix()."c_prospectcontactlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -236,9 +236,9 @@ 
 			dol_print_error($this->db);
 		}
 		if (!empty($htmlname) && $user->admin) {
-			print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-save valignmiddle small" value="' . $langs->trans("Modify") . '">';
+		print '<input type="submit" class="button button-save valignmiddle small" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -279,7 +279,7 @@ 
 		// phpcs:enable
 		global $conf, $langs, $user;
 
-		dol_syslog(get_class($this) . "::select_departement selected=" . $selected . ", country_codeid=" . $country_codeid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
 
 		$langs->load("dict");
 
@@ -287,28 +287,28 @@ 
 
 		// Search departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " " . $this->db->prefix() . "c_departements as d, " . $this->db->prefix() . "c_regions as r," . $this->db->prefix() . "c_country as c";
+		$sql .= " ".$this->db->prefix()."c_departements as d, ".$this->db->prefix()."c_regions as r,".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 		if ($country_codeid && is_numeric($country_codeid)) {
-			$sql .= " AND c.rowid = '" . $this->db->escape($country_codeid) . "'";
+			$sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
 		}
 		if ($country_codeid && !is_numeric($country_codeid)) {
-			$sql .= " AND c.code = '" . $this->db->escape($country_codeid) . "'";
+			$sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
 		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!empty($htmlname)) {
-				$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';
+				$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			}
 			if ($country_codeid) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			dol_syslog(get_class($this) . "::select_departement num=" . $num, LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
 			if ($num) {
 				$country = '';
 				while ($i < $num) {
@@ -319,15 +319,15 @@ 
 						if (!$country || $country != $obj->country) {
 							// Show break if we are in list with multiple countries
 							if (!$country_codeid && $obj->country_code) {
-								$out .= '<option value="-1" disabled data-html="----- ' . $obj->country . ' -----">----- ' . $obj->country . " -----</option>\n";
+								$out .= '<option value="-1" disabled data-html="----- '.$obj->country.' -----">----- '.$obj->country." -----</option>\n";
 								$country = $obj->country;
 							}
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid) {
-							$out .= '<option value="' . $obj->rowid . '" selected>';
+							$out .= '<option value="'.$obj->rowid.'" selected>';
 						} else {
-							$out .= '<option value="' . $obj->rowid . '">';
+							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par default
@@ -336,13 +336,13 @@ 
 							(getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 1 || getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 2 || getDolGlobalString('MAIN_SHOW_STATE_CODE') === 'all')
 						) {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
-								$out .= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							} else {
-								$out .= $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						} else {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
-								$out .= $obj->region_name . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							} else {
 								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
@@ -357,7 +357,7 @@ 
 				$out .= '</select>';
 			}
 			if (!empty($htmlname) && $user->admin) {
-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 		} else {
 			dol_print_error($this->db);
@@ -365,7 +365,7 @@ 
 
 		// Make select dynamic
 		if (!empty($htmlname)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
 
@@ -418,14 +418,14 @@ 
 		$langs->load("dict");
 
 		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql .= " FROM " . $this->db->prefix() . "c_regions as r, " . $this->db->prefix() . "c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_regions as r, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
 		$sql .= " ORDER BY c.code, c.label ASC";
 
-		dol_syslog(get_class($this) . "::select_region", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			print '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">';
+			print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
@@ -437,16 +437,16 @@ 
 					} else {
 						if ($country == '' || $country != $obj->country) {
 							// Show break
-							$key = $langs->trans("Country" . strtoupper($obj->country_code));
-							$valuetoshow = ($key != "Country" . strtoupper($obj->country_code)) ? $obj->country_code . " - " . $key : $obj->country;
-							print '<option value="-2" disabled>----- ' . $valuetoshow . " -----</option>\n";
+							$key = $langs->trans("Country".strtoupper($obj->country_code));
+							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
+							print '<option value="-2" disabled>----- '.$valuetoshow." -----</option>\n";
 							$country = $obj->country;
 						}
 
 						if ($selected > 0 && $selected == $obj->code) {
-							print '<option value="' . $obj->code . '" selected>' . $obj->label . '</option>';
+							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
 						} else {
-							print '<option value="' . $obj->code . '">' . $obj->label . '</option>';
+							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
 					$i++;
@@ -477,13 +477,13 @@ 
 
 		$out = '';
 
-		$sql = "SELECT rowid, code, label, active FROM " . $this->db->prefix() . "c_civility";
+		$sql = "SELECT rowid, code, label, active FROM ".$this->db->prefix()."c_civility";
 		$sql .= " WHERE active = 1";
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			$out .= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -491,12 +491,12 @@ 
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					if ($selected == $obj->code) {
-						$out .= '<option value="' . $obj->code . '" selected>';
+						$out .= '<option value="'.$obj->code.'" selected>';
 					} else {
-						$out .= '<option value="' . $obj->code . '">';
+						$out .= '<option value="'.$obj->code.'">';
 					}
 					// If translation exists, we use it, otherwise, we use the hard coded label
-					$out .= ($langs->trans("Civility" . $obj->code) != "Civility" . $obj->code ? $langs->trans("Civility" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
+					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 					$out .= '</option>';
 					$i++;
 				}
@@ -508,7 +508,7 @@ 
 
 			if ($addjscombo) {
 				// Enhance with select2
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname);
 			}
 		} else {
@@ -558,22 +558,22 @@ 
 
 		// Lookup the active juridical types for the active countries
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
-		$sql .= " FROM " . $this->db->prefix() . "c_forme_juridique as f, " . $this->db->prefix() . "c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_forme_juridique as f, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
 		if ($country_codeid) {
-			$sql .= " AND c.code = '" . $this->db->escape((string) $country_codeid) . "'";
+			$sql .= " AND c.code = '".$this->db->escape((string) $country_codeid)."'";
 		}
 		if ($filter) {
-			$sql .= " " . $filter;
+			$sql .= " ".$filter;
 		}
 		$sql .= " ORDER BY c.code";
 
-		dol_syslog(get_class($this) . "::select_juridicalstatus", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out .= '<div id="particulier2" class="visible">';
-			$out .= '<select class="flat minwidth200' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
+			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($country_codeid) {
 				$out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 			}
@@ -588,9 +588,9 @@ 
 					$obj = $this->db->fetch_object($resql);
 
 					if ($obj->code) {		// We exclude empty line, we will add it later
-						$labelcountry = (($langs->trans("Country" . $obj->country_code) != "Country" . $obj->country_code) ? $langs->trans("Country" . $obj->country_code) : $obj->country);
-						$labeljs = (($langs->trans("JuridicalStatus" . $obj->code) != "JuridicalStatus" . $obj->code) ? $langs->trans("JuridicalStatus" . $obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
-						$arraydata[(int) $obj->code] = array('code' => (int) $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry . '_' . $labeljs, 'country_code' => (string) $obj->country_code, 'country' => $labelcountry);
+						$labelcountry = (($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+						$labeljs = (($langs->trans("JuridicalStatus".$obj->code) != "JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
+						$arraydata[(int) $obj->code] = array('code' => (int) $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry.'_'.$labeljs, 'country_code' => (string) $obj->country_code, 'country' => $labelcountry);
 					}
 					$i++;
 				}
@@ -604,15 +604,15 @@ 
 					if (!$country || $country != $val['country']) {
 						// Show break when we are in multi country mode
 						if (empty($country_codeid) && $val['country_code']) {
-							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- ' . $val['country'] . " -----</option>\n";
+							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
 							$country = $val['country'];
 						}
 					}
 
 					if ($selected > 0 && $selected == $val['code']) {
-						$out .= '<option value="' . $val['code'] . '" selected>';
+						$out .= '<option value="'.$val['code'].'" selected>';
 					} else {
-						$out .= '<option value="' . $val['code'] . '">';
+						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
 					$out .= $val['label'];
@@ -621,11 +621,11 @@ 
 			}
 			$out .= '</select>';
 			if ($user->admin) {
-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 
 			// Make select dynamic
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 
 			$out .= '</div>';
@@ -679,13 +679,13 @@ 
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
 			if (count($events)) {	// If there is some ajax events to run once selection is done, we add code here to run events
-				print '<script nonce="' . getNonce() . '" type="text/javascript">
+				print '<script nonce="'.getNonce().'" type="text/javascript">
 				jQuery(document).ready(function() {
-					$("#search_' . $htmlname . '").change(function() {
-						var obj = ' . json_encode($events) . ';
+					$("#search_' . $htmlname.'").change(function() {
+						var obj = ' . json_encode($events).';
 						$.each(obj, function(key,values) {
 							if (values.method.length) {
-								runJsCodeForEvent' . $htmlname . '(values);
+								runJsCodeForEvent' . $htmlname.'(values);
 							}
 						});
 
@@ -693,13 +693,13 @@ 
 					});
 
 					// Function used to execute events when search_htmlname change
-					function runJsCodeForEvent' . $htmlname . '(obj) {
-						var id = $("#' . $htmlname . '").val();
+					function runJsCodeForEvent' . $htmlname.'(obj) {
+						var id = $("#' . $htmlname.'").val();
 						var method = obj.method;
 						var url = obj.url;
 						var htmlname = obj.htmlname;
 						var showempty = obj.showempty;
-						console.log("Run runJsCodeForEvent-' . $htmlname . ' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
+						console.log("Run runJsCodeForEvent-' . $htmlname.' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
 						$.getJSON(url,
 							{
 								action: method,
@@ -729,9 +729,9 @@ 
 				</script>';
 			}
 
-			print "\n" . '<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->' . "\n";
-			print '<input type="text" size="30" id="search_' . $htmlname . '" name="search_' . $htmlname . '" value="' . $name . '" />';
-			print ajax_autocompleter((string) ($socid ? $socid : -1), $htmlname, DOL_URL_ROOT . '/societe/ajax/ajaxcompanies.php', '', $minLength, 0);
+			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
+			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
+			print ajax_autocompleter((string) ($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajax/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		} else {
 			// Search to list thirdparties
@@ -743,18 +743,18 @@ 
 				$sql .= ", s.address, s.zip, s.town";
 				$sql .= ", dictp.code as country_code";
 			}
-			$sql .= " FROM " . $this->db->prefix() . "societe as s";
+			$sql .= " FROM ".$this->db->prefix()."societe as s";
 			if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
-				$sql .= " LEFT JOIN " . $this->db->prefix() . "c_country as dictp ON dictp.rowid = s.fk_pays";
+				$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as dictp ON dictp.rowid = s.fk_pays";
 			}
-			$sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";
+			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto)) {
-				$sql .= " AND s.rowid IN (" . $this->db->sanitize(implode(',', $limitto)) . ")";
+				$sql .= " AND s.rowid IN (".$this->db->sanitize(implode(',', $limitto)).")";
 			}
 			// filter user access
 			if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
-				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = ".(int) $user->id .")";
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = ".(int) $user->id.")";
 			}
 			if ($user->socid > 0) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
@@ -767,17 +767,17 @@ 
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				print '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '"';
+				print '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"';
 				if ($conf->use_javascript_ajax) {
-					$javaScript = "window.location='" . dol_escape_js($_SERVER['PHP_SELF']) . "?" . $var_id . "=" . ($forceid > 0 ? $forceid : $object->id) . $moreparam . "&" . $htmlname . "=' + form." . $htmlname . ".options[form." . $htmlname . ".selectedIndex].value;";
-					print ' onChange="' . $javaScript . '"';
+					$javaScript = "window.location='".dol_escape_js($_SERVER['PHP_SELF'])."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+					print ' onChange="'.$javaScript.'"';
 				}
 				print '>';
 				print '<option value="-1">&nbsp;</option>';
 
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				$firstCompany = 0;  // For static analysis
+				$firstCompany = 0; // For static analysis
 				if ($num) {
 					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
@@ -789,18 +789,18 @@ 
 							$disabled = 1;
 						}
 						if ($selected > 0 && $selected == $obj->rowid) {
-							print '<option value="' . $obj->rowid . '"';
+							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) {
 								print ' disabled';
 							}
-							print ' selected>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . '</option>';
+							print ' selected>'.dol_escape_htmltag($obj->name, 0, 0, '', 0, 1).'</option>';
 							$firstCompany = $obj->rowid;
 						} else {
-							print '<option value="' . $obj->rowid . '"';
+							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) {
 								print ' disabled';
 							}
-							print '>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . '</option>';
+							print '>'.dol_escape_htmltag($obj->name, 0, 0, '', 0, 1).'</option>';
 						}
 						$i++;
 					}
@@ -835,10 +835,10 @@ 
 
 		$out = '';
 		if (is_object($object) && method_exists($object, 'liste_type_contact')) {
-			'@phan-var-force CommonObject $object';  // CommonObject has the method.
-			$lesTypes = $object->liste_type_contact($source, $sortorder, 2, 1);	// List of types into c_type_contact for element=$object->element
+			'@phan-var-force CommonObject $object'; // CommonObject has the method.
+			$lesTypes = $object->liste_type_contact($source, $sortorder, 2, 1); // List of types into c_type_contact for element=$object->element
 
-			$out .= '<select class="flat valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
+			$out .= '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
@@ -881,9 +881,9 @@ 
 		if ($rendermode === 'view') {
 			$toprint = array();
 			foreach ($contact->roles as $key => $val) {
-				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb;">' . $val['label'] . '</li>';
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb;">'.$val['label'].'</li>';
 			}
-			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="' . $htmlname . '"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="'.$htmlname.'"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 
 		if ($rendermode === 'edit') {	// A multiselect combo list
@@ -929,14 +929,14 @@ 
 
 		$size = '';
 		if (!empty($fieldsize)) {
-			$size = 'size="' . $fieldsize . '"';
+			$size = 'size="'.$fieldsize.'"';
 		}
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
-			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT . '/core/ajax/ziptown.php') . "\n";
+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
 			$moreattrib .= ' autocomplete="off"';
 		}
-		$out .= '<input id="' . $htmlname . '" class="maxwidthonsmartphone' . ($morecss ? ' ' . $morecss : '') . '" type="text"' . ($moreattrib ? ' ' . $moreattrib : '') . ' name="' . $htmlname . '" ' . $size . ' value="' . $selected . '">' . "\n";
+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
 		return $out;
 	}
@@ -1013,7 +1013,7 @@ 
 		$parameters = array('formlength' => $formlength, 'selected' => $preselected, 'idprof' => $idprof, 'htmlname' => $htmlname, 'country_code' => $country_code);
 		$reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
 		if (empty($reshook)) {
-			$out .= '<input type="text" ' . ($morecss ? 'class="' . $morecss . '" ' : '') . 'name="' . $htmlname . '" id="' . $htmlname . '" maxlength="' . $maxlength . '" value="' . $selected . '">';
+			$out .= '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 		}
 		$out .= $hookmanager->resPrint;
 
@@ -1044,9 +1044,9 @@ 
 				$i = 0;
 				while ($i < $nbvalues) {
 					if ($selected == $valors[$i]) {
-						print '<option value="' . $valors[$i] . '" selected>';
+						print '<option value="'.$valors[$i].'" selected>';
 					} else {
-						print '<option value="' . $valors[$i] . '">';
+						print '<option value="'.$valors[$i].'">';
 					}
 					print $valors[$i];
 					print '</option>';
@@ -1075,7 +1075,7 @@ 
 			return '';
 		}
 
-		$out = '<select class="flat ' . $morecss . '" name="' . $htmlname . '" id="' . $htmlidname . '">';
+		$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
 		if ($typeinput == 'form') {
 			if ($allowempty || ($selected == '' || $selected == '-1')) {
 				$out .= '<option value="-1">';
@@ -1087,33 +1087,33 @@ 
 				$out .= '</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
-				$out .= '<option value="2"' . ($selected == 2 ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';
+				$out .= '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
-				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';
+				$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
+				$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
-			$out .= '<option value="0"' . ((string) $selected == '0' ? ' selected' : '') . '>' . $langs->trans('NorProspectNorCustomer') . '</option>';
+			$out .= '<option value="0"'.((string) $selected == '0' ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
 		} elseif ($typeinput == 'list') {
-			$out .= '<option value="-1"' . (($selected == '' || $selected == '-1') ? ' selected' : '') . '>&nbsp;</option>';
+			$out .= '<option value="-1"'.(($selected == '' || $selected == '-1') ? ' selected' : '').'>&nbsp;</option>';
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
-				$out .= '<option value="2,3"' . ($selected == '2,3' ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';
+				$out .= '<option value="2,3"'.($selected == '2,3' ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$out .= '<option value="1,3"' . ($selected == '1,3' ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
+				$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
 			if (isModEnabled("fournisseur")) {
-				$out .= '<option value="4"' . ($selected == '4' ? ' selected' : '') . '>' . $langs->trans('Supplier') . '</option>';
+				$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
 			}
-			$out .= '<option value="0"' . ($selected == '0' ? ' selected' : '') . '>' . $langs->trans('Other') . '</option>';
+			$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';
 		} elseif ($typeinput == 'admin') {
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
-				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';
+				$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
 			}
 			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
-				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
+				$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
 			}
 		}
 		$out .= '</select>';
@@ -1140,12 +1140,12 @@ 
 
 		$out = '';
 		if ($htmlname != "none") {
-			$out .= '<form method="post" action="' . $page . '">';
+			$out .= '<form method="post" action="'.$page.'">';
 			$out .= '<input type="hidden" name="action" value="set_thirdpartytype">';
-			$out .= '<input type="hidden" name="token" value="' . newToken() . '">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$sortparam = getDolGlobalString('SOCIETE_SORT_ON_TYPEENT', 'ASC'); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
-			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';
+			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
 			if ($selected > 0) {
@@ -1184,7 +1184,7 @@ 
 
 			//print $prospectstatic->LibProspCommStatut($statusprospect, 2, $prospectstatic->cacheprospectstatus[$statusprospect]['label'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto']);
 			print img_action('', $actioncode, $actionpicto, 'class="inline-block valignmiddle paddingright pictoprospectstatus"');
-			print '<select class="flat selectprospectstatus maxwidth150" id="'. $htmlname.$idprospect .'" data-socid="'.$idprospect.'" name="' . $htmlname .'"';
+			print '<select class="flat selectprospectstatus maxwidth150" id="'.$htmlname.$idprospect.'" data-socid="'.$idprospect.'" name="'.$htmlname.'"';
 			if (!$user->hasRight('societe', 'creer')) {
 				print ' disabled';
 			}
@@ -1214,8 +1214,8 @@ 
 						var image = $(this).prev(".pictoprospectstatus");
 						$.ajax({
 							type: "POST",
-							url: \'' . DOL_URL_ROOT . '/core/ajax/ajaxstatusprospect.php\',
-							data: { id: statusid, prospectid: prospectid, token: \''. newToken() .'\', action: \'updatestatusprospect\' },
+							url: \'' . DOL_URL_ROOT.'/core/ajax/ajaxstatusprospect.php\',
+							data: { id: statusid, prospectid: prospectid, token: \''. newToken().'\', action: \'updatestatusprospect\' },
 							success: function(response) {
 								console.log(response.img);
 								image.replaceWith(response.img);