alxarafe / alixar

index.php

Spacing +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
  * Alxarafe. Development of PHP applications in a flash!
  * Copyright (C) 2018 Alxarafe <info@alxarafe.com>
  */
-define('BASE_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+define('BASE_PATH', __DIR__.DIRECTORY_SEPARATOR);
 
-include BASE_PATH . 'config/constants.php';
-include BASE_PATH . 'vendor/autoload.php';
+include BASE_PATH.'config/constants.php';
+include BASE_PATH.'vendor/autoload.php';
 
 include('dolibarr/htdocs/index.php');

config/constants.php

Spacing +14 added lines, -14 removed lines

@@ -4,13 +4,13 @@ 
  * Alxarafe. Development of PHP applications in a flash!
  * Copyright (C) 2018 Alxarafe <info@alxarafe.com>
  */
-$_appURI = trim(pathinfo(filter_input(INPUT_SERVER, 'SCRIPT_NAME'), PATHINFO_DIRNAME), ' /') . '/';
-define('APP_URI', $_appURI === '/' ? $_appURI : '/' . $_appURI);
+$_appURI = trim(pathinfo(filter_input(INPUT_SERVER, 'SCRIPT_NAME'), PATHINFO_DIRNAME), ' /').'/';
+define('APP_URI', $_appURI === '/' ? $_appURI : '/'.$_appURI);
 
 define('SERVER_NAME', filter_input(INPUT_SERVER, 'SERVER_NAME'));
 define('APP_PROTOCOL', filter_input(INPUT_SERVER, 'REQUEST_SCHEME'));
-define('SITE_URL', APP_PROTOCOL . '://' . SERVER_NAME);
-define('BASE_URI', SITE_URL . APP_URI);
+define('SITE_URL', APP_PROTOCOL.'://'.SERVER_NAME);
+define('BASE_URI', SITE_URL.APP_URI);
 
 define('CORE_FOLDER', 'core/');
 define('CONFIG_FOLDER', 'core/');
@@ -23,13 +23,13 @@ 
 define('CACHE_FOLDER', '../cache/');
 define('VENDOR_FOLDER', '../vendor/');
 
-define('CORE_PATH', BASE_PATH . CORE_FOLDER);
-define('CONFIG_PATH', BASE_PATH . CONFIG_FOLDER);
-define('CONTROLLERS_PATH', BASE_PATH . CONTROLLERS_FOLDER);
-define('HELPERS_PATH', BASE_PATH . HELPERS_FOLDER);
-define('MODELS_PATH', BASE_PATH . MODELS_FOLDER);
-define('SKINS_PATH', BASE_PATH . SKINS_FOLDER);
-define('TEMPLATES_PATH', BASE_PATH . TEMPLATES_FOLDER);
-define('PLUGINS_PATH', BASE_PATH . PLUGINS_FOLDER);
-define('CACHE_PATH', BASE_PATH . CACHE_FOLDER);
-define('VENDOR_PATH', BASE_PATH . VENDOR_FOLDER);
+define('CORE_PATH', BASE_PATH.CORE_FOLDER);
+define('CONFIG_PATH', BASE_PATH.CONFIG_FOLDER);
+define('CONTROLLERS_PATH', BASE_PATH.CONTROLLERS_FOLDER);
+define('HELPERS_PATH', BASE_PATH.HELPERS_FOLDER);
+define('MODELS_PATH', BASE_PATH.MODELS_FOLDER);
+define('SKINS_PATH', BASE_PATH.SKINS_FOLDER);
+define('TEMPLATES_PATH', BASE_PATH.TEMPLATES_FOLDER);
+define('PLUGINS_PATH', BASE_PATH.PLUGINS_FOLDER);
+define('CACHE_PATH', BASE_PATH.CACHE_FOLDER);
+define('VENDOR_PATH', BASE_PATH.VENDOR_FOLDER);

dolibarr/htdocs/expedition/card.php

Spacing +466 added lines, -466 removed lines

@@ -44,47 +44,47 @@ 
 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';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (!empty($conf->projet->enabled)) {
     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
-$langs->loadLangs(array("sendings","companies","bills",'deliveries','orders','stocks','other','propal'));
+$langs->loadLangs(array("sendings", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
 if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
+if (!empty($conf->productbatch->enabled)) $langs->load('productbatch');
 
-$origin		= GETPOST('origin','alpha')?GETPOST('origin','alpha'):'expedition';   // Example: commande, propal
-$origin_id 	= GETPOST('id','int')?GETPOST('id','int'):'';
+$origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'expedition'; // Example: commande, propal
+$origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
 $id = $origin_id;
-if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
-$ref=GETPOST('ref','alpha');
-$line_id = GETPOST('lineid','int')?GETPOST('lineid','int'):'';
+if (empty($origin_id)) $origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
+if (empty($origin_id)) $origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
+$ref = GETPOST('ref', 'alpha');
+$line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
 
 // Security check
-$socid='';
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = '';
+if ($user->societe_id) $socid = $user->societe_id;
 
-if ($origin == 'expedition') $result=restrictedArea($user, $origin, $id);
+if ($origin == 'expedition') $result = restrictedArea($user, $origin, $id);
 else {
-	$result=restrictedArea($user, 'expedition');
+	$result = restrictedArea($user, 'expedition');
 	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$cancel     = GETPOST('cancel','alpha');
+$action		= GETPOST('action', 'alpha');
+$confirm	= GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 
 //PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
 $object = new Expedition($db);
 $extrafields = new ExtraFields($db);
@@ -94,16 +94,16 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // fetch optionals attributes lines and labels
-$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+$extralabelslines = $extrafieldsline->fetch_name_optionals_label($object->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
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('expeditioncard','globalcard'));
+$hookmanager->initHooks(array('expeditioncard', 'globalcard'));
 
-$permissiondellink=$user->rights->expedition->livraison->creer;	// Used by the include of actions_dellink.inc.php
+$permissiondellink = $user->rights->expedition->livraison->creer; // Used by the include of actions_dellink.inc.php
 //var_dump($object->lines[0]->detail_batch);
 
 
@@ -111,8 +111,8 @@ 
  * Actions
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -123,7 +123,7 @@ 
 		$object->fetch($id); // show shipment also after canceling modification
 	}
 
-	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
 	$upload_dir = $conf->expedition->dir_output.'/sending';
@@ -150,7 +150,7 @@ 
             setEventMessages($object->error, $object->errors, 'errors');
         }
 
-        $result = $object->setValueFrom('ref_customer', GETPOST('ref_customer','alpha'), '', null, 'text', '', $user, 'SHIPMENT_MODIFY');
+        $result = $object->setValueFrom('ref_customer', GETPOST('ref_customer', 'alpha'), '', null, 'text', '', $user, 'SHIPMENT_MODIFY');
         if ($result < 0) {
             setEventMessages($object->error, $object->errors, 'errors');
             $action = 'editref_customer';
@@ -166,10 +166,10 @@ 
 
 		// Fill array 'array_options' with data from update form
 	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 	    if ($ret < 0) $error++;
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        // Actions on extra fields
             $result = $object->insertExtraFields('SHIPMENT_MODIFY');
@@ -187,23 +187,23 @@ 
 	// Create shipment
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
-	    $error=0;
-	    $predef='';
+	    $error = 0;
+	    $predef = '';
 
 	    $db->begin();
 
-	    $object->note				= GETPOST('note','alpha');
+	    $object->note = GETPOST('note', 'alpha');
 	    $object->origin				= $origin;
-        $object->origin_id			= $origin_id;
-        $object->fk_project         = GETPOST('projectid','int');
-	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
-	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
-	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
-	    $object->sizeS				= GETPOST('sizeS','int')==''?"NULL":GETPOST('sizeS','int');
-	    $object->size_units			= GETPOST('size_units','int');
-	    $object->weight_units		= GETPOST('weight_units','int');
+        $object->origin_id = $origin_id;
+        $object->fk_project = GETPOST('projectid', 'int');
+	    $object->weight				= GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
+	    $object->sizeH				= GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
+	    $object->sizeW				= GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
+	    $object->sizeS				= GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
+	    $object->size_units = GETPOST('size_units', 'int');
+	    $object->weight_units = GETPOST('weight_units', 'int');
 
-	    $date_delivery = dol_mktime(GETPOST('date_deliveryhour','int'), GETPOST('date_deliverymin','int'), 0, GETPOST('date_deliverymonth','int'), GETPOST('date_deliveryday','int'), GETPOST('date_deliveryyear','int'));
+	    $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
 	    // On va boucler sur chaque ligne du document d'origine pour completer objet expedition
 	    // avec info diverses + qte a livrer
@@ -211,36 +211,36 @@ 
 	    $objectsrc = new $classname($db);
 	    $objectsrc->fetch($object->origin_id);
 
-	    $object->socid					= $objectsrc->socid;
-	    $object->ref_customer			= GETPOST('ref_customer','alpha');
-	    $object->model_pdf				= GETPOST('model');
-	    $object->date_delivery			= $date_delivery;	    // Date delivery planed
+	    $object->socid = $objectsrc->socid;
+	    $object->ref_customer = GETPOST('ref_customer', 'alpha');
+	    $object->model_pdf = GETPOST('model');
+	    $object->date_delivery = $date_delivery; // Date delivery planed
 	    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
-	    $object->shipping_method_id		= GETPOST('shipping_method_id','int');
-	    $object->tracking_number		= GETPOST('tracking_number','alpha');
-	    $object->ref_int				= GETPOST('ref_int','alpha');
-	    $object->note_private			= GETPOST('note_private','none');
-	    $object->note_public			= GETPOST('note_public','none');
-		$object->fk_incoterms 			= GETPOST('incoterm_id', 'int');
-		$object->location_incoterms 	= GETPOST('location_incoterms', 'alpha');
+	    $object->shipping_method_id		= GETPOST('shipping_method_id', 'int');
+	    $object->tracking_number = GETPOST('tracking_number', 'alpha');
+	    $object->ref_int = GETPOST('ref_int', 'alpha');
+	    $object->note_private = GETPOST('note_private', 'none');
+	    $object->note_public = GETPOST('note_public', 'none');
+		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+		$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 	    $batch_line = array();
 		$stockLine = array();
-		$array_options=array();
+		$array_options = array();
 
-	    $num=count($objectsrc->lines);
-	    $totalqty=0;
+	    $num = count($objectsrc->lines);
+	    $totalqty = 0;
 
 	    for ($i = 0; $i < $num; $i++)
 	    {
-			$idl="idl".$i;
+			$idl = "idl".$i;
 
-			$sub_qty=array();
-			$subtotalqty=0;
+			$sub_qty = array();
+			$subtotalqty = 0;
 
-			$j=0;
-			$batch="batchl".$i."_0";
-			$stockLocation="ent1".$i."_0";
+			$j = 0;
+			$batch = "batchl".$i."_0";
+			$stockLocation = "ent1".$i."_0";
 	    	$qty = "qtyl".$i;
 
 			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
@@ -252,27 +252,27 @@ 
     				while (isset($_POST[$batch]))
     				{
     					// save line of detail into sub_qty
-    				    $sub_qty[$j]['q']=GETPOST($qty,'int');				// the qty we want to move for this stock record
-    				    $sub_qty[$j]['id_batch']=GETPOST($batch,'int');		// the id into llx_product_batch of stock record to move
-    					$subtotalqty+=$sub_qty[$j]['q'];
+    				    $sub_qty[$j]['q'] = GETPOST($qty, 'int'); // the qty we want to move for this stock record
+    				    $sub_qty[$j]['id_batch'] = GETPOST($batch, 'int'); // the id into llx_product_batch of stock record to move
+    					$subtotalqty += $sub_qty[$j]['q'];
 
     					//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
 
     					$j++;
-    					$batch="batchl".$i."_".$j;
+    					$batch = "batchl".$i."_".$j;
     					$qty = "qtyl".$i.'_'.$j;
     				}
 
-    				$batch_line[$i]['detail']=$sub_qty;		// array of details
-    				$batch_line[$i]['qty']=$subtotalqty;
-    				$batch_line[$i]['ix_l']=GETPOST($idl,'int');
+    				$batch_line[$i]['detail'] = $sub_qty; // array of details
+    				$batch_line[$i]['qty'] = $subtotalqty;
+    				$batch_line[$i]['ix_l'] = GETPOST($idl, 'int');
 
-    				$totalqty+=$subtotalqty;
+    				$totalqty += $subtotalqty;
 			    }
 			    else
 			    {
 			        // No detail were provided for lots
-			        if (! empty($_POST[$qty]))
+			        if (!empty($_POST[$qty]))
 			        {
 			            // We try to set an amount
     			        // Case we dont use the list of available qty for each warehouse/lot
@@ -288,14 +288,14 @@ 
 			    while (isset($_POST[$stockLocation]))
 			    {
 			        // save sub line of warehouse
-			        $stockLine[$i][$j]['qty']=GETPOST($qty,'int');
-			        $stockLine[$i][$j]['warehouse_id']=GETPOST($stockLocation,'int');
-			        $stockLine[$i][$j]['ix_l']=GETPOST($idl,'int');
+			        $stockLine[$i][$j]['qty'] = GETPOST($qty, 'int');
+			        $stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
+			        $stockLine[$i][$j]['ix_l'] = GETPOST($idl, 'int');
 
-			        $totalqty+=GETPOST($qty,'int');
+			        $totalqty += GETPOST($qty, 'int');
 
 			        $j++;
-			        $stockLocation="ent1".$i."_".$j;
+			        $stockLocation = "ent1".$i."_".$j;
 			        $qty = "qtyl".$i.'_'.$j;
 			    }
 			}
@@ -303,7 +303,7 @@ 
 			{
 			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
+				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
 			}
 
 			// Extrafields
@@ -313,7 +313,7 @@ 
 			if (is_array($extralabelsline)) {
 				// Get extra fields
 				foreach ($extralabelsline as $key => $value) {
-					unset($_POST["options_" . $key]);
+					unset($_POST["options_".$key]);
 				}
 			}
 	    }
@@ -326,18 +326,18 @@ 
 	        for ($i = 0; $i < $num; $i++)
 	        {
 	            $qty = "qtyl".$i;
-				if (! isset($batch_line[$i]))
+				if (!isset($batch_line[$i]))
 				{
 					// not batch mode
 					if (isset($stockLine[$i]))
 					{
     					//shipment from multiple stock locations
 					    $nbstockline = count($stockLine[$i]);
-    					for($j = 0; $j < $nbstockline; $j++)
+    					for ($j = 0; $j < $nbstockline; $j++)
     					{
-    					    if ($stockLine[$i][$j]['qty']>0)
+    					    if ($stockLine[$i][$j]['qty'] > 0)
     					    {
-    					        $ret=$object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
+    					        $ret = $object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
     					        if ($ret < 0)
     					        {
     					            setEventMessages($object->error, $object->errors, 'errors');
@@ -348,15 +348,15 @@ 
 					}
 					else
 					{
-						if (GETPOST($qty,'int') > 0 || (GETPOST($qty,'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
+						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
 						{
 							$ent = "entl".$i;
 							$idl = "idl".$i;
-							$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
-							if ($entrepot_id < 0) $entrepot_id='';
-							if (! ($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
+							$entrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
+							if ($entrepot_id < 0) $entrepot_id = '';
+							if (!($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
 
-							$ret=$object->addline($entrepot_id, GETPOST($idl,'int'), GETPOST($qty,'int'), $array_options[$i]);
+							$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i]);
 							if ($ret < 0)
 							{
 								setEventMessages($object->error, $object->errors, 'errors');
@@ -368,9 +368,9 @@ 
 				else
 				{
 					// batch mode
-					if ($batch_line[$i]['qty']>0)
+					if ($batch_line[$i]['qty'] > 0)
 					{
-						$ret=$object->addline_batch($batch_line[$i],$array_options[$i]);
+						$ret = $object->addline_batch($batch_line[$i], $array_options[$i]);
 						if ($ret < 0)
 						{
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -383,9 +383,9 @@ 
 	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	        if ($ret < 0) $error++;
 
-	        if (! $error)
+	        if (!$error)
 	        {
-	            $ret=$object->create($user);		// This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment.
+	            $ret = $object->create($user); // This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment.
 	            if ($ret <= 0)
 	            {
 	                setEventMessages($object->error, $object->errors, 'errors');
@@ -395,11 +395,11 @@ 
 	    }
 	    else
 	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
@@ -408,8 +408,8 @@ 
 	    else
 	    {
 	        $db->rollback();
-	        $_GET["commande_id"]=GETPOST('commande_id','int');
-	        $action='create';
+	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
+	        $action = 'create';
 	    }
 	}
 
@@ -431,8 +431,8 @@ 
 	}
 
 	else if ($action == 'confirm_valid' && $confirm == 'yes' &&
-        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
+        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 	)
 	{
 	    $object->fetch_thirdparty();
@@ -451,17 +451,17 @@ 
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	    		if (! empty($newlang)) {
+	    		if (!empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
 	    			$outputlangs->setDefaultLang($newlang);
 	    		}
-	    		$model=$object->modelpdf;
+	    		$model = $object->modelpdf;
 	    		$ret = $object->fetch($id); // Reload to get new records
 
-	    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db,$result);
+	    		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	    		if ($result < 0) dol_print_error($db, $result);
 	    	}
 	    }
 	}
@@ -492,10 +492,10 @@ 
 	else if ($action == 'setdate_livraison' && $user->rights->expedition->creer)
 	{
 	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
+	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 	    $object->fetch($id);
-	    $result=$object->set_date_livraison($user,$datedelivery);
+	    $result = $object->set_date_livraison($user, $datedelivery);
 	    if ($result < 0)
 	    {
 	        setEventMessages($object->error, $object->errors, 'errors');
@@ -514,23 +514,23 @@ 
 		&& $user->rights->expedition->creer
 		)
 	{
-	    $error=0;
+	    $error = 0;
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
-	    if ($action == 'settrueWeight')	{
-	    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
-			$object->weight_units = GETPOST('weight_units','int');
+	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
+	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+	    if ($action == 'settrueWeight') {
+	    	$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
+			$object->weight_units = GETPOST('weight_units', 'int');
 	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
-	    if ($action == 'settrueHeight'){
-	    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
-						$object->size_units = GETPOST('size_units','int');
+	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+	    if ($action == 'settrueHeight') {
+	    				$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
+						$object->size_units = GETPOST('size_units', 'int');
 		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        if ($object->update($user) >= 0)
 	        {
@@ -540,15 +540,15 @@ 
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 
-	    $action="";
+	    $action = "";
 	}
 
 	elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	    if ($result >= 0) {
+	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
 	}
@@ -557,8 +557,8 @@ 
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	    if ($result >= 0) {
+	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
 	}
@@ -566,14 +566,14 @@ 
 	/*
 	 *  delete a line
 	 */
-	elseif ($action == 'deleteline' && ! empty($line_id))
+	elseif ($action == 'deleteline' && !empty($line_id))
 	{
 		$object->fetch($id);
 		$lines = $object->lines;
 		$line = new ExpeditionLigne($db);
 
 		$num_prod = count($lines);
-		for ($i = 0 ; $i < $num_prod ; $i++)
+		for ($i = 0; $i < $num_prod; $i++)
 		{
 			if ($lines[$i]->id == $line_id)
 			{
@@ -582,7 +582,7 @@ 
 					// delete multi warehouse lines
 					foreach ($lines[$i]->details_entrepot as $details_entrepot) {
 						$line->id = $details_entrepot->line_id;
-						if (! $error && $line->delete($user) < 0)
+						if (!$error && $line->delete($user) < 0)
 						{
 							$error++;
 						}
@@ -592,7 +592,7 @@ 
 				{
 					// delete single warehouse line
 					$line->id = $line_id;
-					if (! $error && $line->delete($user) < 0)
+					if (!$error && $line->delete($user) < 0)
 					{
 						$error++;
 					}
@@ -601,8 +601,8 @@ 
 			unset($_POST["lineid"]);
 		}
 
-		if(! $error) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		if (!$error) {
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 		else
@@ -617,13 +617,13 @@ 
 	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save'))
 	{
 		// Clean parameters
-		$qty=0;
+		$qty = 0;
 		$entrepot_id = 0;
 		$batch_id = 0;
 
 		$lines = $object->lines;
 		$num_prod = count($lines);
-		for ($i = 0 ; $i < $num_prod ; $i++)
+		for ($i = 0; $i < $num_prod; $i++)
 		{
 			if ($lines[$i]->id == $line_id)		// we have found line to update
 			{
@@ -635,7 +635,7 @@ 
 				// Unset extrafield POST Data
 				if (is_array($extralabelsline)) {
 					foreach ($extralabelsline as $key => $value) {
-						unset($_POST["options_" . $key]);
+						unset($_POST["options_".$key]);
 					}
 				}
 				$line->fk_product = $lines[$i]->fk_product;
@@ -645,11 +645,11 @@ 
 					foreach ($lines[$i]->detail_batch as $detail_batch)
 					{
 						$lotStock = new Productbatch($db);
-						$batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
+						$batch = "batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
 						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
-						$batch_id = GETPOST($batch,'int');
+						$batch_id = GETPOST($batch, 'int');
 						$batch_qty = GETPOST($qty, 'int');
-						if (! empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty))
+						if (!empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty))
 						{
 							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0)	// $line is ExpeditionLine
 							{
@@ -660,7 +660,7 @@ 
 								}
 
 								// detail_batch can be an object with keys, or an array of ExpeditionLineBatch
-								if (empty($line->detail_batch)) $line->detail_batch=new stdClass();
+								if (empty($line->detail_batch)) $line->detail_batch = new stdClass();
 
 								$line->detail_batch->fk_origin_stock = $batch_id;
 								$line->detail_batch->batch = $lotStock->batch;
@@ -683,12 +683,12 @@ 
 					}
 					// add new batch
 					$lotStock = new Productbatch($db);
-					$batch="batchl".$line_id."_0";
+					$batch = "batchl".$line_id."_0";
 					$qty = "qtyl".$line_id."_0";
-					$batch_id = GETPOST($batch,'int');
+					$batch_id = GETPOST($batch, 'int');
 					$batch_qty = GETPOST($qty, 'int');
 					$lineIdToAddLot = 0;
-					if ($batch_qty > 0 && ! empty($batch_id))
+					if ($batch_qty > 0 && !empty($batch_id))
 					{
 						if ($lotStock->fetch($batch_id) > 0)
 						{
@@ -764,10 +764,10 @@ 
 						if ($lines[$i]->entrepot_id > 0)
 						{
 							// single warehouse shipment line
-							$stockLocation="entl".$line_id;
+							$stockLocation = "entl".$line_id;
 							$qty = "qtyl".$line_id;
 							$line->id = $line_id;
-							$line->entrepot_id = GETPOST($stockLocation,'int');
+							$line->entrepot_id = GETPOST($stockLocation, 'int');
 							$line->qty = GETPOST($qty, 'int');
 							if ($line->update($user) < 0) {
 								setEventMessages($line->error, $line->errors, 'errors');
@@ -781,10 +781,10 @@ 
 							// multi warehouse shipment lines
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
 							{
-								if (! $error) {
-									$stockLocation="entl".$detail_entrepot->line_id;
+								if (!$error) {
+									$stockLocation = "entl".$detail_entrepot->line_id;
 									$qty = "qtyl".$detail_entrepot->line_id;
-									$warehouse = GETPOST($stockLocation,'int');
+									$warehouse = GETPOST($stockLocation, 'int');
 									if (!empty ($warehouse))
 									{
 										$line->id = $detail_entrepot->line_id;
@@ -819,16 +819,16 @@ 
 
 		unset($_POST["lineid"]);
 
-		if (! $error) {
+		if (!$error) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					$newlang = GETPOST('lang_id', 'aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 					$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -839,24 +839,24 @@ 
 		}
 		else
 		{
-			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
 	}
 
-	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	if (empty($id)) $id=$facid;
-	$trigger_name='SHIPPING_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromshipment';
-	$trackid='shi'.$object->id;
+	if (empty($id)) $id = $facid;
+	$trigger_name = 'SHIPPING_SENTBYMAIL';
+	$paramname = 'id';
+	$mode = 'emailfromshipment';
+	$trackid = 'shi'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
@@ -865,12 +865,12 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Shipment'),'Expedition');
+llxHeader('', $langs->trans('Shipment'), 'Expedition');
 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 $product_static = new Product($db);
 $shipment_static = new Expedition($db);
@@ -880,7 +880,7 @@ 
 {
     print load_fiche_titre($langs->trans("CreateShipment")).'<br>';
     print $langs->trans("ShipmentCreationIsDoneFromOrder");
-    $action=''; $id=''; $ref='';
+    $action = ''; $id = ''; $ref = '';
 }
 
 // Mode creation.
@@ -889,7 +889,7 @@ 
     $expe = new Expedition($db);
 
     print load_fiche_titre($langs->trans("CreateShipment"));
-    if (! $origin)
+    if (!$origin)
     {
         setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
     }
@@ -907,7 +907,7 @@ 
             $author = new User($db);
             $author->fetch($object->user_author_id);
 
-            if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+            if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
 
             print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -915,9 +915,9 @@ 
             print '<input type="hidden" name="origin" value="'.$origin.'">';
             print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
             print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-            if (GETPOST('entrepot_id','int'))
+            if (GETPOST('entrepot_id', 'int'))
             {
-                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id','int').'">';
+                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
             }
 
             dol_fiche_head('');
@@ -926,13 +926,13 @@ 
 
             // Ref
             print '<tr><td class="titlefieldcreate fieldrequired">';
-            if ($origin == 'commande' && ! empty($conf->commande->enabled))
+            if ($origin == 'commande' && !empty($conf->commande->enabled))
             {
-                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$object->ref;
+                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
             }
-            if ($origin == 'propal' && ! empty($conf->propal->enabled))
+            if ($origin == 'propal' && !empty($conf->propal->enabled))
             {
-                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref;
+                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
             }
             print '</a></td>';
             print "</tr>\n";
@@ -953,17 +953,17 @@ 
             print '</tr>';
 
             // Project
-            if (! empty($conf->projet->enabled))
+            if (!empty($conf->projet->enabled))
             {
-                $projectid = GETPOST('projectid','int')?GETPOST('projectid','int'):0;
-                if(empty($projectid) && ! empty($object->fk_project)) $projectid = $object->fk_project;
+                $projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
+                if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
                 if ($origin == 'project') $projectid = ($originid ? $originid : 0);
 
                 $langs->load("projects");
                 print '<tr>';
-                print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+                print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
                 $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">'.$langs->trans("AddProject").'</a>';
                 print '</td>';
                 print '</tr>';
             }
@@ -972,8 +972,8 @@ 
             print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
             print '<td colspan="3">';
             //print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
-            $date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST
-            print $form->selectDate($date_delivery?$date_delivery:-1, 'date_delivery', 1, 1, 1);
+            $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+            print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
             print "</td>\n";
             print '</tr>';
 
@@ -985,7 +985,7 @@ 
             print "</td></tr>";
 
             // Note Private
-            if ($object->note_private && ! $user->societe_id)
+            if ($object->note_private && !$user->societe_id)
             {
                 print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
                 print '<td colspan="3">';
@@ -997,20 +997,20 @@ 
             // Weight
             print '<tr><td>';
             print $langs->trans("Weight");
-            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
-            $text=$formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
-            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
+            $text = $formproduct->select_measuring_units("weight_units", "weight", GETPOST('weight_units', 'int'));
+            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
             print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
             // Dim
             print '<tr><td>';
             print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-            print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW','int').'">';
-            print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH','int').'">';
-            print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS','int').'">';
+            print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
+            print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
+            print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
             print ' ';
-            $text=$formproduct->select_measuring_units("size_units","size");
-            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            $text = $formproduct->select_measuring_units("size_units", "size");
+            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
             print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
 
@@ -1018,19 +1018,19 @@ 
             print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
             print '<td colspan="3">';
             $expe->fetch_delivery_methods();
-            print $form->selectarray("shipping_method_id", $expe->meths, GETPOST('shipping_method_id','int'),1,0,0,"",1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print $form->selectarray("shipping_method_id", $expe->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print "</td></tr>\n";
 
             // Tracking number
             print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
             print '<td colspan="3">';
-            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";
 
             // Other attributes
             $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $expe, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
 			if (empty($reshook)) {
@@ -1050,12 +1050,12 @@ 
 				print '<tr>';
 				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->libelle_incoterms, 1).'</label></td>';
 		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
             // Document model
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 			$liste = ModelePdfExpedition::liste_modeles($db);
 			if (count($liste) > 1)
 			{
@@ -1077,16 +1077,16 @@ 
             print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    	$i=0;
-    	    	while($i < $numAsked)
+    	    	$i = 0;
+    	    	while ($i < $numAsked)
     	    	{
     	    		print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
     	    		$i++;
     	    	}
         		print '});
 	            jQuery("#autoreset").click(function() {';
-    	    	$i=0;
-    	    	while($i < $numAsked)
+    	    	$i = 0;
+    	    	while ($i < $numAsked)
     	    	{
     	    		print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
     	    		$i++;
@@ -1118,7 +1118,7 @@ 
 	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
 				}
                 print '</td>';
-                if (! empty($conf->stock->enabled))
+                if (!empty($conf->stock->enabled))
                 {
 					if (empty($conf->productbatch->enabled))
 					{
@@ -1141,11 +1141,11 @@ 
 
 
                 // Show product and description
-                $type=$line->product_type?$line->product_type:$line->fk_product_type;
+                $type = $line->product_type ? $line->product_type : $line->fk_product_type;
                 // Try to enhance type detection using date_start and date_end for free lines where type
                 // was not saved.
-                if (! empty($line->date_start)) $type=1;
-                if (! empty($line->date_end)) $type=1;
+                if (!empty($line->date_start)) $type = 1;
+                if (!empty($line->date_end)) $type = 1;
 
                 print '<!-- line '.$line->rowid.' for product -->'."\n";
                 print '<tr class="oddeven">'."\n";
@@ -1154,29 +1154,29 @@ 
                 if ($line->fk_product > 0)  // If predefined product
                 {
                     $product->fetch($line->fk_product);
-                    $product->load_stock('warehouseopen');	// Load all $product->stock_warehouse[idwarehouse]->detail_batch
+                    $product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
                     //var_dump($product->stock_warehouse[1]);
 
                     print '<td>';
                     print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
                     // Show product and description
-                    $product_static->type=$line->fk_product_type;
-                    $product_static->id=$line->fk_product;
-                    $product_static->ref=$line->ref;
-                    $product_static->status_batch=$line->product_tobatch;
-                    $text=$product_static->getNomUrl(1);
-                    $text.= ' - '.(! empty($line->label)?$line->label:$line->product_label);
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
+                    $product_static->type = $line->fk_product_type;
+                    $product_static->id = $line->fk_product;
+                    $product_static->ref = $line->ref;
+                    $product_static->status_batch = $line->product_tobatch;
+                    $text = $product_static->getNomUrl(1);
+                    $text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
+                    $description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
+                    print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
                     // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
                     // Add description in form
-                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                    if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
                     {
-                        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>';
@@ -1184,18 +1184,18 @@ 
                 else
 				{
 				    print "<td>";
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
+                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+                    else $text = img_object($langs->trans('Product'), 'product');
 
-                    if (! empty($line->label)) {
-                    	$text.= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
+                    if (!empty($line->label)) {
+                    	$text .= ' <strong>'.$line->label.'</strong>';
+                    	print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
                     } else {
                     	print $text.' '.nl2br($line->desc);
                     }
 
                     // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
                     print "</td>\n";
                 }
 
@@ -1203,7 +1203,7 @@ 
                 print '<td align="center">'.$line->qty;
                 print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
                 print '</td>';
-                $qtyProdCom=$line->qty;
+                $qtyProdCom = $line->qty;
 
                 // Qty already shipped
                 print '<td align="center">';
@@ -1222,23 +1222,23 @@ 
 				{
 					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 				}
-                $warehouse_id = GETPOST('entrepot_id','int');
+                $warehouse_id = GETPOST('entrepot_id', 'int');
 
 				$warehouseObject = null;
-				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+				if ($warehouse_id > 0 || !($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
 				    print '<!-- Case warehouse already known or product not a predefined product -->';
 					//ship from preselected location
 					$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
-					$deliverableQty=min($quantityToBeDelivered, $stock);
+					$deliverableQty = min($quantityToBeDelivered, $stock);
 					if ($deliverableQty < 0) $deliverableQty = 0;
-					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
+					if (empty($conf->productbatch->enabled) || !$product->hasbatch())
 					{
 						// Quantity to send
 						print '<td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+						if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 						}
@@ -1246,15 +1246,15 @@ 
 						print '</td>';
 
 						// Stock
-						if (! empty($conf->stock->enabled))
+						if (!empty($conf->stock->enabled))
 						{
 							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
+							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
 							{
 								// Show warehouse combo list
 								$ent = "entl".$indiceAsked;
 								$idl = "idl".$indiceAsked;
-								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
+								$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : $warehouse_id;
 								if ($line->fk_product > 0)
 								{
 								    print '<!-- Show warehouse selection -->';
@@ -1264,7 +1264,7 @@ 
 										//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
 										}
 									}
 								}
@@ -1279,19 +1279,19 @@ 
 						print "</tr>\n";
 
 						// Show subproducts of product
-						if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+						if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
 						{
 							$product->get_sousproduits_arbo();
 							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-							if(count($prods_arbo) > 0)
+							if (count($prods_arbo) > 0)
 							{
-								foreach($prods_arbo as $key => $value)
+								foreach ($prods_arbo as $key => $value)
 								{
 									//print $value[0];
-									$img='';
+									$img = '';
 									if ($value['stock'] < $value['stock_alert'])
 									{
-										$img=img_warning($langs->trans("StockTooLow"));
+										$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']."
@@ -1304,15 +1304,15 @@ 
 					else
 					{
 					    // Product need lot
-						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+						print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 						print '<!-- Case product need lot -->';
 
-						$staticwarehouse=new Entrepot($db);
+						$staticwarehouse = new Entrepot($db);
 						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
 
-						$subj=0;
+						$subj = 0;
 						// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
+						$nbofsuggested = 0;
 						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)
@@ -1326,9 +1326,9 @@ 
 							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
 							{
 								//var_dump($dbatch);
-								$batchStock = + $dbatch->qty;		// To get a numeric
-								$deliverableQty = min($quantityToBeDelivered,$batchStock);
-								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
+								$batchStock = + $dbatch->qty; // To get a numeric
+								$deliverableQty = min($quantityToBeDelivered, $batchStock);
+								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
 								print '<td colspan="3" ></td><td align="center">';
 								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 								print '</td>';
@@ -1340,12 +1340,12 @@ 
 
 								print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 
-								$detail='';
-								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
-								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-								$detail.= '<br>';
+								$detail = '';
+								$detail .= $langs->trans("Batch").': '.$dbatch->batch;
+								$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+								$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+								$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+								$detail .= '<br>';
 								print $detail;
 
 								$quantityToBeDelivered -= $deliverableQty;
@@ -1373,15 +1373,15 @@ 
 				else
 				{
 					// ship from multiple locations
-					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
+					if (empty($conf->productbatch->enabled) || !$product->hasbatch())
 					{
 					    print '<!-- Case warehouse not already known and product does not need lot -->';
-					    print '<td></td><td></td></tr>'."\n";	// end line and start a new one for each warehouse
+					    print '<td></td><td></td></tr>'."\n"; // end line and start a new one for each warehouse
 
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						$subj=0;
+						$subj = 0;
     					// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
+						$nbofsuggested = 0;
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 						{
 							if ($stock_warehouse->real > 0)
@@ -1389,19 +1389,19 @@ 
                                 $nbofsuggested++;
 						    }
 						}
-						$tmpwarehouseObject=new Entrepot($db);
+						$tmpwarehouseObject = new Entrepot($db);
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
 						{
 							$tmpwarehouseObject->fetch($warehouse_id);
 							if ($stock_warehouse->real > 0)
 							{
 								$stock = + $stock_warehouse->real; // Convert it to number
-								$deliverableQty = min($quantityToBeDelivered,$stock);
+								$deliverableQty = min($quantityToBeDelivered, $stock);
 								$deliverableQty = max(0, $deliverableQty);
 								// Quantity to send
-								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
+								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
 								print '<td colspan="3" ></td><td align="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
-								if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+								if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 								{
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
@@ -1410,10 +1410,10 @@ 
 								print '</td>';
 
 								// Stock
-								if (! empty($conf->stock->enabled))
+								if (!empty($conf->stock->enabled))
 								{
 									print '<td align="left">';
-									if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 									{
 										print $tmpwarehouseObject->getNomUrl(0).' ';
 
@@ -1436,19 +1436,19 @@ 
 							}
 						}
 						// Show subproducts of product (not recommanded)
-						if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+						if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
 						{
 							$product->get_sousproduits_arbo();
 							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
 							if (count($prods_arbo) > 0)
 							{
-								foreach($prods_arbo as $key => $value)
+								foreach ($prods_arbo as $key => $value)
 								{
 									//print $value[0];
-									$img='';
+									$img = '';
 									if ($value['stock'] < $value['stock_alert'])
 									{
-										$img=img_warning($langs->trans("StockTooLow"));
+										$img = img_warning($langs->trans("StockTooLow"));
 									}
 									print '<tr class"oddeven"><td>';
 									print "&nbsp; &nbsp; &nbsp; ->
@@ -1463,15 +1463,15 @@ 
 					else
 					{
 					    print '<!-- Case warehouse not already known and product need lot -->';
-					    print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+					    print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 
-						$subj=0;
+						$subj = 0;
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 
-						$tmpwarehouseObject=new Entrepot($db);
-						$productlotObject=new Productlot($db);
+						$tmpwarehouseObject = new Entrepot($db);
+						$productlotObject = new Productlot($db);
 						// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
+						$nbofsuggested = 0;
 						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 						{
 						    if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
@@ -1488,10 +1488,10 @@ 
 						        foreach ($stock_warehouse->detail_batch as $dbatch)
 								{
 									//var_dump($dbatch);
-									$batchStock = + $dbatch->qty;		// To get a numeric
-									$deliverableQty = min($quantityToBeDelivered,$batchStock);
+									$batchStock = + $dbatch->qty; // To get a numeric
+									$deliverableQty = min($quantityToBeDelivered, $batchStock);
 									if ($deliverableQty < 0) $deliverableQty = 0;
-									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'><td colspan="3"></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
 
@@ -1524,14 +1524,14 @@ 
 					{
 					    print '<!-- line not shown yet, we show it -->';
 						print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+						if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-						    $disabled='';
-					        if (! empty($conf->productbatch->enabled) && $product->hasbatch())
+						    $disabled = '';
+					        if (!empty($conf->productbatch->enabled) && $product->hasbatch())
 					        {
-                                $disabled='disabled="disabled"';
+                                $disabled = 'disabled="disabled"';
 						    }
-    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
+    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
 						}
 						else
 						{
@@ -1540,12 +1540,12 @@ 
 						print '</td>';
 
 						print '<td align="left">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+						if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-							$warehouse_selected_id = GETPOST('entrepot_id','int');
+							$warehouse_selected_id = GETPOST('entrepot_id', 'int');
     						if ($warehouse_selected_id > 0)
     						{
-    							$warehouseObject=new Entrepot($db);
+    							$warehouseObject = new Entrepot($db);
     							$warehouseObject->fetch($warehouse_selected_id);
     							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
     						}
@@ -1566,9 +1566,9 @@ 
 
 
 				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0)
+				if (is_array($extralabelslines) && count($extralabelslines) > 0)
 				{
-					$colspan=5;
+					$colspan = 5;
 					$orderLineExtrafields = new Extrafields($db);
 					$orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
 					$srcLine = new OrderLine($db);
@@ -1577,7 +1577,7 @@ 
 					//$line->fetch_optionals($line->id);
 					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 					print '<tr class="oddeven">';
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
 					print '</tr>';
 				}
 
@@ -1591,7 +1591,7 @@ 
             print '<div class="center">';
             print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
             print '&nbsp; ';
-            print '<input type="'.($backtopage?"submit":"button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage?'':' onclick="javascript:history.go(-1)"').'>';	// Cancel for create does not post form if we don't know the backtopage
+            print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
             print '</div>';
 
             print '</form>';
@@ -1622,7 +1622,7 @@ 
 			$typeobject = $object->origin;
 			$origin = $object->origin;
 			$origin_id = $object->origin_id;
-			$object->fetch_origin();         // Load property $object->commande, $object->propal, ...
+			$object->fetch_origin(); // Load property $object->commande, $object->propal, ...
 		}
 
 		$soc = new Societe($db);
@@ -1630,15 +1630,15 @@ 
 
 		$res = $object->fetch_optionals();
 
-		$head=shipping_prepare_head($object);
+		$head = shipping_prepare_head($object);
 		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
 
-		$formconfirm='';
+		$formconfirm = '';
 
 		// Confirm deleteion
 		if ($action == 'delete')
 		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSending'), $langs->trans("ConfirmDeleteSending", $object->ref), 'confirm_delete', '', 0, 1);
 		}
 
 		// Confirmation validation
@@ -1654,29 +1654,29 @@ 
 				$numref = $object->ref;
 			}
 
-			$text = $langs->trans("ConfirmValidateSending",$numref);
+			$text = $langs->trans("ConfirmValidateSending", $numref);
 
-			if (! empty($conf->notification->enabled))
+			if (!empty($conf->notification->enabled))
 			{
-				require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-				$notify=new Notify($db);
-				$text.='<br>';
-				$text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid, $object);
+				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+				$notify = new Notify($db);
+				$text .= '<br>';
+				$text .= $notify->confirmMessage('SHIPPING_VALIDATE', $object->socid, $object);
 			}
 
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateSending'), $text, 'confirm_valid', '', 0, 1);
 		}
 		// Confirm cancelation
 		if ($action == 'annuler')
 		{
-			$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);
 		}
 
 		// Call Hook formConfirm
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 
 		// Print form confirm
 		print $formconfirm;
@@ -1684,57 +1684,57 @@ 
 
 		// Calculate totalWeight and totalVolume for all products
 		// by adding weight and volume of each product line.
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
+		$tmparray = $object->getTotalWeightVolume();
+		$totalWeight = $tmparray['weight'];
+		$totalVolume = $tmparray['volume'];
 
 
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 		{
-		    $objectsrc=new Commande($db);
+		    $objectsrc = new Commande($db);
 		    $objectsrc->fetch($object->$typeobject->id);
 		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
-		    $objectsrc=new Propal($db);
+		    $objectsrc = new Propal($db);
 		    $objectsrc->fetch($object->$typeobject->id);
 		}
 
 		// Shipment card
-		$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">';
+		$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->rights->expedition->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 		// Thirdparty
-        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
         // Project
-        if (! empty($conf->projet->enabled)) {
+        if (!empty($conf->projet->enabled)) {
             $langs->load("projects");
-            $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+            $morehtmlref .= '<br>'.$langs->trans('Project').' ';
             if (0) {    // Do not change on shipment
                 if ($action != 'classify') {
-                    $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
                 }
                 if ($action == 'classify') {
                     // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
                     $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                    $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                     $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                    $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
                     $morehtmlref .= '</form>';
                 } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
                 }
             } else {
                 // We don't have project on shipment, so we will use the project or source object instead
                 // TODO Add project on shipment
                 $morehtmlref .= ' : ';
-                if (! empty($objectsrc->fk_project)) {
+                if (!empty($objectsrc->fk_project)) {
                     $proj = new Project($db);
                     $proj->fetch($objectsrc->fk_project);
-                    $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                    $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                     $morehtmlref .= $proj->ref;
                     $morehtmlref .= '</a>';
                 } else {
@@ -1742,7 +1742,7 @@ 
                 }
             }
         }
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 
     	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -1755,28 +1755,28 @@ 
         print '<table class="border" width="100%">';
 
 		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 		{
 			print '<tr><td>';
 			print $langs->trans("RefOrder").'</td>';
 			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'commande');
+			print $objectsrc->getNomUrl(1, 'commande');
 			print "</td>\n";
 			print '</tr>';
 		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
 			print '<tr><td>';
 			print $langs->trans("RefProposal").'</td>';
 			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'expedition');
+			print $objectsrc->getNomUrl(1, 'expedition');
 			print "</td>\n";
 			print '</tr>';
 		}
 
 		// Date creation
 		print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
-		print '<td colspan="3">'.dol_print_date($object->date_creation,"dayhour")."</td>\n";
+		print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
 		print '</tr>';
 
 		// Delivery date planned
@@ -1785,7 +1785,7 @@ 
 		print $langs->trans('DateDeliveryPlanned');
 		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editdate_livraison')
@@ -1793,30 +1793,30 @@ 
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
-			print $form->selectDate($object->date_delivery?$object->date_delivery:-1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
 		else
 		{
-			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
+			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
 		print '</tr>';
 
 		// Weight
 		print '<tr><td>';
-		print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer);
+		print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->expedition->creer);
 		print '</td><td colspan="3">';
 
-		if ($action=='edittrueWeight')
+		if ($action == 'edittrueWeight')
 		{
 			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="'.$_SESSION['newtoken'].'">';
 			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
-			print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
+			print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
@@ -1824,7 +1824,7 @@ 
 		else
 		{
 			print $object->trueWeight;
-			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
+			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuring_units_string($object->weight_units, "weight") : '';
 		}
 
         // Calculated
@@ -1832,28 +1832,28 @@ 
 		{
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
 			//print $totalWeight.' '.measuring_units_string(0,"weight");
-			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
 			if (!empty($object->trueWeight)) print ')';
 		}
 		print '</td></tr>';
 
 		// Width
-		print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer);
-		print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
+		print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+		print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->expedition->creer);
+		print ($object->trueWidth && $object->width_units != '') ? ' '.measuring_units_string($object->width_units, "size") : '';
 		print '</td></tr>';
 
 		// Height
-		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		if($action=='edittrueHeight')
+		print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+		if ($action == 'edittrueHeight')
 		{
 			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="'.$_SESSION['newtoken'].'">';
 			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
-			print $formproduct->select_measuring_units("size_units","size",$object->size_units);
+			print $formproduct->select_measuring_units("size_units", "size", $object->size_units);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
@@ -1861,15 +1861,15 @@ 
 		else
 		{
 			print $object->trueHeight;
-			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
+			print ($object->trueHeight && $object->height_units != '') ? ' '.measuring_units_string($object->height_units, "size") : '';
 		}
 
 		print '</td></tr>';
 
 		// Depth
-		print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer);
-		print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
+		print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+		print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->expedition->creer);
+		print ($object->trueDepth && $object->depth_units != '') ? ' '.measuring_units_string($object->depth_units, "size") : '';
 		print '</td></tr>';
 
 		// Volume
@@ -1877,12 +1877,12 @@ 
 		print $langs->trans("Volume");
 		print '</td>';
 		print '<td colspan="3">';
-		$calculatedVolume=0;
-		$volumeUnit=0;
+		$calculatedVolume = 0;
+		$volumeUnit = 0;
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $volumeUnit=$object->size_units * 3;
+		    $calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		    $volumeUnit = $object->size_units * 3;
 		}
 		// If sending volume not defined we use sum of products
 		if ($calculatedVolume > 0)
@@ -1890,15 +1890,15 @@ 
 			if ($volumeUnit < 50)
 			{
 			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
-			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 			}
-			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+			else print $calculatedVolume.' '.measuring_units_string($volumeUnit, "volume");
 		}
 		if ($totalVolume > 0)
 		{
 			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
 			//print $totalVolume.' '.measuring_units_string(0,"volume");
-			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
 			if ($calculatedVolume) print ')';
 		}
@@ -1907,7 +1907,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>';
 
@@ -1924,7 +1924,7 @@ 
 		print $langs->trans('SendingMethod');
 		print '</td>';
 
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
+		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editshipping_method_id')
@@ -1933,8 +1933,8 @@ 
 			print '<input type="hidden" name="token" value="'.$_SESSION['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 $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" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
@@ -1943,7 +1943,7 @@ 
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
-				$code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
+				$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 				print $langs->trans("SendingMethod".strtoupper($code));
 			}
 		}
@@ -1951,8 +1951,8 @@ 
 		print '</tr>';
 
 		// Tracking Number
-		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
+		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
+		print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->rights->expedition->creer, 'string', $object->tracking_number);
 		print '</td></tr>';
 
 		// Incoterms
@@ -1973,7 +1973,7 @@ 
 			}
 			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>';
 		}
@@ -1991,11 +1991,11 @@ 
 
 		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="' . $_SESSION ['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="' . $_SESSION ['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>';
@@ -2004,7 +2004,7 @@ 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		// Adds a line numbering column
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 		{
 			print '<td width="5" align="center">&nbsp;</td>';
 		}
@@ -2021,7 +2021,7 @@ 
 			$editColspan = 3;
 			if (empty($conf->stock->enabled)) $editColspan--;
 			if (empty($conf->productbatch->enabled)) $editColspan--;
-			print '<td align="center" colspan="'. $editColspan . '">';
+			print '<td align="center" colspan="'.$editColspan.'">';
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToShip").' - ';
@@ -2030,11 +2030,11 @@ 
 			{
 				print $langs->trans("QtyShipped").' - ';
 			}
-			if (! empty($conf->stock->enabled))
+			if (!empty($conf->stock->enabled))
 			{
 				print $langs->trans("WarehouseSource").' - ';
 			}
-			if (! empty($conf->productbatch->enabled))
+			if (!empty($conf->productbatch->enabled))
 			{
 				print $langs->trans("Batch");
 			}
@@ -2050,12 +2050,12 @@ 
 			{
 				print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
 			}
-			if (! empty($conf->stock->enabled))
+			if (!empty($conf->stock->enabled))
 			{
 				print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
 			}
 
-			if (! empty($conf->productbatch->enabled))
+			if (!empty($conf->productbatch->enabled))
 			{
 				print '<td align="left">'.$langs->trans("Batch").'</td>';
 			}
@@ -2070,18 +2070,18 @@ 
 		}
 		print "</tr>\n";
 
-		$var=false;
+		$var = false;
 
-		if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 		{
 			$object->fetch_thirdparty();
 			$outputlangs = $langs;
-			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-			if (! empty($newlang))
+			$newlang = '';
+			if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+			if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+			if (!empty($newlang))
 			{
-				$outputlangs = new Translate("",$conf);
+				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
 		}
@@ -2091,22 +2091,22 @@ 
 		if ($origin && $origin_id > 0)
 		{
     		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
-    		$sql.= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
-    		$sql.= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
+    		$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
+    		$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
     		//if ($conf->livraison_bon->enabled) $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.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 .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, 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";
     		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = 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." = ".$origin_id;
-    		$sql.= " AND obj.rowid = ed.fk_origin_line";
-    		$sql.= " AND ed.fk_expedition = e.rowid";
+    		$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." = ".$origin_id;
+    		$sql .= " AND obj.rowid = ed.fk_origin_line";
+    		$sql .= " AND ed.fk_expedition = e.rowid";
     		//if ($filter) $sql.= $filter;
-    		$sql.= " ORDER BY obj.fk_product";
+    		$sql .= " ORDER BY obj.fk_product";
 
     		dol_syslog("get list of shipment lines", LOG_DEBUG);
     		$resql = $db->query($sql);
@@ -2115,13 +2115,13 @@ 
     		    $num = $db->num_rows($resql);
     		    $i = 0;
 
-    		    while($i < $num)
+    		    while ($i < $num)
     		    {
         		    $obj = $db->fetch_object($resql);
         		    if ($obj)
         		    {
         		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->shipmentline_id]=array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+        		        $alreadysent[$obj->rowid][$obj->shipmentline_id] = array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
         		    }
         		    $i++;
     		    }
@@ -2130,62 +2130,62 @@ 
 		}
 
 		// Loop on each product to send/sent
-		for ($i = 0 ; $i < $num_prod ; $i++)
+		for ($i = 0; $i < $num_prod; $i++)
 		{
 		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 			print '<tr class="oddeven">';
 
 			// Adds a line numbering column
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 			{
-				print '<td align="center">'.($i+1).'</td>';
+				print '<td align="center">'.($i + 1).'</td>';
 			}
 
 			// Predefined product or service
 			if ($lines[$i]->fk_product > 0)
 			{
 				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 				{
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
-					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
 				}
 				else
-					$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
+					$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
 
 				print '<td>';
 
 				// Show product and description
-				$product_static->type=$lines[$i]->fk_product_type;
-				$product_static->id=$lines[$i]->fk_product;
-				$product_static->ref=$lines[$i]->ref;
-				$product_static->status_batch=$lines[$i]->product_tobatch;
-				$text=$product_static->getNomUrl(1);
-				$text.= ' - '.$label;
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+				$product_static->type = $lines[$i]->fk_product_type;
+				$product_static->id = $lines[$i]->fk_product;
+				$product_static->ref = $lines[$i]->ref;
+				$product_static->status_batch = $lines[$i]->product_tobatch;
+				$text = $product_static->getNomUrl(1);
+				$text .= ' - '.$label;
+				$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($lines[$i]->description));
+				print $form->textwithtooltip($text, $description, 3, '', '', $i);
+				print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 				{
-					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
 			{
 				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
+				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
+				else $text = img_object($langs->trans('Product'), 'product');
 
-				if (! empty($lines[$i]->label)) {
-					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
+				if (!empty($lines[$i]->label)) {
+					$text .= ' <strong>'.$lines[$i]->label.'</strong>';
+					print $form->textwithtooltip($text, $lines[$i]->description, 3, '', '', $i);
 				} else {
 					print $text.' '.nl2br($lines[$i]->description);
 				}
 
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+				print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
 				print "</td>\n";
 			}
 
@@ -2201,7 +2201,7 @@ 
     			    if ($lines[$i]->fk_origin_line == $key)
     			    {
     			        $j = 0;
-    			        foreach($val as $shipmentline_id=> $shipmentline_var)
+    			        foreach ($val as $shipmentline_id=> $shipmentline_var)
     			        {
     			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
 
@@ -2210,8 +2210,8 @@ 
     			            $shipment_static->fetch($shipmentline_var['shipment_id']);
     			            print $shipment_static->getNomUrl(1);
     			            print ' - '.$shipmentline_var['qty_shipped'];
-    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
-    			            if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
+    			            $htmltext = $langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+    			            if (!empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
     			            {
     			                $warehousestatic->fetch($shipmentline_var['warehouse']);
     			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
@@ -2235,25 +2235,25 @@ 
 					{
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td>' . '<input 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 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 managment
 						if ($lines[$i]->entrepot_id == 0)
 						{
 							// only show lot numbers from src warehouse when shipping from multiple warehouses
 							$line->fetch($detail_batch->fk_expeditiondet);
 						}
-						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, $line->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, $line->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 name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
+					print '<td>'.'<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">'.'</td>';
 					// Batch number managment
-					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>';
 				}
-				else if (! empty($conf->stock->enabled))
+				else if (!empty($conf->stock->enabled))
 				{
 					if ($lines[$i]->fk_product > 0)
 					{
@@ -2262,11 +2262,11 @@ 
 							print '<!-- case edit 2 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+							print '<td>'.'<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.'</td>';
 							// Warehouse source
-							print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
+							print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 							// Batch number managment
-							print '<td> - ' . $langs->trans("NA") . '</td>';
+							print '<td> - '.$langs->trans("NA").'</td>';
 							print '</tr>';
 						}
 						else if (count($lines[$i]->details_entrepot) > 1)
@@ -2276,11 +2276,11 @@ 
 							{
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+								print '<td>'.'<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.'</td>';
 								// Warehouse source
-								print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+								print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 								// Batch number managment
-								print '<td> - ' . $langs->trans("NA") . '</td>';
+								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
 							}
 						}
@@ -2295,11 +2295,11 @@ 
 						print '<!-- case edit 5 -->';
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+						print '<td>'.'<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.'</td>';
 						// Warehouse source
-						print '<td>' . '</td>';
+						print '<td>'.'</td>';
 						// Batch number managment
-						print '<td>' . '</td>';
+						print '<td>'.'</td>';
 						print '</tr>';
 					}
 				}
@@ -2311,7 +2311,7 @@ 
 				print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
 
 				// Warehouse source
-				if (! empty($conf->stock->enabled))
+				if (!empty($conf->stock->enabled))
 				{
 					print '<td align="left">';
 					if ($lines[$i]->entrepot_id > 0)
@@ -2329,16 +2329,16 @@ 
 							{
 								$entrepot = new Entrepot($db);
 								$entrepot->fetch($detail_entrepot->entrepot_id);
-								$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+								$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $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);
 					}
 					print '</td>';
 				}
 
 				// Batch number managment
-				if (! empty($conf->productbatch->enabled))
+				if (!empty($conf->productbatch->enabled))
 				{
 					if (isset($lines[$i]->detail_batch))
 					{
@@ -2349,13 +2349,13 @@ 
 							$detail = '';
 							foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
 							{
-								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
-								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-								$detail.= '<br>';
+								$detail .= $langs->trans("Batch").': '.$dbatch->batch;
+								$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+								$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+								$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
 						{
@@ -2370,13 +2370,13 @@ 
 
 			// Weight
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units, "weight");
 			else print '&nbsp;';
 			print '</td>';
 
 			// Volume
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units, "volume");
 			else print '&nbsp;';
 			print '</td>';
 
@@ -2386,21 +2386,21 @@ 
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td align="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
-				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+				print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'"><br>';
+				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 			}
 			else if ($object->statut == 0)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit" align="center">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
 				print '</td>';
 				print '<td class="linecoldelete" width="10">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 				print '</td>';
 
 				// Display lines extrafields
-				if (! empty($rowExtrafieldsStart))
+				if (!empty($rowExtrafieldsStart))
 				{
 					print $rowExtrafieldsStart;
 					print $rowExtrafieldsView;
@@ -2410,18 +2410,18 @@ 
 			print "</tr>";
 
 			// Display lines extrafields
-			if (is_array($extralabelslines) && count($extralabelslines)>0) {
-				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
+			if (is_array($extralabelslines) && count($extralabelslines) > 0) {
+				$colspan = empty($conf->productbatch->enabled) ? 5 : 6;
 				$line = new ExpeditionLigne($db);
 				$line->fetch_optionals($lines[$i]->id);
 				print '<tr class="oddeven">';
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
 				}
 				else
 				{
-					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
 				}
 				print '</tr>';
 			}
@@ -2437,14 +2437,14 @@ 
 	dol_fiche_end();
 
 
-	$object->fetchObjectLinked($object->id,$object->element);
+	$object->fetchObjectLinked($object->id, $object->element);
 
 
 	/*
 	 *    Boutons actions
 	 */
 
-	if (($user->societe_id == 0) && ($action!='presend'))
+	if (($user->societe_id == 0) && ($action != 'presend'))
 	{
 		print '<div class="tabsAction">';
 
@@ -2456,8 +2456,8 @@ 
 
 			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0)
 			{
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
-	  		     || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
+				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
+	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				}
@@ -2471,7 +2471,7 @@ 
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer)
 			{
-				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				}
@@ -2492,7 +2492,7 @@ 
 			}
 
 			// Create bill
-			if (! empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED))
+			if (!empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED))
 			{
 				if ($user->rights->facture->creer)
 				{
@@ -2511,14 +2511,14 @@ 
 			// Close
 			if ($object->statut == Expedition::STATUS_VALIDATED)
 			{
-				if ($user->rights->expedition->creer && $object->statut > 0 && ! $object->billed)
+				if ($user->rights->expedition->creer && $object->statut > 0 && !$object->billed)
 				{
-					$label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
+					$label = "Close"; $paramaction = 'classifyclosed'; // = Transferred/Received
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
-					if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+					if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					{
-					    $label="ClassifyBilled";
-					    $paramaction='classifybilled';
+					    $label = "ClassifyBilled";
+					    $paramaction = 'classifybilled';
 					}
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
 				}
@@ -2543,14 +2543,14 @@ 
         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;
 
-		$genallowed=$user->rights->expedition->lire;
-		$delallowed=$user->rights->expedition->creer;
+		$genallowed = $user->rights->expedition->lire;
+		$delallowed = $user->rights->expedition->creer;
 
-		print $formfile->showdocuments('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+		print $formfile->showdocuments('expedition', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 
 		// Show links to link elements
@@ -2562,8 +2562,8 @@ 
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown = $formactions->showactions($object,'shipping',$socid,1);
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'shipping', $socid, 1);
 
 		print '</div></div></div>';
 	}
@@ -2579,9 +2579,9 @@ 
 	}
 
 	// Presend form
-	$modelmail='shipping_send';
-	$defaulttopic='SendShippingRef';
-	$diroutput = $conf->expedition->dir_output. '/sending';
+	$modelmail = 'shipping_send';
+	$defaulttopic = 'SendShippingRef';
+	$diroutput = $conf->expedition->dir_output.'/sending';
 	$trackid = 'shi'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';

dolibarr/htdocs/expedition/shipment.php

Spacing +148 added lines, -148 removed lines

@@ -33,25 +33,25 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (! empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('orders',"companies","bills",'propal','deliveries','stocks',"productbatch",'incoterm'));
+$langs->loadLangs(array('orders', "companies", "bills", 'propal', 'deliveries', 'stocks', "productbatch", 'incoterm'));
 
-$id=GETPOST('id','int');			// id of order
-$ref= GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int'); // id of order
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-$socid=0;
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result=restrictedArea($user,'commande',$id);
+$socid = 0;
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'commande', $id);
 
 $object = new Commande($db);
 $extrafields = new ExtraFields($db);
@@ -60,7 +60,7 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-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
 
 
 
@@ -80,10 +80,10 @@ 
     {
     	$object = new Commande($db);
     	$object->fetch($id);
-    	$object->setProject(GETPOST('projectid','int'));
+    	$object->setProject(GETPOST('projectid', 'int'));
     }
 
-    if ($action == 'confirm_cloture' && GETPOST('confirm','alpha') == 'yes')
+    if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes')
     {
     	$object = new Commande($db);
     	$object->fetch($id);
@@ -102,11 +102,11 @@ 
     if ($action == 'setdatedelivery' && $user->rights->commande->creer)
     {
     	//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-    	$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
+    	$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
     	$object = new Commande($db);
     	$object->fetch($id);
-    	$result=$object->set_date_livraison($user,$datelivraison);
+    	$result = $object->set_date_livraison($user, $datelivraison);
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -124,7 +124,7 @@ 
     {
     	$object = new Commande($db);
     	$object->fetch($id);
-    	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
+    	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -132,7 +132,7 @@ 
     if ($action == 'setavailability' && $user->rights->commande->creer) {
         $object = new Commande($db);
         $object->fetch($id);
-        $result=$object->availability(GETPOST('availability_id'));
+        $result = $object->availability(GETPOST('availability_id'));
         if ($result < 0)
             setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -140,7 +140,7 @@ 
     if ($action == 'setdemandreason' && $user->rights->commande->creer) {
         $object = new Commande($db);
         $object->fetch($id);
-        $result=$object->demand_reason(GETPOST('demand_reason_id'));
+        $result = $object->demand_reason(GETPOST('demand_reason_id'));
         if ($result < 0)
             setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -149,7 +149,7 @@ 
     {
     	$object = new Commande($db);
     	$object->fetch($id);
-    	$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
+    	$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -167,7 +167,7 @@ 
     if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
         $object = new Commande($db);
         $object->fetch($id);
-        $result=$object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+        $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
     	if ($result < 0)
     		setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -190,7 +190,7 @@ 
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
         if ($ret < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
             // Actions on extra fields
             $result = $object->insertExtraFields('SHIPMENT_MODIFY');
@@ -210,7 +210,7 @@ 
         $object->fetch($id);
         $object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
 
-        header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
         exit();
     }
 
@@ -224,19 +224,19 @@ 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
-llxHeader('',$langs->trans('OrderCard'),'');
+llxHeader('', $langs->trans('OrderCard'), '');
 
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$object = new Commande($db);
-	if ( $object->fetch($id,$ref) > 0)
+	if ($object->fetch($id, $ref) > 0)
 	{
 		$object->loadExpeditions(1);
 
-		$product_static=new Product($db);
+		$product_static = new Product($db);
 
 		$soc = new Societe($db);
 		$soc->fetch($object->socid);
@@ -255,14 +255,14 @@ 
 		// Confirm validation
 		if ($action == 'cloture')
 		{
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id,$langs->trans("CloseShipment"),$langs->trans("ConfirmCloseShipment"),"confirm_cloture");
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id, $langs->trans("CloseShipment"), $langs->trans("ConfirmCloseShipment"), "confirm_cloture");
 		}
 
 		// Call Hook formConfirm
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 
 		// Print form confirm
 		print $formconfirm;
@@ -270,48 +270,48 @@ 
 
 		// Order card
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-		$morehtmlref='<div class="refidno">';
+		$morehtmlref = '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
 	    // Thirdparty
-	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
 	    // Project
-	    if (! empty($conf->projet->enabled))
+	    if (!empty($conf->projet->enabled))
 	    {
 	        $langs->load("projects");
-	        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	        if ($user->rights->commande->creer)
 	        {
 	            if ($action != 'classify')
-	                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	                $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 	                if ($action == 'classify') {
 	                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                    $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                    $morehtmlref.='</form>';
+	                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+	                    $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                    $morehtmlref .= '</form>';
 	                } else {
-	                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	                }
 	        } else {
-	            if (! empty($object->fk_project)) {
+	            if (!empty($object->fk_project)) {
 	                $proj = new Project($db);
 	                $proj->fetch($object->fk_project);
-	                $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	                $morehtmlref.=$proj->ref;
-	                $morehtmlref.='</a>';
+	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+	                $morehtmlref .= $proj->ref;
+	                $morehtmlref .= '</a>';
 	            } else {
-	                $morehtmlref.='';
+	                $morehtmlref .= '';
 	            }
 	        }
 	    }
-	    $morehtmlref.='</div>';
+	    $morehtmlref .= '</div>';
 
 
 	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -324,7 +324,7 @@ 
 	    print '<table class="border" width="100%">';
 
 		// Discounts for third party
-	    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	    	$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 	    	$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 	    } else {
@@ -334,14 +334,14 @@ 
 
 		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
 
-		$absolute_discount=$soc->getAvailableDiscounts('',$filterabsolutediscount);
-		$absolute_creditnote=$soc->getAvailableDiscounts('',$filtercreditnote);
-		$absolute_discount=price2num($absolute_discount,'MT');
-		$absolute_creditnote=price2num($absolute_creditnote,'MT');
+		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
+		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
+		$absolute_discount = price2num($absolute_discount, 'MT');
+		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
 		$thirdparty = $soc;
 		$discount_type = 0;
-		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
 		$cannotApplyDiscount = 1;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 		print '</td></tr>';
@@ -349,7 +349,7 @@ 
 		// Date
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">';
-		print dol_print_date($object->date,'daytext');
+		print dol_print_date($object->date, 'daytext');
 		if ($object->hasDelay() && empty($object->date_livraison)) {
 		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
@@ -362,7 +362,7 @@ 
 		print $langs->trans('DateDeliveryPlanned');
 		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editdate_livraison')
@@ -370,14 +370,14 @@ 
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
-			print $form->selectDate($object->date_livraison>0?$object->date_livraison:-1, 'liv_', '', '', '', "setdatedelivery");
+			print $form->selectDate($object->date_livraison > 0 ? $object->date_livraison : -1, 'liv_', '', '', '', "setdatedelivery");
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
 		else
 		{
-			print dol_print_date($object->date_livraison,'daytext');
-			if ($object->hasDelay() && ! empty($object->date_livraison)) {
+			print dol_print_date($object->date_livraison, 'daytext');
+			if ($object->hasDelay() && !empty($object->date_livraison)) {
 			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
 		}
@@ -394,7 +394,7 @@ 
         print $langs->trans('SendingMethod');
         print '</td>';
         if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
-            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td colspan="2">';
         if ($action == 'editshippingmethod') {
@@ -406,15 +406,15 @@ 
         print '</tr>';
 
         // Warehouse
-        if (! empty($conf->stock->enabled) && ! empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+        if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
             require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-            $formproduct=new FormProduct($db);
+            $formproduct = new FormProduct($db);
             print '<tr><td>';
             print '<table width="100%" class="nobordernopadding"><tr><td>';
             print $langs->trans('Warehouse');
             print '</td>';
             if ($action != 'editwarehouse' && $user->rights->commande->creer)
-                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'),1).'</a></td>';
+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
             print '</tr></table>';
             print '</td><td colspan="2">';
             if ($action == 'editwarehouse') {
@@ -470,13 +470,13 @@ 
 		print $langs->trans('AvailabilityPeriod');
 		print '</td>';
 		if ($action != 'editavailability')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->trans('SetAvailability'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editavailability') {
-			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
 		} else {
-			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'none', 1);
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
 		}
 		print '</td></tr>';
 
@@ -486,27 +486,27 @@ 
 		print $langs->trans('Source');
 		print '</td>';
 		if ($action != 'editdemandreason')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDemandReason'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editdemandreason') {
-			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
 		} else {
-			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
 		}
 
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
+		$tmparray = $object->getTotalWeightVolume();
+		$totalWeight = $tmparray['weight'];
+		$totalVolume = $tmparray['volume'];
 		if ($totalWeight || $totalVolume)
 		{
 		    print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
 		    print '<td>';
-		    print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+		    print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 		    print '</td></tr>';
 		    print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
 		    print '<td>';
-		    print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+		    print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 		    print '</td></tr>';
 		}
 
@@ -530,14 +530,14 @@ 
 		    }
 		    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>';
 		}
 
 		// 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>';
 
@@ -551,18 +551,18 @@ 
 		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 		{
 		    // Multicurrency Amount HT
-		    print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . '</td>';
-		    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		    print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
+		    print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		    print '</tr>';
 
 		    // Multicurrency Amount VAT
-		    print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . '</td>';
-		    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
+		    print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		    print '</tr>';
 
 		    // Multicurrency Amount TTC
-		    print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . '</td>';
-		    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+		    print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		    print '</tr>';
 		}
 
@@ -578,13 +578,13 @@ 
 		// Amount Local Taxes
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
 		{
-		    print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-		    print '<td>' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		    print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+		    print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
 		{
-		    print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-		    print '<td>' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		    print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+		    print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 
 		// Total TTC
@@ -608,15 +608,15 @@ 
 		print '<table class="noborder noshadow" width="100%">';
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
-		$sql.= " cd.price, cd.tva_tx, cd.subprice,";
-		$sql.= " cd.qty,";
-		$sql.= ' cd.date_start,';
-		$sql.= ' cd.date_end,';
-		$sql.= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-		$sql.= " WHERE cd.fk_commande = ".$object->id;
-		$sql.= " ORDER BY cd.rang, cd.rowid";
+		$sql .= " cd.price, cd.tva_tx, cd.subprice,";
+		$sql .= " cd.qty,";
+		$sql .= ' cd.date_start,';
+		$sql .= ' cd.date_end,';
+		$sql .= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+		$sql .= " WHERE cd.fk_commande = ".$object->id;
+		$sql .= " ORDER BY cd.rang, cd.rowid";
 
 		//print $sql;
 		dol_syslog("shipment.php", LOG_DEBUG);
@@ -631,7 +631,7 @@ 
 			print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
 			print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
 			print '<td align="center">'.$langs->trans("KeepToShip").'</td>';
-			if (! empty($conf->stock->enabled))
+			if (!empty($conf->stock->enabled))
 			{
 				print '<td align="center">'.$langs->trans("RealStock").'</td>';
 			}
@@ -641,20 +641,20 @@ 
 			}
 			print "</tr>\n";
 
-			$toBeShipped=array();
-			$toBeShippedTotal=0;
+			$toBeShipped = array();
+			$toBeShippedTotal = 0;
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
 
 
 				// Show product and description
-				$type=isset($objp->type)?$objp->type:$objp->product_type;
+				$type = isset($objp->type) ? $objp->type : $objp->product_type;
 
 				// Try to enhance type detection using date_start and date_end for free lines where type
 				// was not saved.
-				if (! empty($objp->date_start)) $type=1;
-				if (! empty($objp->date_end)) $type=1;
+				if (!empty($objp->date_start)) $type = 1;
+				if (!empty($objp->date_end)) $type = 1;
 
 				print '<tr class="oddeven">';
 
@@ -662,7 +662,7 @@ 
 				if ($objp->fk_product > 0)
 				{
 					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 					{
 						$object->fetch_thirdparty();
 
@@ -672,41 +672,41 @@ 
 						$prod->getMultiLangs();
 
 						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-						if (! empty($newlang))
+						$newlang = '';
+						if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+						if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+						if (!empty($newlang))
 						{
-							$outputlangs = new Translate("",$conf);
+							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 						}
 
-						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 					}
 					else
-						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
+						$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
 					// Show product and description
-					$product_static->type=$type;
-					$product_static->id=$objp->fk_product;
-					$product_static->ref=$objp->ref;
+					$product_static->type = $type;
+					$product_static->id = $objp->fk_product;
+					$product_static->ref = $objp->ref;
                     $product_static->entity = $objp->entity;
-					$text=$product_static->getNomUrl(1);
-					$text.= ' - '.$label;
-					$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description)).'<br>';
-                    $description.= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-					print $form->textwithtooltip($text,$description,3,'','',$i);
+					$text = $product_static->getNomUrl(1);
+					$text .= ' - '.$label;
+					$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($objp->description)).'<br>';
+                    $description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+					print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
 					// Show range
-					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+					print_date_range($db->jdate($objp->date_start), $db->jdate($objp->date_end));
 
 					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 					{
-						print ($objp->description && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+						print ($objp->description && $objp->description != $objp->product_label) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 					}
 
 					print '</td>';
@@ -714,35 +714,35 @@ 
 				else
 				{
 					print "<td>";
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+					else $text = img_object($langs->trans('Product'), 'product');
 
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						print $form->textwithtooltip($text,$objp->description,3,'','',$i);
+					if (!empty($objp->label)) {
+						$text .= ' <strong>'.$objp->label.'</strong>';
+						print $form->textwithtooltip($text, $objp->description, 3, '', '', $i);
 					} else {
 						print $text.' '.nl2br($objp->description);
 					}
 
 					// Show range
-					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+					print_date_range($db->jdate($objp->date_start), $db->jdate($objp->date_end));
 					print "</td>\n";
 				}
 
 				// Qty ordered
-				print '<td align="center">' . $objp->qty . '</td>';
+				print '<td align="center">'.$objp->qty.'</td>';
 
 				// Qty already shipped
-				$qtyProdCom=$objp->qty;
+				$qtyProdCom = $objp->qty;
 				print '<td align="center">';
 				// Nb of sending products for this line of order
-				$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
+				$qtyAlreadyShipped = (!empty($object->expeditions[$objp->rowid]) ? $object->expeditions[$objp->rowid] : 0);
 				print $qtyAlreadyShipped;
 				print '</td>';
 
 				// Qty remains to ship
 				print '<td align="center">';
-				if ($type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				if ($type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
 					$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 					$toBeShippedTotal += $toBeShipped[$objp->fk_product];
@@ -761,7 +761,7 @@ 
 					$product->load_stock('warehouseopen');
 				}
 
-				if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && ! empty($conf->stock->enabled))
+				if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && !empty($conf->stock->enabled))
 				{
 					print '<td align="center">';
 					print $product->stock_reel;
@@ -778,7 +778,7 @@ 
 				print "</tr>\n";
 
 				// Show subproducts lines
-				if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
+				if ($objp->fk_product > 0 && !empty($conf->global->PRODUIT_SOUSPRODUITS))
 				{
 					// Set tree of subproducts in product->sousprods
 					$product->get_sousproduits_arbo();
@@ -789,12 +789,12 @@ 
 					//var_dump($prods_arbo);
 					if (count($prods_arbo) > 0)
 					{
-						foreach($prods_arbo as $key => $value)
+						foreach ($prods_arbo as $key => $value)
 						{
-							$img='';
+							$img = '';
 							if ($value['stock'] < $value['stock_alert'])
 							{
-								$img=img_warning($langs->trans("StockTooLow"));
+								$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>';
 							print '<td align="center"> '.$value['nb_total'].'</td>';
@@ -809,7 +809,7 @@ 
 			}
 			$db->free($resql);
 
-			if (! $num)
+			if (!$num)
 			{
 				print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
 			}
@@ -854,12 +854,12 @@ 
 
         // Bouton expedier avec gestion des stocks
 
-        if (! empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
+        if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
         {
             print $langs->trans("ValidateOrderFirstBeforeShipment");
         }
 
-		if (! empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
+		if (!empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
 		{
 			if ($user->rights->expedition->creer)
 			{
@@ -879,13 +879,13 @@ 
 
 				//print '<tr>';
 
-				if (! empty($conf->stock->enabled))
+				if (!empty($conf->stock->enabled))
 				{
 					//print '<td>';
 					print $langs->trans("WarehouseSource");
 					//print '</td>';
 					//print '<td>';
-					print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
+					print $formproduct->selectWarehouses(!empty($object->warehouse_id) ? $object->warehouse_id : -1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
 					if (count($formproduct->cache_warehouses) <= 0)
 					{
 						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
@@ -905,7 +905,7 @@ 
 
 				print '</div>';
 
-				$somethingshown=1;
+				$somethingshown = 1;
 			}
 			else
 			{
@@ -915,7 +915,7 @@ 
 			}
 		}
 
-		show_list_sending_receive('commande',$object->id);
+		show_list_sending_receive('commande', $object->id);
 	}
 	else
 	{

dolibarr/htdocs/expedition/document.php

Spacing +41 added lines, -41 removed lines

@@ -32,17 +32,17 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other'));
 
-$action		= GETPOST('action','aZ09');
+$action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
-$id			= GETPOST('id','int');
+$id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref');
 
 // Security check
@@ -50,18 +50,18 @@ 
 {
 	$socid = $user->societe_id;
 }
-$result=restrictedArea($user,'expedition',$id,'');
+$result = restrictedArea($user, 'expedition', $id, '');
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
 
 $object = new Expedition($db);
 
@@ -72,22 +72,22 @@ 
 if ($object->fetch($id))
 {
 	$object->fetch_thirdparty();
-	$upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 }
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
  * View
  */
 
-llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref)){
-	if ($object->fetch($id, $ref)){
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref)) {
 		$object->fetch_thirdparty();
 
 		$upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
@@ -97,50 +97,50 @@ 
 	
 
 		// Build file list
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		$totalsize=0;
-		foreach($filearray as $key => $file){
-		    $totalsize+=$file['size'];
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$totalsize = 0;
+		foreach ($filearray as $key => $file) {
+		    $totalsize += $file['size'];
 		}
 
 		// 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">';
+		$morehtmlref = '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (! empty($conf->projet->enabled)) {
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
-			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
 				if ($action != 'classify') {
-					$morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
 				if ($action == 'classify') {
 					// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-					$morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 				}
 			} else {
 				// We don't have project on shipment, so we will use the project or source object instead
 				// TODO Add project on shipment
 				$morehtmlref .= ' : ';
-				if (! empty($objectsrc->fk_project)) {
+				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
 					$morehtmlref .= $proj->ref;
 					$morehtmlref .= '</a>';
 				} else {
@@ -148,11 +148,11 @@ 
 				}
 			}
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 		// Order card
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
@@ -162,7 +162,7 @@ 
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 		print "</table>\n";
 
@@ -173,14 +173,14 @@ 
 		$modulepart = 'expedition';
 		$permission = $user->rights->expedition->creer;
 		$permtoedit = $user->rights->expedition->creer;
-		$param = '&id=' . $object->id;
-		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+		$param = '&id='.$object->id;
+		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	}
-	else{
+	else {
 		dol_print_error($db);
 	}
 }
-else{
+else {
 	header('Location: index.php');
 	exit;
 }

dolibarr/htdocs/expedition/note.php

Spacing +32 added lines, -32 removed lines

@@ -27,7 +27,7 @@ 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -35,17 +35,17 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('sendings', 'companies', 'bills', 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int'));  // For backward compatibility
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-$socid='';
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user, $origin, $origin_id);
+$socid = '';
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, $origin, $origin_id);
 
 $object = new Expedition($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $object->fetch($id, $ref);
     $object->fetch_thirdparty();
@@ -58,26 +58,26 @@ 
     }
 
     // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
     {
-        $objectsrc=new Commande($db);
+        $objectsrc = new Commande($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
-    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
     {
-        $objectsrc=new Propal($db);
+        $objectsrc = new Propal($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
 }
 
-$permissionnote=$user->rights->expedition->creer;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->expedition->creer; // Used by the include of actions_setnotes.inc.php
 
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 /*
@@ -88,49 +88,49 @@ 
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 
-	$head=shipping_prepare_head($object);
+	$head = shipping_prepare_head($object);
 	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
 
 	// 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">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
     // Project
-    if (! empty($conf->projet->enabled)) {
+    if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if (0) {    // Do not change on shipment
             if ($action != 'classify') {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
             }
             if ($action == 'classify') {
                 // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
             } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
         } else {
             // We don't have project on shipment, so we will use the project or source object instead
             // TODO Add project on shipment
             $morehtmlref .= ' : ';
-            if (! empty($objectsrc->fk_project)) {
+            if (!empty($objectsrc->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -138,7 +138,7 @@ 
             }
         }
     }
-    $morehtmlref.='</div>';
+    $morehtmlref .= '</div>';
 
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -146,7 +146,7 @@ 
 
     print '<div class="underbanner clearboth"></div>';
 
-	$cssclass='titlefield';
+	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	dol_fiche_end();

dolibarr/htdocs/expedition/index.php

Spacing +76 added lines, -76 removed lines

@@ -34,12 +34,12 @@ 
  *	View
  */
 
-$orderstatic=new Commande($db);
-$companystatic=new Societe($db);
-$shipment=new Expedition($db);
+$orderstatic = new Commande($db);
+$companystatic = new Societe($db);
+$shipment = new Expedition($db);
 
-$helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
-llxHeader('',$langs->trans("Shipment"),$helpurl);
+$helpurl = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
+llxHeader('', $langs->trans("Shipment"), $helpurl);
 
 print load_fiche_titre($langs->trans("SendingsArea"));
 
@@ -47,7 +47,7 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
     print '<form method="post" action="list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -64,23 +64,23 @@ 
 $clause = " WHERE ";
 
 $sql = "SELECT e.rowid, e.ref, e.ref_customer,";
-$sql.= " s.nom as name, s.rowid as socid,";
-$sql.= " c.ref as commande_ref, c.rowid as commande_id";
-$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " c.ref as commande_ref, c.rowid as commande_id";
+$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (!$user->rights->societe->client->voir && !$socid)
 {
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-	$sql.= $clause." sc.fk_user = " .$user->id;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+	$sql .= $clause." sc.fk_user = ".$user->id;
 	$clause = " AND ";
 }
-$sql.= $clause." e.fk_statut = 0";
-$sql.= " AND e.entity IN (".getEntity('expedition').")";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+$sql .= $clause." e.fk_statut = 0";
+$sql .= " AND e.entity IN (".getEntity('expedition').")";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -94,9 +94,9 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$shipment->id=$obj->rowid;
-			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
+			$shipment->id = $obj->rowid;
+			$shipment->ref = $obj->ref;
+			$shipment->ref_customer = $obj->ref_customer;
 
 			print '<tr class="oddeven"><td class="nowrap">';
 			print $shipment->getNomUrl(1);
@@ -118,17 +118,17 @@ 
  * Commandes a traiter
  */
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity = ".$conf->entity;
-$sql.= " AND c.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " ORDER BY c.rowid ASC";
-
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE c.fk_soc = s.rowid";
+$sql .= " AND c.entity = ".$conf->entity;
+$sql .= " AND c.fk_statut = 1";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " ORDER BY c.rowid ASC";
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -144,21 +144,21 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->fk_statut;
-			$orderstatic->billed=0;
+			$orderstatic->id = $obj->rowid;
+			$orderstatic->ref = $obj->ref;
+			$orderstatic->ref_customer = $obj->ref_customer;
+			$orderstatic->statut = $obj->fk_statut;
+			$orderstatic->billed = 0;
 
-			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
+			$companystatic->name = $obj->name;
+			$companystatic->id = $obj->socid;
 
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
-			print $companystatic->getNomUrl(1,'customer',32);
+			print $companystatic->getNomUrl(1, 'customer', 32);
 			print '</td>';
 			print '<td align="right">';
 			print $orderstatic->getLibStatut(3);
@@ -179,17 +179,17 @@ 
  * Commandes en traitement
  */
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity = ".$conf->entity;
-$sql.= " AND c.fk_statut = 2";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE c.fk_soc = s.rowid";
+$sql .= " AND c.entity = ".$conf->entity;
+$sql .= " AND c.fk_statut = 2";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 
 $resql = $db->query($sql);
-if ( $resql )
+if ($resql)
 {
 	$langs->load("orders");
 
@@ -204,20 +204,20 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->status;
-            $orderstatic->billed=$obj->billed;
+		    $orderstatic->id = $obj->rowid;
+			$orderstatic->ref = $obj->ref;
+			$orderstatic->ref_customer = $obj->ref_customer;
+			$orderstatic->statut = $obj->status;
+            $orderstatic->billed = $obj->billed;
 
-            $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
+            $companystatic->name = $obj->name;
+			$companystatic->id = $obj->socid;
 
 			print '<tr class="oddeven"><td>';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
-			print $companystatic->getNomUrl(1,'customer');
+			print $companystatic->getNomUrl(1, 'customer');
 			print '</td>';
             print '<td align="right">';
             print $orderstatic->getLibStatut(3);
@@ -235,19 +235,19 @@ 
  * Last shipments
  */
 $sql = "SELECT e.rowid, e.ref, e.ref_customer,";
-$sql.= " s.nom as name, s.rowid as socid,";
-$sql.= " c.ref as commande_ref, c.rowid as commande_id";
-$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
-$sql.= " AND e.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-$sql.= " ORDER BY e.date_delivery DESC";
-$sql.= $db->plimit(5, 0);
+$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " c.ref as commande_ref, c.rowid as commande_id";
+$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+$sql .= " AND e.fk_statut = 1";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+$sql .= " ORDER BY e.date_delivery DESC";
+$sql .= $db->plimit(5, 0);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -263,19 +263,19 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$shipment->id=$obj->rowid;
-			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
+			$shipment->id = $obj->rowid;
+			$shipment->ref = $obj->ref;
+			$shipment->ref_customer = $obj->ref_customer;
 
 			print '<tr class="oddeven"><td>';
 			print $shipment->getNomUrl(1);
 			print '</td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.'</a></td>';
 			print '<td>';
 			if ($obj->commande_id > 0)
 			{
-				$orderstatic->id=$obj->commande_id;
-				$orderstatic->ref=$obj->commande_ref;
+				$orderstatic->id = $obj->commande_id;
+				$orderstatic->ref = $obj->commande_ref;
 				print $orderstatic->getNomUrl(1);
 			}
 			else print '&nbsp;';

dolibarr/htdocs/expedition/contact.php

Spacing +40 added lines, -40 removed lines

@@ -29,7 +29,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -37,16 +37,16 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies'));
 
-$id=GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'expedition', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'expedition', $id, '');
 
 $object = new Expedition($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $object->fetch($id, $ref);
     $object->fetch_thirdparty();
@@ -59,14 +59,14 @@ 
     }
 
     // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
     {
-        $objectsrc=new Commande($db);
+        $objectsrc = new Commande($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
-    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
     {
-        $objectsrc=new Propal($db);
+        $objectsrc = new Propal($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
 }
@@ -105,7 +105,7 @@ 
 // bascule du statut d'un contact
 else if ($action == 'swapstatut' && $user->rights->expedition->creer)
 {
-    $result=$objectsrc->swapContactStatus(GETPOST('ligne'));
+    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -135,13 +135,13 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -150,7 +150,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$langs->trans("OrderCard");
 
@@ -159,41 +159,41 @@ 
 
 
 	// 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">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
     // Project
-    if (! empty($conf->projet->enabled)) {
+    if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if (0) {    // Do not change on shipment
             if ($action != 'classify') {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
             }
             if ($action == 'classify') {
                 // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
             } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
         } else {
             // We don't have project on shipment, so we will use the project or source object instead
             // TODO Add project on shipment
             $morehtmlref .= ' : ';
-            if (! empty($objectsrc->fk_project)) {
+            if (!empty($objectsrc->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -201,7 +201,7 @@ 
             }
         }
     }
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -214,25 +214,25 @@ 
     print '<table class="border centpercent">';
 
     // Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 	{
 	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Commande($db);
+	    $objectsrc = new Commande($db);
 	    $objectsrc->fetch($object->$typeobject->id);
 	    print $langs->trans("RefOrder").'</td>';
 	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'commande');
+	    print $objectsrc->getNomUrl(1, 'commande');
 	    print "</td>\n";
 	    print '</tr>';
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
 	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Propal($db);
+	    $objectsrc = new Propal($db);
 	    $objectsrc->fetch($object->$typeobject->id);
 	    print $langs->trans("RefProposal").'</td>';
 	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'expedition');
+	    print $objectsrc->getNomUrl(1, 'expedition');
 	    print "</td>\n";
 	    print '</tr>';
 	}
@@ -259,10 +259,10 @@ 
 	echo '<br>';
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-	foreach($dirtpls as $reldir)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir)
 	{
-	    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 	    if ($res) break;
 	}
 }

dolibarr/htdocs/expedition/list.php

Spacing +210 added lines, -210 removed lines

@@ -31,43 +31,43 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("sendings","deliveries",'companies','bills'));
+$langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills'));
 
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'shipmentlist';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
 
-$socid=GETPOST('socid','int');
+$socid = GETPOST('socid', 'int');
 // Security check
-$expeditionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'expedition',$expeditionid,'');
+$expeditionid = GETPOST('id', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'expedition', $expeditionid, '');
 
-$diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->expedition->dir_output.'/temp/massgeneration/'.$user->id;
 
 $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST("search_company", 'alpha');
-$search_town=GETPOST('search_town','alpha');
-$search_zip=GETPOST('search_zip','alpha');
-$search_state=trim(GETPOST("search_state"));
-$search_country=GETPOST("search_country",'int');
-$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$search_billed=GETPOST("search_billed",'int');
-$sall = trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$optioncss = GETPOST('optioncss','alpha');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
+$search_town = GETPOST('search_town', 'alpha');
+$search_zip = GETPOST('search_zip', 'alpha');
+$search_state = trim(GETPOST("search_state"));
+$search_country = GETPOST("search_country", 'int');
+$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_billed = GETPOST("search_billed", 'int');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$optioncss = GETPOST('optioncss', 'alpha');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
+if (!$sortfield) $sortfield = "e.ref";
+if (!$sortorder) $sortorder = "DESC";
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$viewstatut=GETPOST('viewstatut');
+$viewstatut = GETPOST('viewstatut');
 
 $object = new Expedition($db);
 
@@ -77,7 +77,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('expedition');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -85,10 +85,10 @@ 
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
-$checkedtypetiers=0;
-$arrayfields=array(
+$checkedtypetiers = 0;
+$arrayfields = array(
 	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
@@ -101,17 +101,17 @@ 
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
-	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
+	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled) ? 0 : 1)),
+	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled) ? 0 : 1)),
 	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
 );
 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	foreach ($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
@@ -120,46 +120,46 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha')) { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha')) { $massaction = ''; }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-	$search_ref_exp='';
-	$search_ref_liv='';
-	$search_ref_customer='';
-	$search_company='';
-	$search_town='';
-	$search_zip="";
-	$search_state="";
-	$search_type='';
-	$search_country='';
-	$search_type_thirdparty='';
-	$search_billed='';
-	$viewstatut='';
-	$search_array_options=array();
+	$search_ref_exp = '';
+	$search_ref_liv = '';
+	$search_ref_customer = '';
+	$search_company = '';
+	$search_town = '';
+	$search_zip = "";
+	$search_state = "";
+	$search_type = '';
+	$search_country = '';
+	$search_type_thirdparty = '';
+	$search_billed = '';
+	$viewstatut = '';
+	$search_array_options = array();
 }
 
 if (empty($reshook))
 {
 	// Mass actions. Controls on number of lines checked
-	$maxformassaction=1000;
-	$numtoselect = (is_array($toselect)?count($toselect):0);
-	if (! empty($massaction) && $numtoselect < 1)
+	$maxformassaction = 1000;
+	$numtoselect = (is_array($toselect) ?count($toselect) : 0);
+	if (!empty($massaction) && $numtoselect < 1)
 	{
 		$error++;
 		setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
 	}
-	if (! $error && $numtoselect > $maxformassaction)
+	if (!$error && $numtoselect > $maxformassaction)
 	{
-		setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+		setEventMessages($langs->trans('TooManyRecordForMassAction', $maxformassaction), null, 'errors');
 		$error++;
 	}
 }
@@ -171,55 +171,55 @@ 
  * View
  */
 
-$form=new Form($db);
-$companystatic=new Societe($db);
-$shipment=new Expedition($db);
-$formcompany=new FormCompany($db);
+$form = new Form($db);
+$companystatic = new Societe($db);
+$shipment = new Expedition($db);
+$formcompany = new FormCompany($db);
 
-$helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
-llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
+$helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
+llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = "SELECT e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
-$sql.= " typent.code as typent_code,";
-$sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= ' e.date_creation as date_creation, e.tms as date_update';
+$sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql .= " typent.code as typent_code,";
+$sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= ' e.date_creation as date_creation, e.tms as date_update';
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
-	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
-$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
+$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
-	$sql.= " AND e.fk_soc = sc.fk_soc";
-	$sql.= " AND sc.fk_user = " .$user->id;
+	$sql .= " AND e.fk_soc = sc.fk_soc";
+	$sql .= " AND sc.fk_user = ".$user->id;
 }
 if ($socid)
 {
-	$sql.= " AND e.fk_soc = ".$socid;
+	$sql .= " AND e.fk_soc = ".$socid;
 }
 if ($viewstatut <> '' && $viewstatut >= 0) {
-	$sql.= " AND e.fk_statut = ".$viewstatut;
+	$sql .= " AND e.fk_statut = ".$viewstatut;
 }
-if ($search_ref_customer != '') $sql.=natural_search('e.ref_customer', $search_ref_customer);
-if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
-if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_ref_customer != '') $sql .= natural_search('e.ref_customer', $search_ref_customer);
+if ($search_billed != '' && $search_billed >= 0) $sql .= ' AND e.billed = '.$search_billed;
+if ($search_town)  $sql .= natural_search('s.town', $search_town);
+if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
+if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@@ -231,11 +231,11 @@ 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-$sql.= $db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -249,39 +249,39 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit + 1,$offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
 	$expedition = new Expedition($db);
 
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($sall) $param.= "&amp;sall=".urlencode($sall);
-	if ($search_ref_exp)  $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
-	if ($search_ref_liv)  $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
-	if ($search_ref_customer) $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
-	if ($search_company)   $param.= "&amp;search_company=".urlencode($search_company);
-	if ($search_town)      $param.= '&search_town='.urlencode($search_town);
-	if ($search_zip)       $param.= '&search_zip='.urlencode($search_zip);
-	if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
-	if ($optioncss != '')  $param.='&amp;optioncss='.urlencode($optioncss);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sall) $param .= "&amp;sall=".urlencode($sall);
+	if ($search_ref_exp)  $param .= "&amp;search_ref_exp=".urlencode($search_ref_exp);
+	if ($search_ref_liv)  $param .= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+	if ($search_ref_customer) $param .= "&amp;search_ref_customer=".urlencode($search_ref_customer);
+	if ($search_company)   $param .= "&amp;search_company=".urlencode($search_company);
+	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
+	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
+	if ($viewstatut != '') $param .= '&viewstatut='.urlencode($viewstatut);
+	if ($optioncss != '')  $param .= '&amp;optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
-	$newcardbutton='';
+	$newcardbutton = '';
 	if ($user->rights->expedition->creer)
 	{
-		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2"><span class="valignmiddle">'.$langs->trans('NewSending').'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
+		$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2"><span class="valignmiddle">'.$langs->trans('NewSending').'</span>';
+		$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton .= '</a>';
 	}
 
 	$i = 0;
@@ -294,92 +294,92 @@ 
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
 
 	if ($sall)
 	{
-		foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
-	$moreforfilter='';
-	if (! empty($moreforfilter))
+	$moreforfilter = '';
+	if (!empty($moreforfilter))
 	{
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
-		$parameters=array('type'=>$type);
-		$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+		$parameters = array('type'=>$type);
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		print '</div>';
 	}
 
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['e.ref']['checked']))
+	if (!empty($arrayfields['e.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
 		print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['e.ref_customer']['checked']))
+	if (!empty($arrayfields['e.ref_customer']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
 		print '</td>';
 	}
 	// Thirdparty
-	if (! empty($arrayfields['s.nom']['checked']))
+	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
-	if (! empty($arrayfields['state.nom']['checked']))
+	if (!empty($arrayfields['state.nom']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
+	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td class="liste_titre" align="center">';
-		print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+		print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (! empty($arrayfields['typent.code']['checked']))
+	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 		print '</td>';
 	}
 	// Date delivery planned
-	if (! empty($arrayfields['e.date_delivery']['checked']))
+	if (!empty($arrayfields['e.date_delivery']['checked']))
 	{
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (! empty($arrayfields['l.ref']['checked']))
+	if (!empty($arrayfields['l.ref']['checked']))
 	{
 		// Delivery ref
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
 	}
-	if (! empty($arrayfields['l.date_delivery']['checked']))
+	if (!empty($arrayfields['l.date_delivery']['checked']))
 	{
 		// Date received
 		print '<td class="liste_titre">&nbsp;</td>';
@@ -388,30 +388,30 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields);
-	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (! empty($arrayfields['e.datec']['checked']))
+	if (!empty($arrayfields['e.datec']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (! empty($arrayfields['e.tms']['checked']))
+	if (!empty($arrayfields['e.tms']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (! empty($arrayfields['e.fk_statut']['checked']))
+	if (!empty($arrayfields['e.fk_statut']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
-		print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
+		print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $viewstatut, 1);
 		print '</td>';
 	}
 	// Status billed
-	if (! empty($arrayfields['e.billed']['checked']))
+	if (!empty($arrayfields['e.billed']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
@@ -419,136 +419,136 @@ 
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	if (!empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"], "e.ref_customer", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, 'align="left"', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-		foreach($extrafields->attribute_label as $key => $val)
+		foreach ($extrafields->attribute_label as $key => $val)
 		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
+			if (!empty($arrayfields["ef.".$key]['checked']))
 			{
-				$align=$extrafields->getAlignFlag($key);
+				$align = $extrafields->getAlignFlag($key);
 				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				if (!empty($extrafields->attribute_computed[$key])) $sortonfield = '';
+				print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'"' : ''), $sortfield, $sortorder);
 			}
 		}
 	}
 	// Hook fields
-	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (! empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	if (!empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
-	$i=0;
-	$totalarray=array();
-	while ($i < min($num,$limit))
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-		$shipment->id=$obj->rowid;
-		$shipment->ref=$obj->ref;
+		$shipment->id = $obj->rowid;
+		$shipment->ref = $obj->ref;
 
-		$companystatic->id=$obj->socid;
-		$companystatic->ref=$obj->name;
-		$companystatic->name=$obj->name;
+		$companystatic->id = $obj->socid;
+		$companystatic->ref = $obj->name;
+		$companystatic->name = $obj->name;
 
 
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (! empty($arrayfields['e.ref']['checked']))
+		if (!empty($arrayfields['e.ref']['checked']))
 		{
 			print "<td>";
 			print $shipment->getNomUrl(1);
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Ref customer
-		if (! empty($arrayfields['e.ref_customer']['checked']))
+		if (!empty($arrayfields['e.ref_customer']['checked']))
 		{
 			print "<td>";
 			print $obj->ref_customer;
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
-		if (! empty($arrayfields['s.nom']['checked']))
+		if (!empty($arrayfields['s.nom']['checked']))
 		{
 			print '<td>';
 			print $companystatic->getNomUrl(1);
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Town
-		if (! empty($arrayfields['s.town']['checked']))
+		if (!empty($arrayfields['s.town']['checked']))
 		{
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Zip
-		if (! empty($arrayfields['s.zip']['checked']))
+		if (!empty($arrayfields['s.zip']['checked']))
 		{
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// State
-		if (! empty($arrayfields['state.nom']['checked']))
+		if (!empty($arrayfields['state.nom']['checked']))
 		{
 			print "<td>".$obj->state_name."</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Country
-		if (! empty($arrayfields['country.code_iso']['checked']))
+		if (!empty($arrayfields['country.code_iso']['checked']))
 		{
 			print '<td align="center">';
-			$tmparray=getCountry($obj->fk_pays,'all');
+			$tmparray = getCountry($obj->fk_pays, 'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Type ent
-		if (! empty($arrayfields['typent.code']['checked']))
+		if (!empty($arrayfields['typent.code']['checked']))
 		{
 			print '<td align="center">';
-			if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Date delivery planed
-		if (! empty($arrayfields['e.date_delivery']['checked']))
+		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
 			print '<td align="center">';
-			print dol_print_date($db->jdate($obj->date_livraison),"day");
+			print dol_print_date($db->jdate($obj->date_livraison), "day");
 			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
@@ -556,13 +556,13 @@ 
 			print "</td>\n";
 		}
 
-		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
+		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
 		{
-			$shipment->fetchObjectLinked($shipment->id,$shipment->element);
-			$receiving='';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
+			$shipment->fetchObjectLinked($shipment->id, $shipment->element);
+			$receiving = '';
+			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving = reset($shipment->linkedObjects['delivery']);
 
-			if (! empty($arrayfields['l.ref']['checked']))
+			if (!empty($arrayfields['l.ref']['checked']))
 			{
 				// Ref
 				print '<td>';
@@ -570,11 +570,11 @@ 
 				print '</td>';
 			}
 
-			if (! empty($arrayfields['l.date_delivery']['checked']))
+			if (!empty($arrayfields['l.date_delivery']['checked']))
 			{
 				// Date received
 				print '<td align="center">';
-				print dol_print_date($db->jdate($obj->date_reception),"day");
+				print dol_print_date($db->jdate($obj->date_reception), "day");
 				print '</td>'."\n";
 			}
 		}
@@ -582,41 +582,41 @@ 
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (! empty($arrayfields['e.datec']['checked']))
+		if (!empty($arrayfields['e.datec']['checked']))
 		{
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Date modification
-		if (! empty($arrayfields['e.tms']['checked']))
+		if (!empty($arrayfields['e.tms']['checked']))
 		{
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Status
-		if (! empty($arrayfields['e.fk_statut']['checked']))
+		if (!empty($arrayfields['e.fk_statut']['checked']))
 		{
-			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut, 5).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Billed
-		if (! empty($arrayfields['e.billed']['checked']))
+		if (!empty($arrayfields['e.billed']['checked']))
 		{
 			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Action column
 		print '<td></td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>\n";