Dolibarr / dolibarr

htdocs/modulebuilder/template/class/actions_mymodule.class.php

Spacing +2 added lines, -2 removed lines

@@ -335,10 +335,10 @@
 			if (in_array($element, ['context1', 'context2'])) {
 				$datacount = 0;
 
-				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&module='.$element;
+				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1).'?id='.$id.'&module='.$element;
 				$parameters['head'][$counter][1] = $langs->trans('MyModuleTab');
 				if ($datacount > 0) {
-					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>';
+					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">'.$datacount.'</span>';
 				}
 				$parameters['head'][$counter][2] = 'mymoduleemails';
 				$counter++;

htdocs/opensurvey/results.php

Spacing +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
 						$reponsesadd = str_split($obj->reponses);
 						$lengthresponses = count($reponsesadd);
 						for ($cpt = $lengthresponses; $cpt > $cleinsertion; $cpt--) {
-							$reponsesadd[$cpt] = $reponsesadd[$cpt-1];
+							$reponsesadd[$cpt] = $reponsesadd[$cpt - 1];
 						}
 						$reponsesadd[$cleinsertion] = '0';
 						$reponsesadd = implode($reponsesadd);

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

Braces +9 added lines, -3 removed lines

@@ -436,8 +436,12 @@ 
 					$tmpuser->fetch($object->user_author_id);
 
 					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
-					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+					if ($tmpuser->email) {
+						$creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
+					}
+					if ($tmpuser->office_phone) {
+						$creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+					}
 
 					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
 				}
@@ -1519,7 +1523,9 @@ 
 		global $conf, $langs;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));

Spacing +1 added lines, -1 removed lines

@@ -300,7 +300,7 @@
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 

htdocs/product/stock/class/mouvementstock.class.php

Braces +21 added lines, -7 removed lines

@@ -197,12 +197,18 @@ 
 
 		// Clean parameters
 		$price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value.
-		if (empty($price)) $price = 0;
+		if (empty($price)) {
+			$price = 0;
+		}
 		$now = (!empty($datem) ? $datem : dol_now());
 
 		// Check parameters
-		if (!($fk_product > 0)) return 0;
-		if (!($entrepot_id > 0)) return 0;
+		if (!($fk_product > 0)) {
+			return 0;
+		}
+		if (!($entrepot_id > 0)) {
+			return 0;
+		}
 
 		if (is_numeric($eatby) && $eatby < 0) {
 			dol_syslog(get_class($this)."::_create start ErrorBadValueForParameterEatBy eatby = ".$eatby);
@@ -245,7 +251,9 @@ 
 		// Define if we must make the stock change (If product type is a service or if stock is used also for services)
 		// Only record into stock tables wil be disabled by this (the rest like writing into lot table or movement of subproucts are done)
 		$movestock = 0;
-		if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock = 1;
+		if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$movestock = 1;
+		}
 
 		$this->db->begin();
 
@@ -377,7 +385,9 @@ 
 					}
 
 					$foundforbatch = 1;
-					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
+					if ($prodbatch->qty < abs($qty)) {
+						$qtyisnotenough = $prodbatch->qty;
+					}
 					break;
 				}
 				if (!$foundforbatch || $qtyisnotenough) {
@@ -578,7 +588,9 @@ 
 		if ($movestock && !$error) {
 			// Call trigger
 			$result = $this->call_trigger('STOCK_MOVEMENT', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
 			// Check unicity for serial numbered equipments once all movement were done.
@@ -845,7 +857,9 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $nb = $obj->nb;
+			if ($obj) {
+				$nb = $obj->nb;
+			}
 			return (empty($nb) ? 0 : $nb);
 		} else {
 			dol_print_error($this->db);

Spacing +7 added lines, -7 removed lines

@@ -198,7 +198,7 @@ 
 				'skip_batch'       => &$skip_batch,
 				'id_product_batch' => &$id_product_batch
 			);
-			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 			if ($reshook < 0) {
 				if (!empty($hookmanager->resPrint)) {
@@ -665,8 +665,8 @@ 
 				$this->price = $obj->price;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->label = $obj->label;
-				$this->fk_origin = $obj->origin_id;		// For backward compatibility
-				$this->origintype = $obj->origin_type;	// For backward compatibility
+				$this->fk_origin = $obj->origin_id; // For backward compatibility
+				$this->origintype = $obj->origin_type; // For backward compatibility
 				$this->origin_id = $obj->origin_id;
 				$this->origin_type = $obj->origin_type;
 				$this->inventorycode = $obj->inventorycode;
@@ -894,8 +894,8 @@ 
 			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
-				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
-				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
@@ -1205,8 +1205,8 @@ 
 		$sql = "SELECT sum(pb.qty) as cpt";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
 		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
-		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
-		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE ps.fk_product = ".((int) $fk_product);
+		$sql .= " AND pb.batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {

htdocs/salaries/payments.php

Braces +4 added lines, -2 removed lines

@@ -113,8 +113,10 @@
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
-}
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();

htdocs/core/modules/modWorkstation.class.php

Spacing +6 added lines, -6 removed lines

@@ -263,7 +263,7 @@ 
 		$this->menu = array();
 		$r = 0;
 		// Add here entries to declare new menus
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'fk_menu'=>'fk_mainmenu=mrp',
 			// This is a Left menu entry
@@ -275,7 +275,7 @@ 
 			'url'=>'',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'langs'=>'mrp',
-			'position'=>1100+$r,
+			'position'=>1100 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->workstation->enabled',
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
@@ -284,7 +284,7 @@ 
 			// 0=Menu for internal users, 1=external users, 2=both
 			'user'=>2,
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
 			// This is a Left menu entry
@@ -295,7 +295,7 @@ 
 			'url'=>'/workstation/workstation_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'langs'=>'mrp',
-			'position'=>1100+$r,
+			'position'=>1100 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->workstation->enabled',
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
@@ -304,7 +304,7 @@ 
 			// 0=Menu for internal users, 1=external users, 2=both
 			'user'=>2
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
 			// This is a Left menu entry
@@ -315,7 +315,7 @@ 
 			'url'=>'/workstation/workstation_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'langs'=>'mrp',
-			'position'=>1101+$r,
+			'position'=>1101 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->workstation->enabled',
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules

htdocs/expensereport/list.php

Spacing +14 added lines, -14 removed lines

@@ -80,10 +80,10 @@ 
 
 
 // Load variable for pagination
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -98,34 +98,34 @@ 
 }
 
 
-$sall			= trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 $search_ref			= GETPOST('search_ref', 'alpha');
 $search_user		= GETPOST('search_user', 'int');
-$search_amount_ht	= GETPOST('search_amount_ht', 'alpha');
+$search_amount_ht = GETPOST('search_amount_ht', 'alpha');
 $search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
 $search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
-$search_status		= (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
+$search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 
-$search_date_startday		= GETPOST('search_date_startday', 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
 $search_date_startmonth		= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear		= GETPOST('search_date_startyear', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
 $search_date_startendday	= GETPOST('search_date_startendday', 'int');
-$search_date_startendmonth	= GETPOST('search_date_startendmonth', 'int');
-$search_date_startendyear	= GETPOST('search_date_startendyear', 'int');
-$search_date_start			= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_startendmonth = GETPOST('search_date_startendmonth', 'int');
+$search_date_startendyear = GETPOST('search_date_startendyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_startend		= dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear);
 
 $search_date_endday			= GETPOST('search_date_endday', 'int');
 $search_date_endmonth		= GETPOST('search_date_endmonth', 'int');
 $search_date_endyear		= GETPOST('search_date_endyear', 'int');
-$search_date_endendday		= GETPOST('search_date_endendday', 'int');
+$search_date_endendday = GETPOST('search_date_endendday', 'int');
 $search_date_endendmonth	= GETPOST('search_date_endendmonth', 'int');
 $search_date_endendyear		= GETPOST('search_date_endendyear', 'int');
-$search_date_end			= dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);	// Use tzserver
-$search_date_endend			= dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
+$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver
+$search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
 
-$optioncss    = GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 if ($search_status == '') {
 	$search_status = -1;

htdocs/ticket/class/cticketcategory.class.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1),
 		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),

htdocs/expedition/card.php

Braces +6 added lines, -2 removed lines

@@ -1336,7 +1336,9 @@ 
 											$deliverableQty = min($quantityToBeDelivered, $stock);
 										}
 
-										if ($deliverableQty < 0) $deliverableQty = 0;
+										if ($deliverableQty < 0) {
+											$deliverableQty = 0;
+										}
 
 										$tooltip = '';
 										if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
@@ -1435,7 +1437,9 @@ 
 											$deliverableQty = min($quantityToBeDelivered, $batchStock);
 										}
 
-										if ($deliverableQty < 0) $deliverableQty = 0;
+										if ($deliverableQty < 0) {
+											$deliverableQty = 0;
+										}
 
 										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {

Spacing +18 added lines, -18 removed lines

@@ -273,7 +273,7 @@ 
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			$is_batch_or_serial=0;
+			$is_batch_or_serial = 0;
 			if (!empty($objectsrc->lines[$i]->fk_product)) {
 				$resultFetch = $product->fetch($objectsrc->lines[$i]->fk_product, '', '', '', 1, 1, 1);
 				if ($resultFetch < 0) {
@@ -299,9 +299,9 @@ 
 						//var_dump($sub_qty[$j]['id_batch']);
 
 						//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
-						if ($is_batch_or_serial==2 && $sub_qty[$j]['q']>1) {
+						if ($is_batch_or_serial == 2 && $sub_qty[$j]['q'] > 1) {
 							setEventMessages($langs->trans("TooManyQtyForSerialNumber", $product->ref, ''), null, 'errors');
-							$totalqty=0;
+							$totalqty = 0;
 							break 2;
 						}
 						$j++;
@@ -350,7 +350,7 @@ 
 
 			// check qty shipped not greater than ordered
 			if (getDolGlobalInt("MAIN_DONT_SHIP_MORE_THAN_ORDERED") && $subtotalqty > $objectsrc->lines[$i]->qty) {
-				setEventMessages($langs->trans("ErrorTooMuchShipped", $i+1), null, 'errors');
+				setEventMessages($langs->trans("ErrorTooMuchShipped", $i + 1), null, 'errors');
 				$error++;
 				continue;
 			}
@@ -678,7 +678,7 @@ 
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								} else {
-									$update_done=true;
+									$update_done = true;
 								}
 							} else {
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
@@ -722,7 +722,7 @@ 
 										setEventMessages($line->error, $line->errors, 'errors');
 										$error++;
 									} else {
-										$update_done=true;
+										$update_done = true;
 									}
 								} else {
 									setEventMessages($line->error, $line->errors, 'errors');
@@ -741,7 +741,7 @@ 
 									setEventMessages($object->error, $object->errors, 'errors');
 									$error++;
 								} else {
-									$update_done=true;
+									$update_done = true;
 								}
 							}
 						} else {
@@ -780,7 +780,7 @@ 
 											setEventMessages($line->error, $line->errors, 'errors');
 											$error++;
 										} else {
-											$update_done=true;
+											$update_done = true;
 										}
 									}
 									unset($_POST[$stockLocation]);
@@ -796,7 +796,7 @@ 
 								setEventMessages($line->error, $line->errors, 'errors');
 								$error++;
 							} else {
-								$update_done=true;
+								$update_done = true;
 							}
 							unset($_POST[$qty]);
 						}
@@ -810,7 +810,7 @@ 
 							setEventMessages($line->error, $line->errors, 'errors');
 							$error++;
 						} else {
-							$update_done=true;
+							$update_done = true;
 						}
 						unset($_POST[$qty]);
 					}
@@ -1546,7 +1546,7 @@ 
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-									$nbofsuggested+=count($stock_warehouse->detail_batch);
+									$nbofsuggested += count($stock_warehouse->detail_batch);
 								}
 							}
 
@@ -1587,11 +1587,11 @@ 
 											$tooltipClass = ' classfortooltip';
 											$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)] = 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">';
 										print '<input class="qtyl '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '</td>';
 
@@ -1816,7 +1816,7 @@ 
 	$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);
 	// Project
@@ -2351,7 +2351,7 @@ 
 							// 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;
+						$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 '</tr>';
 					}
@@ -2572,7 +2572,7 @@ 
 				 || (!empty($conf->global->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, '');
 				} 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);
 				}
 			}
 
@@ -2594,7 +2594,7 @@ 
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('expedition', 'shipping_advance', 'send')) {
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 					} else {
-						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 					}
 				}
 			}
@@ -2620,7 +2620,7 @@ 
 					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("Close"), 'default', $_SERVER["PHP_SELF"].'?action='. $paramaction .'&token='.newToken().'&id='.$object->id, '');
+					print dolGetButtonAction('', $langs->trans("Close"), 'default', $_SERVER["PHP_SELF"].'?action='.$paramaction.'&token='.newToken().'&id='.$object->id, '');
 				}
 			}