Dolibarr / dolibarr

htdocs/commande/class/commande.class.php

Spacing +21 added lines, -21 removed lines

@@ -373,8 +373,8 @@ 
 	/**
 	 * Shipment on process
 	 */
-	const STATUS_SHIPMENTONPROCESS = 2;		// We set this status when a shipment is validated
-	const STATUS_ACCEPTED = 2; 				// For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
+	const STATUS_SHIPMENTONPROCESS = 2; // We set this status when a shipment is validated
+	const STATUS_ACCEPTED = 2; // For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
 
 	/**
 	 * Closed (Sent, billed or not)
@@ -407,7 +407,7 @@ 
 		if (getDolGlobalString('COMMANDE_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('COMMANDE_ADDON') . ".php";
+			$file = getDolGlobalString('COMMANDE_ADDON').".php";
 			$classname = getDolGlobalString('COMMANDE_ADDON');
 
 			// Include file with class
@@ -590,7 +590,7 @@ 
 		// Set new ref and current status
 		if (!$error) {
 			$this->ref = $num;
-			$this->statut = self::STATUS_VALIDATED;	// deprecated
+			$this->statut = self::STATUS_VALIDATED; // deprecated
 			$this->status = self::STATUS_VALIDATED;
 		}
 
@@ -1212,7 +1212,7 @@ 
 			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-				$this->deposit_percent		= (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0);
+				$this->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$this->fk_project = 0;
 				$this->fk_delivery_address = 0;
@@ -1303,8 +1303,8 @@ 
 	{
 		global $conf, $hookmanager;
 
-		require_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 		$error = 0;
 
@@ -1336,7 +1336,7 @@ 
 			$line->fk_parent_line    = $object->lines[$i]->fk_parent_line;
 			$line->fk_unit = $object->lines[$i]->fk_unit;
 
-			$line->date_start 		= $object->lines[$i]->date_start;
+			$line->date_start = $object->lines[$i]->date_start;
 			$line->date_end    		= $object->lines[$i]->date_end;
 
 			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
@@ -3566,15 +3566,15 @@ 
 		//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
 		if ($mode == 'toship') {
 			// An order to ship is an open order (validated or in progress)
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ")";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")";
 		}
 		if ($mode == 'tobill') {
 			// An order to bill is an order not already billed
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ", " . self::STATUS_CLOSED . ") AND c.facture = 0";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.", ".self::STATUS_CLOSED.") AND c.facture = 0";
 		}
 		if ($mode == 'shippedtobill') {
 			// An order shipped and to bill is a delivered order not already billed
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_CLOSED . ") AND c.facture = 0";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_CLOSED.") AND c.facture = 0";
 		}
 		if ($user->socid) {
 			$sql .= " AND c.fk_soc = ".((int) $user->socid);
@@ -3900,7 +3900,7 @@ 
 		}
 
 		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) {
@@ -4303,7 +4303,7 @@ 
 			$objp = $this->db->fetch_object($result);
 
 			if (!$objp) {
-				$this->error = 'OrderLine with id '. $rowid .' not found sql='.$sql;
+				$this->error = 'OrderLine with id '.$rowid.' not found sql='.$sql;
 				return 0;
 			}
 
@@ -4388,8 +4388,8 @@ 
 		// check if order line is not in a shipment line before deleting
 		$sqlCheckShipmentLine = "SELECT";
 		$sqlCheckShipmentLine .= " ed.rowid";
-		$sqlCheckShipmentLine .= " FROM " . MAIN_DB_PREFIX . "expeditiondet ed";
-		$sqlCheckShipmentLine .= " WHERE ed.fk_elementdet = " . ((int) $this->id);
+		$sqlCheckShipmentLine .= " FROM ".MAIN_DB_PREFIX."expeditiondet ed";
+		$sqlCheckShipmentLine .= " WHERE ed.fk_elementdet = ".((int) $this->id);
 
 		$resqlCheckShipmentLine = $this->db->query($sqlCheckShipmentLine);
 		if (!$resqlCheckShipmentLine) {
@@ -4402,13 +4402,13 @@ 
 			if ($num > 0) {
 				$error++;
 				$objCheckShipmentLine = $this->db->fetch_object($resqlCheckShipmentLine);
-				$this->error = $langs->trans('ErrorRecordAlreadyExists') . ' : ' . $langs->trans('ShipmentLine') . ' ' . $objCheckShipmentLine->rowid;
+				$this->error = $langs->trans('ErrorRecordAlreadyExists').' : '.$langs->trans('ShipmentLine').' '.$objCheckShipmentLine->rowid;
 				$this->errors[] = $this->error;
 			}
 			$this->db->free($resqlCheckShipmentLine);
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . 'Error ; ' . $this->error, LOG_ERR);
+			dol_syslog(__METHOD__.'Error ; '.$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -4424,7 +4424,7 @@ 
 		}
 
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . "commandedet WHERE rowid = " . ((int) $this->id);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid = ".((int) $this->id);
 
 			dol_syslog("OrderLine::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -4439,7 +4439,7 @@ 
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
-				dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 			}
 		}
 
@@ -4449,8 +4449,8 @@ 
 		}
 
 		foreach ($this->errors as $errmsg) {
-			dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-			$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+			$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 		}
 		$this->db->rollback();
 		return -1 * $error;