From 97223bf2eb141c32e543286740bf2ba347da398b Mon Sep 17 00:00:00 2001
From: Tim Otte <otte@meuser.it>
Date: Tue, 6 Aug 2019 15:10:13 +0200
Subject: [PATCH] Fixed expedition line rangs Rang is now transferred to the
 database

---
 htdocs/expedition/class/expedition.class.php | 30 +++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 97c67fd7701..29ff4ecb33e 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -353,7 +353,7 @@ class Expedition extends CommonObject
 				{
 					if (! isset($this->lines[$i]->detail_batch))
 					{	// no batch management
-						if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0)
+						if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
 						}
@@ -444,7 +444,7 @@ class Expedition extends CommonObject
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, line_id if OK
 	 */
-	public function create_line($entrepot_id, $origin_line_id, $qty, $array_options = 0)
+	public function create_line($entrepot_id, $origin_line_id, $qty, $rang, $array_options = 0)
 	{
 		//phpcs:enable
 		global $user;
@@ -454,6 +454,7 @@ class Expedition extends CommonObject
 		$expeditionline->entrepot_id = $entrepot_id;
 		$expeditionline->fk_origin_line = $origin_line_id;
 		$expeditionline->qty = $qty;
+		$expeditionline->rang = $rang;
 		$expeditionline->array_options = $array_options;
 
 		if (($lineId = $expeditionline->insert($user)) < 0)
@@ -490,7 +491,7 @@ class Expedition extends CommonObject
 		// create shipment lines
 		foreach ($stockLocationQty as $stockLocation => $qty)
 		{
-			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $array_options)) < 0)
+			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
 			{
 				$error++;
 			}
@@ -926,6 +927,9 @@ class Expedition extends CommonObject
 		$orderline = new OrderLine($this->db);
 		$orderline->fetch($id);
 
+		// Copy the rang of the order line to the expedition line
+		$line->rang = $orderline->rang;
+
 		if (! empty($conf->stock->enabled) && ! empty($orderline->fk_product))
 		{
 			$fk_product = $orderline->fk_product;
@@ -1383,7 +1387,7 @@ class Expedition extends CommonObject
 		$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.= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc, cd.rang";
 		$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";
@@ -1452,6 +1456,7 @@ class Expedition extends CommonObject
 				$line->label			= $obj->custom_label;
 				$line->description    	= $obj->description;
 				$line->qty_asked      	= $obj->qty_asked;
+				$line->rang             = $obj->rang;
 				$line->weight         	= $obj->weight;
 				$line->weight_units   	= $obj->weight_units;
 				$line->length         	= $obj->length;
@@ -2459,6 +2464,11 @@ class ExpeditionLigne extends CommonObjectLine
      */
 	public $product_desc;
 
+    /**
+     * @var int rang of line
+     */
+    public $rang;
+
     /**
      * @var float weight
      */
@@ -2579,16 +2589,28 @@ class ExpeditionLigne extends CommonObjectLine
 
 		$this->db->begin();
 
+		if (empty($this->rang)) $this->rang = 0;
+
+		// Rank to use
+		$rangtouse = $this->rang;
+		if ($rangtouse == -1)
+		{
+			$rangmax = $this->line_max($fk_expedition);
+			$rangtouse = $rangmax + 1;
+		}
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
 		$sql.= "fk_expedition";
 		$sql.= ", fk_entrepot";
 		$sql.= ", fk_origin_line";
 		$sql.= ", qty";
+		$sql.= ", rang";
 		$sql.= ") VALUES (";
 		$sql.= $this->fk_expedition;
 		$sql.= ", ".(empty($this->entrepot_id) ? 'NULL' : $this->entrepot_id);
 		$sql.= ", ".$this->fk_origin_line;
 		$sql.= ", ".$this->qty;
+		$sql.= ", ".$rangtouse;
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);