alxarafe / alixar

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

Indentation +197 added lines, -197 removed lines

@@ -28,21 +28,21 @@ 
  */
 class ExpeditionLineBatch extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='expeditionlignebatch';
-
-	private static $_table_element='expeditiondet_batch';		//!< Name of table without prefix where object is stored
-
-	var $sellby;
-	var $eatby;
-	var $batch;
-	var $qty;
-	var $dluo_qty; // deprecated, use qty
-	var $entrepot_id;
-	var $fk_origin_stock;
-	var $fk_expeditiondet;
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='expeditionlignebatch';
+
+    private static $_table_element='expeditiondet_batch';		//!< Name of table without prefix where object is stored
+
+    var $sellby;
+    var $eatby;
+    var $batch;
+    var $qty;
+    var $dluo_qty; // deprecated, use qty
+    var $entrepot_id;
+    var $fk_origin_stock;
+    var $fk_expeditiondet;
 
     /**
      *  Constructor
@@ -54,187 +54,187 @@ 
         $this->db = $db;
     }
 
-	/**
-	 * Fill object based on a product-warehouse-batch's record
-	 *
-	 * @param	int		$id_stockdluo	Rowid in product_batch table
-	 * @return	int      		   	 -1 if KO, 1 if OK
-	 */
-	function fetchFromStock($id_stockdluo)
-	{
-		$sql = "SELECT";
-		$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;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$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->db->free($resql);
-
-			return 1;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 * Create an expeditiondet_batch DB record link to an expedtiondet record
-	 *
-	 * @param	int		$id_line_expdet		rowid of expedtiondet record
-	 * @return	int							<0 if KO, Id of record (>0) if OK
-	 */
-	function create($id_line_expdet)
-	{
-		$error = 0;
-
-		$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.= ")";
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
+    /**
+     * Fill object based on a product-warehouse-batch's record
+     *
+     * @param	int		$id_stockdluo	Rowid in product_batch table
+     * @return	int      		   	 -1 if KO, 1 if OK
+     */
+    function fetchFromStock($id_stockdluo)
+    {
+        $sql = "SELECT";
+        $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;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $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->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     * Create an expeditiondet_batch DB record link to an expedtiondet record
+     *
+     * @param	int		$id_line_expdet		rowid of expedtiondet record
+     * @return	int							<0 if KO, Id of record (>0) if OK
+     */
+    function create($id_line_expdet)
+    {
+        $error = 0;
+
+        $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.= ")";
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
-			$this->fk_expeditiondet=$id_line_expdet;
-			return $this->id;
-		}
-		else
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-	}
-
-	/**
-	 * Delete batch record attach to a shipment
-	 *
-	 * @param	DoliDB	$db				Database object
-	 * @param	int		$id_expedition	rowid of shipment
-	 * @return 	int						-1 if KO, 1 if OK
-	 */
-	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.")";
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-		if ($db->query($sql))
-		{
-			return 1;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-	 * Retrieve all batch number detailed information of a shipment line
-	 *
-	 * @param	DoliDB		$db					Database object
-	 * @param	int			$id_line_expdet		id of shipment line
-	 * @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)
-	{
-		$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.= " 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.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
-
-		dol_syslog(__METHOD__ ."", LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$num=$db->num_rows($resql);
-			$i=0;
-			$ret = array();
-			while ($i<$num)
-			{
-				$tmp=new self($db);
-
-				$obj = $db->fetch_object($resql);
-
-				$tmp->sellby = $db->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
-				$tmp->eatby = $db->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
-				$tmp->batch = $obj->batch;
-				$tmp->id = $obj->rowid;
-				$tmp->fk_origin_stock = $obj->fk_origin_stock;
-				$tmp->fk_expeditiondet = $obj->fk_expeditiondet;
-				$tmp->dluo_qty = $obj->qty; // dluo_qty deprecated, use qty
-				$tmp->qty = $obj->qty;
-
-				$ret[]=$tmp;
-				$i++;
-			}
-			$db->free($resql);
-			return $ret;
-		}
-		else
-		{
-			dol_print_error($db);
-			return -1;
-		}
-	}
+            $this->fk_expeditiondet=$id_line_expdet;
+            return $this->id;
+        }
+        else
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+    }
+
+    /**
+     * Delete batch record attach to a shipment
+     *
+     * @param	DoliDB	$db				Database object
+     * @param	int		$id_expedition	rowid of shipment
+     * @return 	int						-1 if KO, 1 if OK
+     */
+    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.")";
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+        if ($db->query($sql))
+        {
+            return 1;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     * Retrieve all batch number detailed information of a shipment line
+     *
+     * @param	DoliDB		$db					Database object
+     * @param	int			$id_line_expdet		id of shipment line
+     * @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)
+    {
+        $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.= " 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.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
+
+        dol_syslog(__METHOD__ ."", LOG_DEBUG);
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $num=$db->num_rows($resql);
+            $i=0;
+            $ret = array();
+            while ($i<$num)
+            {
+                $tmp=new self($db);
+
+                $obj = $db->fetch_object($resql);
+
+                $tmp->sellby = $db->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
+                $tmp->eatby = $db->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
+                $tmp->batch = $obj->batch;
+                $tmp->id = $obj->rowid;
+                $tmp->fk_origin_stock = $obj->fk_origin_stock;
+                $tmp->fk_expeditiondet = $obj->fk_expeditiondet;
+                $tmp->dluo_qty = $obj->qty; // dluo_qty deprecated, use qty
+                $tmp->qty = $obj->qty;
+
+                $ret[]=$tmp;
+                $i++;
+            }
+            $db->free($resql);
+            return $ret;
+        }
+        else
+        {
+            dol_print_error($db);
+            return -1;
+        }
+    }
 }

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

Indentation +2658 added lines, -2658 removed lines

@@ -45,2305 +45,2305 @@ 
  */
 class Expedition extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element="shipping";
-
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element="fk_expedition";
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element="expedition";
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	public $table_element_line="expeditiondet";
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto = 'sending';
-
-	public $socid;
-
-	/**
-	 * @var string Customer ref
-	 */
-	public $ref_customer;
-
-	/**
-	 * @var string internal ref
-	 */
-	public $ref_int;
-
-	public $brouillon;
-
-	/**
-	 * @var int warehouse id
-	 */
-	public $entrepot_id;
-	public $lines=array();
-
-	/**
-	 * @var string Tracking number
-	 */
-	public $tracking_number;
-
-	/**
-	 * @var string Tracking url
-	 */
-	public $tracking_url;
-	public $billed;
-
-	/**
-	 * @var string name of pdf model
-	 */
-	public $model_pdf;
-
-	public $trueWeight;
-	public $weight_units;
-	public $trueWidth;
-	public $width_units;
-	public $trueHeight;
-	public $height_units;
-	public $trueDepth;
-	public $depth_units;
-	// A denormalized value
-	public $trueSize;
-
-	public $date_delivery;		// Date delivery planed
-
-	/**
-	 * @deprecated
-	 * @see date_shipping
-	 */
-	public $date;
-
-	/**
-	 * @deprecated
-	 * @see date_shipping
-	 */
-	public $date_expedition;
-
-	/**
-	 * Effective delivery date
-	 * @var int
-	 */
-	public $date_shipping;
-
-	public $date_creation;
-	public $date_valid;
-
-	public $meths;
-	public $listmeths;			// List of carriers
-
-    /**
-	 * Draft status
-	 */
-	const STATUS_DRAFT = 0;
-
-	/**
-	 * Validated status
-	 */
-	const STATUS_VALIDATED = 1;
-
-	/**
-	 * Closed status
-	 */
-	const STATUS_CLOSED = 2;
-
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->lines = array();
-		$this->products = array();
-
-		// List of long language codes for status
-		$this->statuts = array();
-		$this->statuts[-1] = 'StatusSendingCanceled';
-		$this->statuts[0]  = 'StatusSendingDraft';
-		$this->statuts[1]  = 'StatusSendingValidated';
-		$this->statuts[2]  = 'StatusSendingProcessed';
-
-		// List of short language codes for status
-		$this->statutshorts = array();
-		$this->statutshorts[-1] = 'StatusSendingCanceledShort';
-		$this->statutshorts[0]  = 'StatusSendingDraftShort';
-		$this->statutshorts[1]  = 'StatusSendingValidatedShort';
-		$this->statutshorts[2]  = 'StatusSendingProcessedShort';
-
-		/* Status "billed" or not is managed by another field than status
-		if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
-		{
-			$this->statuts[2]  = 'StatusSendingBilled';
-			$this->statutshorts[2]  = 'StatusSendingBilledShort';
-		}*/
-	}
-
-	/**
-	 *	Return next contract ref
-	 *
-	 *	@param	Societe		$soc	Thirdparty object
-	 *	@return string				Free reference for contract
-	 */
-	function getNextNumRef($soc)
-	{
-		global $langs, $conf;
-		$langs->load("sendings");
-
-		if (!empty($conf->global->EXPEDITION_ADDON_NUMBER))
-		{
-			$mybool = false;
-
-			$file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
-			$classname = $conf->global->EXPEDITION_ADDON_NUMBER;
-
-			// Include file with class
-			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-			foreach ($dirmodels as $reldir) {
-
-				$dir = dol_buildpath($reldir."core/modules/expedition/");
-
-				// Load file with numbering class (if found)
-				$mybool|=@include_once $dir.$file;
-			}
-
-			if (! $mybool)
-			{
-				dol_print_error('',"Failed to include file ".$file);
-				return '';
-			}
-
-			$obj = new $classname();
-			$numref = "";
-			$numref = $obj->getNextValue($soc,$this);
-
-			if ( $numref != "")
-			{
-				return $numref;
-			}
-			else
-			{
-				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-				return "";
-			}
-		}
-		else
-		{
-			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
-			return "";
-		}
-	}
-
-	/**
-	 *  Create expedition en base
-	 *
-	 *  @param	User	$user       Objet du user qui cree
-	 * 	@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)
-	{
-		global $conf, $hookmanager;
-
-		$now=dol_now();
-
-		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
-		$error = 0;
-
-		// Clean parameters
-		$this->brouillon = 1;
-		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
-		if (empty($this->fk_project)) $this->fk_project = 0;
-
-		$this->user = $user;
-
-
-		$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.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$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;
-
-			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
-				// Insertion des lignes
-				$num=count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					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)
-						{
-							$error++;
-						}
-					}
-					else
-					{	// with batch management
-						if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0)
-						{
-							$error++;
-						}
-					}
-				}
-
-				if (! $error && $this->id && $this->origin_id)
-				{
-					$ret = $this->add_object_linked();
-					if (!$ret)
-					{
-						$error++;
-					}
-				}
-
-				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
-				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
-				}
-
-				if (! $error && ! $notrigger)
-				{
-					// Call trigger
-					$result=$this->call_trigger('SHIPPING_CREATE',$user);
-					if ($result < 0) { $error++; }
-					// End call triggers
-
-					if (! $error)
-					{
-						$this->db->commit();
-						return $this->id;
-					}
-					else
-					{
-						foreach($this->errors as $errmsg)
-						{
-							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-							$this->error.=($this->error?', '.$errmsg:$errmsg);
-						}
-						$this->db->rollback();
-						return -1*$error;
-					}
-				}
-				else
-				{
-					$error++;
-					$this->error=$this->db->lasterror()." - sql=$sql";
-					$this->db->rollback();
-					return -3;
-				}
-			}
-			else
-			{
-				$error++;
-				$this->error=$this->db->lasterror()." - sql=$sql";
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$error++;
-			$this->error=$this->db->error()." - sql=$sql";
-			$this->db->rollback();
-			return -1;
-		}
-	}
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element="shipping";
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a expedition line
-	 *
-	 * @param 	int		$entrepot_id		Id of warehouse
-	 * @param 	int		$origin_line_id		Id of source line
-	 * @param 	int		$qty				Quantity
-	 * @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)
-	{
-        //phpcs:enable
-		$expeditionline = new ExpeditionLigne($this->db);
-		$expeditionline->fk_expedition = $this->id;
-		$expeditionline->entrepot_id = $entrepot_id;
-		$expeditionline->fk_origin_line = $origin_line_id;
-		$expeditionline->qty = $qty;
-		$expeditionline->array_options = $array_options;
-
-		if (($lineId = $expeditionline->insert()) < 0)
-		{
-			$this->errors[]=$expeditionline->error;
-		}
-		return $lineId;
-	}
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element="fk_expedition";
 
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element="expedition";
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create the detail (eat-by date) of the expedition line
-	 *
-	 * @param 	object		$line_ext		full line informations
-	 * @param	array		$array_options		extrafields array
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	function create_line_batch($line_ext,$array_options=0)
-	{
-        // phpcs:enable
-		$error = 0;
-		$stockLocationQty = array(); // associated array with batch qty in stock location
+    /**
+     * @var int    Name of subtable line
+     */
+    public $table_element_line="expeditiondet";
 
-		$tab=$line_ext->detail_batch;
-		// create stockLocation Qty array
-		foreach ($tab as $detbatch)
-		{
-			if ($detbatch->entrepot_id)
-			{
-				$stockLocationQty[$detbatch->entrepot_id] += $detbatch->qty;
-			}
-		}
-		// create shipment lines
-		foreach ($stockLocationQty as $stockLocation => $qty)
-		{
-			if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
-			{
-				$error++;
-			}
-			else
-			{
-				// create shipment batch lines for stockLocation
-				foreach ($tab as $detbatch)
-				{
-					if ($detbatch->entrepot_id == $stockLocation){
-						if (! ($detbatch->create($line_id) >0))		// Create an expeditionlinebatch
-						{
-							$error++;
-						}
-					}
-				}
-			}
-		}
-
-		if (! $error) return 1;
-		else return -1;
-	}
-
-	/**
-	 *	Get object and lines from database
-	 *
-	 *	@param	int		$id       	Id of object to load
-	 * 	@param	string	$ref		Ref of object
-	 * 	@param	string	$ref_ext	External reference of object
-	 * 	@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='')
-	{
-		global $conf;
-
-		// Check parameters
-		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)."'";
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$this->id                   = $obj->rowid;
-				$this->ref                  = $obj->ref;
-				$this->socid                = $obj->socid;
-				$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->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->tracking_number      = $obj->tracking_number;
-				$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->trueWeight           = $obj->weight;
-				$this->weight_units         = $obj->weight_units;
-
-				$this->trueWidth            = $obj->width;
-				$this->width_units          = $obj->size_units;
-				$this->trueHeight           = $obj->height;
-				$this->height_units         = $obj->size_units;
-				$this->trueDepth            = $obj->size;
-				$this->depth_units          = $obj->size_units;
-
-				$this->note_public          = $obj->note_public;
-				$this->note_private         = $obj->note_private;
-
-				// A denormalized value
-				$this->trueSize             = $obj->size."x".$obj->width."x".$obj->height;
-				$this->size_units           = $obj->size_units;
-
-				//Incoterms
-				$this->fk_incoterms         = $obj->fk_incoterms;
-				$this->location_incoterms   = $obj->location_incoterms;
-				$this->libelle_incoterms    = $obj->libelle_incoterms;
-
-				$this->db->free($result);
-
-				if ($this->statut == 0) $this->brouillon = 1;
-
-				// Tracking url
-				$this->getUrlTrackingStatus($obj->tracking_number);
-
-				/*
-				 * Thirparty
-				 */
-				$result=$this->fetch_thirdparty();
+    /**
+     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     * @var int
+     */
+    public $ismultientitymanaged = 1;
 
-				// Retreive extrafields
-				$this->fetch_optionals();
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
+    public $picto = 'sending';
 
-				/*
-				 * Lines
-				 */
-				$result=$this->fetch_lines();
-				if ($result < 0)
-				{
-					return -3;
-				}
-
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
-				$this->error='Delivery with id '.$id.' not found';
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Validate object and update stock if option enabled
-	 *
-	 *  @param      User		$user       Object user that validate
-	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return     int						<0 if OK, >0 if KO
-	 */
-	function valid($user, $notrigger=0)
-	{
-		global $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		dol_syslog(get_class($this)."::valid");
-
-		// Protection
-		if ($this->statut)
-		{
-			dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
-			return 0;
-		}
+    public $socid;
 
-		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';
-			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-			return -1;
-		}
+    /**
+     * @var string Customer ref
+     */
+    public $ref_customer;
 
-		$this->db->begin();
+    /**
+     * @var string internal ref
+     */
+    public $ref_int;
 
-		$error = 0;
+    public $brouillon;
 
-		// Define new ref
-		$soc = new Societe($this->db);
-		$soc->fetch($this->socid);
+    /**
+     * @var int warehouse id
+     */
+    public $entrepot_id;
+    public $lines=array();
 
-		// Class of company linked to order
-		$result=$soc->set_as_client();
+    /**
+     * @var string Tracking number
+     */
+    public $tracking_number;
 
-		// 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
-		{
-			$numref = $this->getNextNumRef($soc);
-		}
-		else
-		{
-			$numref = "EXP".$this->id;
-		}
-		$this->newref = $numref;
-
-		$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;
-
-		dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error=$this->db->lasterror();
-			$error++;
-		}
+    /**
+     * @var string Tracking url
+     */
+    public $tracking_url;
+    public $billed;
 
-		// If stock increment is done on sending (recommanded choice)
-		if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-
-			$langs->load("agenda");
-
-			// 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";
-
-			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if (empty($obj->edbrowid))
-					{
-						$qty = $obj->qty;
-					}
-					else
-					{
-						$qty = $obj->edbqty;
-					}
-					if ($qty <= 0) continue;
-					dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
-
-					//var_dump($this->lines[$i]);
-					$mouvS = new MouvementStock($this->db);
-					$mouvS->origin = &$this;
-
-					if (empty($obj->edbrowid))
-					{
-						// 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));
-						if ($result < 0) {
-							$error++;
-							$this->errors[]=$mouvS->error;
-							$this->errors = array_merge($this->errors, $mouvS->errors);
-							break;
-						}
-					}
-					else
-					{
-						// 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.
-						// 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);
-						if ($result < 0) {
-							$error++;
-							$this->errors[]=$mouvS->error;
-							$this->errors = array_merge($this->errors, $mouvS->errors);
-							break;
-						}
-					}
-				}
-			}
-			else
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error();
-				return -2;
-			}
-		}
-
-		// Change status of order to "shipment in process"
-		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
-
-		if (! $ret)
-		{
-			$error++;
-		}
+    /**
+     * @var string name of pdf model
+     */
+    public $model_pdf;
 
-		if (! $error && ! $notrigger)
-		{
-			// Call trigger
-			$result=$this->call_trigger('SHIPPING_VALIDATE',$user);
-			if ($result < 0) { $error++; }
-			// End call triggers
-		}
+    public $trueWeight;
+    public $weight_units;
+    public $trueWidth;
+    public $width_units;
+    public $trueHeight;
+    public $height_units;
+    public $trueDepth;
+    public $depth_units;
+    // A denormalized value
+    public $trueSize;
 
-		if (! $error)
-		{
-			$this->oldref = $this->ref;
-
-			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref))
-			{
-				// On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
-				// in order not to lose the attached files
-				$oldref = dol_sanitizeFileName($this->ref);
-				$newref = dol_sanitizeFileName($numref);
-				$dirsource = $conf->expedition->dir_output.'/sending/'.$oldref;
-				$dirdest = $conf->expedition->dir_output.'/sending/'.$newref;
-				if (file_exists($dirsource))
-				{
-					dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
-
-					if (@rename($dirsource, $dirdest))
-					{
-						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)
-						{
-							$dirsource=$fileentry['name'];
-							$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-							$dirsource=$fileentry['path'].'/'.$dirsource;
-							$dirdest=$fileentry['path'].'/'.$dirdest;
-							@rename($dirsource, $dirdest);
-						}
-					}
-				}
-			}
-		}
-
-		// Set new ref and current status
-		if (! $error)
-		{
-			$this->ref = $numref;
-			$this->statut = 1;
-		}
+    public $date_delivery;		// Date delivery planed
 
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-	}
+    /**
+     * @deprecated
+     * @see date_shipping
+     */
+    public $date;
 
+    /**
+     * @deprecated
+     * @see date_shipping
+     */
+    public $date_expedition;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Create a delivery receipt from a shipment
-	 *
-	 *	@param	User	$user       User
-	 *  @return int  				<0 if KO, >=0 if OK
-	 */
-	function create_delivery($user)
-	{
-        // phpcs:enable
-		global $conf;
+    /**
+     * Effective delivery date
+     * @var int
+     */
+    public $date_shipping;
 
-		if ($conf->livraison_bon->enabled)
-		{
-			if ($this->statut == 1 || $this->statut == 2)
-			{
-				// 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);
-				if ($result > 0)
-				{
-					return $result;
-				}
-				else
-				{
-					$this->error=$delivery->error;
-					return $result;
-				}
-			}
-			else return 0;
-		}
-		else return 0;
-	}
-
-	/**
-	 * Add an expedition line.
-	 * If STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS is set, you can add a shipment line, with no stock source defined
-	 * If STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT is not set, you can add a shipment line, even if not enough into stock
-	 *
-	 * @param 	int		$entrepot_id		Id of warehouse
-	 * @param 	int		$id					Id of source line (order line)
-	 * @param 	int		$qty				Quantity
-	 * @param	array	$array_options		extrafields array
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	function addline($entrepot_id, $id, $qty,$array_options=0)
-	{
-		global $conf, $langs;
-
-		$num = count($this->lines);
-		$line = new ExpeditionLigne($this->db);
-
-		$line->entrepot_id = $entrepot_id;
-		$line->origin_line_id = $id;
-		$line->qty = $qty;
-
-		$orderline = new OrderLine($this->db);
-		$orderline->fetch($id);
-
-		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))
-			{
-				$langs->load("errors");
-				$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);
-
-				if ($entrepot_id > 0) {
-					$product->load_stock('warehouseopen');
-					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
-				}
-				else
-					$product_stock = $product->stock_reel;
-
-				$product_type=$product->type;
-				if ($product_type == 0 && $product_stock < $qty)
-				{
-					$langs->load("errors");
-					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
-					$this->db->rollback();
-					return -3;
-				}
-			}
-		}
-
-		// 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))
-		{
-			$this->error='ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
-			return -4;
-		}
+    public $date_creation;
+    public $date_valid;
 
-		// extrafields
-		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;
+    public $meths;
+    public $listmeths;			// List of carriers
 
-		$this->lines[$num] = $line;
-	}
+    /**
+     * Draft status
+     */
+    const STATUS_DRAFT = 0;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Add a shipment line with batch record
-	 *
-	 * @param 	array		$dbatch		Array of value (key 'detail' -> Array, key 'qty' total quantity for line, key ix_l : original line index)
-	 * @param	array		$array_options		extrafields array
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function addline_batch($dbatch,$array_options=0)
-	{
-        // phpcs:enable
-		global $conf,$langs;
+    /**
+     * Validated status
+     */
+    const STATUS_VALIDATED = 1;
 
-		$num = count($this->lines);
-		if ($dbatch['qty']>0)
-		{
-			$line = new ExpeditionLigne($this->db);
-			$tab=array();
-			foreach ($dbatch['detail'] as $key=>$value)
-			{
-				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)
-					{
-						$this->error=$linebatch->error;
-						return -1;
-					}
-					$linebatch->qty=$value['q'];
-					$tab[]=$linebatch;
-
-					if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
-					{
-						require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-						$prod_batch = new Productbatch($this->db);
-						$prod_batch->fetch($value['id_batch']);
-
-						if ($prod_batch->qty < $linebatch->qty)
-						{
-							$langs->load("errors");
-							$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;
-						}
-					}
-
-					//var_dump($linebatch);
-				}
-			}
-			$line->entrepot_id = $linebatch->entrepot_id;
-			$line->origin_line_id = $dbatch['ix_l'];
-			$line->qty = $dbatch['qty'];
-			$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
-				$line->array_options = $array_options;
-
-			//var_dump($line);
-			$this->lines[$num] = $line;
-			return 1;
-		}
-	}
-
-	/**
-	 *  Update database
-	 *
-	 *  @param	User	$user        	User that modify
-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 			       	<0 if KO, >0 if OK
-	 */
-	function update($user=null, $notrigger=0)
-	{
-		global $conf;
-		$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);
-
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// 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;
-
-		$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 (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('SHIPPING_MODIFY',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-	/**
-	 * 	Delete shipment.
-	 * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
-	 *
-	 * 	@return	int		>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
-	 */
-	function delete()
-	{
-		global $conf, $langs, $user;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-
-		$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
-		if (count($this->linkedObjectsIds) > 0)
-		{
-			$this->error='ErrorThereIsSomeDeliveries';
-			$error++;
-		}
+    /**
+     * Closed status
+     */
+    const STATUS_CLOSED = 2;
 
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$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)
-		{
-			require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
-
-			$langs->load("agenda");
-
-			// 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";
-
-			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					dol_syslog(get_class($this)."::delete movement index ".$i);
-					$obj = $this->db->fetch_object($resql);
-
-					$mouvS = new MouvementStock($this->db);
-					// we do not log origin because it will be deleted
-					$mouvS->origin = null;
-					// get lot/serial
-					$lotArray = null;
-					if ($conf->productbatch->enabled)
-					{
-						$lotArray = ExpeditionLineBatch::fetchAll($this->db,$obj->expeditiondet_id);
-						if (! is_array($lotArray))
-						{
-							$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
-						if ($result < 0)
-						{
-							$error++;$this->errors=$this->errors + $mouvS->errors;
-							break;
-						}
-					}
-					else
-					{
-						// We increment stock of batches
-						// We use warehouse selected for each line
-						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
-							if ($result < 0)
-							{
-								$error++;$this->errors=$this->errors + $mouvS->errors;
-								break;
-							}
-						}
-						if ($error) break; // break for loop incase of error
-					}
-				}
-			}
-			else
-			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
-			}
-		}
-
-		// delete batch expedition line
-		if (! $error && $conf->productbatch->enabled)
-		{
-			if (ExpeditionLineBatch::deletefromexp($this->db,$this->id) < 0)
-			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
-			}
-		}
 
-		if (! $error)
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
-			$sql.= " WHERE fk_expedition = ".$this->id;
-
-			if ( $this->db->query($sql) )
-			{
-				// Delete linked object
-				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
-
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
-					$sql.= " WHERE rowid = ".$this->id;
-
-					if ($this->db->query($sql))
-					{
-						if (! empty($this->origin) && $this->origin_id > 0)
-						{
-							$this->fetch_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"
-								$this->$origin->loadExpeditions();
-								//var_dump($this->$origin->expeditions);exit;
-								if (count($this->$origin->expeditions) <= 0)
-								{
-									$this->$origin->setStatut(Commande::STATUS_VALIDATED);
-								}
-							}
-						}
-
-						if (! $error)
-						{
-							$this->db->commit();
-
-							// We delete PDFs
-							$ref = dol_sanitizeFileName($this->ref);
-							if (! empty($conf->expedition->dir_output))
-							{
-								$dir = $conf->expedition->dir_output . '/sending/' . $ref ;
-								$file = $dir . '/' . $ref . '.pdf';
-								if (file_exists($file))
-								{
-									if (! dol_delete_file($file))
-									{
-										return 0;
-									}
-								}
-								if (file_exists($dir))
-								{
-									if (!dol_delete_dir_recursive($dir))
-									{
-										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
-										return 0;
-									}
-								}
-							}
-
-							return 1;
-						}
-						else
-						{
-							$this->db->rollback();
-							return -1;
-						}
-					}
-					else
-					{
-						$this->error=$this->db->lasterror()." - sql=$sql";
-						$this->db->rollback();
-						return -3;
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
-					$this->db->rollback();
-					return -2;
-				}
-			}
-			else
-			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->lines = array();
+        $this->products = array();
+
+        // List of long language codes for status
+        $this->statuts = array();
+        $this->statuts[-1] = 'StatusSendingCanceled';
+        $this->statuts[0]  = 'StatusSendingDraft';
+        $this->statuts[1]  = 'StatusSendingValidated';
+        $this->statuts[2]  = 'StatusSendingProcessed';
+
+        // List of short language codes for status
+        $this->statutshorts = array();
+        $this->statutshorts[-1] = 'StatusSendingCanceledShort';
+        $this->statutshorts[0]  = 'StatusSendingDraftShort';
+        $this->statutshorts[1]  = 'StatusSendingValidatedShort';
+        $this->statutshorts[2]  = 'StatusSendingProcessedShort';
+
+        /* Status "billed" or not is managed by another field than status
+		if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
 		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
+			$this->statuts[2]  = 'StatusSendingBilled';
+			$this->statutshorts[2]  = 'StatusSendingBilledShort';
+		}*/
+    }
+
+    /**
+     *	Return next contract ref
+     *
+     *	@param	Societe		$soc	Thirdparty object
+     *	@return string				Free reference for contract
+     */
+    function getNextNumRef($soc)
+    {
+        global $langs, $conf;
+        $langs->load("sendings");
+
+        if (!empty($conf->global->EXPEDITION_ADDON_NUMBER))
+        {
+            $mybool = false;
+
+            $file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
+            $classname = $conf->global->EXPEDITION_ADDON_NUMBER;
+
+            // Include file with class
+            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+            foreach ($dirmodels as $reldir) {
+
+                $dir = dol_buildpath($reldir."core/modules/expedition/");
+
+                // Load file with numbering class (if found)
+                $mybool|=@include_once $dir.$file;
+            }
+
+            if (! $mybool)
+            {
+                dol_print_error('',"Failed to include file ".$file);
+                return '';
+            }
+
+            $obj = new $classname();
+            $numref = "";
+            $numref = $obj->getNextValue($soc,$this);
+
+            if ( $numref != "")
+            {
+                return $numref;
+            }
+            else
+            {
+                dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+                return "";
+            }
+        }
+        else
+        {
+            print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
+            return "";
+        }
+    }
+
+    /**
+     *  Create expedition en base
+     *
+     *  @param	User	$user       Objet du user qui cree
+     * 	@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)
+    {
+        global $conf, $hookmanager;
+
+        $now=dol_now();
+
+        require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+        $error = 0;
+
+        // Clean parameters
+        $this->brouillon = 1;
+        $this->tracking_number = dol_sanitizeFileName($this->tracking_number);
+        if (empty($this->fk_project)) $this->fk_project = 0;
+
+        $this->user = $user;
+
+
+        $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.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $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;
+
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            if ($this->db->query($sql))
+            {
+                // Insertion des lignes
+                $num=count($this->lines);
+                for ($i = 0; $i < $num; $i++)
+                {
+                    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)
+                        {
+                            $error++;
+                        }
+                    }
+                    else
+                    {	// with batch management
+                        if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0)
+                        {
+                            $error++;
+                        }
+                    }
+                }
+
+                if (! $error && $this->id && $this->origin_id)
+                {
+                    $ret = $this->add_object_linked();
+                    if (!$ret)
+                    {
+                        $error++;
+                    }
+                }
+
+                // Actions on extra fields
+                if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+                {
+                    $result=$this->insertExtraFields();
+                    if ($result < 0)
+                    {
+                        $error++;
+                    }
+                }
+
+                if (! $error && ! $notrigger)
+                {
+                    // Call trigger
+                    $result=$this->call_trigger('SHIPPING_CREATE',$user);
+                    if ($result < 0) { $error++; }
+                    // End call triggers
+
+                    if (! $error)
+                    {
+                        $this->db->commit();
+                        return $this->id;
+                    }
+                    else
+                    {
+                        foreach($this->errors as $errmsg)
+                        {
+                            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                            $this->error.=($this->error?', '.$errmsg:$errmsg);
+                        }
+                        $this->db->rollback();
+                        return -1*$error;
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $this->error=$this->db->lasterror()." - sql=$sql";
+                    $this->db->rollback();
+                    return -3;
+                }
+            }
+            else
+            {
+                $error++;
+                $this->error=$this->db->lasterror()." - sql=$sql";
+                $this->db->rollback();
+                return -2;
+            }
+        }
+        else
+        {
+            $error++;
+            $this->error=$this->db->error()." - sql=$sql";
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Load lines
-	 *
-	 *	@return	int		>0 if OK, Otherwise if KO
-	 */
-	function fetch_lines()
-	{
-        // phpcs:enable
-		global $conf, $mysoc;
-		// 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";
-
-		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			$lineindex = 0;
-			$originline = 0;
-
-			$this->total_ht = 0;
-			$this->total_tva = 0;
-			$this->total_ttc = 0;
-			$this->total_localtax1 = 0;
-			$this->total_localtax2 = 0;
-
-			while ($i < $num)
-			{
-				$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;
-				} else {
-					$line = new ExpeditionLigne($this->db);
-					$line->entrepot_id    	= $obj->fk_entrepot;
-					$line->qty_shipped    	= $obj->qty_shipped;
-				}
-
-				$detail_entrepot              = new stdClass;
-				$detail_entrepot->entrepot_id = $obj->fk_entrepot;
-				$detail_entrepot->qty_shipped = $obj->qty_shipped;
-				$detail_entrepot->line_id     = $obj->line_id;
-				$line->details_entrepot[]     = $detail_entrepot;
-
-				$line->line_id          = $obj->line_id;
-				$line->rowid            = $obj->line_id;    // TODO deprecated
-				$line->id               = $obj->line_id;
-
-				$line->fk_origin     	= 'orderline';
-				$line->fk_origin_line 	= $obj->fk_origin_line;
-				$line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
-
-				$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->description    	= $obj->description;
-				$line->qty_asked      	= $obj->qty_asked;
-				$line->weight         	= $obj->weight;
-				$line->weight_units   	= $obj->weight_units;
-				$line->length         	= $obj->length;
-				$line->length_units   	= $obj->length_units;
-				$line->surface        	= $obj->surface;
-				$line->surface_units   	= $obj->surface_units;
-				$line->volume         	= $obj->volume;
-				$line->volume_units   	= $obj->volume_units;
-
-				$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);
-				$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];
-				$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->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;
-
-				$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->multicurrency_subprice 	= $obj->multicurrency_subprice;
-				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
-				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-
-				if ($originline != $obj->fk_origin_line)
-				{
-					$line->detail_batch = array();
-				}
-
-				// Detail of batch
-				if (! empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0)
-				{
-					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-
-					$newdetailbatch = ExpeditionLineBatch::fetchAll($this->db, $obj->line_id, $obj->fk_product);
-					if (is_array($newdetailbatch))
-					{
-						if ($originline != $obj->fk_origin_line)
-						{
-							$line->detail_batch = $newdetailbatch;
-						}
-						else
-						{
-							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
-						}
-					}
-				}
-
-				if ($originline != $obj->fk_origin_line)
-				{
-					$this->lines[$lineindex] = $line;
-					$lineindex++;
-				}
-				else
-				{
-					$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];
-				}
-
-				$i++;
-				$originline = $obj->fk_origin_line;
-			}
-			$this->db->free($resql);
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -3;
-		}
-	}
-
-	/**
-	 *  Delete detail line
-	 *
-	 *  @param		User	$user			User making deletion
-	 *  @param		int		$lineid			Id of line to delete
-	 *  @return     int         			>0 if OK, <0 if KO
-	 */
-	function deleteline($user, $lineid)
-	{
-		global $user;
-
-		if ($this->statut == self::STATUS_DRAFT)
-		{
-			$this->db->begin();
-
-			$line=new ExpeditionLigne($this->db);
-
-			// For triggers
-			$line->fetch($lineid);
-
-			if ($line->delete($user) > 0)
-			{
-				//$this->update_price(1);
-
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error='ErrorDeleteLineNotAllowedByObjectStatus';
-			return -2;
-		}
-	}
-
-
-	/**
-	 *	Return clicable link of object (with eventually picto)
-	 *
-	 *	@param      int			$withpicto      			Add picto into link
-	 *	@param      string		$option         			Where the link point to
-	 *	@param      int			$max          				Max length to show
-	 *	@param      int			$short						Use short labels
-	 *  @param      int         $notooltip      			1=No tooltip
-	 *  @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)
-	{
-		global $langs;
-
-		$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;
-
-		if ($short) return $url;
-
-		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';
-		}
-
-		$linkclose='';
-		if (empty($notooltip))
-		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label=$langs->trans("ShowSending");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip"';
-		}
-
-		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$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;
-		$result .= $linkend;
-
-		return $result;
-	}
-
-	/**
-	 *	Return status label
-	 *
-	 *	@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)
-	{
-		return $this->LibStatut($this->statut,$mode);
-	}
+    /**
+     * Create a expedition line
+     *
+     * @param 	int		$entrepot_id		Id of warehouse
+     * @param 	int		$origin_line_id		Id of source line
+     * @param 	int		$qty				Quantity
+     * @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)
+    {
+        //phpcs:enable
+        $expeditionline = new ExpeditionLigne($this->db);
+        $expeditionline->fk_expedition = $this->id;
+        $expeditionline->entrepot_id = $entrepot_id;
+        $expeditionline->fk_origin_line = $origin_line_id;
+        $expeditionline->qty = $qty;
+        $expeditionline->array_options = $array_options;
+
+        if (($lineId = $expeditionline->insert()) < 0)
+        {
+            $this->errors[]=$expeditionline->error;
+        }
+        return $lineId;
+    }
+
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return label of a status
-	 *
-	 * @param      int		$statut		Id statut
-	 * @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)
-	{
+    /**
+     * Create the detail (eat-by date) of the expedition line
+     *
+     * @param 	object		$line_ext		full line informations
+     * @param	array		$array_options		extrafields array
+     * @return	int							<0 if KO, >0 if OK
+     */
+    function create_line_batch($line_ext,$array_options=0)
+    {
         // phpcs:enable
-		global $langs;
+        $error = 0;
+        $stockLocationQty = array(); // associated array with batch qty in stock location
+
+        $tab=$line_ext->detail_batch;
+        // create stockLocation Qty array
+        foreach ($tab as $detbatch)
+        {
+            if ($detbatch->entrepot_id)
+            {
+                $stockLocationQty[$detbatch->entrepot_id] += $detbatch->qty;
+            }
+        }
+        // create shipment lines
+        foreach ($stockLocationQty as $stockLocation => $qty)
+        {
+            if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
+            {
+                $error++;
+            }
+            else
+            {
+                // create shipment batch lines for stockLocation
+                foreach ($tab as $detbatch)
+                {
+                    if ($detbatch->entrepot_id == $stockLocation){
+                        if (! ($detbatch->create($line_id) >0))		// Create an expeditionlinebatch
+                        {
+                            $error++;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (! $error) return 1;
+        else return -1;
+    }
+
+    /**
+     *	Get object and lines from database
+     *
+     *	@param	int		$id       	Id of object to load
+     * 	@param	string	$ref		Ref of object
+     * 	@param	string	$ref_ext	External reference of object
+     * 	@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='')
+    {
+        global $conf;
+
+        // Check parameters
+        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)."'";
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $this->id                   = $obj->rowid;
+                $this->ref                  = $obj->ref;
+                $this->socid                = $obj->socid;
+                $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->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->tracking_number      = $obj->tracking_number;
+                $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->trueWeight           = $obj->weight;
+                $this->weight_units         = $obj->weight_units;
+
+                $this->trueWidth            = $obj->width;
+                $this->width_units          = $obj->size_units;
+                $this->trueHeight           = $obj->height;
+                $this->height_units         = $obj->size_units;
+                $this->trueDepth            = $obj->size;
+                $this->depth_units          = $obj->size_units;
+
+                $this->note_public          = $obj->note_public;
+                $this->note_private         = $obj->note_private;
+
+                // A denormalized value
+                $this->trueSize             = $obj->size."x".$obj->width."x".$obj->height;
+                $this->size_units           = $obj->size_units;
+
+                //Incoterms
+                $this->fk_incoterms         = $obj->fk_incoterms;
+                $this->location_incoterms   = $obj->location_incoterms;
+                $this->libelle_incoterms    = $obj->libelle_incoterms;
+
+                $this->db->free($result);
+
+                if ($this->statut == 0) $this->brouillon = 1;
+
+                // Tracking url
+                $this->getUrlTrackingStatus($obj->tracking_number);
+
+                /*
+				 * Thirparty
+				 */
+                $result=$this->fetch_thirdparty();
+
+                // Retreive extrafields
+                $this->fetch_optionals();
+
+                /*
+				 * Lines
+				 */
+                $result=$this->fetch_lines();
+                if ($result < 0)
+                {
+                    return -3;
+                }
+
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
+                $this->error='Delivery with id '.$id.' not found';
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
+    /**
+     *  Validate object and update stock if option enabled
+     *
+     *  @param      User		$user       Object user that validate
+     *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
+     *  @return     int						<0 if OK, >0 if KO
+     */
+    function valid($user, $notrigger=0)
+    {
+        global $conf, $langs;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        dol_syslog(get_class($this)."::valid");
+
+        // Protection
+        if ($this->statut)
+        {
+            dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
+            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))))
+        {
+            $this->error='Permission denied';
+            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+            return -1;
+        }
+
+        $this->db->begin();
+
+        $error = 0;
+
+        // Define new ref
+        $soc = new Societe($this->db);
+        $soc->fetch($this->socid);
+
+        // Class of company linked to order
+        $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
+        {
+            $numref = $this->getNextNumRef($soc);
+        }
+        else
+        {
+            $numref = "EXP".$this->id;
+        }
+        $this->newref = $numref;
+
+        $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;
+
+        dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql)
+        {
+            $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))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+            $langs->load("agenda");
+
+            // 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";
+
+            dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $cpt = $this->db->num_rows($resql);
+                for ($i = 0; $i < $cpt; $i++)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if (empty($obj->edbrowid))
+                    {
+                        $qty = $obj->qty;
+                    }
+                    else
+                    {
+                        $qty = $obj->edbqty;
+                    }
+                    if ($qty <= 0) continue;
+                    dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+                    //var_dump($this->lines[$i]);
+                    $mouvS = new MouvementStock($this->db);
+                    $mouvS->origin = &$this;
+
+                    if (empty($obj->edbrowid))
+                    {
+                        // 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));
+                        if ($result < 0) {
+                            $error++;
+                            $this->errors[]=$mouvS->error;
+                            $this->errors = array_merge($this->errors, $mouvS->errors);
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        // 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.
+                        // 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);
+                        if ($result < 0) {
+                            $error++;
+                            $this->errors[]=$mouvS->error;
+                            $this->errors = array_merge($this->errors, $mouvS->errors);
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error();
+                return -2;
+            }
+        }
+
+        // Change status of order to "shipment in process"
+        $ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
+
+        if (! $ret)
+        {
+            $error++;
+        }
+
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('SHIPPING_VALIDATE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+        }
+
+        if (! $error)
+        {
+            $this->oldref = $this->ref;
+
+            // Rename directory if dir was a temporary ref
+            if (preg_match('/^[\(]?PROV/i', $this->ref))
+            {
+                // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
+                // in order not to lose the attached files
+                $oldref = dol_sanitizeFileName($this->ref);
+                $newref = dol_sanitizeFileName($numref);
+                $dirsource = $conf->expedition->dir_output.'/sending/'.$oldref;
+                $dirdest = $conf->expedition->dir_output.'/sending/'.$newref;
+                if (file_exists($dirsource))
+                {
+                    dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
+
+                    if (@rename($dirsource, $dirdest))
+                    {
+                        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)
+                        {
+                            $dirsource=$fileentry['name'];
+                            $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+                            $dirsource=$fileentry['path'].'/'.$dirsource;
+                            $dirdest=$fileentry['path'].'/'.$dirdest;
+                            @rename($dirsource, $dirdest);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Set new ref and current status
+        if (! $error)
+        {
+            $this->ref = $numref;
+            $this->statut = 1;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+    }
 
-		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]);
-		}
-		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]);
-		}
-		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');
-		}
-		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]);
-		}
-		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');
-		}
-	}
-
-	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		global $langs;
-
-		$now=dol_now();
-
-		dol_syslog(get_class($this)."::initAsSpecimen");
-
-		// Load array of products prodids
-		$num_prods = 0;
-		$prodids = array();
-		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num_prods = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num_prods)
-			{
-				$i++;
-				$row = $this->db->fetch_row($resql);
-				$prodids[$i] = $row[0];
-			}
-		}
-
-		$order=new Commande($this->db);
-		$order->initAsSpecimen();
-
-		// Initialise parametres
-		$this->id=0;
-		$this->ref = 'SPECIMEN';
-		$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->entrepot_id          = 0;
-		$this->fk_delivery_address  = 0;
-		$this->socid                = 1;
-
-		$this->commande_id          = 0;
-		$this->commande             = $order;
-
-		$this->origin_id            = 1;
-		$this->origin               = 'commande';
-
-		$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;
-			$xnbp++;
-		}
-	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Set the planned delivery date
-	 *
-	 *	@param      User			$user        		Objet utilisateur qui modifie
-	 *	@param      timestamp		$date_livraison     Date de livraison
-	 *	@return     int         						<0 if KO, >0 if OK
-	 */
-	function set_date_livraison($user, $date_livraison)
-	{
+    /**
+     *	Create a delivery receipt from a shipment
+     *
+     *	@param	User	$user       User
+     *  @return int  				<0 if KO, >=0 if OK
+     */
+    function create_delivery($user)
+    {
         // phpcs:enable
-		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;
-
-			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->date_delivery = $date_livraison;
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			return -2;
-		}
-	}
+        global $conf;
+
+        if ($conf->livraison_bon->enabled)
+        {
+            if ($this->statut == 1 || $this->statut == 2)
+            {
+                // 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);
+                if ($result > 0)
+                {
+                    return $result;
+                }
+                else
+                {
+                    $this->error=$delivery->error;
+                    return $result;
+                }
+            }
+            else return 0;
+        }
+        else return 0;
+    }
+
+    /**
+     * Add an expedition line.
+     * If STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS is set, you can add a shipment line, with no stock source defined
+     * If STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT is not set, you can add a shipment line, even if not enough into stock
+     *
+     * @param 	int		$entrepot_id		Id of warehouse
+     * @param 	int		$id					Id of source line (order line)
+     * @param 	int		$qty				Quantity
+     * @param	array	$array_options		extrafields array
+     * @return	int							<0 if KO, >0 if OK
+     */
+    function addline($entrepot_id, $id, $qty,$array_options=0)
+    {
+        global $conf, $langs;
+
+        $num = count($this->lines);
+        $line = new ExpeditionLigne($this->db);
+
+        $line->entrepot_id = $entrepot_id;
+        $line->origin_line_id = $id;
+        $line->qty = $qty;
+
+        $orderline = new OrderLine($this->db);
+        $orderline->fetch($id);
+
+        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))
+            {
+                $langs->load("errors");
+                $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);
+
+                if ($entrepot_id > 0) {
+                    $product->load_stock('warehouseopen');
+                    $product_stock = $product->stock_warehouse[$entrepot_id]->real;
+                }
+                else
+                    $product_stock = $product->stock_reel;
+
+                $product_type=$product->type;
+                if ($product_type == 0 && $product_stock < $qty)
+                {
+                    $langs->load("errors");
+                    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
+                    $this->db->rollback();
+                    return -3;
+                }
+            }
+        }
+
+        // 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))
+        {
+            $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
+            $line->array_options = $array_options;
+
+        $this->lines[$num] = $line;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
-	 *
-	 * 	@return	void
-	 */
-	function fetch_delivery_methods()
-	{
+    /**
+     * Add a shipment line with batch record
+     *
+     * @param 	array		$dbatch		Array of value (key 'detail' -> Array, key 'qty' total quantity for line, key ix_l : original line index)
+     * @param	array		$array_options		extrafields array
+     * @return	int						<0 if KO, >0 if OK
+     */
+    function addline_batch($dbatch,$array_options=0)
+    {
         // phpcs:enable
-		global $langs;
-		$this->meths = array();
+        global $conf,$langs;
+
+        $num = count($this->lines);
+        if ($dbatch['qty']>0)
+        {
+            $line = new ExpeditionLigne($this->db);
+            $tab=array();
+            foreach ($dbatch['detail'] as $key=>$value)
+            {
+                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)
+                    {
+                        $this->error=$linebatch->error;
+                        return -1;
+                    }
+                    $linebatch->qty=$value['q'];
+                    $tab[]=$linebatch;
+
+                    if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
+                    {
+                        require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+                        $prod_batch = new Productbatch($this->db);
+                        $prod_batch->fetch($value['id_batch']);
+
+                        if ($prod_batch->qty < $linebatch->qty)
+                        {
+                            $langs->load("errors");
+                            $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;
+                        }
+                    }
+
+                    //var_dump($linebatch);
+                }
+            }
+            $line->entrepot_id = $linebatch->entrepot_id;
+            $line->origin_line_id = $dbatch['ix_l'];
+            $line->qty = $dbatch['qty'];
+            $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
+                $line->array_options = $array_options;
+
+            //var_dump($line);
+            $this->lines[$num] = $line;
+            return 1;
+        }
+    }
 
-		$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";
+    /**
+     *  Update database
+     *
+     *  @param	User	$user        	User that modify
+     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *  @return int 			       	<0 if KO, >0 if OK
+     */
+    function update($user=null, $notrigger=0)
+    {
+        global $conf;
+        $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);
+
+
+
+        // Check parameters
+        // Put here code to add control on parameters values
+
+        // 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;
+
+        $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 (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('SHIPPING_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 
-		$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);
-			}
-		}
-	}
+    /**
+     * 	Delete shipment.
+     * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
+     *
+     * 	@return	int		>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
+     */
+    function delete()
+    {
+        global $conf, $langs, $user;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+
+        $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
+        if (count($this->linkedObjectsIds) > 0)
+        {
+            $this->error='ErrorThereIsSomeDeliveries';
+            $error++;
+        }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $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)
+        {
+            require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
+
+            $langs->load("agenda");
+
+            // 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";
+
+            dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $cpt = $this->db->num_rows($resql);
+                for ($i = 0; $i < $cpt; $i++)
+                {
+                    dol_syslog(get_class($this)."::delete movement index ".$i);
+                    $obj = $this->db->fetch_object($resql);
+
+                    $mouvS = new MouvementStock($this->db);
+                    // we do not log origin because it will be deleted
+                    $mouvS->origin = null;
+                    // get lot/serial
+                    $lotArray = null;
+                    if ($conf->productbatch->enabled)
+                    {
+                        $lotArray = ExpeditionLineBatch::fetchAll($this->db,$obj->expeditiondet_id);
+                        if (! is_array($lotArray))
+                        {
+                            $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
+                        if ($result < 0)
+                        {
+                            $error++;$this->errors=$this->errors + $mouvS->errors;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        // We increment stock of batches
+                        // We use warehouse selected for each line
+                        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
+                            if ($result < 0)
+                            {
+                                $error++;$this->errors=$this->errors + $mouvS->errors;
+                                break;
+                            }
+                        }
+                        if ($error) break; // break for loop incase of error
+                    }
+                }
+            }
+            else
+            {
+                $error++;$this->errors[]="Error ".$this->db->lasterror();
+            }
+        }
+
+        // delete batch expedition line
+        if (! $error && $conf->productbatch->enabled)
+        {
+            if (ExpeditionLineBatch::deletefromexp($this->db,$this->id) < 0)
+            {
+                $error++;$this->errors[]="Error ".$this->db->lasterror();
+            }
+        }
+
+        if (! $error)
+        {
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
+            $sql.= " WHERE fk_expedition = ".$this->id;
+
+            if ( $this->db->query($sql) )
+            {
+                // Delete linked object
+                $res = $this->deleteObjectLinked();
+                if ($res < 0) $error++;
+
+                if (! $error)
+                {
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
+                    $sql.= " WHERE rowid = ".$this->id;
+
+                    if ($this->db->query($sql))
+                    {
+                        if (! empty($this->origin) && $this->origin_id > 0)
+                        {
+                            $this->fetch_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"
+                                $this->$origin->loadExpeditions();
+                                //var_dump($this->$origin->expeditions);exit;
+                                if (count($this->$origin->expeditions) <= 0)
+                                {
+                                    $this->$origin->setStatut(Commande::STATUS_VALIDATED);
+                                }
+                            }
+                        }
+
+                        if (! $error)
+                        {
+                            $this->db->commit();
+
+                            // We delete PDFs
+                            $ref = dol_sanitizeFileName($this->ref);
+                            if (! empty($conf->expedition->dir_output))
+                            {
+                                $dir = $conf->expedition->dir_output . '/sending/' . $ref ;
+                                $file = $dir . '/' . $ref . '.pdf';
+                                if (file_exists($file))
+                                {
+                                    if (! dol_delete_file($file))
+                                    {
+                                        return 0;
+                                    }
+                                }
+                                if (file_exists($dir))
+                                {
+                                    if (!dol_delete_dir_recursive($dir))
+                                    {
+                                        $this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+                                        return 0;
+                                    }
+                                }
+                            }
+
+                            return 1;
+                        }
+                        else
+                        {
+                            $this->db->rollback();
+                            return -1;
+                        }
+                    }
+                    else
+                    {
+                        $this->error=$this->db->lasterror()." - sql=$sql";
+                        $this->db->rollback();
+                        return -3;
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror()." - sql=$sql";
+                    $this->db->rollback();
+                    return -2;
+                }
+            }
+            else
+            {
+                $this->error=$this->db->lasterror()." - sql=$sql";
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Fetch all deliveries method and return an array. Load array this->listmeths.
-	 *
-	 *  @param  id      $id     only this carrier, all if none
-	 *  @return void
-	 */
-	function list_delivery_methods($id='')
-	{
+    /**
+     *	Load lines
+     *
+     *	@return	int		>0 if OK, Otherwise if KO
+     */
+    function fetch_lines()
+    {
         // phpcs:enable
-		global $langs;
+        global $conf, $mysoc;
+        // 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";
+
+        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            $lineindex = 0;
+            $originline = 0;
+
+            $this->total_ht = 0;
+            $this->total_tva = 0;
+            $this->total_ttc = 0;
+            $this->total_localtax1 = 0;
+            $this->total_localtax2 = 0;
+
+            while ($i < $num)
+            {
+                $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;
+                } else {
+                    $line = new ExpeditionLigne($this->db);
+                    $line->entrepot_id    	= $obj->fk_entrepot;
+                    $line->qty_shipped    	= $obj->qty_shipped;
+                }
+
+                $detail_entrepot              = new stdClass;
+                $detail_entrepot->entrepot_id = $obj->fk_entrepot;
+                $detail_entrepot->qty_shipped = $obj->qty_shipped;
+                $detail_entrepot->line_id     = $obj->line_id;
+                $line->details_entrepot[]     = $detail_entrepot;
+
+                $line->line_id          = $obj->line_id;
+                $line->rowid            = $obj->line_id;    // TODO deprecated
+                $line->id               = $obj->line_id;
+
+                $line->fk_origin     	= 'orderline';
+                $line->fk_origin_line 	= $obj->fk_origin_line;
+                $line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
+
+                $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->description    	= $obj->description;
+                $line->qty_asked      	= $obj->qty_asked;
+                $line->weight         	= $obj->weight;
+                $line->weight_units   	= $obj->weight_units;
+                $line->length         	= $obj->length;
+                $line->length_units   	= $obj->length_units;
+                $line->surface        	= $obj->surface;
+                $line->surface_units   	= $obj->surface_units;
+                $line->volume         	= $obj->volume;
+                $line->volume_units   	= $obj->volume_units;
+
+                $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);
+                $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];
+                $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->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;
+
+                $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->multicurrency_subprice 	= $obj->multicurrency_subprice;
+                $this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+                $this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+                $this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+
+                if ($originline != $obj->fk_origin_line)
+                {
+                    $line->detail_batch = array();
+                }
+
+                // Detail of batch
+                if (! empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0)
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+
+                    $newdetailbatch = ExpeditionLineBatch::fetchAll($this->db, $obj->line_id, $obj->fk_product);
+                    if (is_array($newdetailbatch))
+                    {
+                        if ($originline != $obj->fk_origin_line)
+                        {
+                            $line->detail_batch = $newdetailbatch;
+                        }
+                        else
+                        {
+                            $line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
+                        }
+                    }
+                }
+
+                if ($originline != $obj->fk_origin_line)
+                {
+                    $this->lines[$lineindex] = $line;
+                    $lineindex++;
+                }
+                else
+                {
+                    $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];
+                }
+
+                $i++;
+                $originline = $obj->fk_origin_line;
+            }
+            $this->db->free($resql);
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -3;
+        }
+    }
 
-		$this->listmeths = array();
-		$i=0;
+    /**
+     *  Delete detail line
+     *
+     *  @param		User	$user			User making deletion
+     *  @param		int		$lineid			Id of line to delete
+     *  @return     int         			>0 if OK, <0 if KO
+     */
+    function deleteline($user, $lineid)
+    {
+        global $user;
+
+        if ($this->statut == self::STATUS_DRAFT)
+        {
+            $this->db->begin();
+
+            $line=new ExpeditionLigne($this->db);
+
+            // For triggers
+            $line->fetch($lineid);
+
+            if ($line->delete($user) > 0)
+            {
+                //$this->update_price(1);
+
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error='ErrorDeleteLineNotAllowedByObjectStatus';
+            return -2;
+        }
+    }
 
-		$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;
 
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$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);
-				$this->listmeths[$i]['description'] = $obj->description;
-				$this->listmeths[$i]['tracking'] = $obj->tracking;
-				$this->listmeths[$i]['active'] = $obj->active;
-				$i++;
-			}
-		}
-	}
+    /**
+     *	Return clicable link of object (with eventually picto)
+     *
+     *	@param      int			$withpicto      			Add picto into link
+     *	@param      string		$option         			Where the link point to
+     *	@param      int			$max          				Max length to show
+     *	@param      int			$short						Use short labels
+     *  @param      int         $notooltip      			1=No tooltip
+     *  @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)
+    {
+        global $langs;
+
+        $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;
+
+        if ($short) return $url;
+
+        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';
+        }
+
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowSending");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip"';
+        }
+
+        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $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;
+        $result .= $linkend;
+
+        return $result;
+    }
+
+    /**
+     *	Return status label
+     *
+     *	@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)
+    {
+        return $this->LibStatut($this->statut,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Update/create delivery method.
-	 *
-	 *  @param	string      $id     id method to activate
-	 *
-	 *  @return void
-	 */
-	function update_delivery_method($id='')
-	{
+    /**
+     * Return label of a status
+     *
+     * @param      int		$statut		Id statut
+     * @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)
+    {
         // phpcs:enable
-		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'])."')";
-			$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;
-			$resql = $this->db->query($sql);
-		}
-		if ($resql < 0) dol_print_error($this->db,'');
-	}
+        global $langs;
+
+        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]);
+        }
+        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]);
+        }
+        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');
+        }
+        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]);
+        }
+        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');
+        }
+    }
+
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+     */
+    function initAsSpecimen()
+    {
+        global $langs;
+
+        $now=dol_now();
+
+        dol_syslog(get_class($this)."::initAsSpecimen");
+
+        // Load array of products prodids
+        $num_prods = 0;
+        $prodids = array();
+        $sql = "SELECT rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."product";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num_prods = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num_prods)
+            {
+                $i++;
+                $row = $this->db->fetch_row($resql);
+                $prodids[$i] = $row[0];
+            }
+        }
+
+        $order=new Commande($this->db);
+        $order->initAsSpecimen();
+
+        // Initialise parametres
+        $this->id=0;
+        $this->ref = 'SPECIMEN';
+        $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->entrepot_id          = 0;
+        $this->fk_delivery_address  = 0;
+        $this->socid                = 1;
+
+        $this->commande_id          = 0;
+        $this->commande             = $order;
+
+        $this->origin_id            = 1;
+        $this->origin               = 'commande';
+
+        $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;
+            $xnbp++;
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *	Set the planned delivery date
+     *
+     *	@param      User			$user        		Objet utilisateur qui modifie
+     *	@param      timestamp		$date_livraison     Date de livraison
+     *	@return     int         						<0 if KO, >0 if OK
+     */
+    function set_date_livraison($user, $date_livraison)
+    {
+        // phpcs:enable
+        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;
+
+            dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->date_delivery = $date_livraison;
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            return -2;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Activate delivery method.
-	 *
-	 *  @param      id      $id     id method to activate
-	 *
-	 *  @return void
-	 */
-	function activ_delivery_method($id)
-	{
+    /**
+     *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
+     *
+     * 	@return	void
+     */
+    function fetch_delivery_methods()
+    {
         // phpcs:enable
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-		$sql.= ' WHERE rowid='.$id;
+        global $langs;
+        $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";
+
+        $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);
+            }
+        }
+    }
 
-		$resql = $this->db->query($sql);
-	}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Fetch all deliveries method and return an array. Load array this->listmeths.
+     *
+     *  @param  id      $id     only this carrier, all if none
+     *  @return void
+     */
+    function list_delivery_methods($id='')
+    {
+        // phpcs:enable
+        global $langs;
+
+        $this->listmeths = array();
+        $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;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $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);
+                $this->listmeths[$i]['description'] = $obj->description;
+                $this->listmeths[$i]['tracking'] = $obj->tracking;
+                $this->listmeths[$i]['active'] = $obj->active;
+                $i++;
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  DesActivate delivery method.
-	 *
-	 *  @param      id      $id     id method to desactivate
-	 *
-	 *  @return void
-	 */
-	function disable_delivery_method($id)
-	{
+    /**
+     *  Update/create delivery method.
+     *
+     *  @param	string      $id     id method to activate
+     *
+     *  @return void
+     */
+    function update_delivery_method($id='')
+    {
         // phpcs:enable
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-		$sql.= ' WHERE rowid='.$id;
-
-		$resql = $this->db->query($sql);
-	}
-
-
-	/**
-	 * Forge an set tracking url
-	 *
-	 * @param	string	$value		Value
-	 * @return	void
-	 */
-	function getUrlTrackingStatus($value='')
-	{
-		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;
-
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if ($obj = $this->db->fetch_object($resql))
-				{
-					$tracking = $obj->tracking;
-				}
-			}
-		}
-
-		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);
-		}
-		else
-		{
-			$this->tracking_url = $value;
-		}
-	}
+        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'])."')";
+            $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;
+            $resql = $this->db->query($sql);
+        }
+        if ($resql < 0) dol_print_error($this->db,'');
+    }
 
-	/**
-	 *	Classify the shipping as closed.
-	 *
-	 *	@return     int     <0 if KO, >0 if OK
-	 */
-	function setClosed()
-	{
-		global $conf,$langs,$user;
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Activate delivery method.
+     *
+     *  @param      id      $id     id method to activate
+     *
+     *  @return void
+     */
+    function activ_delivery_method($id)
+    {
+        // phpcs:enable
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
+        $sql.= ' WHERE rowid='.$id;
 
-		$error=0;
+        $resql = $this->db->query($sql);
+    }
 
-		$this->db->begin();
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  DesActivate delivery method.
+     *
+     *  @param      id      $id     id method to desactivate
+     *
+     *  @return void
+     */
+    function disable_delivery_method($id)
+    {
+        // phpcs:enable
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
+        $sql.= ' WHERE rowid='.$id;
 
-		$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)
-			if ($this->origin == 'commande' && $this->origin_id > 0)
-			{
-				$order = new Commande($this->db);
-				$order->fetch($this->origin_id);
-
-				$order->loadExpeditions(self::STATUS_CLOSED);		// Fill $order->expeditions = array(orderlineid => qty)
-
-				$shipments_match_order = 1;
-				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)
-					{
-						$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';
-						dol_syslog($text);
-						break;
-					}
-				}
-				if ($shipments_match_order)
-				{
-					dol_syslog("Qty for the ".count($order->lines)." lines of order have same value for shipments with status Expedition::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
-					$order->cloture($user);
-				}
-			}
-
-			$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))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-
-				$langs->load("agenda");
-
-				// 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";
-
-				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if ($resql)
-				{
-					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
-						$obj = $this->db->fetch_object($resql);
-						if (empty($obj->edbrowid))
-						{
-							$qty = $obj->qty;
-						}
-						else
-						{
-							$qty = $obj->edbqty;
-						}
-						if ($qty <= 0) continue;
-						dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
-
-						$mouvS = new MouvementStock($this->db);
-						$mouvS->origin = &$this;
-
-						if (empty($obj->edbrowid))
-						{
-							// 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));
-							if ($result < 0) {
-								$this->error = $mouvS->error;
-								$this->errors = $mouvS->errors;
-								$error++; break;
-							}
-						}
-						else
-						{
-							// 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);
-							if ($result < 0) {
-								$this->error = $mouvS->error;
-								$this->errors = $mouvS->errors;
-								$error++; break;
-							}
-						}
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$error++;
-				}
-			}
-
-			// Call trigger
-			if (! $error)
-			{
-				$result=$this->call_trigger('SHIPPING_CLOSED',$user);
-				if ($result < 0) {
-					$error++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			$error++;
-		}
 
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
+    /**
+     * Forge an set tracking url
+     *
+     * @param	string	$value		Value
+     * @return	void
+     */
+    function getUrlTrackingStatus($value='')
+    {
+        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;
+
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                if ($obj = $this->db->fetch_object($resql))
+                {
+                    $tracking = $obj->tracking;
+                }
+            }
+        }
+
+        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);
+        }
+        else
+        {
+            $this->tracking_url = $value;
+        }
+    }
+
+    /**
+     *	Classify the shipping as closed.
+     *
+     *	@return     int     <0 if KO, >0 if OK
+     */
+    function setClosed()
+    {
+        global $conf,$langs,$user;
+
+        $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);
+        if ($resql)
+        {
+            // Set order billed if 100% of order is shipped (qty in shipment lines match qty in order lines)
+            if ($this->origin == 'commande' && $this->origin_id > 0)
+            {
+                $order = new Commande($this->db);
+                $order->fetch($this->origin_id);
+
+                $order->loadExpeditions(self::STATUS_CLOSED);		// Fill $order->expeditions = array(orderlineid => qty)
+
+                $shipments_match_order = 1;
+                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)
+                    {
+                        $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';
+                        dol_syslog($text);
+                        break;
+                    }
+                }
+                if ($shipments_match_order)
+                {
+                    dol_syslog("Qty for the ".count($order->lines)." lines of order have same value for shipments with status Expedition::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
+                    $order->cloture($user);
+                }
+            }
+
+            $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))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+                $langs->load("agenda");
+
+                // 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";
+
+                dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if ($resql)
+                {
+                    $cpt = $this->db->num_rows($resql);
+                    for ($i = 0; $i < $cpt; $i++)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+                        if (empty($obj->edbrowid))
+                        {
+                            $qty = $obj->qty;
+                        }
+                        else
+                        {
+                            $qty = $obj->edbqty;
+                        }
+                        if ($qty <= 0) continue;
+                        dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+                        $mouvS = new MouvementStock($this->db);
+                        $mouvS->origin = &$this;
+
+                        if (empty($obj->edbrowid))
+                        {
+                            // 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));
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                        else
+                        {
+                            // 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);
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $error++;
+                }
+            }
+
+            // Call trigger
+            if (! $error)
+            {
+                $result=$this->call_trigger('SHIPPING_CLOSED',$user);
+                if ($result < 0) {
+                    $error++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
-	 *
-	 *	@return     int     <0 if ko, >0 if ok
-	 */
-	function set_billed()
-	{
+    /**
+     *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
+     *
+     *	@return     int     <0 if ko, >0 if ok
+     */
+    function set_billed()
+    {
         // phpcs:enable
-		global $user;
-		$error=0;
+        global $user;
+        $error=0;
+
+        $this->db->begin();
+
+        $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);
+        if ($resql)
+        {
+            $this->statut=2;
+            $this->billed=1;
+
+            // Call trigger
+            $result=$this->call_trigger('SHIPPING_BILLED',$user);
+            if ($result < 0) {
+                $error++;
+            }
+        } else {
+            $error++;
+            $this->errors[]=$this->db->lasterror;
+        }
+
+        if (empty($error)) {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
-		$this->db->begin();
+    /**
+     *	Classify the shipping as validated/opened
+     *
+     *	@return     int     <0 if KO, 0 if already open, >0 if OK
+     */
+    function reOpen()
+    {
+        global $conf,$langs,$user;
+
+        $error=0;
+
+        // Protection. This avoid to move stock later when we should not
+        if ($this->statut == self::STATUS_VALIDATED)
+        {
+            return 0;
+        }
+
+        $this->db->begin();
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=1';
+        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $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))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+                $langs->load("agenda");
+
+                // 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";
+
+                dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if ($resql)
+                {
+                    $cpt = $this->db->num_rows($resql);
+                    for ($i = 0; $i < $cpt; $i++)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+                        if (empty($obj->edbrowid))
+                        {
+                            $qty = $obj->qty;
+                        }
+                        else
+                        {
+                            $qty = $obj->edbqty;
+                        }
+                        if ($qty <= 0) continue;
+                        dol_syslog(get_class($this)."::reopen expedition movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+                        //var_dump($this->lines[$i]);
+                        $mouvS = new MouvementStock($this->db);
+                        $mouvS->origin = &$this;
+
+                        if (empty($obj->edbrowid))
+                        {
+                            // 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));
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                        else
+                        {
+                            // 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);
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $error++;
+                }
+            }
+
+            if (! $error)
+            {
+                // Call trigger
+                $result=$this->call_trigger('SHIPPING_REOPEN',$user);
+                if ($result < 0) {
+                    $error++;
+                }
+                }
+        } else {
+            $error++;
+            $this->errors[]=$this->db->lasterror();
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
-		$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';
+    /**
+     *  Create a document onto disk according to template module.
+     *
+     *  @param	    string		$modele			Force the model to using ('' to not force)
+     *  @param		Translate	$outputlangs	object lang to use for translations
+     *  @param      int			$hidedetails    Hide details of lines
+     *  @param      int			$hidedesc       Hide description
+     *  @param      int			$hideref        Hide ref
+     *  @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)
+    {
+        global $conf,$langs;
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->statut=2;
-			$this->billed=1;
-
-			// Call trigger
-			$result=$this->call_trigger('SHIPPING_BILLED',$user);
-			if ($result < 0) {
-				$error++;
-			}
-		} else {
-			$error++;
-			$this->errors[]=$this->db->lasterror;
-		}
-
-		if (empty($error)) {
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Classify the shipping as validated/opened
-	 *
-	 *	@return     int     <0 if KO, 0 if already open, >0 if OK
-	 */
-	function reOpen()
-	{
-		global $conf,$langs,$user;
-
-		$error=0;
-
-		// Protection. This avoid to move stock later when we should not
-		if ($this->statut == self::STATUS_VALIDATED)
-		{
-			return 0;
-		}
+        $langs->load("sendings");
 
-		$this->db->begin();
+        if (! dol_strlen($modele)) {
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=1';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+            $modele = 'rouget';
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$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))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-
-				$langs->load("agenda");
-
-				// 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";
-
-				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if ($resql)
-				{
-					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
-						$obj = $this->db->fetch_object($resql);
-						if (empty($obj->edbrowid))
-						{
-							$qty = $obj->qty;
-						}
-						else
-						{
-							$qty = $obj->edbqty;
-						}
-						if ($qty <= 0) continue;
-						dol_syslog(get_class($this)."::reopen expedition movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
-
-						//var_dump($this->lines[$i]);
-						$mouvS = new MouvementStock($this->db);
-						$mouvS->origin = &$this;
-
-						if (empty($obj->edbrowid))
-						{
-							// 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));
-							if ($result < 0) {
-								$this->error = $mouvS->error;
-								$this->errors = $mouvS->errors;
-								$error++; break;
-							}
-						}
-						else
-						{
-							// 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);
-							if ($result < 0) {
-								$this->error = $mouvS->error;
-								$this->errors = $mouvS->errors;
-								$error++; break;
-							}
-						}
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$error++;
-				}
-			}
-
-			if (! $error)
-			{
-				// Call trigger
-				$result=$this->call_trigger('SHIPPING_REOPEN',$user);
-				if ($result < 0) {
-					$error++;
-				}
-   			}
-		} else {
-			$error++;
-			$this->errors[]=$this->db->lasterror();
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Create a document onto disk according to template module.
-	 *
-	 *  @param	    string		$modele			Force the model to using ('' to not force)
-	 *  @param		Translate	$outputlangs	object lang to use for translations
-	 *  @param      int			$hidedetails    Hide details of lines
-	 *  @param      int			$hidedesc       Hide description
-	 *  @param      int			$hideref        Hide ref
-     *  @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)
-	{
-		global $conf,$langs;
-
-		$langs->load("sendings");
-
-		if (! dol_strlen($modele)) {
-
-			$modele = 'rouget';
-
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->EXPEDITION_ADDON_PDF)) {
-				$modele = $conf->global->EXPEDITION_ADDON_PDF;
-			}
-		}
-
-		$modelpath = "core/modules/expedition/doc/";
-
-		$this->fetch_origin();
-
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref,$moreparams);
-	}
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 *
-	 * @param DoliDB $db Database handler
-	 * @param int $origin_id Old thirdparty id
-	 * @param int $dest_id New thirdparty id
-	 * @return bool
-	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-	{
-		$tables = array(
-			'expedition'
-		);
-
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-	}
+            if ($this->modelpdf) {
+                $modele = $this->modelpdf;
+            } elseif (! empty($conf->global->EXPEDITION_ADDON_PDF)) {
+                $modele = $conf->global->EXPEDITION_ADDON_PDF;
+            }
+        }
+
+        $modelpath = "core/modules/expedition/doc/";
+
+        $this->fetch_origin();
+
+        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref,$moreparams);
+    }
+
+    /**
+     * Function used to replace a thirdparty id with another one.
+     *
+     * @param DoliDB $db Database handler
+     * @param int $origin_id Old thirdparty id
+     * @param int $dest_id New thirdparty id
+     * @return bool
+     */
+    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+    {
+        $tables = array(
+            'expedition'
+        );
+
+        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+    }
 }
 
 
@@ -2352,33 +2352,33 @@ 
  */
 class ExpeditionLigne extends CommonObjectLine
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='expeditiondet';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='expeditiondet';
-
-	/**
-	 * @deprecated
-	 * @see fk_origin_line
-	 */
-	public $origin_line_id;
-
-	/**
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='expeditiondet';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='expeditiondet';
+
+    /**
+     * @deprecated
+     * @see fk_origin_line
+     */
+    public $origin_line_id;
+
+    /**
      * @var int ID
      */
-	public $fk_origin_line;
+    public $fk_origin_line;
 
-	/**
-	 * @var int Id of shipment
-	 */
-	public $fk_expedition;
+    /**
+     * @var int Id of shipment
+     */
+    public $fk_expedition;
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
@@ -2402,13 +2402,13 @@ 
     /**
      * @var int Id of warehouse
      */
-	public $entrepot_id;
+    public $entrepot_id;
 
 
     /**
      * @var float qty asked From llx_commandedet or llx_propaldet
      */
-	public $qty_asked;
+    public $qty_asked;
 
     /**
      * @deprecated
@@ -2416,21 +2416,21 @@ 
      */
     public $ref;
 
-	/**
-	 * @var string product ref
-	 */
-	public $product_ref;
+    /**
+     * @var string product ref
+     */
+    public $product_ref;
 
-	/**
-	 * @deprecated
-	 * @see product_label
-	 */
-	public $libelle;
+    /**
+     * @deprecated
+     * @see product_label
+     */
+    public $libelle;
 
     /**
      * @var string product label
      */
-	public $product_label;
+    public $product_label;
 
     /**
      * @var string product description
@@ -2442,7 +2442,7 @@ 
     /**
      * @var string product description
      */
-	public $product_desc;
+    public $product_desc;
 
     /**
      * @var float weight
@@ -2468,8 +2468,8 @@ 
     public $volume;
     public $volume_units;
 
-	// Invoicing
-	public $remise_percent;
+    // Invoicing
+    public $remise_percent;
     public $tva_tx;
 
     /**
@@ -2503,400 +2503,400 @@ 
      *
      *  @param		DoliDB		$db      Database handler
      */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
-
-	/**
-	 *  Load line expedition
-	 *
-	 *  @param  int		$rowid          Id line order
-	 *  @return	int						<0 if KO, >0 if OK
-	 */
-	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;
-		$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->db->free($result);
-
-			return 1;
-		}
-		else
-		{
-			$this->errors[] = $this->db->lasterror();
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Insert line into database
-	 *
-	 *	@param      User	$user			User that modify
-	 *	@param      int		$notrigger		1 = disable triggers
-	 *	@return     int						<0 if KO, line id >0 if OK
-	 */
-	function insert($user=null, $notrigger=0)
-	{
-		global $langs, $conf;
-
-		$error=0;
-
-		// Check parameters
-		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';
-
-		$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.= ")";
-
-		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
-
-			if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
-			{
-				$result=$this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-
-			if (! $error && ! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('LINESHIPPING_INSERT',$user);
-				if ($result < 0)
-				{
-					$error++;
-				}
-				// End call triggers
-			}
-
-			if (! $error) {
-				$this->db->commit();
-				return $this->id;
-			}
-
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$error++;
-		}
-	}
-
-	/**
-	 * 	Delete shipment line.
-	 *
-	 *	@param		User	$user			User that modify
-	 *	@param		int		$notrigger		0=launch triggers after, 1=disable triggers
-	 * 	@return		int		>0 if OK, <0 if KO
-	 */
-	function delete($user = null, $notrigger = 0)
-	{
-		global $conf;
-
-		$error=0;
-
-		$this->db->begin();
-
-		// delete batch expedition line
-		if ($conf->productbatch->enabled)
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
-			$sql.= " WHERE fk_expeditiondet = ".$this->id;
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
 
-			if (!$this->db->query($sql))
-			{
-				$this->errors[]=$this->db->lasterror()." - sql=$sql";
-				$error++;
-			}
-		}
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
-		$sql.= " WHERE rowid = ".$this->id;
+    /**
+     *  Load line expedition
+     *
+     *  @param  int		$rowid          Id line order
+     *  @return	int						<0 if KO, >0 if OK
+     */
+    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;
+        $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->db->free($result);
+
+            return 1;
+        }
+        else
+        {
+            $this->errors[] = $this->db->lasterror();
+            $this->error = $this->db->lasterror();
+            return -1;
+        }
+    }
 
-		if (! $error && $this->db->query($sql))
-		{
-			// Remove extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			{
-				$result=$this->deleteExtraFields();
-				if ($result < 0)
-				{
-					$this->errors[]=$this->error;
-					$error++;
-				}
-			}
-			if (! $error && ! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('LINESHIPPING_DELETE',$user);
-				if ($result < 0)
-				{
-					$this->errors[]=$this->error;
-					$error++;
-				}
-				// End call triggers
-			}
-		}
-		else
-		{
-			$this->errors[]=$this->db->lasterror()." - sql=$sql";
-			$error++;
-		}
-
-		if (! $error) {
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-	}
-
-	/**
-	 *  Update a line in database
-	 *
-	 *	@param		User	$user			User that modify
-	 *	@param		int		$notrigger		1 = disable triggers
-	 *  @return		int					< 0 if KO, > 0 if OK
-	 */
-	function update($user = null, $notrigger = 0)
-	{
-		global $conf;
-
-		$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);
-		$remainingQty = 0;
-		$batch = null;
-		$batch_id = null;
-		$expedition_batch_id = null;
-		if (is_array($this->detail_batch)) 	// array of ExpeditionLineBatch
-		{
-			if (count($this->detail_batch) > 1)
-			{
-				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
-				$this->errors[]='ErrorBadParameters';
-				$error++;
-			}
-			else
-			{
-				$batch = $this->detail_batch[0]->batch;
-				$batch_id = $this->detail_batch[0]->fk_origin_stock;
-				$expedition_batch_id = $this->detail_batch[0]->id;
-				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';
-					$error++;
-				}
-				$qty = price2num($this->detail_batch[0]->qty);
-			}
-		}
-		else if (! empty($this->detail_batch))
-		{
-			$batch = $this->detail_batch->batch;
-			$batch_id = $this->detail_batch->fk_origin_stock;
-			$expedition_batch_id = $this->detail_batch->id;
-			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';
-				$error++;
-			}
-			$qty = price2num($this->detail_batch->qty);
-		}
-
-		// check parameters
-		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';
-			$error++;
-			return -1;
-		}
+    /**
+     *	Insert line into database
+     *
+     *	@param      User	$user			User that modify
+     *	@param      int		$notrigger		1 = disable triggers
+     *	@return     int						<0 if KO, line id >0 if OK
+     */
+    function insert($user=null, $notrigger=0)
+    {
+        global $langs, $conf;
+
+        $error=0;
+
+        // Check parameters
+        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';
+
+        $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.= ")";
+
+        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
+
+            if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+            {
+                $result=$this->insertExtraFields();
+                if ($result < 0)
+                {
+                    $error++;
+                }
+            }
+
+            if (! $error && ! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('LINESHIPPING_INSERT',$user);
+                if ($result < 0)
+                {
+                    $error++;
+                }
+                // End call triggers
+            }
+
+            if (! $error) {
+                $this->db->commit();
+                return $this->id;
+            }
+
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $error++;
+        }
+    }
 
-		// update lot
+    /**
+     * 	Delete shipment line.
+     *
+     *	@param		User	$user			User that modify
+     *	@param		int		$notrigger		0=launch triggers after, 1=disable triggers
+     * 	@return		int		>0 if OK, <0 if KO
+     */
+    function delete($user = null, $notrigger = 0)
+    {
+        global $conf;
+
+        $error=0;
+
+        $this->db->begin();
+
+        // delete batch expedition line
+        if ($conf->productbatch->enabled)
+        {
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
+            $sql.= " WHERE fk_expeditiondet = ".$this->id;
+
+            if (!$this->db->query($sql))
+            {
+                $this->errors[]=$this->db->lasterror()." - sql=$sql";
+                $error++;
+            }
+        }
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
+        $sql.= " WHERE rowid = ".$this->id;
+
+        if (! $error && $this->db->query($sql))
+        {
+            // Remove extrafields
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            {
+                $result=$this->deleteExtraFields();
+                if ($result < 0)
+                {
+                    $this->errors[]=$this->error;
+                    $error++;
+                }
+            }
+            if (! $error && ! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('LINESHIPPING_DELETE',$user);
+                if ($result < 0)
+                {
+                    $this->errors[]=$this->error;
+                    $error++;
+                }
+                // End call triggers
+            }
+        }
+        else
+        {
+            $this->errors[]=$this->db->lasterror()." - sql=$sql";
+            $error++;
+        }
+
+        if (! $error) {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+    }
 
-		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';
-				$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)
-			{
-				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
-				$error++;
-			}
-			else
-			{
-				// caculate new total line qty
-				foreach ($lotArray as $lot)
-				{
-					if ($expedition_batch_id != $lot->id)
-					{
-						$remainingQty += $lot->qty;
-					}
-				}
-				$qty += $remainingQty;
-
-				//fetch lot details
-
-				// 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)
-				{
-					$this->errors[] = $lot->errors;
-					$error++;
-				}
-				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;
-
-					if (!$this->db->query($sql))
-					{
-						$this->errors[]=$this->db->lasterror()." - sql=$sql";
-						$error++;
-					}
-				}
-				if (! $error && $this->detail_batch->qty > 0)
-				{
-					// create lot expedition line
-					if (isset($lot->id))
-					{
-						$shipmentLot = new ExpeditionLineBatch($this->db);
-						$shipmentLot->batch = $lot->batch;
-						$shipmentLot->eatby = $lot->eatby;
-						$shipmentLot->sellby = $lot->sellby;
-						$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
-						$shipmentLot->qty = $this->detail_batch->qty;
-						$shipmentLot->fk_origin_stock = $batch_id;
-						if ($shipmentLot->create($this->id) < 0)
-						{
-							$this->errors[]=$shipmentLot->errors;
-							$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;
-
-			if (!$this->db->query($sql))
-			{
-				$this->errors[]=$this->db->lasterror()." - sql=$sql";
-				$error++;
-			}
-		}
-
-		if (! $error)
-		{
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			{
-				$result=$this->insertExtraFields();
-				if ($result < 0)
-				{
-					$this->errors[]=$this->error;
-					$error++;
-				}
-			}
-		}
-
-		if (! $error && ! $notrigger)
-		{
-			// Call trigger
-			$result=$this->call_trigger('LINESHIPPING_UPDATE',$user);
-			if ($result < 0)
-			{
-				$this->errors[]=$this->error;
-				$error++;
-			}
-			// End call triggers
-		}
-		if (!$error) {
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-	}
+    /**
+     *  Update a line in database
+     *
+     *	@param		User	$user			User that modify
+     *	@param		int		$notrigger		1 = disable triggers
+     *  @return		int					< 0 if KO, > 0 if OK
+     */
+    function update($user = null, $notrigger = 0)
+    {
+        global $conf;
+
+        $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);
+        $remainingQty = 0;
+        $batch = null;
+        $batch_id = null;
+        $expedition_batch_id = null;
+        if (is_array($this->detail_batch)) 	// array of ExpeditionLineBatch
+        {
+            if (count($this->detail_batch) > 1)
+            {
+                dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
+                $this->errors[]='ErrorBadParameters';
+                $error++;
+            }
+            else
+            {
+                $batch = $this->detail_batch[0]->batch;
+                $batch_id = $this->detail_batch[0]->fk_origin_stock;
+                $expedition_batch_id = $this->detail_batch[0]->id;
+                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';
+                    $error++;
+                }
+                $qty = price2num($this->detail_batch[0]->qty);
+            }
+        }
+        else if (! empty($this->detail_batch))
+        {
+            $batch = $this->detail_batch->batch;
+            $batch_id = $this->detail_batch->fk_origin_stock;
+            $expedition_batch_id = $this->detail_batch->id;
+            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';
+                $error++;
+            }
+            $qty = price2num($this->detail_batch->qty);
+        }
+
+        // check parameters
+        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';
+            $error++;
+            return -1;
+        }
+
+        // update lot
+
+        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';
+                $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)
+            {
+                $this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
+                $error++;
+            }
+            else
+            {
+                // caculate new total line qty
+                foreach ($lotArray as $lot)
+                {
+                    if ($expedition_batch_id != $lot->id)
+                    {
+                        $remainingQty += $lot->qty;
+                    }
+                }
+                $qty += $remainingQty;
+
+                //fetch lot details
+
+                // 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)
+                {
+                    $this->errors[] = $lot->errors;
+                    $error++;
+                }
+                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;
+
+                    if (!$this->db->query($sql))
+                    {
+                        $this->errors[]=$this->db->lasterror()." - sql=$sql";
+                        $error++;
+                    }
+                }
+                if (! $error && $this->detail_batch->qty > 0)
+                {
+                    // create lot expedition line
+                    if (isset($lot->id))
+                    {
+                        $shipmentLot = new ExpeditionLineBatch($this->db);
+                        $shipmentLot->batch = $lot->batch;
+                        $shipmentLot->eatby = $lot->eatby;
+                        $shipmentLot->sellby = $lot->sellby;
+                        $shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
+                        $shipmentLot->qty = $this->detail_batch->qty;
+                        $shipmentLot->fk_origin_stock = $batch_id;
+                        if ($shipmentLot->create($this->id) < 0)
+                        {
+                            $this->errors[]=$shipmentLot->errors;
+                            $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;
+
+            if (!$this->db->query($sql))
+            {
+                $this->errors[]=$this->db->lasterror()." - sql=$sql";
+                $error++;
+            }
+        }
+
+        if (! $error)
+        {
+            if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            {
+                $result=$this->insertExtraFields();
+                if ($result < 0)
+                {
+                    $this->errors[]=$this->error;
+                    $error++;
+                }
+            }
+        }
+
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('LINESHIPPING_UPDATE',$user);
+            if ($result < 0)
+            {
+                $this->errors[]=$this->error;
+                $error++;
+            }
+            // End call triggers
+        }
+        if (!$error) {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+    }
 }

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

Indentation +68 added lines, -68 removed lines

@@ -34,16 +34,16 @@ 
  */
 class ExpeditionStats extends Stats
 {
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element;
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element;
 
-	var $socid;
+    var $socid;
     var $userid;
 
     var $from;
-	var $field;
+    var $field;
     var $where;
 
 
@@ -51,96 +51,96 @@ 
      * Constructor
      *
      * @param	DoliDB	$db      	Database handler
-	 * @param 	int		$socid	   	Id third party for filter
-	 * @param 	string	$mode	   	Option (not used)
-	 * @param   int		$userid    	Id user for filter (creation user)
+     * @param 	int		$socid	   	Id third party for filter
+     * @param 	string	$mode	   	Option (not used)
+     * @param   int		$userid    	Id user for filter (creation user)
      */
     function __construct($db, $socid, $mode, $userid=0)
     {
-		global $user, $conf;
+        global $user, $conf;
 
-		$this->db = $db;
+        $this->db = $db;
 
-		$this->socid = ($socid > 0 ? $socid : 0);
+        $this->socid = ($socid > 0 ? $socid : 0);
         $this->userid = $userid;
-		$this->cachefilesuffix = $mode;
+        $this->cachefilesuffix = $mode;
 
         $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->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;
-		if ($this->socid)
-		{
-			$this->where.=" AND c.fk_soc = ".$this->socid;
-		}
+        $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->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;
+        if ($this->socid)
+        {
+            $this->where.=" AND c.fk_soc = ".$this->socid;
+        }
         if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid;
     }
 
     /**
      * Return shipment number by month for a year
      *
-	 * @param	int		$year		Year to scan
+     * @param	int		$year		Year to scan
      *	@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
+     * @return	array				Array with number by month
      */
     function getNbByMonth($year, $format=0)
     {
         global $user;
 
         $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
-		$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.= " 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');
 
-		$res=$this->_getNbByMonth($year, $sql, $format);
-		return $res;
+        $res=$this->_getNbByMonth($year, $sql, $format);
+        return $res;
     }
 
-	/**
-	 * Return shipments number per year
-	 *
-	 * @return	array	Array with number by year
-	 *
-	 */
-	function getNbByYear()
-	{
-		global $user;
-
-		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
-		$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";
+    /**
+     * Return shipments number per year
+     *
+     * @return	array	Array with number by year
+     *
+     */
+    function getNbByYear()
+    {
+        global $user;
+
+        $sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
+        $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');
 
-		return $this->_getNbByYear($sql);
-	}
-
-	/**
-	 *	Return nb, total and average
-	 *
-	 *	@return	array	Array of values
-	 */
-	function getAllByYear()
-	{
-		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;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE ".$this->where;
-		$sql.= " GROUP BY year";
+        return $this->_getNbByYear($sql);
+    }
+
+    /**
+     *	Return nb, total and average
+     *
+     *	@return	array	Array of values
+     */
+    function getAllByYear()
+    {
+        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;
+        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');
 
-		return $this->_getAllByYear($sql);
-	}
+        return $this->_getAllByYear($sql);
+    }
 }
 

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

Indentation +99 added lines, -99 removed lines

@@ -16,9 +16,9 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+    use Luracast\Restler\RestException;
 
- require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 /**
  * API class for shipments
@@ -34,8 +34,8 @@ 
      */
     static $FIELDS = array(
         'socid',
-    	'origin_id',
-    	'origin_type',
+        'origin_id',
+        'origin_type',
     );
 
     /**
@@ -48,8 +48,8 @@ 
      */
     function __construct()
     {
-		global $db, $conf;
-		$this->db = $db;
+        global $db, $conf;
+        $this->db = $db;
         $this->shipment = new Expedition($this->db);
     }
 
@@ -60,26 +60,26 @@ 
      *
      * @param       int         $id         ID of shipment
      * @return 	array|mixed data without useless information
-	 *
+     *
      * @throws 	RestException
      */
     function get($id)
     {
-		if(! DolibarrApiAccess::$user->rights->expedition->lire) {
-			throw new RestException(401);
-		}
+        if(! DolibarrApiAccess::$user->rights->expedition->lire) {
+            throw new RestException(401);
+        }
 
         $result = $this->shipment->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
         $this->shipment->fetchObjectLinked();
-		return $this->_cleanObjectDatas($this->shipment);
+        return $this->_cleanObjectDatas($this->shipment);
     }
 
 
@@ -97,7 +97,7 @@ 
      * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
      * @return  array                               Array of shipment objects
      *
-	 * @throws RestException
+     * @throws RestException
      */
     function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
     {
@@ -134,7 +134,7 @@ 
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
@@ -173,7 +173,7 @@ 
         if( ! count($obj_ret)) {
             throw new RestException(404, 'No shipment found');
         }
-		return $obj_ret;
+        return $obj_ret;
     }
 
     /**
@@ -184,9 +184,9 @@ 
      */
     function post($request_data = null)
     {
-      if(! DolibarrApiAccess::$user->rights->expedition->creer) {
-			  throw new RestException(401, "Insuffisant rights");
-		  }
+        if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+                throw new RestException(401, "Insuffisant rights");
+            }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
@@ -194,11 +194,11 @@ 
             $this->shipment->$field = $value;
         }
         if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
+            $lines = array();
+            foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
-          }
-          $this->shipment->lines = $lines;
+            }
+            $this->shipment->lines = $lines;
         }
 
         if ($this->shipment->create(DolibarrApiAccess::$user) < 0) {
@@ -378,30 +378,30 @@ 
      */
     function deleteLine($id, $lineid)
     {
-    	if(! DolibarrApiAccess::$user->rights->expedition->creer) {
-    		throw new RestException(401);
-    	}
-
-    	$result = $this->shipment->fetch($id);
-    	if( ! $result ) {
-    		throw new RestException(404, 'Shipment not found');
-    	}
-
-    	if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
-
-    	// TODO Check the lineid $lineid is a line of ojbect
-
-    	$request_data = (object) $request_data;
-    	$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
-    	if ($updateRes > 0) {
-    		return $this->get($id);
-    	}
-    	else
-    	{
-    		throw new RestException(405, $this->shipment->error);
-    	}
+        if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->shipment->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Shipment not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        // TODO Check the lineid $lineid is a line of ojbect
+
+        $request_data = (object) $request_data;
+        $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
+        if ($updateRes > 0) {
+            return $this->get($id);
+        }
+        else
+        {
+            throw new RestException(405, $this->shipment->error);
+        }
     }
 
     /**
@@ -414,18 +414,18 @@ 
      */
     function put($id, $request_data = null)
     {
-      if (! DolibarrApiAccess::$user->rights->expedition->creer) {
-		  	throw new RestException(401);
-		  }
+        if (! DolibarrApiAccess::$user->rights->expedition->creer) {
+                throw new RestException(401);
+            }
 
         $result = $this->shipment->fetch($id);
         if (! $result) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        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) {
             if ($field == 'id') continue;
             $this->shipment->$field = $value;
@@ -437,7 +437,7 @@ 
         }
         else
         {
-        	throw new RestException(500, $this->shipment->error);
+            throw new RestException(500, $this->shipment->error);
         }
     }
 
@@ -451,16 +451,16 @@ 
     function delete($id)
     {
         if(! DolibarrApiAccess::$user->rights->shipment->supprimer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
         $result = $this->shipment->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        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)) {
             throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error);
@@ -496,32 +496,32 @@ 
     function validate($id, $notrigger=0)
     {
         if(! DolibarrApiAccess::$user->rights->expedition->creer) {
-			throw new RestException(401);
-		}
+            throw new RestException(401);
+        }
         $result = $this->shipment->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Shipment not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+        if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
 
-		$result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger);
-		if ($result == 0) {
-		    throw new RestException(304, 'Error nothing done. May be object is already validated');
-		}
-		if ($result < 0) {
-		    throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
-		}
-	$result = $this->shipment->fetch($id);
+        $result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger);
+        if ($result == 0) {
+            throw new RestException(304, 'Error nothing done. May be object is already validated');
+        }
+        if ($result < 0) {
+            throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
+        }
+    $result = $this->shipment->fetch($id);
         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);
-       }
+        }
 
         $this->shipment->fetchObjectLinked();
         return $this->_cleanObjectDatas($this->shipment);
@@ -565,19 +565,19 @@ 
 */
 
 
-     /**
-     * Create a shipment using an existing order.
-     *
-     * @param int   $orderid       Id of the order
-     *
-     * @url     POST /createfromorder/{orderid}
-     *
-     * @return int
-     * @throws 400
-     * @throws 401
-     * @throws 404
-     * @throws 405
-     */
+        /**
+         * Create a shipment using an existing order.
+         *
+         * @param int   $orderid       Id of the order
+         *
+         * @url     POST /createfromorder/{orderid}
+         *
+         * @return int
+         * @throws 400
+         * @throws 401
+         * @throws 404
+         * @throws 405
+         */
     /*
     function createShipmentFromOrder($orderid)
     {
@@ -631,17 +631,17 @@ 
 
         if (! empty($object->lines) && is_array($object->lines))
         {
-        	foreach ($object->lines as $line)
-        	{
-        		unset($line->tva_tx);
-        		unset($line->vat_src_code);
-        		unset($line->total_ht);
-        		unset($line->total_ttc);
-        		unset($line->total_tva);
-        		unset($line->total_localtax1);
-        		unset($line->total_localtax2);
-        		unset($line->remise_percent);
-        	}
+            foreach ($object->lines as $line)
+            {
+                unset($line->tva_tx);
+                unset($line->vat_src_code);
+                unset($line->total_ht);
+                unset($line->total_ttc);
+                unset($line->total_tva);
+                unset($line->total_localtax1);
+                unset($line->total_localtax2);
+                unset($line->remise_percent);
+            }
         }
 
         return $object;

dolibarr/htdocs/expedition/card.php

Indentation +1991 added lines, -1991 removed lines

@@ -73,8 +73,8 @@ 
 
 if ($origin == 'expedition') $result=restrictedArea($user, $origin, $id);
 else {
-	$result=restrictedArea($user, 'expedition');
-	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+    $result=restrictedArea($user, 'expedition');
+    if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
 $action		= GETPOST('action','alpha');
@@ -118,33 +118,33 @@ 
 if (empty($reshook))
 {
     if ($cancel)
-	{
-		$action = '';
-		$object->fetch($id); // show shipment also after canceling modification
-	}
+    {
+        $action = '';
+        $object->fetch($id); // show shipment also after canceling modification
+    }
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
-	// Actions to build doc
-	$upload_dir = $conf->expedition->dir_output.'/sending';
-	$permissioncreate = $user->rights->expedition->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+    // Actions to build doc
+    $upload_dir = $conf->expedition->dir_output.'/sending';
+    $permissioncreate = $user->rights->expedition->creer;
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-	// Reopen
-	if ($action == 'reopen' && $user->rights->expedition->creer)
-	{
-	    $object->fetch($id);
-	    $result = $object->reOpen();
-	}
+    // Reopen
+    if ($action == 'reopen' && $user->rights->expedition->creer)
+    {
+        $object->fetch($id);
+        $result = $object->reOpen();
+    }
 
-	// Set incoterm
-	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
-	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
+    // Set incoterm
+    if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+    {
+        $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+    }
 
-	if ($action == 'setref_customer')
-	{
+    if ($action == 'setref_customer')
+    {
         $result = $object->fetch($id);
         if ($result < 0) {
             setEventMessages($object->error, $object->errors, 'errors');
@@ -158,329 +158,329 @@ 
             header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
             exit;
         }
-	}
+    }
 
-	if ($action == 'update_extras')
-	{
-		$object->oldcopy = dol_clone($object);
+    if ($action == 'update_extras')
+    {
+        $object->oldcopy = dol_clone($object);
 
-		// Fill array 'array_options' with data from update form
-	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-	    if ($ret < 0) $error++;
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+        if ($ret < 0) $error++;
 
-	    if (! $error)
-	    {
-	        // Actions on extra fields
+        if (! $error)
+        {
+            // Actions on extra fields
             $result = $object->insertExtraFields('SHIPMENT_MODIFY');
-			if ($result < 0)
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
-	    }
+            if ($result < 0)
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
+        }
 
-	    if ($error)
-	        $action = 'edit_extras';
-	}
+        if ($error)
+            $action = 'edit_extras';
+    }
 
-	// Create shipment
-	if ($action == 'add' && $user->rights->expedition->creer)
-	{
-	    $error=0;
-	    $predef='';
+    // Create shipment
+    if ($action == 'add' && $user->rights->expedition->creer)
+    {
+        $error=0;
+        $predef='';
 
-	    $db->begin();
+        $db->begin();
 
-	    $object->note				= GETPOST('note','alpha');
-	    $object->origin				= $origin;
+        $object->note				= GETPOST('note','alpha');
+        $object->origin				= $origin;
         $object->origin_id			= $origin_id;
         $object->fk_project         = GETPOST('projectid','int');
-	    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
-	    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
-	    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
-	    $object->sizeS				= GETPOST('sizeS','int')==''?"NULL":GETPOST('sizeS','int');
-	    $object->size_units			= GETPOST('size_units','int');
-	    $object->weight_units		= GETPOST('weight_units','int');
-
-	    $date_delivery = dol_mktime(GETPOST('date_deliveryhour','int'), GETPOST('date_deliverymin','int'), 0, GETPOST('date_deliverymonth','int'), GETPOST('date_deliveryday','int'), GETPOST('date_deliveryyear','int'));
-
-	    // On va boucler sur chaque ligne du document d'origine pour completer objet expedition
-	    // avec info diverses + qte a livrer
-	    $classname = ucfirst($object->origin);
-	    $objectsrc = new $classname($db);
-	    $objectsrc->fetch($object->origin_id);
-
-	    $object->socid					= $objectsrc->socid;
-	    $object->ref_customer			= GETPOST('ref_customer','alpha');
-	    $object->model_pdf				= GETPOST('model');
-	    $object->date_delivery			= $date_delivery;	    // Date delivery planed
-	    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
-	    $object->shipping_method_id		= GETPOST('shipping_method_id','int');
-	    $object->tracking_number		= GETPOST('tracking_number','alpha');
-	    $object->ref_int				= GETPOST('ref_int','alpha');
-	    $object->note_private			= GETPOST('note_private','none');
-	    $object->note_public			= GETPOST('note_public','none');
-		$object->fk_incoterms 			= GETPOST('incoterm_id', 'int');
-		$object->location_incoterms 	= GETPOST('location_incoterms', 'alpha');
-
-	    $batch_line = array();
-		$stockLine = array();
-		$array_options=array();
-
-	    $num=count($objectsrc->lines);
-	    $totalqty=0;
-
-	    for ($i = 0; $i < $num; $i++)
-	    {
-			$idl="idl".$i;
-
-			$sub_qty=array();
-			$subtotalqty=0;
-
-			$j=0;
-			$batch="batchl".$i."_0";
-			$stockLocation="ent1".$i."_0";
-	    	$qty = "qtyl".$i;
-
-			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
-			{
-			    if (isset($_POST[$batch]))
-			    {
-    				//shipment line with batch-enable product
-    				$qty .= '_'.$j;
-    				while (isset($_POST[$batch]))
-    				{
-    					// save line of detail into sub_qty
-    				    $sub_qty[$j]['q']=GETPOST($qty,'int');				// the qty we want to move for this stock record
-    				    $sub_qty[$j]['id_batch']=GETPOST($batch,'int');		// the id into llx_product_batch of stock record to move
-    					$subtotalqty+=$sub_qty[$j]['q'];
-
-    					//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
-
-    					$j++;
-    					$batch="batchl".$i."_".$j;
-    					$qty = "qtyl".$i.'_'.$j;
-    				}
-
-    				$batch_line[$i]['detail']=$sub_qty;		// array of details
-    				$batch_line[$i]['qty']=$subtotalqty;
-    				$batch_line[$i]['ix_l']=GETPOST($idl,'int');
-
-    				$totalqty+=$subtotalqty;
-			    }
-			    else
-			    {
-			        // No detail were provided for lots
-			        if (! empty($_POST[$qty]))
-			        {
-			            // We try to set an amount
-    			        // Case we dont use the list of available qty for each warehouse/lot
-    			        // GUI does not allow this yet
-    			        setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
-			        }
-			    }
-			}
-			else if (isset($_POST[$stockLocation]))
-			{
-			    //shipment line from multiple stock locations
-			    $qty .= '_'.$j;
-			    while (isset($_POST[$stockLocation]))
-			    {
-			        // save sub line of warehouse
-			        $stockLine[$i][$j]['qty']=GETPOST($qty,'int');
-			        $stockLine[$i][$j]['warehouse_id']=GETPOST($stockLocation,'int');
-			        $stockLine[$i][$j]['ix_l']=GETPOST($idl,'int');
-
-			        $totalqty+=GETPOST($qty,'int');
-
-			        $j++;
-			        $stockLocation="ent1".$i."_".$j;
-			        $qty = "qtyl".$i.'_'.$j;
-			    }
-			}
-			else
-			{
-			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
-				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
-			}
-
-			// Extrafields
-			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+        $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
+        $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
+        $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
+        $object->sizeS				= GETPOST('sizeS','int')==''?"NULL":GETPOST('sizeS','int');
+        $object->size_units			= GETPOST('size_units','int');
+        $object->weight_units		= GETPOST('weight_units','int');
+
+        $date_delivery = dol_mktime(GETPOST('date_deliveryhour','int'), GETPOST('date_deliverymin','int'), 0, GETPOST('date_deliverymonth','int'), GETPOST('date_deliveryday','int'), GETPOST('date_deliveryyear','int'));
+
+        // On va boucler sur chaque ligne du document d'origine pour completer objet expedition
+        // avec info diverses + qte a livrer
+        $classname = ucfirst($object->origin);
+        $objectsrc = new $classname($db);
+        $objectsrc->fetch($object->origin_id);
+
+        $object->socid					= $objectsrc->socid;
+        $object->ref_customer			= GETPOST('ref_customer','alpha');
+        $object->model_pdf				= GETPOST('model');
+        $object->date_delivery			= $date_delivery;	    // Date delivery planed
+        $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
+        $object->shipping_method_id		= GETPOST('shipping_method_id','int');
+        $object->tracking_number		= GETPOST('tracking_number','alpha');
+        $object->ref_int				= GETPOST('ref_int','alpha');
+        $object->note_private			= GETPOST('note_private','none');
+        $object->note_public			= GETPOST('note_public','none');
+        $object->fk_incoterms 			= GETPOST('incoterm_id', 'int');
+        $object->location_incoterms 	= GETPOST('location_incoterms', 'alpha');
+
+        $batch_line = array();
+        $stockLine = array();
+        $array_options=array();
+
+        $num=count($objectsrc->lines);
+        $totalqty=0;
+
+        for ($i = 0; $i < $num; $i++)
+        {
+            $idl="idl".$i;
+
+            $sub_qty=array();
+            $subtotalqty=0;
+
+            $j=0;
+            $batch="batchl".$i."_0";
+            $stockLocation="ent1".$i."_0";
+            $qty = "qtyl".$i;
+
+            if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
+            {
+                if (isset($_POST[$batch]))
+                {
+                    //shipment line with batch-enable product
+                    $qty .= '_'.$j;
+                    while (isset($_POST[$batch]))
+                    {
+                        // save line of detail into sub_qty
+                        $sub_qty[$j]['q']=GETPOST($qty,'int');				// the qty we want to move for this stock record
+                        $sub_qty[$j]['id_batch']=GETPOST($batch,'int');		// the id into llx_product_batch of stock record to move
+                        $subtotalqty+=$sub_qty[$j]['q'];
+
+                        //var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
+
+                        $j++;
+                        $batch="batchl".$i."_".$j;
+                        $qty = "qtyl".$i.'_'.$j;
+                    }
+
+                    $batch_line[$i]['detail']=$sub_qty;		// array of details
+                    $batch_line[$i]['qty']=$subtotalqty;
+                    $batch_line[$i]['ix_l']=GETPOST($idl,'int');
+
+                    $totalqty+=$subtotalqty;
+                }
+                else
+                {
+                    // No detail were provided for lots
+                    if (! empty($_POST[$qty]))
+                    {
+                        // We try to set an amount
+                        // Case we dont use the list of available qty for each warehouse/lot
+                        // GUI does not allow this yet
+                        setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
+                    }
+                }
+            }
+            else if (isset($_POST[$stockLocation]))
+            {
+                //shipment line from multiple stock locations
+                $qty .= '_'.$j;
+                while (isset($_POST[$stockLocation]))
+                {
+                    // save sub line of warehouse
+                    $stockLine[$i][$j]['qty']=GETPOST($qty,'int');
+                    $stockLine[$i][$j]['warehouse_id']=GETPOST($stockLocation,'int');
+                    $stockLine[$i][$j]['ix_l']=GETPOST($idl,'int');
+
+                    $totalqty+=GETPOST($qty,'int');
+
+                    $j++;
+                    $stockLocation="ent1".$i."_".$j;
+                    $qty = "qtyl".$i.'_'.$j;
+                }
+            }
+            else
+            {
+                //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
+                //shipment line for product with no batch management and no multiple stock location
+                if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
+            }
+
+            // Extrafields
+            $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
             $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i);
-			// Unset extrafield
-			if (is_array($extralabelsline)) {
-				// Get extra fields
-				foreach ($extralabelsline as $key => $value) {
-					unset($_POST["options_" . $key]);
-				}
-			}
-	    }
+            // Unset extrafield
+            if (is_array($extralabelsline)) {
+                // Get extra fields
+                foreach ($extralabelsline as $key => $value) {
+                    unset($_POST["options_" . $key]);
+                }
+            }
+        }
 
-	    //var_dump($batch_line[2]);
+        //var_dump($batch_line[2]);
 
-	    if ($totalqty > 0)		// There is at least one thing to ship
-	    {
-	        //var_dump($_POST);exit;
-	        for ($i = 0; $i < $num; $i++)
-	        {
-	            $qty = "qtyl".$i;
-				if (! isset($batch_line[$i]))
-				{
-					// not batch mode
-					if (isset($stockLine[$i]))
-					{
-    					//shipment from multiple stock locations
-					    $nbstockline = count($stockLine[$i]);
-    					for($j = 0; $j < $nbstockline; $j++)
-    					{
-    					    if ($stockLine[$i][$j]['qty']>0)
-    					    {
-    					        $ret=$object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
-    					        if ($ret < 0)
-    					        {
-    					            setEventMessages($object->error, $object->errors, 'errors');
-    					            $error++;
-    					        }
-    					    }
-    					}
-					}
-					else
-					{
-						if (GETPOST($qty,'int') > 0 || (GETPOST($qty,'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
-						{
-							$ent = "entl".$i;
-							$idl = "idl".$i;
-							$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
-							if ($entrepot_id < 0) $entrepot_id='';
-							if (! ($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
-
-							$ret=$object->addline($entrepot_id, GETPOST($idl,'int'), GETPOST($qty,'int'), $array_options[$i]);
-							if ($ret < 0)
-							{
-								setEventMessages($object->error, $object->errors, 'errors');
-								$error++;
-							}
-						}
-					}
-				}
-				else
-				{
-					// batch mode
-					if ($batch_line[$i]['qty']>0)
-					{
-						$ret=$object->addline_batch($batch_line[$i],$array_options[$i]);
-						if ($ret < 0)
-						{
-							setEventMessages($object->error, $object->errors, 'errors');
-							$error++;
-						}
-					}
-				}
-	        }
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	        if ($ret < 0) $error++;
-
-	        if (! $error)
-	        {
-	            $ret=$object->create($user);		// This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment.
-	            if ($ret <= 0)
-	            {
-	                setEventMessages($object->error, $object->errors, 'errors');
-	                $error++;
-	            }
-	        }
-	    }
-	    else
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	        $error++;
-	    }
+        if ($totalqty > 0)		// There is at least one thing to ship
+        {
+            //var_dump($_POST);exit;
+            for ($i = 0; $i < $num; $i++)
+            {
+                $qty = "qtyl".$i;
+                if (! isset($batch_line[$i]))
+                {
+                    // not batch mode
+                    if (isset($stockLine[$i]))
+                    {
+                        //shipment from multiple stock locations
+                        $nbstockline = count($stockLine[$i]);
+                        for($j = 0; $j < $nbstockline; $j++)
+                        {
+                            if ($stockLine[$i][$j]['qty']>0)
+                            {
+                                $ret=$object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
+                                if ($ret < 0)
+                                {
+                                    setEventMessages($object->error, $object->errors, 'errors');
+                                    $error++;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (GETPOST($qty,'int') > 0 || (GETPOST($qty,'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
+                        {
+                            $ent = "entl".$i;
+                            $idl = "idl".$i;
+                            $entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
+                            if ($entrepot_id < 0) $entrepot_id='';
+                            if (! ($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
+
+                            $ret=$object->addline($entrepot_id, GETPOST($idl,'int'), GETPOST($qty,'int'), $array_options[$i]);
+                            if ($ret < 0)
+                            {
+                                setEventMessages($object->error, $object->errors, 'errors');
+                                $error++;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // batch mode
+                    if ($batch_line[$i]['qty']>0)
+                    {
+                        $ret=$object->addline_batch($batch_line[$i],$array_options[$i]);
+                        if ($ret < 0)
+                        {
+                            setEventMessages($object->error, $object->errors, 'errors');
+                            $error++;
+                        }
+                    }
+                }
+            }
+            // Fill array 'array_options' with data from add form
+            $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+            if ($ret < 0) $error++;
 
-	    if (! $error)
-	    {
-	        $db->commit();
-	        header("Location: card.php?id=".$object->id);
-	        exit;
-	    }
-	    else
-	    {
-	        $db->rollback();
-	        $_GET["commande_id"]=GETPOST('commande_id','int');
-	        $action='create';
-	    }
-	}
+            if (! $error)
+            {
+                $ret=$object->create($user);		// This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment.
+                if ($ret <= 0)
+                {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                    $error++;
+                }
+            }
+        }
+        else
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            header("Location: card.php?id=".$object->id);
+            exit;
+        }
+        else
+        {
+            $db->rollback();
+            $_GET["commande_id"]=GETPOST('commande_id','int');
+            $action='create';
+        }
+    }
 
-	/*
+    /*
 	 * Build a receiving receipt
 	 */
-	else if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
-	{
-	    $result = $object->create_delivery($user);
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
-	        exit;
-	    }
-	    else
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
+    else if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
+    {
+        $result = $object->create_delivery($user);
+        if ($result > 0)
+        {
+            header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 
-	else if ($action == 'confirm_valid' && $confirm == 'yes' &&
+    else if ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
-	)
-	{
-	    $object->fetch_thirdparty();
+           || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
+    )
+    {
+        $object->fetch_thirdparty();
 
-	    $result = $object->valid($user);
+        $result = $object->valid($user);
 
-	    if ($result < 0)
-	    {
-			$langs->load("errors");
-	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else
-	    {
-	    	// Define output language
-	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	    	{
-	    		$outputlangs = $langs;
-	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	    		if (! empty($newlang)) {
-	    			$outputlangs = new Translate("", $conf);
-	    			$outputlangs->setDefaultLang($newlang);
-	    		}
-	    		$model=$object->modelpdf;
-	    		$ret = $object->fetch($id); // Reload to get new records
-
-	    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db,$result);
-	    	}
-	    }
-	}
+        if ($result < 0)
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans($object->error), null, 'errors');
+        }
+        else
+        {
+            // Define output language
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            {
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+                $model=$object->modelpdf;
+                $ret = $object->fetch($id); // Reload to get new records
 
-	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
-	{
-	    $result = $object->delete();
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
-	        exit;
-	    }
-	    else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-	// TODO add alternative status
-	/*else if ($action == 'reopen' && (! empty($user->rights->expedition->creer) || ! empty($user->rights->expedition->shipping_advance->validate)))
+                $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+                if ($result < 0) dol_print_error($db,$result);
+            }
+        }
+    }
+
+    else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+    {
+        $result = $object->delete();
+        if ($result > 0)
+        {
+            header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+    // TODO add alternative status
+    /*else if ($action == 'reopen' && (! empty($user->rights->expedition->creer) || ! empty($user->rights->expedition->shipping_advance->validate)))
 	{
 	    $result = $object->setStatut(0);
 	    if ($result < 0)
@@ -489,375 +489,375 @@ 
 	    }
 	}*/
 
-	else if ($action == 'setdate_livraison' && $user->rights->expedition->creer)
-	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
+    else if ($action == 'setdate_livraison' && $user->rights->expedition->creer)
+    {
+        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+        $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
 
-	    $object->fetch($id);
-	    $result=$object->set_date_livraison($user,$datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-
-	// Action update
-	else if (
-		($action == 'settracking_number'
-		|| $action == 'settracking_url'
-		|| $action == 'settrueWeight'
-		|| $action == 'settrueWidth'
-		|| $action == 'settrueHeight'
-		|| $action == 'settrueDepth'
-		|| $action == 'setshipping_method_id')
-		&& $user->rights->expedition->creer
-		)
-	{
-	    $error=0;
+        $object->fetch($id);
+        $result=$object->set_date_livraison($user,$datedelivery);
+        if ($result < 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
-	    if ($action == 'settrueWeight')	{
-	    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
-			$object->weight_units = GETPOST('weight_units','int');
-	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
-	    if ($action == 'settrueHeight'){
-	    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
-						$object->size_units = GETPOST('size_units','int');
-		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
-
-	    if (! $error)
-	    {
-	        if ($object->update($user) >= 0)
-	        {
-	            header("Location: card.php?id=".$object->id);
-	            exit;
-	        }
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+    // Action update
+    else if (
+        ($action == 'settracking_number'
+        || $action == 'settracking_url'
+        || $action == 'settrueWeight'
+        || $action == 'settrueWidth'
+        || $action == 'settrueHeight'
+        || $action == 'settrueDepth'
+        || $action == 'setshipping_method_id')
+        && $user->rights->expedition->creer
+        )
+    {
+        $error=0;
 
-	    $action="";
-	}
+        if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
+        if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
+        if ($action == 'settrueWeight')	{
+            $object->trueWeight = trim(GETPOST('trueWeight','int'));
+            $object->weight_units = GETPOST('weight_units','int');
+        }
+        if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
+        if ($action == 'settrueHeight'){
+                        $object->trueHeight = trim(GETPOST('trueHeight','int'));
+                        $object->size_units = GETPOST('size_units','int');
+        }
+        if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
+        if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
 
-	elseif ($action == 'classifybilled')
-	{
-	    $object->fetch($id);
-	    $result = $object->set_billed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-	    	exit();
-	    }
-	}
+        if (! $error)
+        {
+            if ($object->update($user) >= 0)
+            {
+                header("Location: card.php?id=".$object->id);
+                exit;
+            }
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
 
-	elseif ($action == 'classifyclosed')
-	{
-	    $object->fetch($id);
-	    $result = $object->setClosed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-	    	exit();
-	    }
-	}
+        $action="";
+    }
+
+    elseif ($action == 'classifybilled')
+    {
+        $object->fetch($id);
+        $result = $object->set_billed();
+        if($result >= 0) {
+            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+            exit();
+        }
+    }
+
+    elseif ($action == 'classifyclosed')
+    {
+        $object->fetch($id);
+        $result = $object->setClosed();
+        if($result >= 0) {
+            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+            exit();
+        }
+    }
 
-	/*
+    /*
 	 *  delete a line
 	 */
-	elseif ($action == 'deleteline' && ! empty($line_id))
-	{
-		$object->fetch($id);
-		$lines = $object->lines;
-		$line = new ExpeditionLigne($db);
-
-		$num_prod = count($lines);
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-			if ($lines[$i]->id == $line_id)
-			{
-				if (count($lines[$i]->details_entrepot) > 1)
-				{
-					// delete multi warehouse lines
-					foreach ($lines[$i]->details_entrepot as $details_entrepot) {
-						$line->id = $details_entrepot->line_id;
-						if (! $error && $line->delete($user) < 0)
-						{
-							$error++;
-						}
-					}
-				}
-				else
-				{
-					// delete single warehouse line
-					$line->id = $line_id;
-					if (! $error && $line->delete($user) < 0)
-					{
-						$error++;
-					}
-				}
-			}
-			unset($_POST["lineid"]);
-		}
-
-		if(! $error) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-			exit();
-		}
-		else
-		{
-			setEventMessages($line->error, $line->errors, 'errors');
-		}
-	}
-
-	/*
+    elseif ($action == 'deleteline' && ! empty($line_id))
+    {
+        $object->fetch($id);
+        $lines = $object->lines;
+        $line = new ExpeditionLigne($db);
+
+        $num_prod = count($lines);
+        for ($i = 0 ; $i < $num_prod ; $i++)
+        {
+            if ($lines[$i]->id == $line_id)
+            {
+                if (count($lines[$i]->details_entrepot) > 1)
+                {
+                    // delete multi warehouse lines
+                    foreach ($lines[$i]->details_entrepot as $details_entrepot) {
+                        $line->id = $details_entrepot->line_id;
+                        if (! $error && $line->delete($user) < 0)
+                        {
+                            $error++;
+                        }
+                    }
+                }
+                else
+                {
+                    // delete single warehouse line
+                    $line->id = $line_id;
+                    if (! $error && $line->delete($user) < 0)
+                    {
+                        $error++;
+                    }
+                }
+            }
+            unset($_POST["lineid"]);
+        }
+
+        if(! $error) {
+            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+            exit();
+        }
+        else
+        {
+            setEventMessages($line->error, $line->errors, 'errors');
+        }
+    }
+
+    /*
 	 *  Update a line
 	 */
-	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save'))
-	{
-		// Clean parameters
-		$qty=0;
-		$entrepot_id = 0;
-		$batch_id = 0;
-
-		$lines = $object->lines;
-		$num_prod = count($lines);
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-			if ($lines[$i]->id == $line_id)		// we have found line to update
-			{
-				$line = new ExpeditionLigne($db);
-				// Extrafields Lines
-				$extrafieldsline = new ExtraFields($db);
-				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-				$line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
-				// Unset extrafield POST Data
-				if (is_array($extralabelsline)) {
-					foreach ($extralabelsline as $key => $value) {
-						unset($_POST["options_" . $key]);
-					}
-				}
-				$line->fk_product = $lines[$i]->fk_product;
-				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
-				{
-					// line with lot
-					foreach ($lines[$i]->detail_batch as $detail_batch)
-					{
-						$lotStock = new Productbatch($db);
-						$batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
-						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
-						$batch_id = GETPOST($batch,'int');
-						$batch_qty = GETPOST($qty, 'int');
-						if (! empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty))
-						{
-							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0)	// $line is ExpeditionLine
-							{
-								if ($lines[$i]->entrepot_id != 0)
-								{
-									// allow update line entrepot_id if not multi warehouse shipping
-									$line->entrepot_id = $lotStock->warehouseid;
-								}
-
-								// detail_batch can be an object with keys, or an array of ExpeditionLineBatch
-								if (empty($line->detail_batch)) $line->detail_batch=new stdClass();
-
-								$line->detail_batch->fk_origin_stock = $batch_id;
-								$line->detail_batch->batch = $lotStock->batch;
-								$line->detail_batch->id = $detail_batch->id;
-								$line->detail_batch->entrepot_id = $lotStock->warehouseid;
-								$line->detail_batch->qty = $batch_qty;
-								if ($line->update($user) < 0) {
-									setEventMessages($line->error, $line->errors, 'errors');
-									$error++;
-								}
-							}
-							else
-							{
-								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
-								$error++;
-							}
-						}
-						unset($_POST[$batch]);
-						unset($_POST[$qty]);
-					}
-					// add new batch
-					$lotStock = new Productbatch($db);
-					$batch="batchl".$line_id."_0";
-					$qty = "qtyl".$line_id."_0";
-					$batch_id = GETPOST($batch,'int');
-					$batch_qty = GETPOST($qty, 'int');
-					$lineIdToAddLot = 0;
-					if ($batch_qty > 0 && ! empty($batch_id))
-					{
-						if ($lotStock->fetch($batch_id) > 0)
-						{
-							// check if lotStock warehouse id is same as line warehouse id
-							if ($lines[$i]->entrepot_id > 0)
-							{
-								// single warehouse shipment line
-								if ($lines[i]->entrepot_id == $lotStock->warehouseid)
-								{
-									$lineIdToAddLot = $line_id;
-								}
-							}
-							else if (count($lines[$i]->details_entrepot) > 1)
-							{
-								// multi warehouse shipment lines
-								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-								{
-									if ($detail_entrepot->entrepot_id == $lotStock->warehouseid)
-									{
-										$lineIdToAddLot = $detail_entrepot->line_id;
-									}
-								}
-							}
-							if ($lineIdToAddLot)
-							{
-								// add lot to existing line
-								if ($line->fetch($lineIdToAddLot) > 0)
-								{
-									$line->detail_batch->fk_origin_stock = $batch_id;
-									$line->detail_batch->batch = $lotStock->batch;
-									$line->detail_batch->entrepot_id = $lotStock->warehouseid;
-									$line->detail_batch->qty = $batch_qty;
-									if ($line->update($user) < 0) {
-										setEventMessages($line->error, $line->errors, 'errors');
-										$error++;
-									}
-								}
-								else
-								{
-									setEventMessages($line->error, $line->errors, 'errors');
-									$error++;
-								}
-							}
-							else
-							{
-								// create new line with new lot
-								$line->origin_line_id = $lines[$i]->origin_line_id;
-								$line->entrepot_id = $lotStock->warehouseid;
-								$line->detail_batch[0] = new ExpeditionLineBatch($db);
-								$line->detail_batch[0]->fk_origin_stock = $batch_id;
-								$line->detail_batch[0]->batch = $lotStock->batch;
-								$line->detail_batch[0]->entrepot_id = $lotStock->warehouseid;
-								$line->detail_batch[0]->qty = $batch_qty;
-								if ($object->create_line_batch($line, $line->array_options) < 0)
-								{
-									setEventMessages($object->error, $object->errors, 'errors');
-									$error++;
-								}
-							}
-						}
-						else
-						{
-							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
-							$error++;
-						}
-					}
-				}
-				else
-				{
-					if ($lines[$i]->fk_product > 0)
-					{
-						// line without lot
-						if ($lines[$i]->entrepot_id > 0)
-						{
-							// single warehouse shipment line
-							$stockLocation="entl".$line_id;
-							$qty = "qtyl".$line_id;
-							$line->id = $line_id;
-							$line->entrepot_id = GETPOST($stockLocation,'int');
-							$line->qty = GETPOST($qty, 'int');
-							if ($line->update($user) < 0) {
-								setEventMessages($line->error, $line->errors, 'errors');
-								$error++;
-							}
-							unset($_POST[$stockLocation]);
-							unset($_POST[$qty]);
-						}
-						else if (count($lines[$i]->details_entrepot) > 1)
-						{
-							// multi warehouse shipment lines
-							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-							{
-								if (! $error) {
-									$stockLocation="entl".$detail_entrepot->line_id;
-									$qty = "qtyl".$detail_entrepot->line_id;
-									$warehouse = GETPOST($stockLocation,'int');
-									if (!empty ($warehouse))
-									{
-										$line->id = $detail_entrepot->line_id;
-										$line->entrepot_id = $warehouse;
-										$line->qty = GETPOST($qty, 'int');
-										if ($line->update($user) < 0) {
-											setEventMessages($line->error, $line->errors, 'errors');
-											$error++;
-										}
-									}
-									unset($_POST[$stockLocation]);
-									unset($_POST[$qty]);
-								}
-							}
-						}
-					}
-					else	// Product no predefined
-					{
-						$qty = "qtyl".$line_id;
-						$line->id = $line_id;
-						$line->qty = GETPOST($qty, 'int');
-						$line->entrepot_id = 0;
-						if ($line->update($user) < 0) {
-							setEventMessages($line->error, $line->errors, 'errors');
-							$error++;
-						}
-						unset($_POST[$qty]);
-					}
-				}
-			}
-		}
-
-		unset($_POST["lineid"]);
-
-		if (! $error) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				// Define output language
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-		else
-		{
-			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
-			exit();
-		}
-	}
-
-	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
-		exit();
-	}
-
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
-	// Actions to send emails
-	if (empty($id)) $id=$facid;
-	$trigger_name='SHIPPING_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromshipment';
-	$trackid='shi'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+    else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save'))
+    {
+        // Clean parameters
+        $qty=0;
+        $entrepot_id = 0;
+        $batch_id = 0;
+
+        $lines = $object->lines;
+        $num_prod = count($lines);
+        for ($i = 0 ; $i < $num_prod ; $i++)
+        {
+            if ($lines[$i]->id == $line_id)		// we have found line to update
+            {
+                $line = new ExpeditionLigne($db);
+                // Extrafields Lines
+                $extrafieldsline = new ExtraFields($db);
+                $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+                $line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+                // Unset extrafield POST Data
+                if (is_array($extralabelsline)) {
+                    foreach ($extralabelsline as $key => $value) {
+                        unset($_POST["options_" . $key]);
+                    }
+                }
+                $line->fk_product = $lines[$i]->fk_product;
+                if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
+                {
+                    // line with lot
+                    foreach ($lines[$i]->detail_batch as $detail_batch)
+                    {
+                        $lotStock = new Productbatch($db);
+                        $batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
+                        $qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
+                        $batch_id = GETPOST($batch,'int');
+                        $batch_qty = GETPOST($qty, 'int');
+                        if (! empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty))
+                        {
+                            if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0)	// $line is ExpeditionLine
+                            {
+                                if ($lines[$i]->entrepot_id != 0)
+                                {
+                                    // allow update line entrepot_id if not multi warehouse shipping
+                                    $line->entrepot_id = $lotStock->warehouseid;
+                                }
+
+                                // detail_batch can be an object with keys, or an array of ExpeditionLineBatch
+                                if (empty($line->detail_batch)) $line->detail_batch=new stdClass();
+
+                                $line->detail_batch->fk_origin_stock = $batch_id;
+                                $line->detail_batch->batch = $lotStock->batch;
+                                $line->detail_batch->id = $detail_batch->id;
+                                $line->detail_batch->entrepot_id = $lotStock->warehouseid;
+                                $line->detail_batch->qty = $batch_qty;
+                                if ($line->update($user) < 0) {
+                                    setEventMessages($line->error, $line->errors, 'errors');
+                                    $error++;
+                                }
+                            }
+                            else
+                            {
+                                setEventMessages($lotStock->error, $lotStock->errors, 'errors');
+                                $error++;
+                            }
+                        }
+                        unset($_POST[$batch]);
+                        unset($_POST[$qty]);
+                    }
+                    // add new batch
+                    $lotStock = new Productbatch($db);
+                    $batch="batchl".$line_id."_0";
+                    $qty = "qtyl".$line_id."_0";
+                    $batch_id = GETPOST($batch,'int');
+                    $batch_qty = GETPOST($qty, 'int');
+                    $lineIdToAddLot = 0;
+                    if ($batch_qty > 0 && ! empty($batch_id))
+                    {
+                        if ($lotStock->fetch($batch_id) > 0)
+                        {
+                            // check if lotStock warehouse id is same as line warehouse id
+                            if ($lines[$i]->entrepot_id > 0)
+                            {
+                                // single warehouse shipment line
+                                if ($lines[i]->entrepot_id == $lotStock->warehouseid)
+                                {
+                                    $lineIdToAddLot = $line_id;
+                                }
+                            }
+                            else if (count($lines[$i]->details_entrepot) > 1)
+                            {
+                                // multi warehouse shipment lines
+                                foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+                                {
+                                    if ($detail_entrepot->entrepot_id == $lotStock->warehouseid)
+                                    {
+                                        $lineIdToAddLot = $detail_entrepot->line_id;
+                                    }
+                                }
+                            }
+                            if ($lineIdToAddLot)
+                            {
+                                // add lot to existing line
+                                if ($line->fetch($lineIdToAddLot) > 0)
+                                {
+                                    $line->detail_batch->fk_origin_stock = $batch_id;
+                                    $line->detail_batch->batch = $lotStock->batch;
+                                    $line->detail_batch->entrepot_id = $lotStock->warehouseid;
+                                    $line->detail_batch->qty = $batch_qty;
+                                    if ($line->update($user) < 0) {
+                                        setEventMessages($line->error, $line->errors, 'errors');
+                                        $error++;
+                                    }
+                                }
+                                else
+                                {
+                                    setEventMessages($line->error, $line->errors, 'errors');
+                                    $error++;
+                                }
+                            }
+                            else
+                            {
+                                // create new line with new lot
+                                $line->origin_line_id = $lines[$i]->origin_line_id;
+                                $line->entrepot_id = $lotStock->warehouseid;
+                                $line->detail_batch[0] = new ExpeditionLineBatch($db);
+                                $line->detail_batch[0]->fk_origin_stock = $batch_id;
+                                $line->detail_batch[0]->batch = $lotStock->batch;
+                                $line->detail_batch[0]->entrepot_id = $lotStock->warehouseid;
+                                $line->detail_batch[0]->qty = $batch_qty;
+                                if ($object->create_line_batch($line, $line->array_options) < 0)
+                                {
+                                    setEventMessages($object->error, $object->errors, 'errors');
+                                    $error++;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            setEventMessages($lotStock->error, $lotStock->errors, 'errors');
+                            $error++;
+                        }
+                    }
+                }
+                else
+                {
+                    if ($lines[$i]->fk_product > 0)
+                    {
+                        // line without lot
+                        if ($lines[$i]->entrepot_id > 0)
+                        {
+                            // single warehouse shipment line
+                            $stockLocation="entl".$line_id;
+                            $qty = "qtyl".$line_id;
+                            $line->id = $line_id;
+                            $line->entrepot_id = GETPOST($stockLocation,'int');
+                            $line->qty = GETPOST($qty, 'int');
+                            if ($line->update($user) < 0) {
+                                setEventMessages($line->error, $line->errors, 'errors');
+                                $error++;
+                            }
+                            unset($_POST[$stockLocation]);
+                            unset($_POST[$qty]);
+                        }
+                        else if (count($lines[$i]->details_entrepot) > 1)
+                        {
+                            // multi warehouse shipment lines
+                            foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+                            {
+                                if (! $error) {
+                                    $stockLocation="entl".$detail_entrepot->line_id;
+                                    $qty = "qtyl".$detail_entrepot->line_id;
+                                    $warehouse = GETPOST($stockLocation,'int');
+                                    if (!empty ($warehouse))
+                                    {
+                                        $line->id = $detail_entrepot->line_id;
+                                        $line->entrepot_id = $warehouse;
+                                        $line->qty = GETPOST($qty, 'int');
+                                        if ($line->update($user) < 0) {
+                                            setEventMessages($line->error, $line->errors, 'errors');
+                                            $error++;
+                                        }
+                                    }
+                                    unset($_POST[$stockLocation]);
+                                    unset($_POST[$qty]);
+                                }
+                            }
+                        }
+                    }
+                    else	// Product no predefined
+                    {
+                        $qty = "qtyl".$line_id;
+                        $line->id = $line_id;
+                        $line->qty = GETPOST($qty, 'int');
+                        $line->entrepot_id = 0;
+                        if ($line->update($user) < 0) {
+                            setEventMessages($line->error, $line->errors, 'errors');
+                            $error++;
+                        }
+                        unset($_POST[$qty]);
+                    }
+                }
+            }
+        }
+
+        unset($_POST["lineid"]);
+
+        if (! $error) {
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+                // Define output language
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+                    $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+                    $newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+
+                $ret = $object->fetch($object->id); // Reload to get new records
+                $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+        }
+        else
+        {
+            header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+            exit();
+        }
+    }
+
+    else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
+        header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+        exit();
+    }
+
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+    // Actions to send emails
+    if (empty($id)) $id=$facid;
+    $trigger_name='SHIPPING_SENTBYMAIL';
+    $paramname='id';
+    $mode='emailfromshipment';
+    $trackid='shi'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -990,7 +990,7 @@ 
                 print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
                 print '<td colspan="3">';
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        		print $doleditor->Create(1);
+                print $doleditor->Create(1);
                 print "</td></tr>";
             }
 
@@ -1033,37 +1033,37 @@ 
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
-			if (empty($reshook)) {
-				// copy from order
-				$orderExtrafields = new Extrafields($db);
-				$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
-				if ($object->fetch_optionals() > 0) {
-					$expe->array_options = array_merge($expe->array_options, $object->array_options);
-				}
-				print $expe->showOptionals($extrafields, 'edit');
-			}
+            if (empty($reshook)) {
+                // copy from order
+                $orderExtrafields = new Extrafields($db);
+                $orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
+                if ($object->fetch_optionals() > 0) {
+                    $expe->array_options = array_merge($expe->array_options, $object->array_options);
+                }
+                print $expe->showOptionals($extrafields, 'edit');
+            }
 
 
             // Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
-				print '<tr>';
-				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->libelle_incoterms, 1).'</label></td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
-				print '</td></tr>';
-			}
+            if (!empty($conf->incoterm->enabled))
+            {
+                print '<tr>';
+                print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->libelle_incoterms, 1).'</label></td>';
+                print '<td colspan="3" class="maxwidthonsmartphone">';
+                print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+                print '</td></tr>';
+            }
 
             // Document model
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
-			$liste = ModelePdfExpedition::liste_modeles($db);
-			if (count($liste) > 1)
-			{
-    			print "<tr><td>".$langs->trans("DefaultModel")."</td>";
+            include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+            $liste = ModelePdfExpedition::liste_modeles($db);
+            if (count($liste) > 1)
+            {
+                print "<tr><td>".$langs->trans("DefaultModel")."</td>";
                 print '<td colspan="3">';
-    			print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
+                print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
                 print "</td></tr>\n";
-			}
+            }
 
             print "</table>";
 
@@ -1077,21 +1077,21 @@ 
             print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    	$i=0;
-    	    	while($i < $numAsked)
-    	    	{
-    	    		print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-    	    		$i++;
-    	    	}
-        		print '});
+                $i=0;
+                while($i < $numAsked)
+                {
+                    print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+                    $i++;
+                }
+                print '});
 	            jQuery("#autoreset").click(function() {';
-    	    	$i=0;
-    	    	while($i < $numAsked)
-    	    	{
-    	    		print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-    	    		$i++;
-    	    	}
-        		print '});
+                $i=0;
+                while($i < $numAsked)
+                {
+                    print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+                    $i++;
+                }
+                print '});
         	});
             </script>';
 
@@ -1112,22 +1112,22 @@ 
                 print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
                 print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
                 print '<td align="center">'.$langs->trans("QtyToShip");
-				if (empty($conf->productbatch->enabled))
-				{
-	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
-	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
-				}
+                if (empty($conf->productbatch->enabled))
+                {
+                    print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+                    print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
+                }
                 print '</td>';
                 if (! empty($conf->stock->enabled))
                 {
-					if (empty($conf->productbatch->enabled))
-					{
-                    	print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-					}
-					else
-					{
-						print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
-					}
+                    if (empty($conf->productbatch->enabled))
+                    {
+                        print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
+                    }
+                    else
+                    {
+                        print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
+                    }
                 }
                 print "</tr>\n";
             }
@@ -1182,16 +1182,16 @@ 
                     print '</td>';
                 }
                 else
-				{
-				    print "<td>";
+                {
+                    print "<td>";
                     if ($type==1) $text = img_object($langs->trans('Service'),'service');
                     else $text = img_object($langs->trans('Product'),'product');
 
                     if (! empty($line->label)) {
-                    	$text.= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
+                        $text.= ' <strong>'.$line->label.'</strong>';
+                        print $form->textwithtooltip($text,$line->desc,3,'','',$i);
                     } else {
-                    	print $text.' '.nl2br($line->desc);
+                        print $text.' '.nl2br($line->desc);
                     }
 
                     // Show range
@@ -1214,372 +1214,372 @@ 
 
                 // Qty to ship
                 $quantityAsked = $line->qty;
-				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
-				{
-					$quantityToBeDelivered = 0;
-				}
-				else
-				{
-					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
-				}
+                if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                {
+                    $quantityToBeDelivered = 0;
+                }
+                else
+                {
+                    $quantityToBeDelivered = $quantityAsked - $quantityDelivered;
+                }
                 $warehouse_id = GETPOST('entrepot_id','int');
 
-				$warehouseObject = null;
-				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
-				{
-				    print '<!-- Case warehouse already known or product not a predefined product -->';
-					//ship from preselected location
-					$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
-					$deliverableQty=min($quantityToBeDelivered, $stock);
-					if ($deliverableQty < 0) $deliverableQty = 0;
-					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
-					{
-						// Quantity to send
-						print '<td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						{
+                $warehouseObject = null;
+                if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+                {
+                    print '<!-- Case warehouse already known or product not a predefined product -->';
+                    //ship from preselected location
+                    $stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
+                    $deliverableQty=min($quantityToBeDelivered, $stock);
+                    if ($deliverableQty < 0) $deliverableQty = 0;
+                    if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
+                    {
+                        // Quantity to send
+                        print '<td align="center">';
+                        if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                        {
                             if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty=GETPOST('qtyl'.$indiceAsked, 'int');
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-						}
-						else print $langs->trans("NA");
-						print '</td>';
-
-						// Stock
-						if (! empty($conf->stock->enabled))
-						{
-							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
-							{
-								// Show warehouse combo list
-								$ent = "entl".$indiceAsked;
-								$idl = "idl".$indiceAsked;
-								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
-								if ($line->fk_product > 0)
-								{
-								    print '<!-- Show warehouse selection -->';
-									print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1);
-									if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
-									{
-										//print $stock.' '.$quantityToBeDelivered;
-										if ($stock < $quantityToBeDelivered)
-										{
-											print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for this $warehouse_id but you can change warehouse
-										}
-									}
-								}
-							}
-							else
-							{
-								print $langs->trans("Service");
-							}
-							print '</td>';
-						}
-
-						print "</tr>\n";
-
-						// Show subproducts of product
-						if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-						{
-							$product->get_sousproduits_arbo();
-							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-							if(count($prods_arbo) > 0)
-							{
-								foreach($prods_arbo as $key => $value)
-								{
-									//print $value[0];
-									$img='';
-									if ($value['stock'] < $value['stock_alert'])
-									{
-										$img=img_warning($langs->trans("StockTooLow"));
-									}
-									print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
+                            print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+                        }
+                        else print $langs->trans("NA");
+                        print '</td>';
+
+                        // Stock
+                        if (! empty($conf->stock->enabled))
+                        {
+                            print '<td align="left">';
+                            if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
+                            {
+                                // Show warehouse combo list
+                                $ent = "entl".$indiceAsked;
+                                $idl = "idl".$indiceAsked;
+                                $tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
+                                if ($line->fk_product > 0)
+                                {
+                                    print '<!-- Show warehouse selection -->';
+                                    print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1);
+                                    if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
+                                    {
+                                        //print $stock.' '.$quantityToBeDelivered;
+                                        if ($stock < $quantityToBeDelivered)
+                                        {
+                                            print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for this $warehouse_id but you can change warehouse
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                print $langs->trans("Service");
+                            }
+                            print '</td>';
+                        }
+
+                        print "</tr>\n";
+
+                        // Show subproducts of product
+                        if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+                        {
+                            $product->get_sousproduits_arbo();
+                            $prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+                            if(count($prods_arbo) > 0)
+                            {
+                                foreach($prods_arbo as $key => $value)
+                                {
+                                    //print $value[0];
+                                    $img='';
+                                    if ($value['stock'] < $value['stock_alert'])
+                                    {
+                                        $img=img_warning($langs->trans("StockTooLow"));
+                                    }
+                                    print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
 										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 										</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
 										<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
-								}
-							}
-						}
-					}
-					else
-					{
-					    // Product need lot
-						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-						print '<!-- Case product need lot -->';
-
-						$staticwarehouse=new Entrepot($db);
-						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
-
-						$subj=0;
-						// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
-						if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
-						{
-							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
-						    {
-   						        $nbofsuggested++;
-    						}
-						}
-						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
-						{
-							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
-							{
-								//var_dump($dbatch);
-								$batchStock = + $dbatch->qty;		// To get a numeric
-								$deliverableQty = min($quantityToBeDelivered,$batchStock);
-								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
-								print '<td colspan="3" ></td><td align="center">';
-								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
-								print '</td>';
-
-								print '<!-- Show details of lot -->';
-								print '<td align="left">';
-
-								print $staticwarehouse->getNomUrl(0).' / ';
-
-								print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
-
-								$detail='';
-								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
-								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-								$detail.= '<br>';
-								print $detail;
-
-								$quantityToBeDelivered -= $deliverableQty;
-								if ($quantityToBeDelivered < 0)
-								{
-									$quantityToBeDelivered = 0;
-								}
-								$subj++;
-								print '</td></tr>';
-							}
-						}
-						else
-						{
-						    print '<!-- Case there is no details of lot at all -->';
-						    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
-							print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
-							print '</td>';
-
-							print '<td align="left">';
-							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
-							print '</td></tr>';
-						}
-					}
-				}
-				else
-				{
-					// ship from multiple locations
-					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
-					{
-					    print '<!-- Case warehouse not already known and product does not need lot -->';
-					    print '<td></td><td></td></tr>'."\n";	// end line and start a new one for each warehouse
-
-						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						$subj=0;
-    					// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-						{
-							if ($stock_warehouse->real > 0)
-							{
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Product need lot
+                        print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+                        print '<!-- Case product need lot -->';
+
+                        $staticwarehouse=new Entrepot($db);
+                        if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
+
+                        $subj=0;
+                        // Define nb of lines suggested for this order line
+                        $nbofsuggested=0;
+                        if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
+                        {
+                            foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
+                            {
+                                    $nbofsuggested++;
+                            }
+                        }
+                        print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+                        if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
+                        {
+                            foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
+                            {
+                                //var_dump($dbatch);
+                                $batchStock = + $dbatch->qty;		// To get a numeric
+                                $deliverableQty = min($quantityToBeDelivered,$batchStock);
+                                print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
+                                print '<td colspan="3" ></td><td align="center">';
+                                print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
+                                print '</td>';
+
+                                print '<!-- Show details of lot -->';
+                                print '<td align="left">';
+
+                                print $staticwarehouse->getNomUrl(0).' / ';
+
+                                print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
+
+                                $detail='';
+                                $detail.= $langs->trans("Batch").': '.$dbatch->batch;
+                                $detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
+                                $detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
+                                $detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+                                $detail.= '<br>';
+                                print $detail;
+
+                                $quantityToBeDelivered -= $deliverableQty;
+                                if ($quantityToBeDelivered < 0)
+                                {
+                                    $quantityToBeDelivered = 0;
+                                }
+                                $subj++;
+                                print '</td></tr>';
+                            }
+                        }
+                        else
+                        {
+                            print '<!-- Case there is no details of lot at all -->';
+                            print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
+                            print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
+                            print '</td>';
+
+                            print '<td align="left">';
+                            print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
+                            print '</td></tr>';
+                        }
+                    }
+                }
+                else
+                {
+                    // ship from multiple locations
+                    if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
+                    {
+                        print '<!-- Case warehouse not already known and product does not need lot -->';
+                        print '<td></td><td></td></tr>'."\n";	// end line and start a new one for each warehouse
+
+                        print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+                        $subj=0;
+                        // Define nb of lines suggested for this order line
+                        $nbofsuggested=0;
+                        foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
+                        {
+                            if ($stock_warehouse->real > 0)
+                            {
                                 $nbofsuggested++;
-						    }
-						}
-						$tmpwarehouseObject=new Entrepot($db);
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
-						{
-							$tmpwarehouseObject->fetch($warehouse_id);
-							if ($stock_warehouse->real > 0)
-							{
-								$stock = + $stock_warehouse->real; // Convert it to number
-								$deliverableQty = min($quantityToBeDelivered,$stock);
-								$deliverableQty = max(0, $deliverableQty);
-								// Quantity to send
-								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
-								print '<td colspan="3" ></td><td align="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
-								if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-								{
-									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
-								}
-								else print $langs->trans("NA");
-								print '</td>';
-
-								// Stock
-								if (! empty($conf->stock->enabled))
-								{
-									print '<td align="left">';
-									if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-									{
-										print $tmpwarehouseObject->getNomUrl(0).' ';
-
-										print '<!-- Show details of stock -->';
-										print '('.$stock.')';
-									}
-									else
-									{
-										print $langs->trans("Service");
-									}
-									print '</td>';
-								}
-								$quantityToBeDelivered -= $deliverableQty;
-								if ($quantityToBeDelivered < 0)
-								{
-									$quantityToBeDelivered = 0;
-								}
-								$subj++;
-								print "</tr>\n";
-							}
-						}
-						// Show subproducts of product (not recommanded)
-						if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-						{
-							$product->get_sousproduits_arbo();
-							$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-							if (count($prods_arbo) > 0)
-							{
-								foreach($prods_arbo as $key => $value)
-								{
-									//print $value[0];
-									$img='';
-									if ($value['stock'] < $value['stock_alert'])
-									{
-										$img=img_warning($langs->trans("StockTooLow"));
-									}
-									print '<tr class"oddeven"><td>';
-									print "&nbsp; &nbsp; &nbsp; ->
+                            }
+                        }
+                        $tmpwarehouseObject=new Entrepot($db);
+                        foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
+                        {
+                            $tmpwarehouseObject->fetch($warehouse_id);
+                            if ($stock_warehouse->real > 0)
+                            {
+                                $stock = + $stock_warehouse->real; // Convert it to number
+                                $deliverableQty = min($quantityToBeDelivered,$stock);
+                                $deliverableQty = max(0, $deliverableQty);
+                                // Quantity to send
+                                print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
+                                print '<td colspan="3" ></td><td align="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
+                                if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                                {
+                                    print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+                                    print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
+                                }
+                                else print $langs->trans("NA");
+                                print '</td>';
+
+                                // Stock
+                                if (! empty($conf->stock->enabled))
+                                {
+                                    print '<td align="left">';
+                                    if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                                    {
+                                        print $tmpwarehouseObject->getNomUrl(0).' ';
+
+                                        print '<!-- Show details of stock -->';
+                                        print '('.$stock.')';
+                                    }
+                                    else
+                                    {
+                                        print $langs->trans("Service");
+                                    }
+                                    print '</td>';
+                                }
+                                $quantityToBeDelivered -= $deliverableQty;
+                                if ($quantityToBeDelivered < 0)
+                                {
+                                    $quantityToBeDelivered = 0;
+                                }
+                                $subj++;
+                                print "</tr>\n";
+                            }
+                        }
+                        // Show subproducts of product (not recommanded)
+                        if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+                        {
+                            $product->get_sousproduits_arbo();
+                            $prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+                            if (count($prods_arbo) > 0)
+                            {
+                                foreach($prods_arbo as $key => $value)
+                                {
+                                    //print $value[0];
+                                    $img='';
+                                    if ($value['stock'] < $value['stock_alert'])
+                                    {
+                                        $img=img_warning($langs->trans("StockTooLow"));
+                                    }
+                                    print '<tr class"oddeven"><td>';
+                                    print "&nbsp; &nbsp; &nbsp; ->
 									<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
 									<td align=\"center\">".$value['stock']." ".$img."</td>";
-									print "</tr>";
-								}
-							}
-						}
-					}
-					else
-					{
-					    print '<!-- Case warehouse not already known and product need lot -->';
-					    print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
-
-						$subj=0;
-						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-
-						$tmpwarehouseObject=new Entrepot($db);
-						$productlotObject=new Productlot($db);
-						// Define nb of lines suggested for this order line
-						$nbofsuggested=0;
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-						{
-						    if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-						        foreach ($stock_warehouse->detail_batch as $dbatch)
-								{
+                                    print "</tr>";
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        print '<!-- Case warehouse not already known and product need lot -->';
+                        print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
+
+                        $subj=0;
+                        print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+
+                        $tmpwarehouseObject=new Entrepot($db);
+                        $productlotObject=new Productlot($db);
+                        // Define nb of lines suggested for this order line
+                        $nbofsuggested=0;
+                        foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
+                        {
+                            if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+                                foreach ($stock_warehouse->detail_batch as $dbatch)
+                                {
                                     $nbofsuggested++;
-								}
-						    }
-						}
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-						{
-							$tmpwarehouseObject->fetch($warehouse_id);
-							if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-						        foreach ($stock_warehouse->detail_batch as $dbatch)
-								{
-									//var_dump($dbatch);
-									$batchStock = + $dbatch->qty;		// To get a numeric
-									$deliverableQty = min($quantityToBeDelivered,$batchStock);
-									if ($deliverableQty < 0) $deliverableQty = 0;
-									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
-									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
-									print '</td>';
-
-									print '<td align="left">';
-
-									print $tmpwarehouseObject->getNomUrl(0).' / ';
-
-									print '<!-- Show details of lot -->';
-									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
-
-									//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
-									print $langs->trans("Batch").': ';
-									$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
-									if ($result > 0) print $productlotObject->getNomUrl(1);
-									else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
-									print ' ('.$dbatch->qty.')';
-									$quantityToBeDelivered -= $deliverableQty;
-									if ($quantityToBeDelivered < 0)
-									{
-										$quantityToBeDelivered = 0;
-									}
-									//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
-									$subj++;
-									print '</td></tr>';
-								}
-							}
-						}
-					}
-					if ($subj == 0) // Line not shown yet, we show it
-					{
-					    print '<!-- line not shown yet, we show it -->';
-						print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						{
-						    $disabled='';
-					        if (! empty($conf->productbatch->enabled) && $product->hasbatch())
-					        {
+                                }
+                            }
+                        }
+                        foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
+                        {
+                            $tmpwarehouseObject->fetch($warehouse_id);
+                            if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+                                foreach ($stock_warehouse->detail_batch as $dbatch)
+                                {
+                                    //var_dump($dbatch);
+                                    $batchStock = + $dbatch->qty;		// To get a numeric
+                                    $deliverableQty = min($quantityToBeDelivered,$batchStock);
+                                    if ($deliverableQty < 0) $deliverableQty = 0;
+                                    print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
+                                    print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
+                                    print '</td>';
+
+                                    print '<td align="left">';
+
+                                    print $tmpwarehouseObject->getNomUrl(0).' / ';
+
+                                    print '<!-- Show details of lot -->';
+                                    print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
+
+                                    //print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
+                                    print $langs->trans("Batch").': ';
+                                    $result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
+                                    if ($result > 0) print $productlotObject->getNomUrl(1);
+                                    else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
+                                    print ' ('.$dbatch->qty.')';
+                                    $quantityToBeDelivered -= $deliverableQty;
+                                    if ($quantityToBeDelivered < 0)
+                                    {
+                                        $quantityToBeDelivered = 0;
+                                    }
+                                    //dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
+                                    $subj++;
+                                    print '</td></tr>';
+                                }
+                            }
+                        }
+                    }
+                    if ($subj == 0) // Line not shown yet, we show it
+                    {
+                        print '<!-- line not shown yet, we show it -->';
+                        print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
+                        if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                        {
+                            $disabled='';
+                            if (! empty($conf->productbatch->enabled) && $product->hasbatch())
+                            {
                                 $disabled='disabled="disabled"';
-						    }
-    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
-						}
-						else
-						{
-						    print $langs->trans("NA");
-						}
-						print '</td>';
-
-						print '<td align="left">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						{
-							$warehouse_selected_id = GETPOST('entrepot_id','int');
-    						if ($warehouse_selected_id > 0)
-    						{
-    							$warehouseObject=new Entrepot($db);
-    							$warehouseObject->fetch($warehouse_selected_id);
-    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
-    						}
-    						else
-    						{
-    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
-    						    else print '';
-    						}
-						}
-						else
-						{
-						    print $langs->trans("Service");
-						}
-						print '</td>';
-						print '</tr>';
-					}
-				}
-
-
-				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0)
-				{
-					$colspan=5;
-					$orderLineExtrafields = new Extrafields($db);
-					$orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
-					$srcLine = new OrderLine($db);
-					$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
-					$line = new ExpeditionLigne($db);
-					//$line->fetch_optionals($line->id);
-					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
-					print '<tr class="oddeven">';
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-					print '</tr>';
-				}
+                            }
+                            print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
+                        }
+                        else
+                        {
+                            print $langs->trans("NA");
+                        }
+                        print '</td>';
+
+                        print '<td align="left">';
+                        if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                        {
+                            $warehouse_selected_id = GETPOST('entrepot_id','int');
+                            if ($warehouse_selected_id > 0)
+                            {
+                                $warehouseObject=new Entrepot($db);
+                                $warehouseObject->fetch($warehouse_selected_id);
+                                print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
+                            }
+                            else
+                            {
+                                if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
+                                else print '';
+                            }
+                        }
+                        else
+                        {
+                            print $langs->trans("Service");
+                        }
+                        print '</td>';
+                        print '</tr>';
+                    }
+                }
+
+
+                //Display lines extrafields
+                if (is_array($extralabelslines) && count($extralabelslines)>0)
+                {
+                    $colspan=5;
+                    $orderLineExtrafields = new Extrafields($db);
+                    $orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
+                    $srcLine = new OrderLine($db);
+                    $srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
+                    $line = new ExpeditionLigne($db);
+                    //$line->fetch_optionals($line->id);
+                    $line->array_options = array_merge($line->array_options, $srcLine->array_options);
+                    print '<tr class="oddeven">';
+                    print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+                    print '</tr>';
+                }
 
                 $indiceAsked++;
             }
@@ -1599,7 +1599,7 @@ 
             print '<br>';
         }
         else
-		{
+        {
             dol_print_error($db);
         }
     }
@@ -1611,102 +1611,102 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 {
-	$lines = $object->lines;
+    $lines = $object->lines;
 
-	$num_prod = count($lines);
+    $num_prod = count($lines);
 
-	if ($object->id > 0)
-	{
-		if (!empty($object->origin) && $object->origin_id > 0)
-		{
-			$typeobject = $object->origin;
-			$origin = $object->origin;
-			$origin_id = $object->origin_id;
-			$object->fetch_origin();         // Load property $object->commande, $object->propal, ...
-		}
-
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-		$res = $object->fetch_optionals();
-
-		$head=shipping_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
-
-		$formconfirm='';
-
-		// Confirm deleteion
-		if ($action == 'delete')
-		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
-		}
-
-		// Confirmation validation
-		if ($action == 'valid')
-		{
-			$objectref = substr($object->ref, 1, 4);
-			if ($objectref == 'PROV')
-			{
-				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
-				$numref = $object->ref;
-			}
-
-			$text = $langs->trans("ConfirmValidateSending",$numref);
-
-			if (! empty($conf->notification->enabled))
-			{
-				require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-				$notify=new Notify($db);
-				$text.='<br>';
-				$text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid, $object);
-			}
-
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
-		}
-		// Confirm cancelation
-		if ($action == 'annuler')
-		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
-		}
-
-		// Call Hook formConfirm
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
-
-		// Print form confirm
-		print $formconfirm;
-
-
-		// Calculate totalWeight and totalVolume for all products
-		// by adding weight and volume of each product line.
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
-
-
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
-		{
-		    $objectsrc=new Commande($db);
-		    $objectsrc->fetch($object->$typeobject->id);
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
-		{
-		    $objectsrc=new Propal($db);
-		    $objectsrc->fetch($object->$typeobject->id);
-		}
-
-		// Shipment card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
-		$morehtmlref='<div class="refidno">';
-		// Ref customer shipment
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
-		// Thirdparty
+    if ($object->id > 0)
+    {
+        if (!empty($object->origin) && $object->origin_id > 0)
+        {
+            $typeobject = $object->origin;
+            $origin = $object->origin;
+            $origin_id = $object->origin_id;
+            $object->fetch_origin();         // Load property $object->commande, $object->propal, ...
+        }
+
+        $soc = new Societe($db);
+        $soc->fetch($object->socid);
+
+        $res = $object->fetch_optionals();
+
+        $head=shipping_prepare_head($object);
+        dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), -1, 'sending');
+
+        $formconfirm='';
+
+        // Confirm deleteion
+        if ($action == 'delete')
+        {
+            $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
+        }
+
+        // Confirmation validation
+        if ($action == 'valid')
+        {
+            $objectref = substr($object->ref, 1, 4);
+            if ($objectref == 'PROV')
+            {
+                $numref = $object->getNextNumRef($soc);
+            }
+            else
+            {
+                $numref = $object->ref;
+            }
+
+            $text = $langs->trans("ConfirmValidateSending",$numref);
+
+            if (! empty($conf->notification->enabled))
+            {
+                require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+                $notify=new Notify($db);
+                $text.='<br>';
+                $text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid, $object);
+            }
+
+            $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
+        }
+        // Confirm cancelation
+        if ($action == 'annuler')
+        {
+            $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
+        }
+
+        // Call Hook formConfirm
+        $parameters = array();
+        $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+        if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+        elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+
+        // Print form confirm
+        print $formconfirm;
+
+
+        // Calculate totalWeight and totalVolume for all products
+        // by adding weight and volume of each product line.
+        $tmparray=$object->getTotalWeightVolume();
+        $totalWeight=$tmparray['weight'];
+        $totalVolume=$tmparray['volume'];
+
+
+        if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+        {
+            $objectsrc=new Commande($db);
+            $objectsrc->fetch($object->$typeobject->id);
+        }
+        if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+        {
+            $objectsrc=new Propal($db);
+            $objectsrc->fetch($object->$typeobject->id);
+        }
+
+        // Shipment card
+        $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+        $morehtmlref='<div class="refidno">';
+        // Ref customer shipment
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+        // Thirdparty
         $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
         // Project
         if (! empty($conf->projet->enabled)) {
@@ -1742,849 +1742,849 @@ 
                 }
             }
         }
-		$morehtmlref.='</div>';
+        $morehtmlref.='</div>';
 
 
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+        print '<div class="fichecenter">';
+        print '<div class="fichehalfleft">';
+        print '<div class="underbanner clearboth"></div>';
 
         print '<table class="border" width="100%">';
 
-		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
-		{
-			print '<tr><td>';
-			print $langs->trans("RefOrder").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'commande');
-			print "</td>\n";
-			print '</tr>';
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
-		{
-			print '<tr><td>';
-			print $langs->trans("RefProposal").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'expedition');
-			print "</td>\n";
-			print '</tr>';
-		}
-
-		// Date creation
-		print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
-		print '<td colspan="3">'.dol_print_date($object->date_creation,"dayhour")."</td>\n";
-		print '</tr>';
-
-		// Delivery date planned
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('DateDeliveryPlanned');
-		print '</td>';
-
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editdate_livraison')
-		{
-			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="setdate_livraison">';
-			print $form->selectDate($object->date_delivery?$object->date_delivery:-1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Weight
-		print '<tr><td>';
-		print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer);
-		print '</td><td colspan="3">';
-
-		if ($action=='edittrueWeight')
-		{
-			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueWeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
-			print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->trueWeight;
-			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
-		}
+        // Linked documents
+        if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+        {
+            print '<tr><td>';
+            print $langs->trans("RefOrder").'</td>';
+            print '<td colspan="3">';
+            print $objectsrc->getNomUrl(1,'commande');
+            print "</td>\n";
+            print '</tr>';
+        }
+        if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+        {
+            print '<tr><td>';
+            print $langs->trans("RefProposal").'</td>';
+            print '<td colspan="3">';
+            print $objectsrc->getNomUrl(1,'expedition');
+            print "</td>\n";
+            print '</tr>';
+        }
+
+        // Date creation
+        print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+        print '<td colspan="3">'.dol_print_date($object->date_creation,"dayhour")."</td>\n";
+        print '</tr>';
+
+        // Delivery date planned
+        print '<tr><td height="10">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('DateDeliveryPlanned');
+        print '</td>';
+
+        if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="2">';
+        if ($action == 'editdate_livraison')
+        {
+            print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="setdate_livraison">';
+            print $form->selectDate($object->date_delivery?$object->date_delivery:-1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+            print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+            print '</form>';
+        }
+        else
+        {
+            print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Weight
+        print '<tr><td>';
+        print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer);
+        print '</td><td colspan="3">';
+
+        if ($action=='edittrueWeight')
+        {
+            print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+            print '<input name="action" value="settrueWeight" type="hidden">';
+            print '<input name="id" value="'.$object->id.'" type="hidden">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
+            print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
+            print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+            print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+            print '</form>';
+        }
+        else
+        {
+            print $object->trueWeight;
+            print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
+        }
 
         // Calculated
-		if ($totalWeight > 0)
-		{
-			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
-			//print $totalWeight.' '.measuring_units_string(0,"weight");
-			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
-			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
-			if (!empty($object->trueWeight)) print ')';
-		}
-		print '</td></tr>';
-
-		// Width
-		print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer);
-		print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
-		print '</td></tr>';
-
-		// Height
-		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		if($action=='edittrueHeight')
-		{
-			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueHeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
-			print $formproduct->select_measuring_units("size_units","size",$object->size_units);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->trueHeight;
-			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
-		}
-
-		print '</td></tr>';
-
-		// Depth
-		print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer);
-		print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
-		print '</td></tr>';
-
-		// Volume
-		print '<tr><td>';
-		print $langs->trans("Volume");
-		print '</td>';
-		print '<td colspan="3">';
-		$calculatedVolume=0;
-		$volumeUnit=0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
-		{
-		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $volumeUnit=$object->size_units * 3;
-		}
-		// If sending volume not defined we use sum of products
-		if ($calculatedVolume > 0)
-		{
-			if ($volumeUnit < 50)
-			{
-			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
-			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
-			}
-			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
-		}
-		if ($totalVolume > 0)
-		{
-			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
-			//print $totalVolume.' '.measuring_units_string(0,"volume");
-			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
-			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
-			if ($calculatedVolume) print ')';
-		}
-		print "</td>\n";
-		print '</tr>';
-
-		// Other attributes
-		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-		print '</table>';
-
-		print '</div>';
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent">';
-
-		// Sending method
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('SendingMethod');
-		print '</td>';
-
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editshipping_method_id')
-		{
-			print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="setshipping_method_id">';
-			$object->fetch_delivery_methods();
-			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($object->shipping_method_id > 0)
-			{
-				// Get code using getLabelFromKey
-				$code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
-				print $langs->trans("SendingMethod".strtoupper($code));
-			}
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Tracking Number
-		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
-		print '</td></tr>';
-
-		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
-			print '<tr><td>';
-	        print '<table width="100%" class="nobordernopadding"><tr><td>';
-	        print $langs->trans('IncotermLabel');
-	        print '<td><td align="right">';
-	        if ($user->rights->expedition->creer) print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-	        else print '&nbsp;';
-	        print '</td></tr></table>';
-	        print '</td>';
-	        print '<td colspan="3">';
-			if ($action != 'editincoterm')
-			{
-				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-			}
-			else
-			{
-				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
-			}
-	        print '</td></tr>';
-		}
-
-		print "</table>";
-
-		print '</div>';
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div>';
-
-
-		// Lines of products
-
-		if ($action == 'editline')
-		{
-			print '	<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
+        if ($totalWeight > 0)
+        {
+            if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
+            //print $totalWeight.' '.measuring_units_string(0,"weight");
+            print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+            //if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
+            if (!empty($object->trueWeight)) print ')';
+        }
+        print '</td></tr>';
+
+        // Width
+        print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+        print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer);
+        print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
+        print '</td></tr>';
+
+        // Height
+        print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+        if($action=='edittrueHeight')
+        {
+            print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+            print '<input name="action" value="settrueHeight" type="hidden">';
+            print '<input name="id" value="'.$object->id.'" type="hidden">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
+            print $formproduct->select_measuring_units("size_units","size",$object->size_units);
+            print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+            print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+            print '</form>';
+        }
+        else
+        {
+            print $object->trueHeight;
+            print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
+        }
+
+        print '</td></tr>';
+
+        // Depth
+        print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+        print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer);
+        print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
+        print '</td></tr>';
+
+        // Volume
+        print '<tr><td>';
+        print $langs->trans("Volume");
+        print '</td>';
+        print '<td colspan="3">';
+        $calculatedVolume=0;
+        $volumeUnit=0;
+        if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
+        {
+            $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+            $volumeUnit=$object->size_units * 3;
+        }
+        // If sending volume not defined we use sum of products
+        if ($calculatedVolume > 0)
+        {
+            if ($volumeUnit < 50)
+            {
+                //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+                print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+            }
+            else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+        }
+        if ($totalVolume > 0)
+        {
+            if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
+            //print $totalVolume.' '.measuring_units_string(0,"volume");
+            print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+            //if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
+            if ($calculatedVolume) print ')';
+        }
+        print "</td>\n";
+        print '</tr>';
+
+        // Other attributes
+        $cols = 2;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+        print '</table>';
+
+        print '</div>';
+        print '<div class="fichehalfright">';
+        print '<div class="ficheaddleft">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border centpercent">';
+
+        // Sending method
+        print '<tr><td height="10">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('SendingMethod');
+        print '</td>';
+
+        if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="2">';
+        if ($action == 'editshipping_method_id')
+        {
+            print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="setshipping_method_id">';
+            $object->fetch_delivery_methods();
+            print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($object->shipping_method_id > 0)
+            {
+                // Get code using getLabelFromKey
+                $code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
+                print $langs->trans("SendingMethod".strtoupper($code));
+            }
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Tracking Number
+        print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+        print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
+        print '</td></tr>';
+
+        // Incoterms
+        if (!empty($conf->incoterm->enabled))
+        {
+            print '<tr><td>';
+            print '<table width="100%" class="nobordernopadding"><tr><td>';
+            print $langs->trans('IncotermLabel');
+            print '<td><td align="right">';
+            if ($user->rights->expedition->creer) print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+            else print '&nbsp;';
+            print '</td></tr></table>';
+            print '</td>';
+            print '<td colspan="3">';
+            if ($action != 'editincoterm')
+            {
+                print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+            }
+            else
+            {
+                print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+            }
+            print '</td></tr>';
+        }
+
+        print "</table>";
+
+        print '</div>';
+        print '</div>';
+        print '</div>';
+
+        print '<div class="clearboth"></div>';
+
+
+        // Lines of products
+
+        if ($action == 'editline')
+        {
+            print '	<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
 			<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
 			<input type="hidden" name="action" value="updateline">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="' . $object->id . '">
 			';
-		}
-		print '<br>';
+        }
+        print '<br>';
 
         print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		// Adds a line numbering column
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-		{
-			print '<td width="5" align="center">&nbsp;</td>';
-		}
-		// Product/Service
-		print '<td>'.$langs->trans("Products").'</td>';
-		// Qty
-		print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-		if ($origin && $origin_id > 0)
-		{
-			print '<td align="center">'.$langs->trans("QtyInOtherShipments").'</td>';
-		}
-		if ($action == 'editline')
-		{
-			$editColspan = 3;
-			if (empty($conf->stock->enabled)) $editColspan--;
-			if (empty($conf->productbatch->enabled)) $editColspan--;
-			print '<td align="center" colspan="'. $editColspan . '">';
-			if ($object->statut <= 1)
-			{
-				print $langs->trans("QtyToShip").' - ';
-			}
-			else
-			{
-				print $langs->trans("QtyShipped").' - ';
-			}
-			if (! empty($conf->stock->enabled))
-			{
-				print $langs->trans("WarehouseSource").' - ';
-			}
-			if (! empty($conf->productbatch->enabled))
-			{
-				print $langs->trans("Batch");
-			}
-			print '</td>';
-		}
-		else
-		{
-			if ($object->statut <= 1)
-			{
-				print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
-			}
-			else
-			{
-				print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-			}
-			if (! empty($conf->stock->enabled))
-			{
-				print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
-			}
-
-			if (! empty($conf->productbatch->enabled))
-			{
-				print '<td align="left">'.$langs->trans("Batch").'</td>';
-			}
-		}
-		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
-		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
-		//print '<td align="center">'.$langs->trans("Size").'</td>';
-		if ($object->statut == 0)
-		{
-			print '<td class="linecoledit"></td>';
-			print '<td class="linecoldelete" width="10"></td>';
-		}
-		print "</tr>\n";
-
-		$var=false;
-
-		if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-		{
-			$object->fetch_thirdparty();
-			$outputlangs = $langs;
-			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-		}
-
-		// Get list of products already sent for same source object into $alreadysent
-		$alreadysent = array();
-		if ($origin && $origin_id > 0)
-		{
-    		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
-    		$sql.= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
-    		$sql.= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
-    		//if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-    		$sql.= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
-    		$sql.= ', p.description as product_desc';
-    		$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-    		$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
-    		$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-    		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
-    		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-    		$sql.= " AND obj.fk_".$origin." = ".$origin_id;
-    		$sql.= " AND obj.rowid = ed.fk_origin_line";
-    		$sql.= " AND ed.fk_expedition = e.rowid";
-    		//if ($filter) $sql.= $filter;
-    		$sql.= " ORDER BY obj.fk_product";
-
-    		dol_syslog("get list of shipment lines", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    		    $num = $db->num_rows($resql);
-    		    $i = 0;
-
-    		    while($i < $num)
-    		    {
-        		    $obj = $db->fetch_object($resql);
-        		    if ($obj)
-        		    {
-        		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->shipmentline_id]=array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
-        		    }
-        		    $i++;
-    		    }
-    		}
-    		//var_dump($alreadysent);
-		}
-
-		// Loop on each product to send/sent
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
-			print '<tr class="oddeven">';
-
-			// Adds a line numbering column
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-			{
-				print '<td align="center">'.($i+1).'</td>';
-			}
-
-			// Predefined product or service
-			if ($lines[$i]->fk_product > 0)
-			{
-				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-				{
-					$prod = new Product($db);
-					$prod->fetch($lines[$i]->fk_product);
-					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-				}
-				else
-					$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
-
-				print '<td>';
-
-				// Show product and description
-				$product_static->type=$lines[$i]->fk_product_type;
-				$product_static->id=$lines[$i]->fk_product;
-				$product_static->ref=$lines[$i]->ref;
-				$product_static->status_batch=$lines[$i]->product_tobatch;
-				$text=$product_static->getNomUrl(1);
-				$text.= ' - '.$label;
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
-					print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
-				}
-				print "</td>\n";
-			}
-			else
-			{
-				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
-
-				if (! empty($lines[$i]->label)) {
-					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
-				} else {
-					print $text.' '.nl2br($lines[$i]->description);
-				}
-
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				print "</td>\n";
-			}
-
-			// Qty ordered
-			print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
-
-			// Qty in other shipments (with shipment and warehouse used)
-    		if ($origin && $origin_id > 0)
-    		{
-    			print '<td align="center" class="nowrap">';
-    			foreach ($alreadysent as $key => $val)
-    			{
-    			    if ($lines[$i]->fk_origin_line == $key)
-    			    {
-    			        $j = 0;
-    			        foreach($val as $shipmentline_id=> $shipmentline_var)
-    			        {
-    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
-
-    			            $j++;
-    			            if ($j > 1) print '<br>';
-    			            $shipment_static->fetch($shipmentline_var['shipment_id']);
-    			            print $shipment_static->getNomUrl(1);
-    			            print ' - '.$shipmentline_var['qty_shipped'];
-    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
-    			            if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
-    			            {
-    			                $warehousestatic->fetch($shipmentline_var['warehouse']);
-    			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
-    			            }
-    			            print ' '.$form->textwithpicto('', $htmltext, 1);
-    			        }
-    			    }
-    			}
-    		}
-			print '</td>';
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				// edit mode
-				print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
-				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
-				{
-					print '<!-- case edit 1 -->';
-					$line = new ExpeditionLigne($db);
-					foreach ($lines[$i]->detail_batch as $detail_batch)
-					{
-						print '<tr>';
-						// Qty to ship or shipped
-						print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'">' . '</td>';
-						// Batch number managment
-						if ($lines[$i]->entrepot_id == 0)
-						{
-							// only show lot numbers from src warehouse when shipping from multiple warehouses
-							$line->fetch($detail_batch->fk_expeditiondet);
-						}
-						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
-						print '</tr>';
-					}
-					// add a 0 qty lot row to be able to add a lot
-					print '<tr>';
-					// Qty to ship or shipped
-					print '<td>' . '<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
-					// Batch number managment
-					print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
-					print '</tr>';
-				}
-				else if (! empty($conf->stock->enabled))
-				{
-					if ($lines[$i]->fk_product > 0)
-					{
-						if ($lines[$i]->entrepot_id > 0)
-						{
-							print '<!-- case edit 2 -->';
-							print '<tr>';
-							// Qty to ship or shipped
-							print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
-							// Warehouse source
-							print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
-							// Batch number managment
-							print '<td> - ' . $langs->trans("NA") . '</td>';
-							print '</tr>';
-						}
-						else if (count($lines[$i]->details_entrepot) > 1)
-						{
-							print '<!-- case edit 3 -->';
-							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-							{
-								print '<tr>';
-								// Qty to ship or shipped
-								print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
-								// Warehouse source
-								print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
-								// Batch number managment
-								print '<td> - ' . $langs->trans("NA") . '</td>';
-								print '</tr>';
-							}
-						}
-						else
-						{
-							print '<!-- case edit 4 -->';
-							print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
-						}
-					}
-					else
-					{
-						print '<!-- case edit 5 -->';
-						print '<tr>';
-						// Qty to ship or shipped
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
-						// Warehouse source
-						print '<td>' . '</td>';
-						// Batch number managment
-						print '<td>' . '</td>';
-						print '</tr>';
-					}
-				}
-				print '</table></td>';
-			}
-			else
-			{
-				// Qty to ship or shipped
-				print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
-
-				// Warehouse source
-				if (! empty($conf->stock->enabled))
-				{
-					print '<td align="left">';
-					if ($lines[$i]->entrepot_id > 0)
-					{
-						$entrepot = new Entrepot($db);
-						$entrepot->fetch($lines[$i]->entrepot_id);
-						print $entrepot->getNomUrl(1);
-					}
-					else if (count($lines[$i]->details_entrepot) > 1)
-					{
-						$detail = '';
-						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-						{
-							if ($detail_entrepot->entrepot_id > 0)
-							{
-								$entrepot = new Entrepot($db);
-								$entrepot->fetch($detail_entrepot->entrepot_id);
-								$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
-							}
-						}
-						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
-					}
-					print '</td>';
-				}
-
-				// Batch number managment
-				if (! empty($conf->productbatch->enabled))
-				{
-					if (isset($lines[$i]->detail_batch))
-					{
-						print '<!-- Detail of lot -->';
-						print '<td>';
-						if ($lines[$i]->product_tobatch)
-						{
-							$detail = '';
-							foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
-							{
-								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
-								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
-								$detail.= '<br>';
-							}
-							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-						}
-						else
-						{
-							print $langs->trans("NA");
-						}
-						print '</td>';
-					} else {
-						print '<td></td>';
-					}
-				}
-			}
-
-			// Weight
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Volume
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Size
-			//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				print '<td align="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
-				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
-			}
-			else if ($object->statut == 0)
-			{
-				// edit-delete buttons
-				print '<td class="linecoledit" align="center">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
-				print '</td>';
-				print '<td class="linecoldelete" width="10">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
-				print '</td>';
-
-				// Display lines extrafields
-				if (! empty($rowExtrafieldsStart))
-				{
-					print $rowExtrafieldsStart;
-					print $rowExtrafieldsView;
-					print $rowEnd;
-				}
-			}
-			print "</tr>";
-
-			// Display lines extrafields
-			if (is_array($extralabelslines) && count($extralabelslines)>0) {
-				$colspan= empty($conf->productbatch->enabled) ? 5 : 6;
-				$line = new ExpeditionLigne($db);
-				$line->fetch_optionals($lines[$i]->id);
-				print '<tr class="oddeven">';
-				if ($action == 'editline' && $lines[$i]->id == $line_id)
-				{
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-				}
-				else
-				{
-					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-				}
-				print '</tr>';
-			}
-		}
-
-		// TODO Show also lines ordered but not delivered
-
-		print "</table>\n";
-		print '</div>';
-	}
-
-
-	dol_fiche_end();
-
-
-	$object->fetchObjectLinked($object->id,$object->element);
-
-
-	/*
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        // Adds a line numbering column
+        if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+        {
+            print '<td width="5" align="center">&nbsp;</td>';
+        }
+        // Product/Service
+        print '<td>'.$langs->trans("Products").'</td>';
+        // Qty
+        print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+        if ($origin && $origin_id > 0)
+        {
+            print '<td align="center">'.$langs->trans("QtyInOtherShipments").'</td>';
+        }
+        if ($action == 'editline')
+        {
+            $editColspan = 3;
+            if (empty($conf->stock->enabled)) $editColspan--;
+            if (empty($conf->productbatch->enabled)) $editColspan--;
+            print '<td align="center" colspan="'. $editColspan . '">';
+            if ($object->statut <= 1)
+            {
+                print $langs->trans("QtyToShip").' - ';
+            }
+            else
+            {
+                print $langs->trans("QtyShipped").' - ';
+            }
+            if (! empty($conf->stock->enabled))
+            {
+                print $langs->trans("WarehouseSource").' - ';
+            }
+            if (! empty($conf->productbatch->enabled))
+            {
+                print $langs->trans("Batch");
+            }
+            print '</td>';
+        }
+        else
+        {
+            if ($object->statut <= 1)
+            {
+                print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
+            }
+            else
+            {
+                print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
+            }
+            if (! empty($conf->stock->enabled))
+            {
+                print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
+            }
+
+            if (! empty($conf->productbatch->enabled))
+            {
+                print '<td align="left">'.$langs->trans("Batch").'</td>';
+            }
+        }
+        print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
+        print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
+        //print '<td align="center">'.$langs->trans("Size").'</td>';
+        if ($object->statut == 0)
+        {
+            print '<td class="linecoledit"></td>';
+            print '<td class="linecoldelete" width="10"></td>';
+        }
+        print "</tr>\n";
+
+        $var=false;
+
+        if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+        {
+            $object->fetch_thirdparty();
+            $outputlangs = $langs;
+            $newlang='';
+            if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+            if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+            if (! empty($newlang))
+            {
+                $outputlangs = new Translate("",$conf);
+                $outputlangs->setDefaultLang($newlang);
+            }
+        }
+
+        // Get list of products already sent for same source object into $alreadysent
+        $alreadysent = array();
+        if ($origin && $origin_id > 0)
+        {
+            $sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
+            $sql.= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
+            $sql.= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
+            //if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
+            $sql.= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+            $sql.= ', p.description as product_desc';
+            $sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+            $sql.= ", ".MAIN_DB_PREFIX."expedition as e";
+            $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+            //if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+            $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
+            $sql.= " AND obj.fk_".$origin." = ".$origin_id;
+            $sql.= " AND obj.rowid = ed.fk_origin_line";
+            $sql.= " AND ed.fk_expedition = e.rowid";
+            //if ($filter) $sql.= $filter;
+            $sql.= " ORDER BY obj.fk_product";
+
+            dol_syslog("get list of shipment lines", LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+                $i = 0;
+
+                while($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    if ($obj)
+                    {
+                        // $obj->rowid is rowid in $origin."det" table
+                        $alreadysent[$obj->rowid][$obj->shipmentline_id]=array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+                    }
+                    $i++;
+                }
+            }
+            //var_dump($alreadysent);
+        }
+
+        // Loop on each product to send/sent
+        for ($i = 0 ; $i < $num_prod ; $i++)
+        {
+            print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+            print '<tr class="oddeven">';
+
+            // Adds a line numbering column
+            if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+            {
+                print '<td align="center">'.($i+1).'</td>';
+            }
+
+            // Predefined product or service
+            if ($lines[$i]->fk_product > 0)
+            {
+                // Define output language
+                if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+                {
+                    $prod = new Product($db);
+                    $prod->fetch($lines[$i]->fk_product);
+                    $label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
+                }
+                else
+                    $label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
+
+                print '<td>';
+
+                // Show product and description
+                $product_static->type=$lines[$i]->fk_product_type;
+                $product_static->id=$lines[$i]->fk_product;
+                $product_static->ref=$lines[$i]->ref;
+                $product_static->status_batch=$lines[$i]->product_tobatch;
+                $text=$product_static->getNomUrl(1);
+                $text.= ' - '.$label;
+                $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
+                print $form->textwithtooltip($text,$description,3,'','',$i);
+                print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+                if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                {
+                    print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
+                }
+                print "</td>\n";
+            }
+            else
+            {
+                print "<td>";
+                if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
+                else $text = img_object($langs->trans('Product'),'product');
+
+                if (! empty($lines[$i]->label)) {
+                    $text.= ' <strong>'.$lines[$i]->label.'</strong>';
+                    print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
+                } else {
+                    print $text.' '.nl2br($lines[$i]->description);
+                }
+
+                print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+                print "</td>\n";
+            }
+
+            // Qty ordered
+            print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
+
+            // Qty in other shipments (with shipment and warehouse used)
+            if ($origin && $origin_id > 0)
+            {
+                print '<td align="center" class="nowrap">';
+                foreach ($alreadysent as $key => $val)
+                {
+                    if ($lines[$i]->fk_origin_line == $key)
+                    {
+                        $j = 0;
+                        foreach($val as $shipmentline_id=> $shipmentline_var)
+                        {
+                            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
+
+                            $j++;
+                            if ($j > 1) print '<br>';
+                            $shipment_static->fetch($shipmentline_var['shipment_id']);
+                            print $shipment_static->getNomUrl(1);
+                            print ' - '.$shipmentline_var['qty_shipped'];
+                            $htmltext=$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+                            if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
+                            {
+                                $warehousestatic->fetch($shipmentline_var['warehouse']);
+                                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
+                            }
+                            print ' '.$form->textwithpicto('', $htmltext, 1);
+                        }
+                    }
+                }
+            }
+            print '</td>';
+
+            if ($action == 'editline' && $lines[$i]->id == $line_id)
+            {
+                // edit mode
+                print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
+                if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
+                {
+                    print '<!-- case edit 1 -->';
+                    $line = new ExpeditionLigne($db);
+                    foreach ($lines[$i]->detail_batch as $detail_batch)
+                    {
+                        print '<tr>';
+                        // Qty to ship or shipped
+                        print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'">' . '</td>';
+                        // Batch number managment
+                        if ($lines[$i]->entrepot_id == 0)
+                        {
+                            // only show lot numbers from src warehouse when shipping from multiple warehouses
+                            $line->fetch($detail_batch->fk_expeditiondet);
+                        }
+                        print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
+                        print '</tr>';
+                    }
+                    // add a 0 qty lot row to be able to add a lot
+                    print '<tr>';
+                    // Qty to ship or shipped
+                    print '<td>' . '<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
+                    // Batch number managment
+                    print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
+                    print '</tr>';
+                }
+                else if (! empty($conf->stock->enabled))
+                {
+                    if ($lines[$i]->fk_product > 0)
+                    {
+                        if ($lines[$i]->entrepot_id > 0)
+                        {
+                            print '<!-- case edit 2 -->';
+                            print '<tr>';
+                            // Qty to ship or shipped
+                            print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+                            // Warehouse source
+                            print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
+                            // Batch number managment
+                            print '<td> - ' . $langs->trans("NA") . '</td>';
+                            print '</tr>';
+                        }
+                        else if (count($lines[$i]->details_entrepot) > 1)
+                        {
+                            print '<!-- case edit 3 -->';
+                            foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+                            {
+                                print '<tr>';
+                                // Qty to ship or shipped
+                                print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+                                // Warehouse source
+                                print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+                                // Batch number managment
+                                print '<td> - ' . $langs->trans("NA") . '</td>';
+                                print '</tr>';
+                            }
+                        }
+                        else
+                        {
+                            print '<!-- case edit 4 -->';
+                            print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
+                        }
+                    }
+                    else
+                    {
+                        print '<!-- case edit 5 -->';
+                        print '<tr>';
+                        // Qty to ship or shipped
+                        print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+                        // Warehouse source
+                        print '<td>' . '</td>';
+                        // Batch number managment
+                        print '<td>' . '</td>';
+                        print '</tr>';
+                    }
+                }
+                print '</table></td>';
+            }
+            else
+            {
+                // Qty to ship or shipped
+                print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
+
+                // Warehouse source
+                if (! empty($conf->stock->enabled))
+                {
+                    print '<td align="left">';
+                    if ($lines[$i]->entrepot_id > 0)
+                    {
+                        $entrepot = new Entrepot($db);
+                        $entrepot->fetch($lines[$i]->entrepot_id);
+                        print $entrepot->getNomUrl(1);
+                    }
+                    else if (count($lines[$i]->details_entrepot) > 1)
+                    {
+                        $detail = '';
+                        foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+                        {
+                            if ($detail_entrepot->entrepot_id > 0)
+                            {
+                                $entrepot = new Entrepot($db);
+                                $entrepot->fetch($detail_entrepot->entrepot_id);
+                                $detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+                            }
+                        }
+                        print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
+                    }
+                    print '</td>';
+                }
+
+                // Batch number managment
+                if (! empty($conf->productbatch->enabled))
+                {
+                    if (isset($lines[$i]->detail_batch))
+                    {
+                        print '<!-- Detail of lot -->';
+                        print '<td>';
+                        if ($lines[$i]->product_tobatch)
+                        {
+                            $detail = '';
+                            foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
+                            {
+                                $detail.= $langs->trans("Batch").': '.$dbatch->batch;
+                                $detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
+                                $detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
+                                $detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+                                $detail.= '<br>';
+                            }
+                            print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
+                        }
+                        else
+                        {
+                            print $langs->trans("NA");
+                        }
+                        print '</td>';
+                    } else {
+                        print '<td></td>';
+                    }
+                }
+            }
+
+            // Weight
+            print '<td align="center">';
+            if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
+            else print '&nbsp;';
+            print '</td>';
+
+            // Volume
+            print '<td align="center">';
+            if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
+            else print '&nbsp;';
+            print '</td>';
+
+            // Size
+            //print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
+
+            if ($action == 'editline' && $lines[$i]->id == $line_id)
+            {
+                print '<td align="center" colspan="2" valign="middle">';
+                print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
+                print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+            }
+            else if ($object->statut == 0)
+            {
+                // edit-delete buttons
+                print '<td class="linecoledit" align="center">';
+                print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
+                print '</td>';
+                print '<td class="linecoldelete" width="10">';
+                print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+                print '</td>';
+
+                // Display lines extrafields
+                if (! empty($rowExtrafieldsStart))
+                {
+                    print $rowExtrafieldsStart;
+                    print $rowExtrafieldsView;
+                    print $rowEnd;
+                }
+            }
+            print "</tr>";
+
+            // Display lines extrafields
+            if (is_array($extralabelslines) && count($extralabelslines)>0) {
+                $colspan= empty($conf->productbatch->enabled) ? 5 : 6;
+                $line = new ExpeditionLigne($db);
+                $line->fetch_optionals($lines[$i]->id);
+                print '<tr class="oddeven">';
+                if ($action == 'editline' && $lines[$i]->id == $line_id)
+                {
+                    print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+                }
+                else
+                {
+                    print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+                }
+                print '</tr>';
+            }
+        }
+
+        // TODO Show also lines ordered but not delivered
+
+        print "</table>\n";
+        print '</div>';
+    }
+
+
+    dol_fiche_end();
+
+
+    $object->fetchObjectLinked($object->id,$object->element);
+
+
+    /*
 	 *    Boutons actions
 	 */
 
-	if (($user->societe_id == 0) && ($action!='presend'))
-	{
-		print '<div class="tabsAction">';
-
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		                                                                                               // modified by hook
-		if (empty($reshook))
-		{
-
-			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0)
-			{
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
-	  		     || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
-				}
-			}
-
-			// TODO add alternative status
-			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
-			if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer)
-			{
-				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else
-				{
-			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-				}
-			}
-
-			// Send
-			if ($object->statut > 0)
-			{
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-				}
-				else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
-			}
-
-			// Create bill
-			if (! empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED))
-			{
-				if ($user->rights->facture->creer)
-				{
-					// TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
-					// If we do that, we must also make this option official.
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
-				}
-			}
-
-			// This is just to generate a delivery receipt
-			//var_dump($object->linkedObjectsIds['delivery']);
-			if ($conf->livraison_bon->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->livraison->creer && count($object->linkedObjectsIds['delivery']) == 0)
-			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
-			}
-			// Close
-			if ($object->statut == Expedition::STATUS_VALIDATED)
-			{
-				if ($user->rights->expedition->creer && $object->statut > 0 && ! $object->billed)
-				{
-					$label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
-					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
-					if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-					{
-					    $label="ClassifyBilled";
-					    $paramaction='classifybilled';
-					}
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
-				}
-			}
-
-			if ($user->rights->expedition->supprimer)
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-			}
-		}
-
-		print '</div>';
-	}
-
-
-	/*
+    if (($user->societe_id == 0) && ($action!='presend'))
+    {
+        print '<div class="tabsAction">';
+
+        $parameters = array();
+        $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+                                                                                                        // modified by hook
+        if (empty($reshook))
+        {
+
+            if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0)
+            {
+                if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
+                   || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+                }
+                else
+                {
+                    print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
+                }
+            }
+
+            // TODO add alternative status
+            // 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
+            if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer)
+            {
+                if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
+                }
+                else
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+                }
+            }
+
+            // Send
+            if ($object->statut > 0)
+            {
+                if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+                }
+                else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+            }
+
+            // Create bill
+            if (! empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED))
+            {
+                if ($user->rights->facture->creer)
+                {
+                    // TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
+                    // If we do that, we must also make this option official.
+                    print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+                }
+            }
+
+            // This is just to generate a delivery receipt
+            //var_dump($object->linkedObjectsIds['delivery']);
+            if ($conf->livraison_bon->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->livraison->creer && count($object->linkedObjectsIds['delivery']) == 0)
+            {
+                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
+            }
+            // Close
+            if ($object->statut == Expedition::STATUS_VALIDATED)
+            {
+                if ($user->rights->expedition->creer && $object->statut > 0 && ! $object->billed)
+                {
+                    $label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
+                    // Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
+                    if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+                    {
+                        $label="ClassifyBilled";
+                        $paramaction='classifybilled';
+                    }
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
+                }
+            }
+
+            if ($user->rights->expedition->supprimer)
+            {
+                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+            }
+        }
+
+        print '</div>';
+    }
+
+
+    /*
 	 * Documents generated
 	 */
 
-	if ($action != 'presend' && $action != 'editline')
-	{
+    if ($action != 'presend' && $action != 'editline')
+    {
         print '<div class="fichecenter"><div class="fichehalfleft">';
 
         $objectref = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
+        $filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
 
-		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+        $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
-		$genallowed=$user->rights->expedition->lire;
-		$delallowed=$user->rights->expedition->creer;
+        $genallowed=$user->rights->expedition->lire;
+        $delallowed=$user->rights->expedition->creer;
 
-		print $formfile->showdocuments('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+        print $formfile->showdocuments('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
 
 
-		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-		$somethingshown = $form->showLinkedObjectBlock($object, '');
+        // Show links to link elements
+        //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+        $somethingshown = $form->showLinkedObjectBlock($object, '');
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown = $formactions->showactions($object,'shipping',$socid,1);
+        // List of actions on element
+        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+        $formactions=new FormActions($db);
+        $somethingshown = $formactions->showactions($object,'shipping',$socid,1);
 
-		print '</div></div></div>';
-	}
+        print '</div></div></div>';
+    }
 
 
-	/*
+    /*
 	 * Action presend
 	 */
 
-	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
+    //Select mail models is same action as presend
+    if (GETPOST('modelselected')) {
+        $action = 'presend';
+    }
 
-	// Presend form
-	$modelmail='shipping_send';
-	$defaulttopic='SendShippingRef';
-	$diroutput = $conf->expedition->dir_output. '/sending';
-	$trackid = 'shi'.$object->id;
+    // Presend form
+    $modelmail='shipping_send';
+    $defaulttopic='SendShippingRef';
+    $diroutput = $conf->expedition->dir_output. '/sending';
+    $trackid = 'shi'.$object->id;
 
-	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page

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

Indentation +11 added lines, -11 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>
@@ -51,20 +51,20 @@ 
         <td></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;
-    			echo price($objectlink->total_ht);
-    		} ?></td>
+            if ($user->rights->expedition->lire) {
+                $total = $total + $objectlink->total_ht;
+                echo price($objectlink->total_ht);
+            } ?></td>
     	<td align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td align="right">
     		<?php
-    		// For now, shipments must stay linked to order, so link is not deletable
-    		if($object->element != 'commande') {
-    			?>
+            // For now, shipments must stay linked to order, so link is not deletable
+            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
-    		}
-    		?>
+            }
+            ?>
     </tr>
 <?php
 }

dolibarr/htdocs/expedition/shipment.php

Indentation +597 added lines, -597 removed lines

@@ -34,8 +34,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
 if (! empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
@@ -78,16 +78,16 @@ 
     // Categorisation dans projet
     if ($action == 'classin')
     {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$object->setProject(GETPOST('projectid','int'));
+        $object = new Commande($db);
+        $object->fetch($id);
+        $object->setProject(GETPOST('projectid','int'));
     }
 
     if ($action == 'confirm_cloture' && GETPOST('confirm','alpha') == 'yes')
     {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->cloture($user);
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result = $object->cloture($user);
     }
 
     // Positionne ref commande client
@@ -101,14 +101,14 @@ 
 
     if ($action == 'setdatedelivery' && $user->rights->commande->creer)
     {
-    	//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-    	$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
+        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+        $datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
 
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result=$object->set_date_livraison($user,$datelivraison);
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result=$object->set_date_livraison($user,$datelivraison);
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
     }
     /*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
@@ -122,11 +122,11 @@ 
     */
     if ($action == 'setmode' && $user->rights->commande->creer)
     {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
     }
 
     if ($action == 'setavailability' && $user->rights->commande->creer) {
@@ -147,20 +147,20 @@ 
 
     if ($action == 'setconditions' && $user->rights->commande->creer)
     {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
     }
 
     // Set incoterm
     elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
     {
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    	if ($result < 0) {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
+        $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+        if ($result < 0) {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
     }
 
     // shipping method
@@ -168,8 +168,8 @@ 
         $object = new Commande($db);
         $object->fetch($id);
         $result=$object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
     }
 
     // warehouse
@@ -183,9 +183,9 @@ 
 
     if ($action == 'update_extras')
     {
-    	$object->oldcopy = dol_clone($object);
+        $object->oldcopy = dol_clone($object);
 
-    	// Fill array 'array_options' with data from update form
+        // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
         if ($ret < 0) $error++;
@@ -194,11 +194,11 @@ 
         {
             // Actions on extra fields
             $result = $object->insertExtraFields('SHIPMENT_MODIFY');
-			if ($result < 0)
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
+            if ($result < 0)
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
         }
 
         if ($error)
@@ -231,162 +231,162 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Commande($db);
-	if ( $object->fetch($id,$ref) > 0)
-	{
-		$object->loadExpeditions(1);
+    $object = new Commande($db);
+    if ( $object->fetch($id,$ref) > 0)
+    {
+        $object->loadExpeditions(1);
 
-		$product_static=new Product($db);
+        $product_static=new Product($db);
 
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
+        $soc = new Societe($db);
+        $soc->fetch($object->socid);
 
-		$author = new User($db);
-		$author->fetch($object->user_author_id);
+        $author = new User($db);
+        $author->fetch($object->user_author_id);
 
-		$res = $object->fetch_optionals();
+        $res = $object->fetch_optionals();
 
-		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
+        $head = commande_prepare_head($object);
+        dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
 
 
-		$formconfirm = '';
+        $formconfirm = '';
 
-		// Confirm validation
-		if ($action == 'cloture')
-		{
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id,$langs->trans("CloseShipment"),$langs->trans("ConfirmCloseShipment"),"confirm_cloture");
-		}
+        // Confirm validation
+        if ($action == 'cloture')
+        {
+            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id,$langs->trans("CloseShipment"),$langs->trans("ConfirmCloseShipment"),"confirm_cloture");
+        }
 
-		// Call Hook formConfirm
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
-
-		// Print form confirm
-		print $formconfirm;
-
-
-		// Order card
-
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-
-		$morehtmlref='<div class="refidno">';
-		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
-	    // Thirdparty
-	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	    // Project
-	    if (! empty($conf->projet->enabled))
-	    {
-	        $langs->load("projects");
-	        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	        if ($user->rights->commande->creer)
-	        {
-	            if ($action != 'classify')
-	                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	                if ($action == 'classify') {
-	                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                    $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                    $morehtmlref.='</form>';
-	                } else {
-	                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	                }
-	        } else {
-	            if (! empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	                $morehtmlref.=$proj->ref;
-	                $morehtmlref.='</a>';
-	            } else {
-	                $morehtmlref.='';
-	            }
-	        }
-	    }
-	    $morehtmlref.='</div>';
-
-
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
-	    print '<div class="underbanner clearboth"></div>';
-
-	    print '<table class="border" width="100%">';
-
-		// Discounts for third party
-	    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    	$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	    	$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	    } else {
-	    	$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-	    	$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-	    }
-
-		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
-
-		$absolute_discount=$soc->getAvailableDiscounts('',$filterabsolutediscount);
-		$absolute_creditnote=$soc->getAvailableDiscounts('',$filtercreditnote);
-		$absolute_discount=price2num($absolute_discount,'MT');
-		$absolute_creditnote=price2num($absolute_creditnote,'MT');
-
-		$thirdparty = $soc;
-		$discount_type = 0;
-		$backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
-		$cannotApplyDiscount = 1;
-		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
-		print '</td></tr>';
+        // Call Hook formConfirm
+        $parameters = array();
+        $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+        if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+        elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
 
-		// Date
-		print '<tr><td>'.$langs->trans('Date').'</td>';
-		print '<td colspan="2">';
-		print dol_print_date($object->date,'daytext');
-		if ($object->hasDelay() && empty($object->date_livraison)) {
-		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
-		}
-		print '</td>';
-		print '</tr>';
+        // Print form confirm
+        print $formconfirm;
 
-		// Delivery date planned
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('DateDeliveryPlanned');
-		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editdate_livraison')
-		{
-			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="setdatedelivery">';
-			print $form->selectDate($object->date_livraison>0?$object->date_livraison:-1, 'liv_', '', '', '', "setdatedelivery");
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			print dol_print_date($object->date_livraison,'daytext');
-			if ($object->hasDelay() && ! empty($object->date_livraison)) {
-			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
-			}
-		}
-		print '</td>';
-		// Note on several rows
-		//print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
-		//print nl2br($object->note_public);
-		//print '</td>';
-		print '</tr>';
+        // Order card
+
+        $linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
+        $morehtmlref='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+        // Project
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load("projects");
+            $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+            if ($user->rights->commande->creer)
+            {
+                if ($action != 'classify')
+                    $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    if ($action == 'classify') {
+                        //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                        $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                        $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                        $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                        $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                        $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                        $morehtmlref.='</form>';
+                    } else {
+                        $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                    }
+            } else {
+                if (! empty($object->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($object->fk_project);
+                    $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                    $morehtmlref.=$proj->ref;
+                    $morehtmlref.='</a>';
+                } else {
+                    $morehtmlref.='';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+        print '<div class="fichecenter">';
+        print '<div class="fichehalfleft">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
+
+        // Discounts for third party
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+            $filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+            $filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+        } else {
+            $filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+            $filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+        }
+
+        print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
+
+        $absolute_discount=$soc->getAvailableDiscounts('',$filterabsolutediscount);
+        $absolute_creditnote=$soc->getAvailableDiscounts('',$filtercreditnote);
+        $absolute_discount=price2num($absolute_discount,'MT');
+        $absolute_creditnote=price2num($absolute_creditnote,'MT');
+
+        $thirdparty = $soc;
+        $discount_type = 0;
+        $backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
+        $cannotApplyDiscount = 1;
+        include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
+        print '</td></tr>';
+
+        // Date
+        print '<tr><td>'.$langs->trans('Date').'</td>';
+        print '<td colspan="2">';
+        print dol_print_date($object->date,'daytext');
+        if ($object->hasDelay() && empty($object->date_livraison)) {
+            print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Delivery date planned
+        print '<tr><td height="10">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('DateDeliveryPlanned');
+        print '</td>';
+
+        if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="2">';
+        if ($action == 'editdate_livraison')
+        {
+            print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="setdatedelivery">';
+            print $form->selectDate($object->date_livraison>0?$object->date_livraison:-1, 'liv_', '', '', '', "setdatedelivery");
+            print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+            print '</form>';
+        }
+        else
+        {
+            print dol_print_date($object->date_livraison,'daytext');
+            if ($object->hasDelay() && ! empty($object->date_livraison)) {
+                print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+            }
+        }
+        print '</td>';
+        // Note on several rows
+        //print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
+        //print nl2br($object->note_public);
+        //print '</td>';
+        print '</tr>';
 
         // Shipping Method
         print '<tr><td>';
@@ -426,8 +426,8 @@ 
             print '</tr>';
         }
 
-		// Terms of payment
-		/*
+        // Terms of payment
+        /*
 		print '<tr><td height="10">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentConditionsShort');
@@ -464,392 +464,392 @@ 
 		}
 		print '</td></tr>';*/
 
-		// Availability
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('AvailabilityPeriod');
-		print '</td>';
-		if ($action != 'editavailability')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editavailability') {
-			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
-		} else {
-			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'none', 1);
-		}
-		print '</td></tr>';
+        // Availability
+        print '<tr><td height="10">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('AvailabilityPeriod');
+        print '</td>';
+        if ($action != 'editavailability')
+            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="3">';
+        if ($action == 'editavailability') {
+            $form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
+        } else {
+            $form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'none', 1);
+        }
+        print '</td></tr>';
 
-		// Source
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Source');
-		print '</td>';
-		if ($action != 'editdemandreason')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdemandreason') {
-			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
-		} else {
-			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
-		}
+        // Source
+        print '<tr><td height="10">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('Source');
+        print '</td>';
+        if ($action != 'editdemandreason')
+            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="3">';
+        if ($action == 'editdemandreason') {
+            $form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+        } else {
+            $form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
+        }
 
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
-		if ($totalWeight || $totalVolume)
-		{
-		    print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
-		    print '<td>';
-		    print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
-		    print '</td></tr>';
-		    print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
-		    print '<td>';
-		    print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
-		    print '</td></tr>';
-		}
+        $tmparray=$object->getTotalWeightVolume();
+        $totalWeight=$tmparray['weight'];
+        $totalVolume=$tmparray['volume'];
+        if ($totalWeight || $totalVolume)
+        {
+            print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
+            print '<td>';
+            print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+            print '</td></tr>';
+            print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
+            print '<td>';
+            print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+            print '</td></tr>';
+        }
 
-		// TODO How record was recorded OrderMode (llx_c_input_method)
+        // TODO How record was recorded OrderMode (llx_c_input_method)
 
-		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
-		    print '<tr><td>';
-		    print '<table width="100%" class="nobordernopadding"><tr><td>';
-		    print $langs->trans('IncotermLabel');
-		    print '<td><td align="right">';
-		    if ($user->rights->commande->creer) print '<a href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		    else print '&nbsp;';
-		    print '</td></tr></table>';
-		    print '</td>';
-		    print '<td colspan="3">';
-		    if ($action != 'editincoterm')
-		    {
-		        print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-		    }
-		    else
-		    {
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
-		    }
-		    print '</td></tr>';
-		}
+        // Incoterms
+        if (!empty($conf->incoterm->enabled))
+        {
+            print '<tr><td>';
+            print '<table width="100%" class="nobordernopadding"><tr><td>';
+            print $langs->trans('IncotermLabel');
+            print '<td><td align="right">';
+            if ($user->rights->commande->creer) print '<a href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+            else print '&nbsp;';
+            print '</td></tr></table>';
+            print '</td>';
+            print '<td colspan="3">';
+            if ($action != 'editincoterm')
+            {
+                print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+            }
+            else
+            {
+                print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+            }
+            print '</td></tr>';
+        }
 
-		// Other attributes
-		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+        // Other attributes
+        $cols = 2;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-		print '</table>';
+        print '</table>';
 
-		print '</div>';
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
-		print '<div class="underbanner clearboth"></div>';
+        print '</div>';
+        print '<div class="fichehalfright">';
+        print '<div class="ficheaddleft">';
+        print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+        print '<table class="border centpercent">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-		{
-		    // Multicurrency Amount HT
-		    print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . '</td>';
-		    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-		    print '</tr>';
-
-		    // Multicurrency Amount VAT
-		    print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . '</td>';
-		    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-		    print '</tr>';
-
-		    // Multicurrency Amount TTC
-		    print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . '</td>';
-		    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
-		    print '</tr>';
-		}
+        if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
+        {
+            // Multicurrency Amount HT
+            print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . '</td>';
+            print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+            print '</tr>';
 
-		// Total HT
-		print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
-		print '<td>'.price($object->total_ht, 0, '', 1, -1, -1, $conf->currency).'</td>';
-		print '</tr>';
+            // Multicurrency Amount VAT
+            print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . '</td>';
+            print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+            print '</tr>';
 
-		// Total VAT
-		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 0, '', 1, -1, -1, $conf->currency).'</td>';
-		print '</tr>';
+            // Multicurrency Amount TTC
+            print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . '</td>';
+            print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+            print '</tr>';
+        }
 
-		// Amount Local Taxes
-		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
-		{
-		    print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-		    print '<td>' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-		}
-		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
-		{
-		    print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-		    print '<td>' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-		}
+        // Total HT
+        print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+        print '<td>'.price($object->total_ht, 0, '', 1, -1, -1, $conf->currency).'</td>';
+        print '</tr>';
 
-		// Total TTC
-		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 0, '', 1, -1, -1, $conf->currency).'</td>';
-		print '</tr>';
+        // Total VAT
+        print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 0, '', 1, -1, -1, $conf->currency).'</td>';
+        print '</tr>';
 
-		print '</table>';
+        // Amount Local Taxes
+        if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
+        {
+            print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+            print '<td>' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+        }
+        if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
+        {
+            print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+            print '<td>' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+        }
+
+        // Total TTC
+        print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 0, '', 1, -1, -1, $conf->currency).'</td>';
+        print '</tr>';
 
-		print '</div>';
-		print '</div>';
-		print '</div>';
+        print '</table>';
 
-		print '<div class="clearboth"></div><br>';
+        print '</div>';
+        print '</div>';
+        print '</div>';
 
+        print '<div class="clearboth"></div><br>';
 
 
-		/**
-		 *  Lines or orders with quantity shipped and remain to ship
-		 *  Note: Qty shipped are already available into $object->expeditions[fk_product]
-		 */
-		print '<table class="noborder noshadow" width="100%">';
-
-		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
-		$sql.= " cd.price, cd.tva_tx, cd.subprice,";
-		$sql.= " cd.qty,";
-		$sql.= ' cd.date_start,';
-		$sql.= ' cd.date_end,';
-		$sql.= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-		$sql.= " WHERE cd.fk_commande = ".$object->id;
-		$sql.= " ORDER BY cd.rang, cd.rowid";
-
-		//print $sql;
-		dol_syslog("shipment.php", LOG_DEBUG);
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$num = $db->num_rows($resql);
-			$i = 0;
-
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("Description").'</td>';
-			print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-			print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-			print '<td align="center">'.$langs->trans("KeepToShip").'</td>';
-			if (! empty($conf->stock->enabled))
-			{
-				print '<td align="center">'.$langs->trans("RealStock").'</td>';
-			}
-			else
-			{
-				print '<td>&nbsp;</td>';
-			}
-			print "</tr>\n";
-
-			$toBeShipped=array();
-			$toBeShippedTotal=0;
-			while ($i < $num)
-			{
-				$objp = $db->fetch_object($resql);
-
-
-				// Show product and description
-				$type=isset($objp->type)?$objp->type:$objp->product_type;
-
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (! empty($objp->date_start)) $type=1;
-				if (! empty($objp->date_end)) $type=1;
-
-				print '<tr class="oddeven">';
-
-				// Product label
-				if ($objp->fk_product > 0)
-				{
-					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-					{
-						$object->fetch_thirdparty();
-
-						$prod = new Product($db);
+
+        /**
+         *  Lines or orders with quantity shipped and remain to ship
+         *  Note: Qty shipped are already available into $object->expeditions[fk_product]
+         */
+        print '<table class="noborder noshadow" width="100%">';
+
+        $sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
+        $sql.= " cd.price, cd.tva_tx, cd.subprice,";
+        $sql.= " cd.qty,";
+        $sql.= ' cd.date_start,';
+        $sql.= ' cd.date_end,';
+        $sql.= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
+        $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+        $sql.= " WHERE cd.fk_commande = ".$object->id;
+        $sql.= " ORDER BY cd.rang, cd.rowid";
+
+        //print $sql;
+        dol_syslog("shipment.php", LOG_DEBUG);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0;
+
+            print '<tr class="liste_titre">';
+            print '<td>'.$langs->trans("Description").'</td>';
+            print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+            print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
+            print '<td align="center">'.$langs->trans("KeepToShip").'</td>';
+            if (! empty($conf->stock->enabled))
+            {
+                print '<td align="center">'.$langs->trans("RealStock").'</td>';
+            }
+            else
+            {
+                print '<td>&nbsp;</td>';
+            }
+            print "</tr>\n";
+
+            $toBeShipped=array();
+            $toBeShippedTotal=0;
+            while ($i < $num)
+            {
+                $objp = $db->fetch_object($resql);
+
+
+                // Show product and description
+                $type=isset($objp->type)?$objp->type:$objp->product_type;
+
+                // Try to enhance type detection using date_start and date_end for free lines where type
+                // was not saved.
+                if (! empty($objp->date_start)) $type=1;
+                if (! empty($objp->date_end)) $type=1;
+
+                print '<tr class="oddeven">';
+
+                // Product label
+                if ($objp->fk_product > 0)
+                {
+                    // Define output language
+                    if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+                    {
+                        $object->fetch_thirdparty();
+
+                        $prod = new Product($db);
                         $prod->id = $objp->fk_product;
                         $prod->entity = $objp->entity;
-						$prod->getMultiLangs();
-
-						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-						if (! empty($newlang))
-						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlang);
-						}
-
-						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-					}
-					else
-						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
-
-					print '<td>';
-					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-
-					// Show product and description
-					$product_static->type=$type;
-					$product_static->id=$objp->fk_product;
-					$product_static->ref=$objp->ref;
+                        $prod->getMultiLangs();
+
+                        $outputlangs = $langs;
+                        $newlang='';
+                        if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+                        if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+                        if (! empty($newlang))
+                        {
+                            $outputlangs = new Translate("",$conf);
+                            $outputlangs->setDefaultLang($newlang);
+                        }
+
+                        $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+                    }
+                    else
+                        $label = (! empty($objp->label)?$objp->label:$objp->product_label);
+
+                    print '<td>';
+                    print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+                    // Show product and description
+                    $product_static->type=$type;
+                    $product_static->id=$objp->fk_product;
+                    $product_static->ref=$objp->ref;
                     $product_static->entity = $objp->entity;
-					$text=$product_static->getNomUrl(1);
-					$text.= ' - '.$label;
-					$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description)).'<br>';
+                    $text=$product_static->getNomUrl(1);
+                    $text.= ' - '.$label;
+                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description)).'<br>';
                     $description.= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-					print $form->textwithtooltip($text,$description,3,'','',$i);
-
-					// Show range
-					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
-
-					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-					{
-						print ($objp->description && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-					}
-
-					print '</td>';
-				}
-				else
-				{
-					print "<td>";
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
-
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						print $form->textwithtooltip($text,$objp->description,3,'','',$i);
-					} else {
-						print $text.' '.nl2br($objp->description);
-					}
-
-					// Show range
-					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
-					print "</td>\n";
-				}
-
-				// Qty ordered
-				print '<td align="center">' . $objp->qty . '</td>';
-
-				// Qty already shipped
-				$qtyProdCom=$objp->qty;
-				print '<td align="center">';
-				// Nb of sending products for this line of order
-				$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
-				print $qtyAlreadyShipped;
-				print '</td>';
-
-				// Qty remains to ship
-				print '<td align="center">';
-				if ($type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-				{
-					$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
-					$toBeShippedTotal += $toBeShipped[$objp->fk_product];
-					print $toBeShipped[$objp->fk_product];
-				}
-				else
-				{
-					print '0 ('.$langs->trans("Service").')';
-				}
-				print '</td>';
-
-				if ($objp->fk_product > 0)
-				{
-					$product = new Product($db);
-					$product->fetch($objp->fk_product);
-					$product->load_stock('warehouseopen');
-				}
-
-				if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && ! empty($conf->stock->enabled))
-				{
-					print '<td align="center">';
-					print $product->stock_reel;
-					if ($product->stock_reel < $toBeShipped[$objp->fk_product])
-					{
-						print ' '.img_warning($langs->trans("StockTooLow"));
-					}
-					print '</td>';
-				}
-				else
-				{
-					print '<td>&nbsp;</td>';
-				}
-				print "</tr>\n";
-
-				// Show subproducts lines
-				if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
-				{
-					// Set tree of subproducts in product->sousprods
-					$product->get_sousproduits_arbo();
-					//var_dump($product->sousprods);exit;
-
-					// Define a new tree with quantiies recalculated
-					$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-					//var_dump($prods_arbo);
-					if (count($prods_arbo) > 0)
-					{
-						foreach($prods_arbo as $key => $value)
-						{
-							$img='';
-							if ($value['stock'] < $value['stock_alert'])
-							{
-								$img=img_warning($langs->trans("StockTooLow"));
-							}
-							print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
-							print '<td align="center"> '.$value['nb_total'].'</td>';
-							print '<td>&nbsp</td>';
-							print '<td>&nbsp</td>';
-							print '<td align="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
-						}
-					}
-				}
-
-				$i++;
-			}
-			$db->free($resql);
-
-			if (! $num)
-			{
-				print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
-			}
-
-			print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
+                    print $form->textwithtooltip($text,$description,3,'','',$i);
+
+                    // Show range
+                    print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+
+                    // Add description in form
+                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                    {
+                        print ($objp->description && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+                    }
+
+                    print '</td>';
+                }
+                else
+                {
+                    print "<td>";
+                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
+                    else $text = img_object($langs->trans('Product'),'product');
+
+                    if (! empty($objp->label)) {
+                        $text.= ' <strong>'.$objp->label.'</strong>';
+                        print $form->textwithtooltip($text,$objp->description,3,'','',$i);
+                    } else {
+                        print $text.' '.nl2br($objp->description);
+                    }
+
+                    // Show range
+                    print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+                    print "</td>\n";
+                }
+
+                // Qty ordered
+                print '<td align="center">' . $objp->qty . '</td>';
+
+                // Qty already shipped
+                $qtyProdCom=$objp->qty;
+                print '<td align="center">';
+                // Nb of sending products for this line of order
+                $qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
+                print $qtyAlreadyShipped;
+                print '</td>';
+
+                // Qty remains to ship
+                print '<td align="center">';
+                if ($type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                {
+                    $toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
+                    $toBeShippedTotal += $toBeShipped[$objp->fk_product];
+                    print $toBeShipped[$objp->fk_product];
+                }
+                else
+                {
+                    print '0 ('.$langs->trans("Service").')';
+                }
+                print '</td>';
+
+                if ($objp->fk_product > 0)
+                {
+                    $product = new Product($db);
+                    $product->fetch($objp->fk_product);
+                    $product->load_stock('warehouseopen');
+                }
+
+                if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && ! empty($conf->stock->enabled))
+                {
+                    print '<td align="center">';
+                    print $product->stock_reel;
+                    if ($product->stock_reel < $toBeShipped[$objp->fk_product])
+                    {
+                        print ' '.img_warning($langs->trans("StockTooLow"));
+                    }
+                    print '</td>';
+                }
+                else
+                {
+                    print '<td>&nbsp;</td>';
+                }
+                print "</tr>\n";
+
+                // Show subproducts lines
+                if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
+                {
+                    // Set tree of subproducts in product->sousprods
+                    $product->get_sousproduits_arbo();
+                    //var_dump($product->sousprods);exit;
+
+                    // Define a new tree with quantiies recalculated
+                    $prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+                    //var_dump($prods_arbo);
+                    if (count($prods_arbo) > 0)
+                    {
+                        foreach($prods_arbo as $key => $value)
+                        {
+                            $img='';
+                            if ($value['stock'] < $value['stock_alert'])
+                            {
+                                $img=img_warning($langs->trans("StockTooLow"));
+                            }
+                            print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
+                            print '<td align="center"> '.$value['nb_total'].'</td>';
+                            print '<td>&nbsp</td>';
+                            print '<td>&nbsp</td>';
+                            print '<td align="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
+                        }
+                    }
+                }
+
+                $i++;
+            }
+            $db->free($resql);
+
+            if (! $num)
+            {
+                print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
+            }
 
-		print '</div>';
+            print "</table>";
+        }
+        else
+        {
+            dol_print_error($db);
+        }
 
+        print '</div>';
 
-		/*
+
+        /*
 		 * Boutons Actions
 		 */
 
-		if (empty($user->societe_id))
-		{
-			print '<div class="tabsAction">';
+        if (empty($user->societe_id))
+        {
+            print '<div class="tabsAction">';
 
             // Bouton expedier sans gestion des stocks
             if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
-			{
-				if ($user->rights->expedition->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create&amp;origin=commande&amp;object_id='.$id.'">'.$langs->trans("CreateShipment").'</a>';
-					if ($toBeShippedTotal <= 0)
-					{
-						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
-					}
-				}
-				else
-				{
-					print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
-				}
-			}
-			print "</div>";
-		}
+            {
+                if ($user->rights->expedition->creer)
+                {
+                    print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create&amp;origin=commande&amp;object_id='.$id.'">'.$langs->trans("CreateShipment").'</a>';
+                    if ($toBeShippedTotal <= 0)
+                    {
+                        print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
+                    }
+                }
+                else
+                {
+                    print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
+                }
+            }
+            print "</div>";
+        }
 
 
         // Bouton expedier avec gestion des stocks
@@ -859,69 +859,69 @@ 
             print $langs->trans("ValidateOrderFirstBeforeShipment");
         }
 
-		if (! empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
-		{
-			if ($user->rights->expedition->creer)
-			{
-				//print load_fiche_titre($langs->trans("CreateShipment"));
+        if (! empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
+        {
+            if ($user->rights->expedition->creer)
+            {
+                //print load_fiche_titre($langs->trans("CreateShipment"));
                 print '<div class="tabsAction">';
 
-				print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
-				print '<input type="hidden" name="action" value="create">';
-				//print '<input type="hidden" name="id" value="'.$object->id.'">';
+                print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
+                print '<input type="hidden" name="action" value="create">';
+                //print '<input type="hidden" name="id" value="'.$object->id.'">';
                 print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
-				print '<input type="hidden" name="origin" value="commande">';
-				print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-				print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
-				//print '<table class="border" width="100%">';
-
-				$langs->load("stocks");
-
-				//print '<tr>';
-
-				if (! empty($conf->stock->enabled))
-				{
-					//print '<td>';
-					print $langs->trans("WarehouseSource");
-					//print '</td>';
-					//print '<td>';
-					print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
-					if (count($formproduct->cache_warehouses) <= 0)
-					{
-						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
-					}
-					//print '</td>';
-				}
-				//print '<td align="center">';
-				print '<input type="submit" class="butAction" named="save" value="'.$langs->trans("CreateShipment").'">';
-				if ($toBeShippedTotal <= 0)
-				{
-					print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
-				}
-				//print '</td></tr>';
-
-				//print "</table>";
-				print "</form>\n";
-
-				print '</div>';
-
-				$somethingshown=1;
-			}
-			else
-			{
-				print '<div class="tabsAction">';
-				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
-				print '</div>';
-			}
-		}
+                print '<input type="hidden" name="origin" value="commande">';
+                print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+                print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
+                //print '<table class="border" width="100%">';
+
+                $langs->load("stocks");
+
+                //print '<tr>';
+
+                if (! empty($conf->stock->enabled))
+                {
+                    //print '<td>';
+                    print $langs->trans("WarehouseSource");
+                    //print '</td>';
+                    //print '<td>';
+                    print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
+                    if (count($formproduct->cache_warehouses) <= 0)
+                    {
+                        print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
+                    }
+                    //print '</td>';
+                }
+                //print '<td align="center">';
+                print '<input type="submit" class="butAction" named="save" value="'.$langs->trans("CreateShipment").'">';
+                if ($toBeShippedTotal <= 0)
+                {
+                    print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
+                }
+                //print '</td></tr>';
+
+                //print "</table>";
+                print "</form>\n";
+
+                print '</div>';
+
+                $somethingshown=1;
+            }
+            else
+            {
+                print '<div class="tabsAction">';
+                print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
+                print '</div>';
+            }
+        }
 
-		show_list_sending_receive('commande',$object->id);
-	}
-	else
-	{
-		/* Order not found */
-		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
-	}
+        show_list_sending_receive('commande',$object->id);
+    }
+    else
+    {
+        /* Order not found */
+        setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
+    }
 }
 
 // End of page

dolibarr/htdocs/expedition/document.php

Indentation +94 added lines, -94 removed lines

@@ -34,7 +34,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -48,7 +48,7 @@ 
 // Security check
 if ($user->societe_id)
 {
-	$socid = $user->societe_id;
+    $socid = $user->societe_id;
 }
 $result=restrictedArea($user,'expedition',$id,'');
 
@@ -71,8 +71,8 @@ 
  */
 if ($object->fetch($id))
 {
-	$object->fetch_thirdparty();
-	$upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
+    $object->fetch_thirdparty();
+    $upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
 }
 
 include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
@@ -87,102 +87,102 @@ 
 $form = new Form($db);
 
 if ($id > 0 || ! empty($ref)){
-	if ($object->fetch($id, $ref)){
-		$object->fetch_thirdparty();
+    if ($object->fetch($id, $ref)){
+        $object->fetch_thirdparty();
 
-		$upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
+        $upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
 
-		$head = shipping_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
+        $head = shipping_prepare_head($object);
+        dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
 	
 
-		// Build file list
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		$totalsize=0;
-		foreach($filearray as $key => $file){
-		    $totalsize+=$file['size'];
-		}
-
-		// Shipment card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
-
-
-		$morehtmlref='<div class="refidno">';
-		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-
-		// Project
-		if (! empty($conf->projet->enabled)) {
-			$langs->load("projects");
-			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
-			if (0) {    // Do not change on shipment
-				if ($action != 'classify') {
-					$morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				}
-				if ($action == 'classify') {
-					// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
-					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-					$morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
-					$morehtmlref .= '</form>';
-				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
-			} else {
-				// We don't have project on shipment, so we will use the project or source object instead
-				// TODO Add project on shipment
-				$morehtmlref .= ' : ';
-				if (! empty($objectsrc->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
-				} else {
-					$morehtmlref .= '';
-				}
-			}
-		}
-		$morehtmlref.='</div>';
-
-		// Order card
-
-		$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
-
-		print "</table>\n";
-
-		print "</div>\n";
-
-		print dol_fiche_end();
-
-		$modulepart = 'expedition';
-		$permission = $user->rights->expedition->creer;
-		$permtoedit = $user->rights->expedition->creer;
-		$param = '&id=' . $object->id;
-		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else{
-		dol_print_error($db);
-	}
+        // Build file list
+        $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+        $totalsize=0;
+        foreach($filearray as $key => $file){
+            $totalsize+=$file['size'];
+        }
+
+        // Shipment card
+        $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+
+
+        $morehtmlref='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+
+        // Project
+        if (! empty($conf->projet->enabled)) {
+            $langs->load("projects");
+            $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+            if (0) {    // Do not change on shipment
+                if ($action != 'classify') {
+                    $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                }
+                if ($action == 'classify') {
+                    // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                    $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+                    $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                    $morehtmlref .= '</form>';
+                } else {
+                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+            } else {
+                // We don't have project on shipment, so we will use the project or source object instead
+                // TODO Add project on shipment
+                $morehtmlref .= ' : ';
+                if (! empty($objectsrc->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($objectsrc->fk_project);
+                    $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                    $morehtmlref .= $proj->ref;
+                    $morehtmlref .= '</a>';
+                } else {
+                    $morehtmlref .= '';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+        // Order card
+
+        $linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+        print '<div class="fichecenter">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
+
+        print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+        print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+
+        print "</table>\n";
+
+        print "</div>\n";
+
+        print dol_fiche_end();
+
+        $modulepart = 'expedition';
+        $permission = $user->rights->expedition->creer;
+        $permtoedit = $user->rights->expedition->creer;
+        $param = '&id=' . $object->id;
+        include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    }
+    else{
+        dol_print_error($db);
+    }
 }
 else{
-	header('Location: index.php');
-	exit;
+    header('Location: index.php');
+    exit;
 }
 
 // End of page

dolibarr/htdocs/expedition/note.php

Indentation +13 added lines, -13 removed lines

@@ -91,19 +91,19 @@ 
 if ($id > 0 || ! empty($ref))
 {
 
-	$head=shipping_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
+    $head=shipping_prepare_head($object);
+    dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
 
-	// Shipment card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+    // Shipment card
+    $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    $morehtmlref='<div class="refidno">';
+    // Ref customer shipment
+    $morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
     // Project
     if (! empty($conf->projet->enabled)) {
         $langs->load("projects");
@@ -146,10 +146,10 @@ 
 
     print '<div class="underbanner clearboth"></div>';
 
-	$cssclass='titlefield';
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass='titlefield';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 // End of page