alxarafe / alixar

dolibarr/htdocs/expedition/class/expeditionbatch.class.php

Spacing +59 added lines, -59 removed lines

@@ -31,9 +31,9 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='expeditionlignebatch';
+	public $element = 'expeditionlignebatch';
 
-	private static $_table_element='expeditiondet_batch';		//!< Name of table without prefix where object is stored
+	private static $_table_element = 'expeditiondet_batch'; //!< Name of table without prefix where object is stored
 
 	var $sellby;
 	var $eatby;
@@ -63,18 +63,18 @@ 
 	function fetchFromStock($id_stockdluo)
 	{
 		$sql = "SELECT";
-		$sql.= " pb.batch,";
-		$sql.= " pl.sellby,";
-		$sql.= " pl.eatby,";
-		$sql.= " ps.fk_entrepot";
+		$sql .= " pb.batch,";
+		$sql .= " pl.sellby,";
+		$sql .= " pl.eatby,";
+		$sql .= " ps.fk_entrepot";
 
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
-		$sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
-		$sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
+		$sql .= " WHERE pb.rowid = ".(int) $id_stockdluo;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -84,8 +84,8 @@ 
 				$this->sellby = $this->db->jdate($obj->sellby);
 				$this->eatby = $this->db->jdate($obj->eatby);
 				$this->batch = $obj->batch;
-				$this->entrepot_id= $obj->fk_entrepot;
-				$this->fk_origin_stock=(int) $id_stockdluo;
+				$this->entrepot_id = $obj->fk_entrepot;
+				$this->fk_origin_stock = (int) $id_stockdluo;
 			}
 			$this->db->free($resql);
 
@@ -93,7 +93,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -111,40 +111,40 @@ 
 		$id_line_expdet = (int) $id_line_expdet;
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.self::$_table_element." (";
-		$sql.= "fk_expeditiondet";
-		$sql.= ", sellby";
-		$sql.= ", eatby";
-		$sql.= ", batch";
-		$sql.= ", qty";
-		$sql.= ", fk_origin_stock";
-		$sql.= ") VALUES (";
-		$sql.= $id_line_expdet.",";
-		$sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':("'".$this->db->idate($this->sellby))."'").",";
-		$sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':("'".$this->db->idate($this->eatby))."'").",";
-		$sql.= " ".(! isset($this->batch)?'NULL':("'".$this->db->escape($this->batch)."'")).",";
-		$sql.= " ".(! isset($this->qty)?((! isset($this->dluo_qty))?'NULL':$this->dluo_qty):$this->qty).","; // dluo_qty deprecated, use qty
-		$sql.= " ".(! isset($this->fk_origin_stock)?'NULL':$this->fk_origin_stock);
-		$sql.= ")";
+		$sql .= "fk_expeditiondet";
+		$sql .= ", sellby";
+		$sql .= ", eatby";
+		$sql .= ", batch";
+		$sql .= ", qty";
+		$sql .= ", fk_origin_stock";
+		$sql .= ") VALUES (";
+		$sql .= $id_line_expdet.",";
+		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : ("'".$this->db->idate($this->sellby))."'").",";
+		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : ("'".$this->db->idate($this->eatby))."'").",";
+		$sql .= " ".(!isset($this->batch) ? 'NULL' : ("'".$this->db->escape($this->batch)."'")).",";
+		$sql .= " ".(!isset($this->qty) ? ((!isset($this->dluo_qty)) ? 'NULL' : $this->dluo_qty) : $this->qty).","; // dluo_qty deprecated, use qty
+		$sql .= " ".(!isset($this->fk_origin_stock) ? 'NULL' : $this->fk_origin_stock);
+		$sql .= ")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
-			$this->fk_expeditiondet=$id_line_expdet;
+			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -155,12 +155,12 @@ 
 	 * @param	int		$id_expedition	rowid of shipment
 	 * @return 	int						-1 if KO, 1 if OK
 	 */
-	static function deletefromexp($db,$id_expedition)
+	static function deletefromexp($db, $id_expedition)
 	{
 		$id_expedition = (int) $id_expedition;
 
-		$sql="DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
-		$sql.=" WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
+		$sql .= " WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		if ($db->query($sql))
@@ -181,38 +181,38 @@ 
 	 * @param	int			$fk_product			If provided, load also detailed information of lot
 	 * @return	int|array						-1 if KO, array of ExpeditionLineBatch if OK
 	 */
-	static function fetchAll($db, $id_line_expdet, $fk_product=0)
+	static function fetchAll($db, $id_line_expdet, $fk_product = 0)
 	{
-		$sql="SELECT";
-		$sql.= " eb.rowid,";
-		$sql.= " eb.fk_expeditiondet,";
-		$sql.= " eb.sellby as oldsellby,";				// deprecated
-		$sql.= " eb.eatby as oldeatby,";				// deprecated
-		$sql.= " eb.batch,";
-		$sql.= " eb.qty,";
-		$sql.= " eb.fk_origin_stock";
+		$sql = "SELECT";
+		$sql .= " eb.rowid,";
+		$sql .= " eb.fk_expeditiondet,";
+		$sql .= " eb.sellby as oldsellby,"; // deprecated
+		$sql .= " eb.eatby as oldeatby,"; // deprecated
+		$sql .= " eb.batch,";
+		$sql .= " eb.qty,";
+		$sql .= " eb.fk_origin_stock";
 		if ($fk_product > 0)
 		{
-			$sql.= ", pl.sellby";
-			$sql.= ", pl.eatby";
+			$sql .= ", pl.sellby";
+			$sql .= ", pl.eatby";
 		}
-		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as eb";
+		$sql .= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as eb";
 		if ($fk_product > 0)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.batch = eb.batch AND pl.fk_product = ".$fk_product;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.batch = eb.batch AND pl.fk_product = ".$fk_product;
 		}
-		$sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
+		$sql .= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
 
-		dol_syslog(__METHOD__ ."", LOG_DEBUG);
-		$resql=$db->query($sql);
+		dol_syslog(__METHOD__."", LOG_DEBUG);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
-			$i=0;
+			$num = $db->num_rows($resql);
+			$i = 0;
 			$ret = array();
-			while ($i<$num)
+			while ($i < $num)
 			{
-				$tmp=new self($db);
+				$tmp = new self($db);
 
 				$obj = $db->fetch_object($resql);
 
@@ -225,7 +225,7 @@ 
 				$tmp->dluo_qty = $obj->qty; // dluo_qty deprecated, use qty
 				$tmp->qty = $obj->qty;
 
-				$ret[]=$tmp;
+				$ret[] = $tmp;
 				$i++;
 			}
 			$db->free($resql);

dolibarr/htdocs/expedition/class/expedition.class.php

Spacing +562 added lines, -562 removed lines

@@ -35,9 +35,9 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.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.'/expedition/class/expeditionbatch.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.'/expedition/class/expeditionbatch.class.php';
 
 
 /**
@@ -48,22 +48,22 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element="shipping";
+	public $element = "shipping";
 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element="fk_expedition";
+	public $fk_element = "fk_expedition";
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element="expedition";
+	public $table_element = "expedition";
 
 	/**
 	 * @var int    Name of subtable line
 	 */
-	public $table_element_line="expeditiondet";
+	public $table_element_line = "expeditiondet";
 
 	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -94,7 +94,7 @@ 
 	 * @var int warehouse id
 	 */
 	public $entrepot_id;
-	public $lines=array();
+	public $lines = array();
 
 	/**
 	 * @var string Tracking number
@@ -123,7 +123,7 @@ 
 	// A denormalized value
 	public $trueSize;
 
-	public $date_delivery;		// Date delivery planed
+	public $date_delivery; // Date delivery planed
 
 	/**
 	 * @deprecated
@@ -147,7 +147,7 @@ 
 	public $date_valid;
 
 	public $meths;
-	public $listmeths;			// List of carriers
+	public $listmeths; // List of carriers
 
     /**
 	 * Draft status
@@ -227,26 +227,26 @@ 
 				$dir = dol_buildpath($reldir."core/modules/expedition/");
 
 				// Load file with numbering class (if found)
-				$mybool|=@include_once $dir.$file;
+				$mybool |= @include_once $dir.$file;
 			}
 
-			if (! $mybool)
+			if (!$mybool)
 			{
-				dol_print_error('',"Failed to include file ".$file);
+				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
 
 			$obj = new $classname();
 			$numref = "";
-			$numref = $obj->getNextValue($soc,$this);
+			$numref = $obj->getNextValue($soc, $this);
 
-			if ( $numref != "")
+			if ($numref != "")
 			{
 				return $numref;
 			}
 			else
 			{
-				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
@@ -264,13 +264,13 @@ 
 	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				<0 si erreur, id expedition creee si ok
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 		$error = 0;
 
 		// Clean parameters
@@ -284,90 +284,90 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition (";
-		$sql.= "ref";
-		$sql.= ", entity";
-		$sql.= ", ref_customer";
-		$sql.= ", ref_int";
-		$sql.= ", date_creation";
-		$sql.= ", fk_user_author";
-		$sql.= ", date_expedition";
-		$sql.= ", date_delivery";
-		$sql.= ", fk_soc";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_address";
-		$sql.= ", fk_shipping_method";
-		$sql.= ", tracking_number";
-		$sql.= ", weight";
-		$sql.= ", size";
-		$sql.= ", width";
-		$sql.= ", height";
-		$sql.= ", weight_units";
-		$sql.= ", size_units";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_incoterms, location_incoterms";
-		$sql.= ") VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".($this->ref_customer?"'".$this->db->escape($this->ref_customer)."'":"null");
-		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->date_expedition>0?"'".$this->db->idate($this->date_expedition)."'":"null");
-		$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
-		$sql.= ", ".$this->socid;
-		$sql.= ", ".$this->fk_project;
-		$sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:"null");
-		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
-		$sql.= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql.= ", ".$this->weight;
-		$sql.= ", ".$this->sizeS;	// TODO Should use this->trueDepth
-		$sql.= ", ".$this->sizeW;	// TODO Should use this->trueWidth
-		$sql.= ", ".$this->sizeH;	// TODO Should use this->trueHeight
-		$sql.= ", ".$this->weight_units;
-		$sql.= ", ".$this->size_units;
-		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-		$sql.= ", ".(int) $this->fk_incoterms;
-		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ")";
+		$sql .= "ref";
+		$sql .= ", entity";
+		$sql .= ", ref_customer";
+		$sql .= ", ref_int";
+		$sql .= ", date_creation";
+		$sql .= ", fk_user_author";
+		$sql .= ", date_expedition";
+		$sql .= ", date_delivery";
+		$sql .= ", fk_soc";
+		$sql .= ", fk_projet";
+		$sql .= ", fk_address";
+		$sql .= ", fk_shipping_method";
+		$sql .= ", tracking_number";
+		$sql .= ", weight";
+		$sql .= ", size";
+		$sql .= ", width";
+		$sql .= ", height";
+		$sql .= ", weight_units";
+		$sql .= ", size_units";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_incoterms, location_incoterms";
+		$sql .= ") VALUES (";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : "null");
+		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->date_expedition > 0 ? "'".$this->db->idate($this->date_expedition)."'" : "null");
+		$sql .= ", ".($this->date_delivery > 0 ? "'".$this->db->idate($this->date_delivery)."'" : "null");
+		$sql .= ", ".$this->socid;
+		$sql .= ", ".$this->fk_project;
+		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
+		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
+		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
+		$sql .= ", ".$this->weight;
+		$sql .= ", ".$this->sizeS; // TODO Should use this->trueDepth
+		$sql .= ", ".$this->sizeW; // TODO Should use this->trueWidth
+		$sql .= ", ".$this->sizeH; // TODO Should use this->trueHeight
+		$sql .= ", ".$this->weight_units;
+		$sql .= ", ".$this->size_units;
+		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
+		$sql .= ", ".(int) $this->fk_incoterms;
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expedition");
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
-			$sql.= " SET ref = '(PROV".$this->id.")'";
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET ref = '(PROV".$this->id.")'";
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			if ($this->db->query($sql))
 			{
 				// Insertion des lignes
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
-					if (! isset($this->lines[$i]->detail_batch))
+					if (!isset($this->lines[$i]->detail_batch))
 					{	// no batch management
-						if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0)
+						if (!$this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
 						}
 					}
 					else
 					{	// with batch management
-						if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0)
+						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
 						}
 					}
 				}
 
-				if (! $error && $this->id && $this->origin_id)
+				if (!$error && $this->id && $this->origin_id)
 				{
 					$ret = $this->add_object_linked();
 					if (!$ret)
@@ -377,42 +377,42 @@ 
 				}
 
 				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+				if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
 				{
-					$result=$this->insertExtraFields();
+					$result = $this->insertExtraFields();
 					if ($result < 0)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && ! $notrigger)
+				if (!$error && !$notrigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('SHIPPING_CREATE',$user);
+					$result = $this->call_trigger('SHIPPING_CREATE', $user);
 					if ($result < 0) { $error++; }
 					// End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						$this->db->commit();
 						return $this->id;
 					}
 					else
 					{
-						foreach($this->errors as $errmsg)
+						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-							$this->error.=($this->error?', '.$errmsg:$errmsg);
+							$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 						}
 						$this->db->rollback();
-						return -1*$error;
+						return -1 * $error;
 					}
 				}
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
@@ -420,7 +420,7 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
@@ -428,7 +428,7 @@ 
 		else
 		{
 			$error++;
-			$this->error=$this->db->error()." - sql=$sql";
+			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
 		}
@@ -444,7 +444,7 @@ 
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, line_id if OK
 	 */
-	function create_line($entrepot_id, $origin_line_id, $qty,$array_options=0)
+	function create_line($entrepot_id, $origin_line_id, $qty, $array_options = 0)
 	{
         //phpcs:enable
 		$expeditionline = new ExpeditionLigne($this->db);
@@ -456,7 +456,7 @@ 
 
 		if (($lineId = $expeditionline->insert()) < 0)
 		{
-			$this->errors[]=$expeditionline->error;
+			$this->errors[] = $expeditionline->error;
 		}
 		return $lineId;
 	}
@@ -470,13 +470,13 @@ 
 	 * @param	array		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function create_line_batch($line_ext,$array_options=0)
+	function create_line_batch($line_ext, $array_options = 0)
 	{
         // phpcs:enable
 		$error = 0;
 		$stockLocationQty = array(); // associated array with batch qty in stock location
 
-		$tab=$line_ext->detail_batch;
+		$tab = $line_ext->detail_batch;
 		// create stockLocation Qty array
 		foreach ($tab as $detbatch)
 		{
@@ -488,7 +488,7 @@ 
 		// create shipment lines
 		foreach ($stockLocationQty as $stockLocation => $qty)
 		{
-			if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
+			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $array_options)) < 0)
 			{
 				$error++;
 			}
@@ -497,8 +497,8 @@ 
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
-					if ($detbatch->entrepot_id == $stockLocation){
-						if (! ($detbatch->create($line_id) >0))		// Create an expeditionlinebatch
+					if ($detbatch->entrepot_id == $stockLocation) {
+						if (!($detbatch->create($line_id) > 0))		// Create an expeditionlinebatch
 						{
 							$error++;
 						}
@@ -507,7 +507,7 @@ 
 			}
 		}
 
-		if (! $error) return 1;
+		if (!$error) return 1;
 		else return -1;
 	}
 
@@ -520,7 +520,7 @@ 
 	 * 	@param	string	$ref_int	Internal reference of other object
 	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
 	 */
-	function fetch($id, $ref='', $ref_ext='', $ref_int='')
+	function fetch($id, $ref = '', $ref_ext = '', $ref_int = '')
 	{
 		global $conf;
 
@@ -528,23 +528,23 @@ 
 		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet, e.billed";
-		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
-		$sql.= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
-		$sql.= ", e.fk_shipping_method, e.tracking_number";
-		$sql.= ", e.note_private, e.note_public";
-		$sql.= ', e.fk_incoterms, e.location_incoterms';
-		$sql.= ', i.libelle as libelle_incoterms';
-		$sql.= ', s.libelle as shipping_method';
-		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_shipment_mode as s ON e.fk_shipping_method = s.rowid';
-		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
-		if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-		if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-		if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		$sql .= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
+		$sql .= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
+		$sql .= ", e.fk_shipping_method, e.tracking_number";
+		$sql .= ", e.note_private, e.note_public";
+		$sql .= ', e.fk_incoterms, e.location_incoterms';
+		$sql .= ', i.libelle as libelle_incoterms';
+		$sql .= ', s.libelle as shipping_method';
+		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_shipment_mode as s ON e.fk_shipping_method = s.rowid';
+		$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+		if ($id)   	  $sql .= " AND e.rowid=".$id;
+		if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($ref_int) $sql .= " AND e.ref_int='".$this->db->escape($ref_int)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -557,25 +557,25 @@ 
 				$this->id                   = $obj->rowid;
 				$this->ref                  = $obj->ref;
 				$this->socid                = $obj->socid;
-				$this->ref_customer	    = $obj->ref_customer;
+				$this->ref_customer = $obj->ref_customer;
 				$this->ref_ext		    = $obj->ref_ext;
 				$this->ref_int		    = $obj->ref_int;
 				$this->statut               = $obj->fk_statut;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
-				$this->date                 = $this->db->jdate($obj->date_expedition);	// TODO deprecated
-				$this->date_expedition      = $this->db->jdate($obj->date_expedition);	// TODO deprecated
-				$this->date_shipping        = $this->db->jdate($obj->date_expedition);	// Date real
-				$this->date_delivery        = $this->db->jdate($obj->date_delivery);	// Date planed
+				$this->date                 = $this->db->jdate($obj->date_expedition); // TODO deprecated
+				$this->date_expedition      = $this->db->jdate($obj->date_expedition); // TODO deprecated
+				$this->date_shipping        = $this->db->jdate($obj->date_expedition); // Date real
+				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->modelpdf             = $obj->model_pdf;
 				$this->shipping_method_id   = $obj->fk_shipping_method;
-				$this->shipping_method	    = $obj->shipping_method;
+				$this->shipping_method = $obj->shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
-				$this->origin               = ($obj->origin?$obj->origin:'commande'); // For compatibility
+				$this->origin               = ($obj->origin ? $obj->origin : 'commande'); // For compatibility
 				$this->origin_id            = $obj->origin_id;
 				$this->billed               = $obj->billed;
-				$this->fk_project	    = $obj->fk_projet;
+				$this->fk_project = $obj->fk_projet;
 
 				$this->trueWeight           = $obj->weight;
 				$this->weight_units         = $obj->weight_units;
@@ -609,7 +609,7 @@ 
 				/*
 				 * Thirparty
 				 */
-				$result=$this->fetch_thirdparty();
+				$result = $this->fetch_thirdparty();
 
 				// Retreive extrafields
 				$this->fetch_optionals();
@@ -617,7 +617,7 @@ 
 				/*
 				 * Lines
 				 */
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
 					return -3;
@@ -628,13 +628,13 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
-				$this->error='Delivery with id '.$id.' not found';
+				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -646,7 +646,7 @@ 
 	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
-	function valid($user, $notrigger=0)
+	function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -661,10 +661,10 @@ 
 			return 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))))
 		{
-			$this->error='Permission denied';
+			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -678,10 +678,10 @@ 
 		$soc->fetch($this->socid);
 
 		// Class of company linked to order
-		$result=$soc->set_as_client();
+		$result = $soc->set_as_client();
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
@@ -691,26 +691,26 @@ 
 		}
 		$this->newref = $numref;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Validate
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-		$sql.= " ref='".$numref."'";
-		$sql.= ", fk_statut = 1";
-		$sql.= ", date_valid = '".$this->db->idate($now)."'";
-		$sql.= ", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " ref='".$numref."'";
+		$sql .= ", fk_statut = 1";
+		$sql .= ", date_valid = '".$this->db->idate($now)."'";
+		$sql .= ", fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$error++;
 		}
 
 		// If stock increment is done on sending (recommanded choice)
-		if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
+		if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -718,16 +718,16 @@ 
 
 			// Loop on each product line to add a stock movement
 			$sql = "SELECT cd.fk_product, cd.subprice,";
-			$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-			$sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-			$sql.= " WHERE ed.fk_expedition = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_origin_line";
+			$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+			$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+			$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+			$sql .= " WHERE ed.fk_expedition = ".$this->id;
+			$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$cpt = $this->db->num_rows($resql);
@@ -754,10 +754,10 @@ 
 						// line without batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref));
+						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref));
 						if ($result < 0) {
 							$error++;
-							$this->errors[]=$mouvS->error;
+							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
@@ -768,10 +768,10 @@ 
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 						// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
-						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 						if ($result < 0) {
 							$error++;
-							$this->errors[]=$mouvS->error;
+							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
@@ -781,7 +781,7 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -2;
 			}
 		}
@@ -789,20 +789,20 @@ 
 		// Change status of order to "shipment in process"
 		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
 
-		if (! $ret)
+		if (!$ret)
 		{
 			$error++;
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('SHIPPING_VALIDATE',$user);
+			$result = $this->call_trigger('SHIPPING_VALIDATE', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->oldref = $this->ref;
 
@@ -823,13 +823,13 @@ 
 					{
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
-						$listoffiles=dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-						foreach($listoffiles as $fileentry)
+						$listoffiles = dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry)
 						{
-							$dirsource=$fileentry['name'];
-							$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-							$dirsource=$fileentry['path'].'/'.$dirsource;
-							$dirdest=$fileentry['path'].'/'.$dirdest;
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
 							@rename($dirsource, $dirdest);
 						}
 					}
@@ -838,26 +838,26 @@ 
 		}
 
 		// Set new ref and current status
-		if (! $error)
+		if (!$error)
 		{
 			$this->ref = $numref;
 			$this->statut = 1;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -881,14 +881,14 @@ 
 				// Expedition validee
 				include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
 				$delivery = new Livraison($this->db);
-				$result=$delivery->create_from_sending($user, $this->id);
+				$result = $delivery->create_from_sending($user, $this->id);
 				if ($result > 0)
 				{
 					return $result;
 				}
 				else
 				{
-					$this->error=$delivery->error;
+					$this->error = $delivery->error;
 					return $result;
 				}
 			}
@@ -908,7 +908,7 @@ 
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function addline($entrepot_id, $id, $qty,$array_options=0)
+	function addline($entrepot_id, $id, $qty, $array_options = 0)
 	{
 		global $conf, $langs;
 
@@ -922,22 +922,22 @@ 
 		$orderline = new OrderLine($this->db);
 		$orderline->fetch($id);
 
-		if (! empty($conf->stock->enabled) && ! empty($orderline->fk_product))
+		if (!empty($conf->stock->enabled) && !empty($orderline->fk_product))
 		{
 			$fk_product = $orderline->fk_product;
 
-			if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
+			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
 			{
 				$langs->load("errors");
-				$this->error=$langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
+				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
 			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 			{
 				// Check must be done for stock of product into warehouse if $entrepot_id defined
-				$product=new Product($this->db);
-				$result=$product->fetch($fk_product);
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
 
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
@@ -946,11 +946,11 @@ 
 				else
 					$product_stock = $product->stock_reel;
 
-				$product_type=$product->type;
+				$product_type = $product->type;
 				if ($product_type == 0 && $product_stock < $qty)
 				{
 					$langs->load("errors");
-					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
+					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -958,14 +958,14 @@ 
 		}
 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
-		if (! empty($conf->productbatch->enabled) && ! empty($orderline->fk_product) && ! empty($orderline->product_tobatch))
+		if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch))
 		{
-			$this->error='ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
+			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
 			return -4;
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
 
 		$this->lines[$num] = $line;
@@ -979,33 +979,33 @@ 
 	 * @param	array		$array_options		extrafields array
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-	function addline_batch($dbatch,$array_options=0)
+	function addline_batch($dbatch, $array_options = 0)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$num = count($this->lines);
-		if ($dbatch['qty']>0)
+		if ($dbatch['qty'] > 0)
 		{
 			$line = new ExpeditionLigne($this->db);
-			$tab=array();
+			$tab = array();
 			foreach ($dbatch['detail'] as $key=>$value)
 			{
-				if ($value['q']>0)
+				if ($value['q'] > 0)
 				{
 					// $value['q']=qty to move
 					// $value['id_batch']=id into llx_product_batch of record to move
 					//var_dump($value);
 
 					$linebatch = new ExpeditionLineBatch($this->db);
-					$ret=$linebatch->fetchFromStock($value['id_batch']);	// load serial, sellby, eatby
-					if ($ret<0)
+					$ret = $linebatch->fetchFromStock($value['id_batch']); // load serial, sellby, eatby
+					if ($ret < 0)
 					{
-						$this->error=$linebatch->error;
+						$this->error = $linebatch->error;
 						return -1;
 					}
-					$linebatch->qty=$value['q'];
-					$tab[]=$linebatch;
+					$linebatch->qty = $value['q'];
+					$tab[] = $linebatch;
 
 					if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 					{
@@ -1016,7 +1016,7 @@ 
 						if ($prod_batch->qty < $linebatch->qty)
 						{
 							$langs->load("errors");
-							$this->errors[]=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
+							$this->errors[] = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
 							dol_syslog(get_class($this)."::addline_batch error=Product ".$prod_batch->batch.": ".$this->errorsToString(), LOG_ERR);
 							$this->db->rollback();
 							return -1;
@@ -1029,10 +1029,10 @@ 
 			$line->entrepot_id = $linebatch->entrepot_id;
 			$line->origin_line_id = $dbatch['ix_l'];
 			$line->qty = $dbatch['qty'];
-			$line->detail_batch=$tab;
+			$line->detail_batch = $tab;
 
 			// extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 				$line->array_options = $array_options;
 
 			//var_dump($line);
@@ -1048,32 +1048,32 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int 			       	<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
 		global $conf;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->entity)) $this->entity = trim($this->entity);
+		if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
+		if (isset($this->socid)) $this->socid = trim($this->socid);
+		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
+		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = trim($this->fk_delivery_address);
+		if (isset($this->shipping_method_id)) $this->shipping_method_id = trim($this->shipping_method_id);
+		if (isset($this->tracking_number)) $this->tracking_number = trim($this->tracking_number);
+		if (isset($this->statut)) $this->statut = (int) $this->statut;
+		if (isset($this->trueDepth)) $this->trueDepth = trim($this->trueDepth);
+		if (isset($this->trueWidth)) $this->trueWidth = trim($this->trueWidth);
+		if (isset($this->trueHeight)) $this->trueHeight = trim($this->trueHeight);
+		if (isset($this->size_units)) $this->size_units = trim($this->size_units);
+		if (isset($this->weight_units)) $this->weight_units = trim($this->weight_units);
+		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
+		if (isset($this->note_private)) $this->note = trim($this->note_private);
+		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
 
 
 
@@ -1083,46 +1083,46 @@ 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
 
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
-		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
-		$sql.= " date_creation=".(dol_strlen($this->date_creation)!=0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " date_valid=".(dol_strlen($this->date_valid)!=0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
-		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-		$sql.= " date_expedition=".(dol_strlen($this->date_expedition)!=0 ? "'".$this->db->idate($this->date_expedition)."'" : 'null').",";
-		$sql.= " date_delivery=".(dol_strlen($this->date_delivery)!=0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
-		$sql.= " fk_address=".(isset($this->fk_delivery_address)?$this->fk_delivery_address:"null").",";
-		$sql.= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0)?$this->shipping_method_id:"null").",";
-		$sql.= " tracking_number=".(isset($this->tracking_number)?"'".$this->db->escape($this->tracking_number)."'":"null").",";
-		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-		$sql.= " height=".(($this->trueHeight != '')?$this->trueHeight:"null").",";
-		$sql.= " width=".(($this->trueWidth != '')?$this->trueWidth:"null").",";
-		$sql.= " size_units=".(isset($this->size_units)?$this->size_units:"null").",";
-		$sql.= " size=".(($this->trueDepth != '')?$this->trueDepth:"null").",";
-		$sql.= " weight_units=".(isset($this->weight_units)?$this->weight_units:"null").",";
-		$sql.= " weight=".(($this->trueWeight != '')?$this->trueWeight:"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " entity=".$conf->entity;
-
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
+		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
+		$sql .= " date_creation=".(dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
+		$sql .= " fk_user_author=".(isset($this->fk_user_author) ? $this->fk_user_author : "null").",";
+		$sql .= " date_valid=".(dol_strlen($this->date_valid) != 0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
+		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+		$sql .= " date_expedition=".(dol_strlen($this->date_expedition) != 0 ? "'".$this->db->idate($this->date_expedition)."'" : 'null').",";
+		$sql .= " date_delivery=".(dol_strlen($this->date_delivery) != 0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
+		$sql .= " fk_address=".(isset($this->fk_delivery_address) ? $this->fk_delivery_address : "null").",";
+		$sql .= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0) ? $this->shipping_method_id : "null").",";
+		$sql .= " tracking_number=".(isset($this->tracking_number) ? "'".$this->db->escape($this->tracking_number)."'" : "null").",";
+		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+		$sql .= " height=".(($this->trueHeight != '') ? $this->trueHeight : "null").",";
+		$sql .= " width=".(($this->trueWidth != '') ? $this->trueWidth : "null").",";
+		$sql .= " size_units=".(isset($this->size_units) ? $this->size_units : "null").",";
+		$sql .= " size=".(($this->trueDepth != '') ? $this->trueDepth : "null").",";
+		$sql .= " weight_units=".(isset($this->weight_units) ? $this->weight_units : "null").",";
+		$sql .= " weight=".(($this->trueWeight != '') ? $this->trueWeight : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " entity=".$conf->entity;
+
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('SHIPPING_MODIFY',$user);
+				$result = $this->call_trigger('SHIPPING_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -1131,13 +1131,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -1159,32 +1159,32 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
-		$error=0;
-		$this->error='';
+		$error = 0;
+		$this->error = '';
 
 		$this->db->begin();
 
 		// Add a protection to refuse deleting if shipment has at least one delivery
-		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery');	// Get deliveries linked to this shipment
+		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery'); // Get deliveries linked to this shipment
 		if (count($this->linkedObjectsIds) > 0)
 		{
-			$this->error='ErrorThereIsSomeDeliveries';
+			$this->error = 'ErrorThereIsSomeDeliveries';
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('SHIPPING_DELETE',$user);
+				$result = $this->call_trigger('SHIPPING_DELETE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 		}
 
 		// Stock control
-		if (! $error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > 0)
+		if (!$error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > 0)
 		{
 			require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
 
@@ -1192,13 +1192,13 @@ 
 
 			// Loop on each product line to add a stock movement
 			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-			$sql.= " WHERE ed.fk_expedition = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_origin_line";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+			$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+			$sql .= " WHERE ed.fk_expedition = ".$this->id;
+			$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$cpt = $this->db->num_rows($resql);
@@ -1214,20 +1214,20 @@ 
 					$lotArray = null;
 					if ($conf->productbatch->enabled)
 					{
-						$lotArray = ExpeditionLineBatch::fetchAll($this->db,$obj->expeditiondet_id);
-						if (! is_array($lotArray))
+						$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id);
+						if (!is_array($lotArray))
 						{
-							$error++;$this->errors[]="Error ".$this->db->lasterror();
+							$error++; $this->errors[] = "Error ".$this->db->lasterror();
 						}
 					}
 					if (empty($lotArray)) {
 						// no lot/serial
 						// We increment stock of product (and sub-products)
 						// We use warehouse selected for each line
-						$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref));  // Price is set to 0, because we don't want to see WAP changed
+						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
 						if ($result < 0)
 						{
-							$error++;$this->errors=$this->errors + $mouvS->errors;
+							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
 					}
@@ -1235,12 +1235,12 @@ 
 					{
 						// We increment stock of batches
 						// We use warehouse selected for each line
-						foreach($lotArray as $lot)
+						foreach ($lotArray as $lot)
 						{
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch);  // Price is set to 0, because we don't want to see WAP changed
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
 							if ($result < 0)
 							{
-								$error++;$this->errors=$this->errors + $mouvS->errors;
+								$error++; $this->errors = $this->errors + $mouvS->errors;
 								break;
 							}
 						}
@@ -1250,41 +1250,41 @@ 
 			}
 			else
 			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
 		// delete batch expedition line
-		if (! $error && $conf->productbatch->enabled)
+		if (!$error && $conf->productbatch->enabled)
 		{
-			if (ExpeditionLineBatch::deletefromexp($this->db,$this->id) < 0)
+			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0)
 			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
-			$sql.= " WHERE fk_expedition = ".$this->id;
+			$sql .= " WHERE fk_expedition = ".$this->id;
 
-			if ( $this->db->query($sql) )
+			if ($this->db->query($sql))
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error++;
 
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
-					$sql.= " WHERE rowid = ".$this->id;
+					$sql .= " WHERE rowid = ".$this->id;
 
 					if ($this->db->query($sql))
 					{
-						if (! empty($this->origin) && $this->origin_id > 0)
+						if (!empty($this->origin) && $this->origin_id > 0)
 						{
 							$this->fetch_origin();
-							$origin=$this->origin;
+							$origin = $this->origin;
 							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
 							{
 								// Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
@@ -1297,19 +1297,19 @@ 
 							}
 						}
 
-						if (! $error)
+						if (!$error)
 						{
 							$this->db->commit();
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
-							if (! empty($conf->expedition->dir_output))
+							if (!empty($conf->expedition->dir_output))
 							{
-								$dir = $conf->expedition->dir_output . '/sending/' . $ref ;
-								$file = $dir . '/' . $ref . '.pdf';
+								$dir = $conf->expedition->dir_output.'/sending/'.$ref;
+								$file = $dir.'/'.$ref.'.pdf';
 								if (file_exists($file))
 								{
-									if (! dol_delete_file($file))
+									if (!dol_delete_file($file))
 									{
 										return 0;
 									}
@@ -1318,7 +1318,7 @@ 
 								{
 									if (!dol_delete_dir_recursive($dir))
 									{
-										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+										$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 										return 0;
 									}
 								}
@@ -1334,21 +1334,21 @@ 
 					}
 					else
 					{
-						$this->error=$this->db->lasterror()." - sql=$sql";
+						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
 				}
 				else
 				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
@@ -1373,17 +1373,17 @@ 
 		// TODO: recuperer les champs du document associe a part
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type";
-		$sql.= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
-		$sql.= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.info_bits, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
-		$sql.= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc";
-		$sql.= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
-		$sql.= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
-		$sql.= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
-		$sql.= " WHERE ed.fk_expedition = ".$this->id;
-		$sql.= " AND ed.fk_origin_line = cd.rowid";
-		$sql.= " ORDER BY cd.rang, ed.fk_origin_line";
+		$sql .= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
+		$sql .= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.info_bits, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
+		$sql .= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc";
+		$sql .= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
+		$sql .= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
+		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
+		$sql .= " WHERE ed.fk_expedition = ".$this->id;
+		$sql .= " AND ed.fk_origin_line = cd.rowid";
+		$sql .= " ORDER BY cd.rang, ed.fk_origin_line";
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1407,8 +1407,8 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 				if ($originline == $obj->fk_origin_line) {
-					$line->entrepot_id       = 0; // entrepod_id in details_entrepot
-					$line->qty_shipped    	+= $obj->qty_shipped;
+					$line->entrepot_id = 0; // entrepod_id in details_entrepot
+					$line->qty_shipped += $obj->qty_shipped;
 				} else {
 					$line = new ExpeditionLigne($this->db);
 					$line->entrepot_id    	= $obj->fk_entrepot;
@@ -1422,24 +1422,24 @@ 
 				$line->details_entrepot[]     = $detail_entrepot;
 
 				$line->line_id          = $obj->line_id;
-				$line->rowid            = $obj->line_id;    // TODO deprecated
+				$line->rowid            = $obj->line_id; // TODO deprecated
 				$line->id               = $obj->line_id;
 
-				$line->fk_origin     	= 'orderline';
+				$line->fk_origin = 'orderline';
 				$line->fk_origin_line 	= $obj->fk_origin_line;
-				$line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
+				$line->origin_line_id 	= $obj->fk_origin_line; // TODO deprecated
 
-				$line->fk_expedition    = $this->id;                // id of parent
+				$line->fk_expedition    = $this->id; // id of parent
 
 				$line->product_type     = $obj->product_type;
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;
-				$line->ref				= $obj->product_ref;		// TODO deprecated
-				$line->product_ref		= $obj->product_ref;
-				$line->product_label	= $obj->product_label;
-				$line->libelle        	= $obj->product_label;		// TODO deprecated
-				$line->product_tobatch  = $obj->product_tobatch;
-				$line->label			= $obj->custom_label;
+				$line->ref = $obj->product_ref; // TODO deprecated
+				$line->product_ref = $obj->product_ref;
+				$line->product_label = $obj->product_label;
+				$line->libelle        	= $obj->product_label; // TODO deprecated
+				$line->product_tobatch = $obj->product_tobatch;
+				$line->label = $obj->custom_label;
 				$line->description    	= $obj->description;
 				$line->qty_asked      	= $obj->qty_asked;
 				$line->weight         	= $obj->weight;
@@ -1447,44 +1447,44 @@ 
 				$line->length         	= $obj->length;
 				$line->length_units   	= $obj->length_units;
 				$line->surface        	= $obj->surface;
-				$line->surface_units   	= $obj->surface_units;
+				$line->surface_units = $obj->surface_units;
 				$line->volume         	= $obj->volume;
 				$line->volume_units   	= $obj->volume_units;
 
-				$line->pa_ht 			= $obj->pa_ht;
+				$line->pa_ht = $obj->pa_ht;
 
 				// Local taxes
-				$localtax_array=array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx);
+				$localtax_array = array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx);
 				$localtax1_tx = get_localtax($obj->tva_tx, 1, $this->thirdparty);
 				$localtax2_tx = get_localtax($obj->tva_tx, 2, $this->thirdparty);
 
 				// For invoicing
-				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $localtax1_tx, $localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array);	// We force type to 0
-				$line->desc	         	= $obj->description;		// We need ->desc because some code into CommonObject use desc (property defined for other elements)
-				$line->qty 				= $line->qty_shipped;
-				$line->total_ht			= $tabprice[0];
+				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $localtax1_tx, $localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array); // We force type to 0
+				$line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements)
+				$line->qty = $line->qty_shipped;
+				$line->total_ht = $tabprice[0];
 				$line->total_localtax1 	= $tabprice[9];
 				$line->total_localtax2 	= $tabprice[10];
 				$line->total_ttc	 	= $tabprice[2];
 				$line->total_tva	 	= $tabprice[1];
-				$line->vat_src_code	 	= $obj->vat_src_code;
-				$line->tva_tx 		 	= $obj->tva_tx;
+				$line->vat_src_code = $obj->vat_src_code;
+				$line->tva_tx = $obj->tva_tx;
 				$line->localtax1_tx 	= $obj->localtax1_tx;
 				$line->localtax2_tx 	= $obj->localtax2_tx;
-				$line->info_bits        = $obj->info_bits;
-				$line->price			= $obj->price;
-				$line->subprice			= $obj->subprice;
-				$line->remise_percent	= $obj->remise_percent;
+				$line->info_bits = $obj->info_bits;
+				$line->price = $obj->price;
+				$line->subprice = $obj->subprice;
+				$line->remise_percent = $obj->remise_percent;
 
-				$this->total_ht+= $tabprice[0];
-				$this->total_tva+= $tabprice[1];
-				$this->total_ttc+= $tabprice[2];
-				$this->total_localtax1+= $tabprice[9];
-				$this->total_localtax2+= $tabprice[10];
+				$this->total_ht += $tabprice[0];
+				$this->total_tva += $tabprice[1];
+				$this->total_ttc += $tabprice[2];
+				$this->total_localtax1 += $tabprice[9];
+				$this->total_localtax2 += $tabprice[10];
 
 				// Multicurrency
-				$this->fk_multicurrency 		= $obj->fk_multicurrency;
-				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->fk_multicurrency = $obj->fk_multicurrency;
+				$this->multicurrency_code = $obj->multicurrency_code;
 				$this->multicurrency_subprice 	= $obj->multicurrency_subprice;
 				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
@@ -1496,7 +1496,7 @@ 
 				}
 
 				// Detail of batch
-				if (! empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0)
+				if (!empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0)
 				{
 					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
@@ -1521,7 +1521,7 @@ 
 				}
 				else
 				{
-					$line->total_ht			+= $tabprice[0];
+					$line->total_ht += $tabprice[0];
 					$line->total_localtax1 	+= $tabprice[9];
 					$line->total_localtax2 	+= $tabprice[10];
 					$line->total_ttc	 	+= $tabprice[2];
@@ -1536,7 +1536,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -3;
 		}
 	}
@@ -1556,7 +1556,7 @@ 
 		{
 			$this->db->begin();
 
-			$line=new ExpeditionLigne($this->db);
+			$line = new ExpeditionLigne($this->db);
 
 			// For triggers
 			$line->fetch($lineid);
@@ -1576,7 +1576,7 @@ 
 		}
 		else
 		{
-			$this->error='ErrorDeleteLineNotAllowedByObjectStatus';
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
 	}
@@ -1593,13 +1593,13 @@ 
 	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return     string          						String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $langs;
 
-		$result='';
-		$label = '<u>' . $langs->trans("ShowSending") . '</u>';
-		$label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+		$result = '';
+		$label = '<u>'.$langs->trans("ShowSending").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
@@ -1609,29 +1609,29 @@ 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowSending");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowSending");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
 		return $result;
@@ -1643,9 +1643,9 @@ 
 	 *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
 	 *	@return     string      		Libelle
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1656,40 +1656,40 @@ 
 	 * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
 	 * @return     string				Label of status
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
         // phpcs:enable
 		global $langs;
 
-		if ($mode==0)
+		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			elseif ($statut==1) return $langs->trans($this->statuts[$statut]);
-			elseif ($statut==2) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return $langs->trans($this->statuts[$statut]);
+			elseif ($statut == 1) return $langs->trans($this->statuts[$statut]);
+			elseif ($statut == 2) return $langs->trans($this->statuts[$statut]);
 		}
-		elseif ($mode==1)
+		elseif ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans($this->statutshorts[$statut]);
-			elseif ($statut==1) return $langs->trans($this->statutshorts[$statut]);
-			elseif ($statut==2) return $langs->trans($this->statutshorts[$statut]);
+			if ($statut == 0) return $langs->trans($this->statutshorts[$statut]);
+			elseif ($statut == 1) return $langs->trans($this->statutshorts[$statut]);
+			elseif ($statut == 2) return $langs->trans($this->statutshorts[$statut]);
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			elseif ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut4');
+			elseif ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
+			elseif ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			elseif ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			elseif ($statut==1) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			elseif ($statut==2) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut == 0) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			elseif ($statut == 1) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut4');
+			elseif ($statut == 2) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
 		}
 	}
 
@@ -1704,7 +1704,7 @@ 
 	{
 		global $langs;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
@@ -1712,8 +1712,8 @@ 
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1727,20 +1727,20 @@ 
 			}
 		}
 
-		$order=new Commande($this->db);
+		$order = new Commande($this->db);
 		$order->initAsSpecimen();
 
 		// Initialise parametres
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->statut               = 1;
 		$this->livraison_id         = 0;
 		$this->date                 = $now;
 		$this->date_creation        = $now;
 		$this->date_valid           = $now;
 		$this->date_delivery        = $now;
-		$this->date_expedition      = $now + 24*3600;
+		$this->date_expedition      = $now + 24 * 3600;
 
 		$this->entrepot_id          = 0;
 		$this->fk_delivery_address  = 0;
@@ -1752,22 +1752,22 @@ 
 		$this->origin_id            = 1;
 		$this->origin               = 'commande';
 
-		$this->note_private			= 'Private note';
-		$this->note_public			= 'Public note';
+		$this->note_private = 'Private note';
+		$this->note_public = 'Public note';
 
 		$nbp = 5;
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$line=new ExpeditionLigne($this->db);
-			$line->desc=$langs->trans("Description")." ".$xnbp;
-			$line->libelle=$langs->trans("Description")." ".$xnbp;
-			$line->qty=10;
-			$line->qty_asked=5;
-			$line->qty_shipped=4;
-			$line->fk_product=$this->commande->lines[$xnbp]->fk_product;
-
-			$this->lines[]=$line;
+			$line = new ExpeditionLigne($this->db);
+			$line->desc = $langs->trans("Description")." ".$xnbp;
+			$line->libelle = $langs->trans("Description")." ".$xnbp;
+			$line->qty = 10;
+			$line->qty_asked = 5;
+			$line->qty_shipped = 4;
+			$line->fk_product = $this->commande->lines[$xnbp]->fk_product;
+
+			$this->lines[] = $line;
 			$xnbp++;
 		}
 	}
@@ -1786,11 +1786,11 @@ 
 		if ($user->rights->expedition->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
-			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->date_delivery = $date_livraison;
@@ -1798,7 +1798,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
@@ -1821,17 +1821,17 @@ 
 		$this->meths = array();
 
 		$sql = "SELECT em.rowid, em.code, em.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		$sql.= " WHERE em.active = 1";
-		$sql.= " ORDER BY em.libelle ASC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		$sql .= " WHERE em.active = 1";
+		$sql .= " ORDER BY em.libelle ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label=$langs->trans('SendingMethod'.$obj->code);
-				$this->meths[$obj->rowid] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
+				$label = $langs->trans('SendingMethod'.$obj->code);
+				$this->meths[$obj->rowid] = ($label != 'SendingMethod'.$obj->code ? $label : $obj->libelle);
 			}
 		}
 	}
@@ -1843,17 +1843,17 @@ 
 	 *  @param  id      $id     only this carrier, all if none
 	 *  @return void
 	 */
-	function list_delivery_methods($id='')
+	function list_delivery_methods($id = '')
 	{
         // phpcs:enable
 		global $langs;
 
 		$this->listmeths = array();
-		$i=0;
+		$i = 0;
 
 		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		if ($id!='') $sql.= " WHERE em.rowid=".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		if ($id != '') $sql .= " WHERE em.rowid=".$id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1862,8 +1862,8 @@ 
 			{
 				$this->listmeths[$i]['rowid'] = $obj->rowid;
 				$this->listmeths[$i]['code'] = $obj->code;
-				$label=$langs->trans('SendingMethod'.$obj->code);
-				$this->listmeths[$i]['libelle'] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
+				$label = $langs->trans('SendingMethod'.$obj->code);
+				$this->listmeths[$i]['libelle'] = ($label != 'SendingMethod'.$obj->code ? $label : $obj->libelle);
 				$this->listmeths[$i]['description'] = $obj->description;
 				$this->listmeths[$i]['tracking'] = $obj->tracking;
 				$this->listmeths[$i]['active'] = $obj->active;
@@ -1880,26 +1880,26 @@ 
 	 *
 	 *  @return void
 	 */
-	function update_delivery_method($id='')
+	function update_delivery_method($id = '')
 	{
         // phpcs:enable
-		if ($id=='')
+		if ($id == '')
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-			$sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
+			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
 			$resql = $this->db->query($sql);
 		}
 		else
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-			$sql.= " code='".$this->db->escape($this->update['code'])."'";
-			$sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-			$sql.= ",description='".$this->db->escape($this->update['description'])."'";
-			$sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-			$sql.= " WHERE rowid=".$id;
+			$sql .= " code='".$this->db->escape($this->update['code'])."'";
+			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
+			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
+			$sql .= " WHERE rowid=".$id;
 			$resql = $this->db->query($sql);
 		}
-		if ($resql < 0) dol_print_error($this->db,'');
+		if ($resql < 0) dol_print_error($this->db, '');
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1914,7 +1914,7 @@ 
 	{
         // phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-		$sql.= ' WHERE rowid='.$id;
+		$sql .= ' WHERE rowid='.$id;
 
 		$resql = $this->db->query($sql);
 	}
@@ -1931,7 +1931,7 @@ 
 	{
         // phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-		$sql.= ' WHERE rowid='.$id;
+		$sql .= ' WHERE rowid='.$id;
 
 		$resql = $this->db->query($sql);
 	}
@@ -1943,13 +1943,13 @@ 
 	 * @param	string	$value		Value
 	 * @return	void
 	 */
-	function getUrlTrackingStatus($value='')
+	function getUrlTrackingStatus($value = '')
 	{
-		if (! empty($this->shipping_method_id))
+		if (!empty($this->shipping_method_id))
 		{
 			$sql = "SELECT em.code, em.tracking";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-			$sql.= " WHERE em.rowid = ".$this->shipping_method_id;
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+			$sql .= " WHERE em.rowid = ".$this->shipping_method_id;
 
 			$resql = $this->db->query($sql);
 			if ($resql)
@@ -1964,7 +1964,7 @@ 
 		if (!empty($tracking) && !empty($value))
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
+			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		}
 		else
 		{
@@ -1979,16 +1979,16 @@ 
 	 */
 	function setClosed()
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED;
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Set order billed if 100% of order is shipped (qty in shipment lines match qty in order lines)
@@ -1997,17 +1997,17 @@ 
 				$order = new Commande($this->db);
 				$order->fetch($this->origin_id);
 
-				$order->loadExpeditions(self::STATUS_CLOSED);		// Fill $order->expeditions = array(orderlineid => qty)
+				$order->loadExpeditions(self::STATUS_CLOSED); // Fill $order->expeditions = array(orderlineid => qty)
 
 				$shipments_match_order = 1;
-				foreach($order->lines as $line)
+				foreach ($order->lines as $line)
 				{
 					$lineid = $line->id;
 					$qty = $line->qty;
-					if (($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty)
+					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty)
 					{
 						$shipments_match_order = 0;
-						$text='Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
+						$text = 'Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
 						dol_syslog($text);
 						break;
 					}
@@ -2019,11 +2019,11 @@ 
 				}
 			}
 
-			$this->statut=self::STATUS_CLOSED;
+			$this->statut = self::STATUS_CLOSED;
 
 
 			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -2032,16 +2032,16 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite d'expedier a partir d'une propale ou autre origine ?
 				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-				$sql.= " WHERE ed.fk_expedition = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_origin_line";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+				$sql .= " WHERE ed.fk_expedition = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$cpt = $this->db->num_rows($resql);
@@ -2067,7 +2067,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr",$numref));
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $numref));
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -2079,7 +2079,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -2090,15 +2090,15 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
 			// Call trigger
-			if (! $error)
+			if (!$error)
 			{
-				$result=$this->call_trigger('SHIPPING_CLOSED',$user);
+				$result = $this->call_trigger('SHIPPING_CLOSED', $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -2110,7 +2110,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2132,27 +2132,27 @@ 
 	{
         // phpcs:enable
 		global $user;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2, billed=1';    // TODO Update only billed
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2, billed=1'; // TODO Update only billed
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->statut=2;
-			$this->billed=1;
+			$this->statut = 2;
+			$this->billed = 1;
 
 			// Call trigger
-			$result=$this->call_trigger('SHIPPING_BILLED',$user);
+			$result = $this->call_trigger('SHIPPING_BILLED', $user);
 			if ($result < 0) {
 				$error++;
 			}
 		} else {
 			$error++;
-			$this->errors[]=$this->db->lasterror;
+			$this->errors[] = $this->db->lasterror;
 		}
 
 		if (empty($error)) {
@@ -2173,9 +2173,9 @@ 
 	 */
 	function reOpen()
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		// Protection. This avoid to move stock later when we should not
 		if ($this->statut == self::STATUS_VALIDATED)
@@ -2188,14 +2188,14 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=1';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->statut=1;
-			$this->billed=0;
+			$this->statut = 1;
+			$this->billed = 0;
 
 			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -2204,16 +2204,16 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite d'expedier a partir d'une propale ou autre origine
 				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-				$sql.= " WHERE ed.fk_expedition = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_origin_line";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+				$sql .= " WHERE ed.fk_expedition = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$cpt = $this->db->num_rows($resql);
@@ -2240,7 +2240,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr",$numref));
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr", $numref));
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -2252,7 +2252,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -2263,25 +2263,25 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// Call trigger
-				$result=$this->call_trigger('SHIPPING_REOPEN',$user);
+				$result = $this->call_trigger('SHIPPING_REOPEN', $user);
 				if ($result < 0) {
 					$error++;
 				}
    			}
 		} else {
 			$error++;
-			$this->errors[]=$this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2304,19 +2304,19 @@ 
      *  @param      null|array  $moreparams     Array to provide more information
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0,$moreparams=null)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("sendings");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'rouget';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->EXPEDITION_ADDON_PDF)) {
+			} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
 				$modele = $conf->global->EXPEDITION_ADDON_PDF;
 			}
 		}
@@ -2325,7 +2325,7 @@ 
 
 		$this->fetch_origin();
 
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref,$moreparams);
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 	}
 
 	/**
@@ -2355,12 +2355,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='expeditiondet';
+	public $element = 'expeditiondet';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='expeditiondet';
+	public $table_element = 'expeditiondet';
 
 	/**
 	 * @deprecated
@@ -2505,7 +2505,7 @@ 
      */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 	/**
@@ -2517,18 +2517,18 @@ 
 	function fetch($rowid)
 	{
 		$sql = 'SELECT ed.rowid, ed.fk_expedition, ed.fk_entrepot, ed.fk_origin_line, ed.qty, ed.rang';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as ed';
-		$sql.= ' WHERE ed.rowid = '.$rowid;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as ed';
+		$sql .= ' WHERE ed.rowid = '.$rowid;
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$objp = $this->db->fetch_object($result);
-			$this->id				= $objp->rowid;
-			$this->fk_expedition	= $objp->fk_expedition;
-			$this->entrepot_id		= $objp->fk_entrepot;
-			$this->fk_origin_line	= $objp->fk_origin_line;
-			$this->qty				= $objp->qty;
-			$this->rang				= $objp->rang;
+			$this->id = $objp->rowid;
+			$this->fk_expedition = $objp->fk_expedition;
+			$this->entrepot_id = $objp->fk_entrepot;
+			$this->fk_origin_line = $objp->fk_origin_line;
+			$this->qty = $objp->qty;
+			$this->rang = $objp->rang;
 
 			$this->db->free($result);
 
@@ -2549,34 +2549,34 @@ 
 	 *	@param      int		$notrigger		1 = disable triggers
 	 *	@return     int						<0 if KO, line id >0 if OK
 	 */
-	function insert($user=null, $notrigger=0)
+	function insert($user = null, $notrigger = 0)
 	{
 		global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
 		// Check parameters
-		if (empty($this->fk_expedition) || empty($this->fk_origin_line) || ! is_numeric($this->qty))
+		if (empty($this->fk_expedition) || empty($this->fk_origin_line) || !is_numeric($this->qty))
 		{
 			$this->error = 'ErrorMandatoryParametersNotProvided';
 			return -1;
 		}
 		// Clean parameters
-		if (empty($this->entrepot_id)) $this->entrepot_id='null';
+		if (empty($this->entrepot_id)) $this->entrepot_id = 'null';
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
-		$sql.= "fk_expedition";
-		$sql.= ", fk_entrepot";
-		$sql.= ", fk_origin_line";
-		$sql.= ", qty";
-		$sql.= ") VALUES (";
-		$sql.= $this->fk_expedition;
-		$sql.= ", ".$this->entrepot_id;
-		$sql.= ", ".$this->fk_origin_line;
-		$sql.= ", ".$this->qty;
-		$sql.= ")";
+		$sql .= "fk_expedition";
+		$sql .= ", fk_entrepot";
+		$sql .= ", fk_origin_line";
+		$sql .= ", qty";
+		$sql .= ") VALUES (";
+		$sql .= $this->fk_expedition;
+		$sql .= ", ".$this->entrepot_id;
+		$sql .= ", ".$this->fk_origin_line;
+		$sql .= ", ".$this->qty;
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2584,19 +2584,19 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
 
-			if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+			if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
 			{
-				$result=$this->insertExtraFields();
+				$result = $this->insertExtraFields();
 				if ($result < 0)
 				{
 					$error++;
 				}
 			}
 
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('LINESHIPPING_INSERT',$user);
+				$result = $this->call_trigger('LINESHIPPING_INSERT', $user);
 				if ($result < 0)
 				{
 					$error++;
@@ -2604,19 +2604,19 @@ 
 				// End call triggers
 			}
 
-			if (! $error) {
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			}
 
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -2635,7 +2635,7 @@ 
 	{
 		global $conf;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -2643,37 +2643,37 @@ 
 		if ($conf->productbatch->enabled)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
-			$sql.= " WHERE fk_expeditiondet = ".$this->id;
+			$sql .= " WHERE fk_expeditiondet = ".$this->id;
 
 			if (!$this->db->query($sql))
 			{
-				$this->errors[]=$this->db->lasterror()." - sql=$sql";
+				$this->errors[] = $this->db->lasterror()." - sql=$sql";
 				$error++;
 			}
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-		if (! $error && $this->db->query($sql))
+		if (!$error && $this->db->query($sql))
 		{
 			// Remove extrafields
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				$result=$this->deleteExtraFields();
+				$result = $this->deleteExtraFields();
 				if ($result < 0)
 				{
-					$this->errors[]=$this->error;
+					$this->errors[] = $this->error;
 					$error++;
 				}
 			}
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('LINESHIPPING_DELETE',$user);
+				$result = $this->call_trigger('LINESHIPPING_DELETE', $user);
 				if ($result < 0)
 				{
-					$this->errors[]=$this->error;
+					$this->errors[] = $this->error;
 					$error++;
 				}
 				// End call triggers
@@ -2681,23 +2681,23 @@ 
 		}
 		else
 		{
-			$this->errors[]=$this->db->lasterror()." - sql=$sql";
+			$this->errors[] = $this->db->lasterror()." - sql=$sql";
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -2712,15 +2712,15 @@ 
 	{
 		global $conf;
 
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
 
 		$this->db->begin();
 
 		// Clean parameters
-		if (empty($this->qty)) $this->qty=0;
-		$qty=price2num($this->qty);
+		if (empty($this->qty)) $this->qty = 0;
+		$qty = price2num($this->qty);
 		$remainingQty = 0;
 		$batch = null;
 		$batch_id = null;
@@ -2730,7 +2730,7 @@ 
 			if (count($this->detail_batch) > 1)
 			{
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
-				$this->errors[]='ErrorBadParameters';
+				$this->errors[] = 'ErrorBadParameters';
 				$error++;
 			}
 			else
@@ -2741,13 +2741,13 @@ 
 				if ($this->entrepot_id != $this->detail_batch[0]->entrepot_id)
 				{
 					dol_syslog(get_class($this).'::update only possible for batch of same warehouse', LOG_ERR);
-					$this->errors[]='ErrorBadParameters';
+					$this->errors[] = 'ErrorBadParameters';
 					$error++;
 				}
 				$qty = price2num($this->detail_batch[0]->qty);
 			}
 		}
-		else if (! empty($this->detail_batch))
+		else if (!empty($this->detail_batch))
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
@@ -2755,38 +2755,38 @@ 
 			if ($this->entrepot_id != $this->detail_batch->entrepot_id)
 			{
 				dol_syslog(get_class($this).'::update only possible for batch of same warehouse', LOG_ERR);
-				$this->errors[]='ErrorBadParameters';
+				$this->errors[] = 'ErrorBadParameters';
 				$error++;
 			}
 			$qty = price2num($this->detail_batch->qty);
 		}
 
 		// check parameters
-		if (! isset($this->id) || ! isset($this->entrepot_id))
+		if (!isset($this->id) || !isset($this->entrepot_id))
 		{
 			dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
-			$this->errors[]='ErrorMandatoryParametersNotProvided';
+			$this->errors[] = 'ErrorMandatoryParametersNotProvided';
 			$error++;
 			return -1;
 		}
 
 		// update lot
 
-		if (! empty($batch) && $conf->productbatch->enabled)
+		if (!empty($batch) && $conf->productbatch->enabled)
 		{
 			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");
 
 			if (empty($batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
-				$this->errors[]='ErrorMandatoryParametersNotProvided';
+				$this->errors[] = 'ErrorMandatoryParametersNotProvided';
 				$error++;
 			}
 
 			// fetch remaining lot qty
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-			if (! $error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
+			if (!$error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
 			{
-				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
+				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
 			}
 			else
@@ -2806,25 +2806,25 @@ 
 				// fetch from product_lot
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 				$lot = new Productlot($this->db);
-				if ($lot->fetch(0,$this->fk_product,$batch) < 0)
+				if ($lot->fetch(0, $this->fk_product, $batch) < 0)
 				{
 					$this->errors[] = $lot->errors;
 					$error++;
 				}
-				if (! $error && ! empty($expedition_batch_id))
+				if (!$error && !empty($expedition_batch_id))
 				{
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
-					$sql.= " WHERE fk_expeditiondet = ".$this->id;
-					$sql.= " AND rowid = ".$expedition_batch_id;
+					$sql .= " WHERE fk_expeditiondet = ".$this->id;
+					$sql .= " AND rowid = ".$expedition_batch_id;
 
 					if (!$this->db->query($sql))
 					{
-						$this->errors[]=$this->db->lasterror()." - sql=$sql";
+						$this->errors[] = $this->db->lasterror()." - sql=$sql";
 						$error++;
 					}
 				}
-				if (! $error && $this->detail_batch->qty > 0)
+				if (!$error && $this->detail_batch->qty > 0)
 				{
 					// create lot expedition line
 					if (isset($lot->id))
@@ -2838,48 +2838,48 @@ 
 						$shipmentLot->fk_origin_stock = $batch_id;
 						if ($shipmentLot->create($this->id) < 0)
 						{
-							$this->errors[]=$shipmentLot->errors;
+							$this->errors[] = $shipmentLot->errors;
 							$error++;
 						}
 					}
 				}
 			}
 		}
-		if (! $error)
+		if (!$error)
 		{
 			// update line
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-			$sql.= " fk_entrepot = ".($this->entrepot_id > 0 ? $this->entrepot_id : 'null');
-			$sql.= " , qty = ".$qty;
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " fk_entrepot = ".($this->entrepot_id > 0 ? $this->entrepot_id : 'null');
+			$sql .= " , qty = ".$qty;
+			$sql .= " WHERE rowid = ".$this->id;
 
 			if (!$this->db->query($sql))
 			{
-				$this->errors[]=$this->db->lasterror()." - sql=$sql";
+				$this->errors[] = $this->db->lasterror()." - sql=$sql";
 				$error++;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				$result=$this->insertExtraFields();
+				$result = $this->insertExtraFields();
 				if ($result < 0)
 				{
-					$this->errors[]=$this->error;
+					$this->errors[] = $this->error;
 					$error++;
 				}
 			}
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('LINESHIPPING_UPDATE',$user);
+			$result = $this->call_trigger('LINESHIPPING_UPDATE', $user);
 			if ($result < 0)
 			{
-				$this->errors[]=$this->error;
+				$this->errors[] = $this->error;
 				$error++;
 			}
 			// End call triggers
@@ -2890,13 +2890,13 @@ 
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 }

dolibarr/htdocs/expedition/class/expeditionstats.class.php

Spacing +26 added lines, -26 removed lines

@@ -24,9 +24,9 @@ 
  *  \brief      File of class fo tmanage shipment statistics
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
-include_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 /**
@@ -55,7 +55,7 @@ 
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
      */
-    function __construct($db, $socid, $mode, $userid=0)
+    function __construct($db, $socid, $mode, $userid = 0)
     {
 		global $user, $conf;
 
@@ -65,20 +65,20 @@ 
         $this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object=new Expedition($this->db);
+        $object = new Expedition($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
-		$this->field='weight';	// Warning, unit of weight is NOT USED AND MUST BE
-		$this->where.= " c.fk_statut > 0";    // Not draft and not cancelled
+		$this->field = 'weight'; // Warning, unit of weight is NOT USED AND MUST BE
+		$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
-		$this->where.= " AND c.entity = ".$conf->entity;
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		$this->where .= " AND c.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
 		{
-			$this->where.=" AND c.fk_soc = ".$this->socid;
+			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid;
+        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
     }
 
     /**
@@ -88,19 +88,19 @@ 
      *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 * @return	array				Array with number by month
      */
-    function getNbByMonth($year, $format=0)
+    function getNbByMonth($year, $format = 0)
     {
         global $user;
 
         $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
-		$sql.= " FROM ".$this->from;
+		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-		$sql.= " AND ".$this->where;
-		$sql.= " GROUP BY dm";
-        $sql.= $this->db->order('dm','DESC');
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+        $sql .= $this->db->order('dm', 'DESC');
 
-		$res=$this->_getNbByMonth($year, $sql, $format);
+		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
     }
 
@@ -115,11 +115,11 @@ 
 		global $user;
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
-		$sql.= " FROM ".$this->from;
+		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE ".$this->where;
-		$sql.= " GROUP BY dm";
-        $sql.= $this->db->order('dm','DESC');
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY dm";
+        $sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -134,11 +134,11 @@ 
 		global $user;
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
-		$sql.= " FROM ".$this->from;
+		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE ".$this->where;
-		$sql.= " GROUP BY year";
-        $sql.= $this->db->order('year','DESC');
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+        $sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}

dolibarr/htdocs/expedition/class/api_shipments.class.php

Spacing +40 added lines, -40 removed lines

@@ -65,16 +65,16 @@ 
      */
     function get($id)
     {
-		if(! DolibarrApiAccess::$user->rights->expedition->lire) {
+		if (!DolibarrApiAccess::$user->rights->expedition->lire) {
 			throw new RestException(401);
 		}
 
         $result = $this->shipment->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -110,18 +110,18 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."expedition as t";
+        $sql .= " FROM ".MAIN_DB_PREFIX."expedition as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('expedition').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        $sql .= ' WHERE t.entity IN ('.getEntity('expedition').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -130,23 +130,23 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
@@ -156,12 +156,12 @@ 
         {
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i=0;
+            $i = 0;
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $shipment_static = new Expedition($db);
-                if($shipment_static->fetch($obj->rowid)) {
+                if ($shipment_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($shipment_static);
                 }
                 $i++;
@@ -170,7 +170,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No shipment found');
         }
 		return $obj_ret;
@@ -184,13 +184,13 @@ 
      */
     function post($request_data = null)
     {
-      if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+      if (!DolibarrApiAccess::$user->rights->expedition->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->shipment->$field = $value;
         }
         if (isset($request_data["lines"])) {
@@ -378,16 +378,16 @@ 
      */
     function deleteLine($id, $lineid)
     {
-    	if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+    	if (!DolibarrApiAccess::$user->rights->expedition->creer) {
     		throw new RestException(401);
     	}
 
     	$result = $this->shipment->fetch($id);
-    	if( ! $result ) {
+    	if (!$result) {
     		throw new RestException(404, 'Shipment not found');
     	}
 
-    	if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+    	if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
     		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
     	}
 
@@ -414,19 +414,19 @@ 
      */
     function put($id, $request_data = null)
     {
-      if (! DolibarrApiAccess::$user->rights->expedition->creer) {
+      if (!DolibarrApiAccess::$user->rights->expedition->creer) {
 		  	throw new RestException(401);
 		  }
 
         $result = $this->shipment->fetch($id);
-        if (! $result) {
+        if (!$result) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             if ($field == 'id') continue;
             $this->shipment->$field = $value;
         }
@@ -450,19 +450,19 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->shipment->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->shipment->supprimer) {
 			throw new RestException(401);
 		}
         $result = $this->shipment->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( ! $this->shipment->delete(DolibarrApiAccess::$user)) {
+        if (!$this->shipment->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error);
         }
 
@@ -493,17 +493,17 @@ 
      *   "notrigger": 0
      * }
      */
-    function validate($id, $notrigger=0)
+    function validate($id, $notrigger = 0)
     {
-        if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
 			throw new RestException(401);
 		}
         $result = $this->shipment->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -515,11 +515,11 @@ 
 		    throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
 		}
 	$result = $this->shipment->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Shipment not found');
         }
 
-	if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+	if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
        }
 
@@ -620,7 +620,7 @@ 
 
         $object = parent::_cleanObjectDatas($object);
 
-        unset($object->thirdparty);	// id already returned
+        unset($object->thirdparty); // id already returned
 
         unset($object->note);
         unset($object->address);
@@ -629,7 +629,7 @@ 
         unset($object->barcode_type_label);
         unset($object->barcode_type_coder);
 
-        if (! empty($object->lines) && is_array($object->lines))
+        if (!empty($object->lines) && is_array($object->lines))
         {
         	foreach ($object->lines as $line)
         	{

dolibarr/htdocs/expedition/tpl/linkedobjectblock.tpl.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -37,19 +37,19 @@ 
 // Load translation files required by the page
 $langs->load("sendings");
 
-$total=0; $ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0; $ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
 
-    $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+    $trclass = 'oddeven';
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 ?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("Shipment"); ?></td>
         <td><?php echo $objectlink->getNomUrl(1); ?></td>
         <td></td>
-    	<td align="center"><?php echo dol_print_date($objectlink->date_delivery,'day'); ?></td>
+    	<td align="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
     	<td align="right"><?php
     		if ($user->rights->expedition->lire) {
     			$total = $total + $objectlink->total_ht;
@@ -59,7 +59,7 @@ 
     	<td align="right">
     		<?php
     		// For now, shipments must stay linked to order, so link is not deletable
-    		if($object->element != 'commande') {
+    		if ($object->element != 'commande') {
     			?>
     			<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     			<?php
@@ -71,7 +71,7 @@ 
 if (count($linkedObjectBlock) > 1)
 {
     ?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
     	<td align="center"></td>

dolibarr/htdocs/societe/class/companypaymentmode.class.php

Spacing +53 added lines, -53 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -79,7 +79,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
 		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15),
 		'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-2, 'position'=>30),
@@ -212,8 +212,8 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		$idpayment =  $this->createCommon($user, $notrigger);
+		$idpayment = $this->createCommon($user, $notrigger);
 
 		return $idpayment;
 	}
@@ -291,11 +291,11 @@ 
 	public function fetch($id, $ref = null, $socid = 0, $type = '')
 	{
 		$morewhere = '';
-		if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
+		if ($socid) $morewhere .= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+		if ($type)  $morewhere .= " AND type = '".$this->db->escape($type)."'";
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -347,51 +347,51 @@ 
      *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
         $result = '';
         $companylink = '';
 
-        $label = '<u>' . $langs->trans("CompanyPaymentMode") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("CompanyPaymentMode").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/monmodule/companypaymentmode_card.php',1).'?id='.$this->id;
+        $url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
 
         if ($option != 'nolink')
         {
 	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowCompanyPaymentMode");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowCompanyPaymentMode");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -405,10 +405,10 @@ 
 	 * @param	string	$alltypes	1=The default is for all payment types instead of per type
 	 * @return  int             	0 if KO, 1 if OK
 	 */
-	function setAsDefault($id=0, $alltypes=0)
+	function setAsDefault($id = 0, $alltypes = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($id?$id:$this->id);
+		$sql1 .= " WHERE rowid = ".($id ? $id : $this->id);
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
@@ -428,14 +428,14 @@ 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
-				if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
+				$sql2 .= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
+				if ($type) $sql2 .= " AND type = '".$this->db->escape($type)."'";
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
-				if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
+				$sql3 .= " WHERE rowid = ".$obj->id;
+				if ($type) $sql3 .= " AND type = '".$this->db->escape($type)."'";
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -465,9 +465,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -478,7 +478,7 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -490,28 +490,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 
@@ -524,10 +524,10 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -538,7 +538,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -552,7 +552,7 @@ 
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);

dolibarr/htdocs/societe/class/address.class.php

Spacing +77 added lines, -77 removed lines

@@ -85,9 +85,9 @@ 
 	 *  @param  User	$user       Object user making creation
 	 *  @return int         		0 if OK, < 0 if KO
 	 */
-	function create($socid, $user='')
+	function create($socid, $user = '')
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		// Nettoyage parametres
 		$this->name  = trim($this->name);
@@ -101,12 +101,12 @@ 
 
 		if ($result >= 0)
 		{
-			$now=dol_now();
+			$now = dol_now();
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_address (label, fk_soc, name, datec, fk_user_creat) ";
 			$sql .= " VALUES ('".$this->db->escape($this->label)."', '".$socid."', '".$this->db->escape($this->name)."', '".$this->db->idate($now)."', '".$user->id."')";
 
-			$result=$this->db->query($sql);
+			$result = $this->db->query($sql);
 			if ($result)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_address");
@@ -132,7 +132,7 @@ 
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);
+					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
 				}
 
 				$this->db->rollback();
@@ -175,27 +175,27 @@ 
 	 *  @param  User	$user           Utilisateur qui demande la mise a jour
 	 *  @return int             		<0 if KO, >=0 if OK
 	 */
-	function update($id, $socid, $user='')
+	function update($id, $socid, $user = '')
 	{
 		global $langs;
 
 		// Clean parameters
-		$this->fk_soc		= $socid;
+		$this->fk_soc = $socid;
 		$this->label		= trim($this->label);
 		$this->name			= trim($this->name);
-		$this->address		= trim($this->address);
-		$this->zip			= trim($this->zip);
+		$this->address = trim($this->address);
+		$this->zip = trim($this->zip);
 		$this->town			= trim($this->town);
-		$this->country_id	= trim($this->country_id);
+		$this->country_id = trim($this->country_id);
 		$this->phone		= trim($this->phone);
-		$this->phone		= preg_replace("/\s/","",$this->phone);
-		$this->phone		= preg_replace("/\./","",$this->phone);
+		$this->phone		= preg_replace("/\s/", "", $this->phone);
+		$this->phone		= preg_replace("/\./", "", $this->phone);
 		$this->fax			= trim($this->fax);
-		$this->fax			= preg_replace("/\s/","",$this->fax);
-		$this->fax			= preg_replace("/\./","",$this->fax);
-		$this->note			= trim($this->note);
+		$this->fax			= preg_replace("/\s/", "", $this->fax);
+		$this->fax			= preg_replace("/\./", "", $this->fax);
+		$this->note = trim($this->note);
 
-		$result = $this->verify();		// Verifie que name et label obligatoire
+		$result = $this->verify(); // Verifie que name et label obligatoire
 
 		if ($result >= 0)
 		{
@@ -204,20 +204,20 @@ 
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe_address";
-			$sql.= " SET label = '" . $this->db->escape($this->label) ."'"; // Champ obligatoire
-			$sql.= ", name = '" . $this->db->escape($this->name) ."'"; // Champ obligatoire
-			$sql.= ", address = ".($this->address?"'".$this->db->escape($this->address)."'":"null");
-			$sql.= ", zip = ".($this->zip?"'".$this->db->escape($this->zip)."'":"null");
-			$sql.= ", town = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
-			$sql.= ", fk_pays = '" . ($this->country_id?$this->db->escape($this->country_id):'0') ."'";
-			$sql.= ", note = ".($this->note?"'".$this->db->escape($this->note)."'":"null");
-			$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
-			$sql.= ", fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");
+			$sql .= " SET label = '".$this->db->escape($this->label)."'"; // Champ obligatoire
+			$sql .= ", name = '".$this->db->escape($this->name)."'"; // Champ obligatoire
+			$sql .= ", address = ".($this->address ? "'".$this->db->escape($this->address)."'" : "null");
+			$sql .= ", zip = ".($this->zip ? "'".$this->db->escape($this->zip)."'" : "null");
+			$sql .= ", town = ".($this->town ? "'".$this->db->escape($this->town)."'" : "null");
+			$sql .= ", fk_pays = '".($this->country_id ? $this->db->escape($this->country_id) : '0')."'";
+			$sql .= ", note = ".($this->note ? "'".$this->db->escape($this->note)."'" : "null");
+			$sql .= ", phone = ".($this->phone ? "'".$this->db->escape($this->phone)."'" : "null");
+			$sql .= ", fax = ".($this->fax ? "'".$this->db->escape($this->fax)."'" : "null");
 			if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
-			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $this->db->escape($id) ."'";
+			$sql .= " WHERE fk_soc = '".$socid."' AND rowid = '".$this->db->escape($id)."'";
 
 			dol_syslog(get_class($this)."::Update", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				dol_syslog(get_class($this)."::Update success");
@@ -229,13 +229,13 @@ 
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 
-					$this->error=$langs->trans("ErrorDuplicateField",$this->name);
-					$result=-1;
+					$this->error = $langs->trans("ErrorDuplicateField", $this->name);
+					$result = -1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
-					$result=-2;
+					$this->error = $this->db->lasterror();
+					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
@@ -251,7 +251,7 @@ 
 	 *  @param  User	$user        Objet de l'utilisateur
 	 *  @return int 			     >0 si ok, <0 si ko
 	 */
-	function fetch_lines($socid, $user=null)
+	function fetch_lines($socid, $user = null)
 	{
         // phpcs:enable
 		global $langs, $conf;
@@ -260,18 +260,18 @@ 
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe';
 		$sql .= ' WHERE rowid = '.$socid;
 
-		$resqlsoc=$this->db->query($sql);
+		$resqlsoc = $this->db->query($sql);
 		if ($resqlsoc)
 		{
 			if ($this->db->num_rows($resqlsoc))
 			{
 				$obj = $this->db->fetch_object($resqlsoc);
 
-				$this->socname 		= $obj->name;
-				$this->socid		= $obj->rowid;
-				$this->id			= $obj->rowid;
-				$this->client		= $obj->client;
-				$this->fournisseur	= $obj->fournisseur;
+				$this->socname = $obj->name;
+				$this->socid = $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->client = $obj->client;
+				$this->fournisseur = $obj->fournisseur;
 			}
 
 			$this->db->free($resqlsoc);
@@ -288,7 +288,7 @@ 
 				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON a.fk_pays = c.rowid';
 				$sql .= ' WHERE a.fk_soc = '.$this->socid;
 
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$num = $this->db->num_rows($resql);
@@ -299,22 +299,22 @@ 
 
 						$line = new AddressLine($this->db);
 
-						$line->id				= $objp->id;
-						$line->date_creation	 = $this->db->jdate($objp->date_creation);
+						$line->id = $objp->id;
+						$line->date_creation = $this->db->jdate($objp->date_creation);
 						$line->date_modification = $this->db->jdate($objp->date_modification);
 						$line->label			= $objp->label;
 						$line->name				= $objp->name;
-						$line->address			= $objp->address;
-						$line->zip				= $objp->zip;
+						$line->address = $objp->address;
+						$line->zip = $objp->zip;
 						$line->town				= $objp->town;
-						$line->country_id		= $objp->country_id;
-						$line->country_code		= $objp->country_id?$objp->country_code:'';
-						$line->country			= $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?$langs->trans('Country'.$objp->country_code):$objp->country):'';
+						$line->country_id = $objp->country_id;
+						$line->country_code = $objp->country_id ? $objp->country_code : '';
+						$line->country = $objp->country_id ? ($langs->trans('Country'.$objp->country_code) != 'Country'.$objp->country_code ? $langs->trans('Country'.$objp->country_code) : $objp->country) : '';
 						$line->phone			= $objp->phone;
-						$line->fax				= $objp->fax;
+						$line->fax = $objp->fax;
 						$line->note				= $objp->note;
 
-						$this->lines[$i]		= $line;
+						$this->lines[$i] = $line;
 						$i++;
 					}
 					$this->db->free($resql);
@@ -334,7 +334,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 		}
 	}
 
@@ -346,7 +346,7 @@ 
 	 *  @param  User	$user       Objet de l'utilisateur
 	 *  @return int 				>0 si ok, <0 si ko
 	 */
-	function fetch_address($id, $user=null)
+	function fetch_address($id, $user = null)
 	{
         // phpcs:enable
 		global $langs;
@@ -358,31 +358,31 @@ 
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON a.fk_pays = c.rowid';
 		$sql .= ' WHERE a.rowid = '.$id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id				= $obj->rowid;
-				$this->socid			= $obj->fk_soc;
+				$this->id = $obj->rowid;
+				$this->socid = $obj->fk_soc;
 
-				$this->date_modification		= $this->db->jdate($obj->date_modification);
-				$this->date_creation 	= $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+				$this->date_creation = $this->db->jdate($obj->date_creation);
 
-				$this->label 			= $obj->label;
+				$this->label = $obj->label;
 				$this->name 			= $obj->name;
-				$this->address 			= $obj->address;
+				$this->address = $obj->address;
 				$this->zip 				= $obj->zip;
 				$this->town 			= $obj->town;
 
-				$this->country_id 		= $obj->country_id;
-				$this->country_code 	= $obj->country_id?$obj->country_code:'';
-				$this->country			= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->trans('Country'.$obj->country_code):$obj->country):'';
+				$this->country_id = $obj->country_id;
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->trans('Country'.$obj->country_code) : $obj->country) : '';
 
 				$this->phone			= $obj->phone;
-				$this->fax				= $obj->fax;
+				$this->fax = $obj->fax;
 				$this->note				= $obj->note;
 
 				$result = 1;
@@ -390,7 +390,7 @@ 
 			else
 			{
 				dol_syslog('Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql);
-				$this->error='Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql;
+				$this->error = 'Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql;
 				$result = -2;
 			}
 
@@ -400,7 +400,7 @@ 
 		{
 			dol_syslog('Erreur Societe::Fetch echec', LOG_DEBUG);
 			dol_syslog('Erreur Societe::Fetch '.$this->db->error());
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$result = -3;
 		}
 
@@ -415,13 +415,13 @@ 
 	 *  @param	int		$socid	id third party
 	 *  @return	<0 KO >0 OK
 	 */
-	function delete($id,$socid)
+	function delete($id, $socid)
 	{
 		dol_syslog("Address::Delete");
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_address";
-		$sql.= " WHERE rowid = ".$id;
-		$sql.= " AND fk_soc = ".$socid;
+		$sql .= " WHERE rowid = ".$id;
+		$sql .= " AND fk_soc = ".$socid;
 
 		$result = $this->db->query($sql);
 
@@ -440,18 +440,18 @@ 
 	 *	@param		string		$option			Where the link point to
 	 *	@return		string						String with URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto = 0, $option = '')
 	{
 		global $langs;
 
-		$result='';
+		$result = '';
         $label = $langs->trans("ShowAddress").': '.$this->label;
 
         $link = '<a href="'.DOL_URL_ROOT.'/comm/address.php?id='.$this->id.'&socid='.$this->socid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
-        if ($withpicto) $result.=($link.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$linkend.' ');
-		$result.=$link.$this->label.$linkend;
+        if ($withpicto) $result .= ($link.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$linkend.' ');
+		$result .= $link.$this->label.$linkend;
 		return $result;
 	}
 
@@ -465,11 +465,11 @@ 
 	function info($id)
 	{
 		$sql = "SELECT s.rowid, s.nom as name, datec as date_creation, tms as date_modification,";
-		$sql.= " fk_user_creat, fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.rowid = ".$id;
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.rowid = ".$id;
 
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -481,7 +481,7 @@ 
 				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_modif) {
@@ -489,7 +489,7 @@ 
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
 				}
-				$this->ref			     = $obj->name;
+				$this->ref = $obj->name;
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 			}

dolibarr/htdocs/societe/class/companybankaccount.class.php

Spacing +58 added lines, -58 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File of class to manage bank accounts description of third parties
  */
 
-require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 
 /**
@@ -67,37 +67,37 @@ 
 	 * @param   int    $notrigger   1=Disable triggers
 	 * @return	int					<0 if KO, >= 0 if OK
 	 */
-	function create(User $user = null, $notrigger=0)
+	function create(User $user = null, $notrigger = 0)
 	{
 		$now	= dol_now();
-		$error	= 0;
+		$error = 0;
 		// Correct default_rib to be sure to have always one default
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
    		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$numrows=$this->db->num_rows($result);
+			$numrows = $this->db->num_rows($result);
 			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
 			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
-		$sql.= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
-		$resql=$this->db->query($sql);
+		$sql .= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->affected_rows($resql))
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
 				   	// Call trigger
-					$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+					$result = $this->call_trigger('COMPANY_RIB_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						return 1;
 					}
@@ -131,47 +131,47 @@ 
 		global $conf;
 		$error = 0;
 
-		if (! $this->id) return -1;
+		if (!$this->id) return -1;
 
 		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
 		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
-		$sql.= " bank = '" .$this->db->escape($this->bank)."'";
-		$sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
-		$sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
-		$sql.= ",number='".$this->db->escape($this->number)."'";
-		$sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
-		$sql.= ",bic='".$this->db->escape($this->bic)."'";
-		$sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-		$sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
-		$sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
-		$sql.= ",default_rib = ".$this->default_rib;
+		$sql .= " bank = '".$this->db->escape($this->bank)."'";
+		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
+		$sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+		$sql .= ",number='".$this->db->escape($this->number)."'";
+		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+		$sql .= ",bic='".$this->db->escape($this->bic)."'";
+		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+		$sql .= ",default_rib = ".$this->default_rib;
 		if ($conf->prelevement->enabled)
 		{
-			$sql.= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
-			$sql.= ",rum = '".$this->db->escape($this->rum)."'";
-			$sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
+			$sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
+			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
+			$sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
 		}
 		if (trim($this->label) != '')
-			$sql.= ",label = '".$this->db->escape($this->label)."'";
+			$sql .= ",label = '".$this->db->escape($this->label)."'";
 		else
-			$sql.= ",label = NULL";
-		$sql.= " WHERE rowid = ".$this->id;
+			$sql .= ",label = NULL";
+		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 
 
-		if (! $notrigger)
+		if (!$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
+			$result = $this->call_trigger('COMPANY_RIB_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
-			if(! $error )
+			if (!$error)
 			{
 				return 1;
 			}
@@ -201,19 +201,19 @@ 
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					<0 if KO, >0 if OK
 	 */
-	function fetch($id, $socid=0, $default=1, $type='ban')
+	function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
 		if (empty($id) && empty($socid)) return -1;
 
 		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql.= " WHERE rowid = ".$id;
+		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id)    $sql .= " WHERE rowid = ".$id;
 		if ($socid)
 		{
-			$sql.= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql.=" AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql.= " AND type ='".$this->db->escape($type)."'";
+			$sql .= " WHERE fk_soc  = ".$socid;
+			if ($default > -1) $sql .= " AND default_rib = ".$this->db->escape($default);
+			if ($type) $sql .= " AND type ='".$this->db->escape($type)."'";
 		}
 
 		$resql = $this->db->query($sql);
@@ -223,10 +223,10 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->ref             = $obj->fk_soc.'-'.$obj->label;      // Generate an artificial ref
+				$this->ref = $obj->fk_soc.'-'.$obj->label; // Generate an artificial ref
 
-				$this->id			   = $obj->rowid;
-				$this->type			   = $obj->type;
+				$this->id = $obj->rowid;
+				$this->type = $obj->type;
 				$this->socid           = $obj->fk_soc;
 				$this->bank            = $obj->bank;
 				$this->code_banque     = $obj->code_banque;
@@ -234,7 +234,7 @@ 
 				$this->number          = $obj->number;
 				$this->cle_rib         = $obj->cle_rib;
 				$this->bic             = $obj->bic;
-				$this->iban		       = $obj->iban;
+				$this->iban = $obj->iban;
 				$this->domiciliation   = $obj->domiciliation;
 				$this->proprio         = $obj->proprio;
 				$this->owner_address   = $obj->owner_address;
@@ -263,37 +263,37 @@ 
 	 *	@param  	int		$notrigger	1=Disable triggers
 	 *  @return		int		            <0 if KO, >0 if OK
 	 */
-	function delete(User $user = null, $notrigger=0)
+	function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 
 		$error = 0;
 
-		dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete ".$this->id, LOG_DEBUG);
 
 		$this->db->begin();
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
+			$result = $this->call_trigger('COMPANY_RIB_DELETE', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
-			$sql .= " WHERE rowid  = " . $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
+			$sql .= " WHERE rowid  = ".$this->id;
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				$error++;
-				$this->errors[]=$this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -301,7 +301,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -315,7 +315,7 @@ 
 	{
 		$rib = '';
 
-		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic ) {
+		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic) {
 
 			if ($this->label && $displayriblabel) {
 				$rib = $this->label." : ";
@@ -333,10 +333,10 @@ 
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
 	 */
-	function setAsDefault($rib=0)
+	function setAsDefault($rib = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
+		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
@@ -353,12 +353,12 @@ 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
+				$sql2 .= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
+				$sql3 .= " WHERE rowid = ".$obj->id;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -409,7 +409,7 @@ 
 		$this->country_id      = 1;
 
 		$this->rum             = 'UMR-CU1212-0007-5-1475405262';
-		$this->date_rum        =dol_now() - 10000;
+		$this->date_rum        = dol_now() - 10000;
 		$this->frstrecur       = 'FRST';
 
 		$this->socid = 0;

dolibarr/htdocs/societe/class/api_contacts.class.php

Spacing +22 added lines, -22 removed lines

@@ -81,7 +81,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -122,37 +122,37 @@ 
 			$search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX . "socpeople_extrafields as te ON te.fk_object = t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object = t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
-			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
-		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
-		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
-		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON t.fk_soc = s.rowid";
+		$sql .= ' WHERE t.entity IN ('.getEntity('socpeople').')';
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
-			$sql.= " AND t.fk_soc = sc.fk_soc";
+			$sql .= " AND t.fk_soc = sc.fk_soc";
 		if ($search_sale > 0)
-			$sql.= " AND s.rowid = sc.fk_soc";  // Join for the needed table to filter by sale
+			$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
-			$sql .= " AND sc.fk_user = " . $search_sale;
+			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 	    // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-		$sql.= $db->order($sortfield, $sortorder);
+		$sql .= $db->order($sortfield, $sortorder);
 
 		if ($limit)
 		{
@@ -162,7 +162,7 @@ 
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 		$result = $db->query($sql);
 		if ($result)
@@ -181,7 +181,7 @@ 
 			}
 		}
 		else {
-			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
+			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
 		if (!count($obj_ret))
 		{
@@ -237,7 +237,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach ($request_data as $field => $value)
@@ -272,7 +272,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->contact->delete($id);
@@ -312,19 +312,19 @@ 
 	    }
 
 	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-	        throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+	        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	    }
 
 	    // Check mandatory fields
 	    $login = $request_data["login"];
 	    $password = $request_data["password"];
 	    $useraccount = new User($this->db);
-	    $result = $useraccount->create_from_contact($contact,$login,$password);
+	    $result = $useraccount->create_from_contact($contact, $login, $password);
 	    if ($result <= 0) {
 	        throw new RestException(500, "User not created");
 	    }
 	    // password parameter not used in create_from_contact
-	    $useraccount->setPassword($useraccount,$password);
+	    $useraccount->setPassword($useraccount, $password);
 
 	    return $result;
 	}
@@ -344,7 +344,7 @@ 
      */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}