Dolibarr / dolibarr

htdocs/comm/propal/class/propaleligne.class.php

Spacing +5 added lines, -5 removed lines

@@ -427,9 +427,9 @@ 
 				$this->product_custom_code = $objp->customcode;
 				$this->product_custom_country_id = $objp->country_id;
 				$this->product_custom_country_code = $objp->country_code;
-				$this->fk_unit          = $objp->fk_unit;
+				$this->fk_unit = $objp->fk_unit;
 
-				$this->packaging      	= $objp->packaging;
+				$this->packaging = $objp->packaging;
 
 				$this->date_start       = $this->db->jdate($objp->date_start);
 				$this->date_end         = $this->db->jdate($objp->date_end);
@@ -655,7 +655,7 @@ 
 		// End call triggers
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "propaldet WHERE rowid = " . ((int) $this->rowid);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".((int) $this->rowid);
 			dol_syslog("PropaleLigne::delete", LOG_DEBUG);
 			if ($this->db->query($sql)) {
 				// Remove extrafields
@@ -663,10 +663,10 @@ 
 				$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);
 				}
 			} else {
-				$this->error = $this->db->error() . " sql=" . $sql;
+				$this->error = $this->db->error()." sql=".$sql;
 				$error++;
 			}
 		}

htdocs/commande/class/orderline.class.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';		// Because the CommonOrderLine is still in commonorder.class.php file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php'; // Because the CommonOrderLine is still in commonorder.class.php file
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 
 
@@ -223,7 +223,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;
 			}
 
@@ -272,7 +272,7 @@ 
 			$this->product_custom_country_id = $objp->country_id;
 			$this->product_custom_country_code = $objp->country_code;
 			$this->fk_unit          = $objp->fk_unit;
-			$this->packaging      	= $objp->packaging;
+			$this->packaging = $objp->packaging;
 
 			$this->date_start       = $this->db->jdate($objp->date_start);
 			$this->date_end         = $this->db->jdate($objp->date_end);
@@ -317,8 +317,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) {
@@ -331,13 +331,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;
 		}
 
@@ -353,7 +353,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);
@@ -368,7 +368,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);
 			}
 		}
 
@@ -378,8 +378,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;

htdocs/install/step5.php

Spacing +6 added lines, -6 removed lines

@@ -269,7 +269,7 @@ 
 					}
 				}
 
-				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = ' . getDolGlobalString('DATABASE_PWD_ENCRYPTED').' MAIN_SECURITY_HASH_ALGO = ' . getDolGlobalString('MAIN_SECURITY_HASH_ALGO'), LOG_INFO);
+				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.getDolGlobalString('DATABASE_PWD_ENCRYPTED').' MAIN_SECURITY_HASH_ALGO = '.getDolGlobalString('MAIN_SECURITY_HASH_ALGO'), LOG_INFO);
 			}
 
 			// Create user used to create the admin user
@@ -286,8 +286,8 @@ 
 			$newuser->admin = 1;
 			$newuser->entity = 0;
 
-			$conf->global->USER_MAIL_REQUIRED = 0; 			// Force global option to be sure to create a new user with no email
-			$conf->global->USER_PASSWORD_GENERATED = '';	// To not use any rule for password validation
+			$conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+			$conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
 
 			$result = $newuser->create($createuser, 1);
 			if ($result > 0) {
@@ -470,7 +470,7 @@ 
 				}
 				$conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
 			} else {
-				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to ' . getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
+				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
 
 				// Force the delete of the flag that say installation is not complete
 				dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const after upgrade process (should not exists but this is a security)');
@@ -533,7 +533,7 @@ 
 			print '</a></div><br>';
 		} else {
 			// If here MAIN_VERSION_LAST_UPGRADE is not empty
-			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">' . getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
+			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
 			print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
 			print $langs->trans("MigrationNotFinished").'<br>';
 			print "<br>";
@@ -583,7 +583,7 @@ 
 		$morehtml .= '</a></div><br>';
 	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
-		print $langs->trans("VersionLastUpgrade").': <b><span class="okinversed">' . getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
+		print $langs->trans("VersionLastUpgrade").': <b><span class="okinversed">'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
 		print '<br>';
 		print $langs->trans("VersionProgram").': <b><span class="okinversed">'.DOL_VERSION.'</span></b>';