Dolibarr / dolibarr

htdocs/expedition/class/expedition.class.php

Spacing +37 added lines, -37 removed lines

@@ -369,7 +369,7 @@ 
 		if (getDolGlobalString('EXPEDITION_ADDON_NUMBER')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER') . ".php";
+			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER').".php";
 			$classname = getDolGlobalString('EXPEDITION_ADDON_NUMBER');
 
 			// Include file with class
@@ -632,7 +632,7 @@ 
 									$line_id = $this->create_line($warehouse_id, 0, $product_child_qty, $line->rang, $line->array_options, $parent_line_id, $product_child_id);
 									if ($line_id <= 0) {
 										$error++;
-										dol_syslog(__METHOD__ . ' : ' . $this->errorsToString(), LOG_ERR);
+										dol_syslog(__METHOD__.' : '.$this->errorsToString(), LOG_ERR);
 										break;
 									}
 
@@ -867,7 +867,7 @@ 
 				$this->ref_ext = $obj->ref_ext;
 				$this->status               = $obj->fk_statut;
 				$this->statut               = $this->status; // Deprecated
-				$this->signed_status		= $obj->signed_status;
+				$this->signed_status = $obj->signed_status;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->fk_user_author       = $obj->fk_user_author;
 				$this->user_creation_id = $obj->fk_user_author;
@@ -1244,7 +1244,7 @@ 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
 		// If this happen, we may have a bug in card.php page
 		if (isModEnabled('productbatch') && !empty($line->fk_product) && !empty($orderline->product_tobatch)) {
-			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH '.$orderline->id.' '.$line->fk_product;	//
+			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH '.$orderline->id.' '.$line->fk_product; //
 			return -4;
 		}
 
@@ -1867,14 +1867,14 @@ 
 					$this->db->commit();
 
 					// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-					$this->deleteEcmFiles(0);	 // Deleting files physically is done later with the dol_delete_dir_recursive
-					$this->deleteEcmFiles(1);	 // Deleting files physically is done later with the dol_delete_dir_recursive
+					$this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+					$this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive
 
 					// 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';
+						$dir = $conf->expedition->dir_output.'/sending/'.$ref;
+						$file = $dir.'/'.$ref.'.pdf';
 						if (file_exists($file)) {
 							if (!dol_delete_file($file)) {
 								return 0;
@@ -1934,7 +1934,7 @@ 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		$sql .= " AND ed.fk_elementdet = cd.rowid";
-		$sql .= " ORDER BY cd.rang, ed.fk_elementdet";		// We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
+		$sql .= " ORDER BY cd.rang, ed.fk_elementdet"; // We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1968,9 +1968,9 @@ 
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
-					$line = new ExpeditionLigne($this->db);		// new group to start
-					$line->entrepot_id = $obj->fk_entrepot;	// this is a property of a shipment line
-					$line->qty_shipped = $obj->qty_shipped;	// this is a property of a shipment line
+					$line = new ExpeditionLigne($this->db); // new group to start
+					$line->entrepot_id = $obj->fk_entrepot; // this is a property of a shipment line
+					$line->qty_shipped = $obj->qty_shipped; // this is a property of a shipment line
 				}
 
 				$detail_entrepot              = new stdClass();
@@ -1983,13 +1983,13 @@ 
 				$line->rowid            = $obj->line_id; // TODO deprecated
 				$line->id               = $obj->line_id;
 
-				$line->fk_origin = 'orderline';	// TODO deprecated, we already have element_type that can be use to guess type of line
+				$line->fk_origin = 'orderline'; // TODO deprecated, we already have element_type that can be use to guess type of line
 
-				$line->fk_element 		= $obj->fk_element;
-				$line->origin_id 		= $obj->fk_element;
-				$line->fk_elementdet 	= $obj->fk_elementdet;
-				$line->origin_line_id 	= $obj->fk_elementdet;
-				$line->element_type 	= $obj->element_type;
+				$line->fk_element = $obj->fk_element;
+				$line->origin_id = $obj->fk_element;
+				$line->fk_elementdet = $obj->fk_elementdet;
+				$line->origin_line_id = $obj->fk_elementdet;
+				$line->element_type = $obj->element_type;
 
 				$line->fk_expedition    = $this->id; // id of parent
 
@@ -2283,7 +2283,7 @@ 
 		}
 		$result .= $linkend;
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -2332,9 +2332,9 @@ 
 			$statusType = 'status9';
 		}
 
-		$signed_label = ' (' . $this->getLibSignedStatus() . ')';
-		$status_label = $this->signed_status ? $labelStatus . $signed_label : $labelStatus;
-		$status_label_short = $this->signed_status ? $labelStatusShort . $signed_label : $labelStatusShort;
+		$signed_label = ' ('.$this->getLibSignedStatus().')';
+		$status_label = $this->signed_status ? $labelStatus.$signed_label : $labelStatus;
+		$status_label_short = $this->signed_status ? $labelStatusShort.$signed_label : $labelStatusShort;
 
 		return dolGetStatus($status_label, $status_label_short, '', $statusType, $mode);
 	}
@@ -2358,7 +2358,7 @@ 
 		$return .= img_picto('', 'order');
 		$return .= '</div>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl() . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl().'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
@@ -2415,7 +2415,7 @@ 
 		$this->note_private = 'Private note';
 		$this->note_public = 'Public note';
 
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new ExpeditionLigne($this->db);
@@ -2427,7 +2427,7 @@ 
 			$line->fk_product = $this->commande->lines[$xnbp]->fk_product;
 
 			$line->weight = 1.123456;
-			$line->weight_units = 0;		// kg
+			$line->weight_units = 0; // kg
 
 			$line->volume = 2.34567;
 			$line->volume_unit = 0;
@@ -2561,7 +2561,7 @@ 
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				$label = $langs->trans('SendingMethod'.$obj->code);
-				$this->listmeths[$i]= [
+				$this->listmeths[$i] = [
 					'rowid' => (int) $obj->rowid,
 					'code' => $obj->code,
 					'libelle' => ($label != 'SendingMethod'.$obj->code ? $label : $obj->label),
@@ -2651,12 +2651,12 @@ 
 				if ($shipments_match_order) {
 					dol_syslog("Qty for the ".count($order->lines)." lines of the origin order is same than qty for lines in the shipment we close (shipments_match_order is true), with new status Expedition::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
 					// We close the order
-					$order->cloture($user);		// Note this may also create an invoice if module workflow ask it
+					$order->cloture($user); // Note this may also create an invoice if module workflow ask it
 				}
 			}
 
-			$this->statut = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
-			$this->status = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$this->statut = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$this->status = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
 
 			// If stock increment is done on closing
 			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
@@ -2704,7 +2704,7 @@ 
 
 		$error = 0;
 
-		require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 		$langs->load("agenda");
 
@@ -2715,14 +2715,14 @@ 
 		$sql .= ", cd.subprice";
 		$sql .= ", edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
 		$sql .= ", e.ref";
-		$sql .= " FROM " . $this->db->prefix() . "expeditiondet as ed";
-		$sql .= " LEFT JOIN " . $this->db->prefix() . "commandedet as cd ON cd.rowid = ed.fk_elementdet";
-		$sql .= " LEFT JOIN " . $this->db->prefix() . "expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-		$sql .= " INNER JOIN " . $this->db->prefix() . "expedition as e ON ed.fk_expedition = e.rowid";
-		$sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
+		$sql .= " FROM ".$this->db->prefix()."expeditiondet as ed";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."commandedet as cd ON cd.rowid = ed.fk_elementdet";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+		$sql .= " INNER JOIN ".$this->db->prefix()."expedition as e ON ed.fk_expedition = e.rowid";
+		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		//$sql .= " AND cd.rowid = ed.fk_elementdet";
 
-		dol_syslog(get_class($this) . "::valid select details", LOG_DEBUG);
+		dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$cpt = $this->db->num_rows($resql);
@@ -2736,7 +2736,7 @@ 
 				if ($qty <= 0 || ($qty < 0 && !getDolGlobalInt('SHIPMENT_ALLOW_NEGATIVE_QTY'))) {
 					continue;
 				}
-				dol_syslog(get_class($this) . "::valid movement index " . $i . " ed.rowid=" . $obj->edid . " edb.rowid=" . $obj->edbrowid);
+				dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->edid." edb.rowid=".$obj->edbrowid);
 
 				$mouvS = new MouvementStock($this->db);
 				$mouvS->origin = &$this;