Dolibarr / dolibarr

htdocs/expedition/class/expedition.class.php

Spacing +50 added lines, -50 removed lines

@@ -370,7 +370,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
@@ -642,7 +642,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;
 									}
 
@@ -869,20 +869,20 @@ 
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
-				$this->id 					= (int) $obj->rowid;
-				$this->entity 				= $obj->entity;
-				$this->ref 					= $obj->ref;
-				$this->socid 				= $obj->socid;
-				$this->ref_customer 		= $obj->ref_customer;
-				$this->ref_ext 				= $obj->ref_ext;
+				$this->id = (int) $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->ref = $obj->ref;
+				$this->socid = $obj->socid;
+				$this->ref_customer = $obj->ref_customer;
+				$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;
+				$this->user_creation_id = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
-				$this->date_valid 			= $this->db->jdate($obj->date_valid);
+				$this->date_valid = $this->db->jdate($obj->date_valid);
 				$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
@@ -890,13 +890,13 @@ 
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->model_pdf            = $obj->model_pdf;
 				$this->shipping_method_id   = $obj->fk_shipping_method;
-				$this->shipping_method 		= $obj->shipping_method;
+				$this->shipping_method = $obj->shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
 				$this->origin               = ($obj->origin_type ? $obj->origin_type : 'commande'); // For compatibility
 				$this->origin_type          = ($obj->origin_type ? $obj->origin_type : 'commande');
 				$this->origin_id            = $obj->origin_id;
 				$this->billed               = $obj->billed;
-				$this->fk_project 			= $obj->fk_project;
+				$this->fk_project = $obj->fk_project;
 				$this->signed_status        = $obj->signed_status;
 				$this->trueWeight           = $obj->weight;
 				$this->weight_units         = $obj->weight_units;
@@ -1263,7 +1263,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;
 		}
 
@@ -2048,14 +2048,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;
@@ -2115,7 +2115,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);
@@ -2149,9 +2149,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();
@@ -2164,13 +2164,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
 
@@ -2357,16 +2357,16 @@ 
 				$line = new ExpeditionLigne($this->db);
 
 				$line->rowid            = $objp->rowid;
-				$line->id				= $objp->rowid;
-				$line->fk_expedition	= $this->id;
+				$line->id = $objp->rowid;
+				$line->fk_expedition = $this->id;
 				$line->description      = $objp->description;
 				$line->qty              = $objp->qty;
 				$line->fk_entrepot      = $objp->fk_entrepot;
 				$line->fk_product       = $objp->fk_product;
 				$line->rang             = $objp->rang;
-				$line->fk_element 		= $objp->fk_element;
+				$line->fk_element = $objp->fk_element;
 				$line->fk_unit          = $objp->fk_unit;
-				$line->fk_elementdet 	= $objp->fk_elementdet;
+				$line->fk_elementdet = $objp->fk_elementdet;
 				$line->fk_element_type 	= $objp->element_type;
 				$line->fetch_optionals();
 
@@ -2533,7 +2533,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) {
@@ -2582,9 +2582,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);
 	}
@@ -2608,7 +2608,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"' : '').'>';
 		}
@@ -2665,7 +2665,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);
@@ -2677,7 +2677,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;
@@ -2901,12 +2901,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')) {
@@ -2954,7 +2954,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");
 
@@ -2965,14 +2965,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);
@@ -2986,7 +2986,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;

htdocs/product/class/productcustomerprice.class.php

Spacing +11 added lines, -11 removed lines

@@ -177,25 +177,25 @@ 
 		global $langs;
 
 		$sql = "SELECT COUNT(*) AS nb";
-		$sql .= " FROM " . $this->db->prefix() . "product_customer_price as t";
-		$sql .= " WHERE (t.date_begin = '" . $this->db->idate($this->date_begin) . "' OR t.date_end = '" . $this->db->idate($this->date_begin) . "'";
-		$sql .= "  OR t.date_begin = '" . $this->db->idate($this->date_end) . "' OR t.date_end = '" . $this->db->idate($this->date_end) . "'";
-		$sql .= "  OR (t.date_begin <= '" . $this->db->idate($this->date_begin) . "' AND '" . $this->db->idate($this->date_begin) . "' <= t.date_end)";
-		$sql .= "  OR (t.date_begin <= '" . $this->db->idate($this->date_end) . "' AND '" . $this->db->idate($this->date_end) . "' <= t.date_end))";
+		$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
+		$sql .= " WHERE (t.date_begin = '".$this->db->idate($this->date_begin)."' OR t.date_end = '".$this->db->idate($this->date_begin)."'";
+		$sql .= "  OR t.date_begin = '".$this->db->idate($this->date_end)."' OR t.date_end = '".$this->db->idate($this->date_end)."'";
+		$sql .= "  OR (t.date_begin <= '".$this->db->idate($this->date_begin)."' AND '".$this->db->idate($this->date_begin)."' <= t.date_end)";
+		$sql .= "  OR (t.date_begin <= '".$this->db->idate($this->date_end)."' AND '".$this->db->idate($this->date_end)."' <= t.date_end))";
 		if ($this->fk_product > 0) {
-			$sql .= " AND t.fk_product = " . ((int) $this->fk_product);
+			$sql .= " AND t.fk_product = ".((int) $this->fk_product);
 		}
 		if ($this->fk_soc > 0) {
-			$sql .= " AND t.fk_soc = " . ((int) $this->fk_soc);
+			$sql .= " AND t.fk_soc = ".((int) $this->fk_soc);
 		}
 		if ($this->id > 0) {
-			$sql .= " AND t.rowid != " . ((int) $this->id);
+			$sql .= " AND t.rowid != ".((int) $this->id);
 		}
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -370,7 +370,7 @@ 
 		$sql .= " '".$this->db->idate($this->date_begin)."',";
 		$sql .= " ".(empty($this->date_end) ? 'NULL' : "'".$this->db->idate($this->date_end)."'").",";
 		$sql .= " ".((int) $user->id).",";
-		$sql .=  " ".(!isset($this->price_label) ? 'NULL' : "'".$this->db->escape($this->price_label)."'").",";
+		$sql .= " ".(!isset($this->price_label) ? 'NULL' : "'".$this->db->escape($this->price_label)."'").",";
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'");
 		$sql .= ")";
 

htdocs/accountancy/closure/index.php

Spacing +30 added lines, -30 removed lines

@@ -97,7 +97,7 @@ 
 			if ($fiscal_period_id == $fiscal_period['id'] || (empty($fiscal_period_id) && $fiscal_period['date_start'] <= $now && $now <= $fiscal_period['date_end'])) {
 				$current_fiscal_period = $fiscal_period;
 			} else {
-				$last_fiscal_period = $fiscal_period;	// $last_fiscal_period is in fact $previous_fiscal_period
+				$last_fiscal_period = $fiscal_period; // $last_fiscal_period is in fact $previous_fiscal_period
 			}
 		}
 	}
@@ -146,7 +146,7 @@ 
 			if ($result > 0) {
 				setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
 
-				header("Location: " . $_SERVER['PHP_SELF'] . '?fiscal_period_id=' . $current_fiscal_period['id']);
+				header("Location: ".$_SERVER['PHP_SELF'].'?fiscal_period_id='.$current_fiscal_period['id']);
 				exit;
 			} else {
 				setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
@@ -176,7 +176,7 @@ 
 				} else {
 					setEventMessages($langs->trans("AccountancyClosureCloseSuccessfully"), null, 'mesgs');
 
-					header("Location: " . $_SERVER['PHP_SELF'] . '?fiscal_period_id=' . $current_fiscal_period['id']);
+					header("Location: ".$_SERVER['PHP_SELF'].'?fiscal_period_id='.$current_fiscal_period['id']);
 					exit;
 				}
 			}
@@ -192,7 +192,7 @@ 
 			} else {
 				setEventMessages($langs->trans("AccountancyClosureInsertAccountingReversalSuccessfully"), null, 'mesgs');
 
-				header("Location: " . $_SERVER['PHP_SELF'] . '?fiscal_period_id=' . $current_fiscal_period['id']);
+				header("Location: ".$_SERVER['PHP_SELF'].'?fiscal_period_id='.$current_fiscal_period['id']);
 				exit;
 			}
 		}
@@ -233,7 +233,7 @@ 
 		);
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'],
 			$langs->trans('ValidateMovements'),
 			$langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")),
 			'confirm_step_1',
@@ -271,7 +271,7 @@ 
 		);
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'],
 			$langs->trans('AccountancyClosureClose'),
 			$langs->trans('AccountancyClosureConfirmClose'),
 			'confirm_step_2',
@@ -315,7 +315,7 @@ 
 		);
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$_SERVER["PHP_SELF"].'?fiscal_period_id='.$current_fiscal_period['id'],
 			$langs->trans('AccountancyClosureAccountingReversal'),
 			$langs->trans('AccountancyClosureConfirmAccountingReversal'),
 			'confirm_step_3',
@@ -342,13 +342,13 @@ 
 
 $fiscal_period_nav_text = $langs->trans("FiscalPeriod");
 
-$fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($last_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $last_fiscal_period['id'] : '#" class="disabled') . '">' . img_previous() . '</a>';
-$fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($next_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $next_fiscal_period['id'] : '#" class="disabled') . '">' . img_next() . '</a>';
+$fiscal_period_nav_text .= '&nbsp;<a href="'.(isset($last_fiscal_period) ? $_SERVER["PHP_SELF"].'?fiscal_period_id='.$last_fiscal_period['id'] : '#" class="disabled').'">'.img_previous().'</a>';
+$fiscal_period_nav_text .= '&nbsp;<a href="'.(isset($next_fiscal_period) ? $_SERVER["PHP_SELF"].'?fiscal_period_id='.$next_fiscal_period['id'] : '#" class="disabled').'">'.img_next().'</a>';
 if (!empty($current_fiscal_period)) {
-	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;(' . dol_print_date($current_fiscal_period['date_start'], 'day') . '&nbsp;-&nbsp;' . dol_print_date($current_fiscal_period['date_end'], 'day') . ')';
+	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;('.dol_print_date($current_fiscal_period['date_start'], 'day').'&nbsp;-&nbsp;'.dol_print_date($current_fiscal_period['date_end'], 'day').')';
 }
 
-print load_fiche_titre($langs->trans("Closure") . " - " . $fiscal_period_nav_text, '', 'title_accountancy');
+print load_fiche_titre($langs->trans("Closure")." - ".$fiscal_period_nav_text, '', 'title_accountancy');
 
 if (empty($current_fiscal_period)) {
 	print $langs->trans('ErrorNoFiscalPeriodActiveFound', $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("FiscalPeriod"));
@@ -356,12 +356,12 @@ 
 	if (!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
 		// Step 1
 		$head = array();
-		$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+		$head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id'];
 		$head[0][1] = $langs->trans("Step").' 1 - '.$langs->trans("AccountancyClosureStep1");
 		$head[0][2] = 'step1';
 		print dol_get_fiche_head($head, 'step1', '', -1, '');
 
-		print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep1Desc") . '</span><br>';
+		print '<span class="opacitymedium">'.$langs->trans("AccountancyClosureStep1Desc").'</span><br>';
 
 		$count_by_month = $object->getCountByMonthForFiscalPeriod((int) $current_fiscal_period['date_start'], (int) $current_fiscal_period['date_end']);
 
@@ -370,9 +370,9 @@ 
 		}
 
 		if (empty($count_by_month['total'])) {
-			$buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("ValidateMovements") . '</a>';
+			$buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("ValidateMovements").'</a>';
 		} else {
-			$buttonvalidate = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_1&token='.newToken().'&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("ValidateMovements") . '</a>';
+			$buttonvalidate = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_1&token='.newToken().'&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("ValidateMovements").'</a>';
 		}
 		print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), 0, '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0);
 
@@ -382,24 +382,24 @@ 
 		print '<tr class="liste_titre">';
 		$nb_years = is_array($count_by_month['list']) ? count($count_by_month['list']) : 0;
 		if ($nb_years > 1) {
-			print '<td class="right">' . $langs->trans("Year") . '</td>';
+			print '<td class="right">'.$langs->trans("Year").'</td>';
 		}
 		for ($i = 1; $i <= 12; $i++) {
-			print '<td class="right">' . $langs->trans('MonthShort' . str_pad((string) $i, 2, '0', STR_PAD_LEFT)) . '</td>';
+			print '<td class="right">'.$langs->trans('MonthShort'.str_pad((string) $i, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
-		print '<td class="right"><b>' . $langs->trans("Total") . '</b></td>';
+		print '<td class="right"><b>'.$langs->trans("Total").'</b></td>';
 		print '</tr>';
 
 		if (is_array($count_by_month['list'])) {
 			foreach ($count_by_month['list'] as $info) {
 				print '<tr class="oddeven">';
 				if ($nb_years > 1) {
-					print '<td class="right">' . $info['year'] . '</td>';
+					print '<td class="right">'.$info['year'].'</td>';
 				}
 				for ($i = 1; $i <= 12; $i++) {
-					print '<td class="right">' . ((int) $info['count'][$i]) . '</td>';
+					print '<td class="right">'.((int) $info['count'][$i]).'</td>';
 				}
-				print '<td class="right"><b>' . $info['total'] . '</b></td></tr>';
+				print '<td class="right"><b>'.$info['total'].'</b></td></tr>';
 			}
 		}
 
@@ -411,8 +411,8 @@ 
 
 	// Step 2
 	$head = array();
-	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
-	$head[0][1] = $langs->trans("Step"). ' ' . (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2");
+	$head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id'];
+	$head[0][1] = $langs->trans("Step").' '.(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2");
 	$head[0][2] = 'step2';
 	print dol_get_fiche_head($head, 'step2', '', -1, '');
 
@@ -420,12 +420,12 @@ 
 	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep2Desc") . '</span><br>';
 	if ((empty($count_by_month['total']) || getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) && empty($current_fiscal_period['status'])) {
 		// If no unlocked record and period still open
-		$button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_2&token='.newToken().'&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureClose") . '</a>';
+		$button = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_2&token='.newToken().'&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("AccountancyClosureClose").'</a>';
 	} else {
 		if (!empty($current_fiscal_period['status'])) {
-			$button = '<a class="butActionRefused classfortooltip" href="#" title="The period is already closed. Feature disabled.">' . $langs->trans("AccountancyClosureClose") . '</a>';
+			$button = '<a class="butActionRefused classfortooltip" href="#" title="The period is already closed. Feature disabled.">'.$langs->trans("AccountancyClosureClose").'</a>';
 		} elseif (!empty($count_by_month['total'])) {
-			$button = '<a class="butActionRefused classfortooltip" href="#" title="There is some lines not yet locked. Feature disabled.">' . $langs->trans("AccountancyClosureClose") . '</a>';
+			$button = '<a class="butActionRefused classfortooltip" href="#" title="There is some lines not yet locked. Feature disabled.">'.$langs->trans("AccountancyClosureClose").'</a>';
 		}
 	}
 	print_barre_liste('', 0, '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
@@ -434,17 +434,17 @@ 
 
 	// Step 3
 	$head = array();
-	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
-	$head[0][1] = $langs->trans("Step"). ' ' . (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3");
+	$head[0][0] = DOL_URL_ROOT.'/accountancy/closure/index.php?fiscal_period_id='.$current_fiscal_period['id'];
+	$head[0][1] = $langs->trans("Step").' '.(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3");
 	$head[0][2] = 'step3';
 	print dol_get_fiche_head($head, 'step3', '', -1, '');
 
 	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep3Desc") . '</span><br>';
 
 	if (empty($current_fiscal_period['status'])) {
-		$button = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>';
+		$button = '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AccountancyClosureAccountingReversal").'</a>';
 	} else {
-		$button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_3&token='.newToken().'&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>';
+		$button = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=step_3&token='.newToken().'&fiscal_period_id='.$current_fiscal_period['id'].'">'.$langs->trans("AccountancyClosureAccountingReversal").'</a>';
 	}
 	print_barre_liste('', 0, '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
 }

htdocs/accountancy/class/accountancyexport.class.php

Spacing +34 added lines, -34 removed lines

@@ -382,8 +382,8 @@ 
 	 */
 	public function export(&$TData, $formatexportset, $withAttachment = 0, $downloadMode = 1, $outputMode = 1, $noouput = 1)
 	{
-		global $db, $conf, $langs;	// The tpl file use $db
-		global $search_date_end; 	// Used into /accountancy/tpl/export_journal.tpl.php
+		global $db, $conf, $langs; // The tpl file use $db
+		global $search_date_end; // Used into /accountancy/tpl/export_journal.tpl.php
 
 		// Define name of file to save
 		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
@@ -464,7 +464,7 @@ 
 					$exportFileFullName = $completefilename;
 					$exportFileBaseName = basename($exportFileFullName);
 					$exportFileName = pathinfo($exportFileBaseName, PATHINFO_FILENAME);
-					$exportFilePath = $outputDir . '/' . $exportFileFullName;
+					$exportFilePath = $outputDir.'/'.$exportFileFullName;
 					$exportFile = fopen($exportFilePath, 'w');
 					if (!$exportFile) {
 						$this->errors[] = $langs->trans('ErrorFileNotFound', $exportFilePath);
@@ -478,8 +478,8 @@ 
 						);
 
 						// archive name and path
-						$archiveFullName = $exportFileName . '.zip';
-						$archivePath = $outputDir . '/' . $archiveFullName;
+						$archiveFullName = $exportFileName.'.zip';
+						$archivePath = $outputDir.'/'.$archiveFullName;
 					}
 				}
 			}
@@ -620,11 +620,11 @@ 
 					if (!empty($downloadFileMimeType) && !empty($downloadFileFullName) && !empty($downloadFilePath) && empty($noouput)) {
 						// deprecated. We must not use this anymore, but have $noouput = 1 because HTTP header must be sent
 						// into main page not into a method.
-						header('Content-Type: ' . $downloadFileMimeType);
-						header('Content-Disposition: attachment; filename=' . $downloadFileFullName);
+						header('Content-Type: '.$downloadFileMimeType);
+						header('Content-Disposition: attachment; filename='.$downloadFileFullName);
 						header('Cache-Control: Public, must-revalidate');
 						header('Pragma: public');
-						header('Content-Length: ' . dol_filesize($downloadFilePath));
+						header('Content-Length: '.dol_filesize($downloadFilePath));
 
 						readfileLowMemory($downloadFilePath);
 					}
@@ -696,14 +696,14 @@ 
 			$refInvoice = '';
 			if ($line->doc_type == 'customer_invoice') {
 				// Customer invoice
-				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$invoice = new Facture($this->db);
 				$invoice->fetch($line->fk_doc);
 
 				$refInvoice = $invoice->ref;
 			} elseif ($line->doc_type == 'supplier_invoice') {
 				// Supplier invoice
-				require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$invoice = new FactureFournisseur($this->db);
 				$invoice->fetch($line->fk_doc);
 
@@ -1384,25 +1384,25 @@ 
 			/*** preparation du champ label operation pour istea ***/
 			// retrecissement du champs car ISTEA n'affiche pas bcp de caract�re.
 			$search = array('Paiement fournisseur ', 'Virement ', 'Paiement ');
-			$replace = array('Paiemt fourn ','Virt ','Paiemt ');
+			$replace = array('Paiemt fourn ', 'Virt ', 'Paiemt ');
 			$label_operation = str_replace($search, $replace, $line->label_operation);
 			// encadrement par des ' si le champs contient le separateur
 			$label_operation = preg_match('/'.$separator.'/', $label_operation) ? "'".$label_operation."'" : $label_operation;
 
 			$tab = array();
 			// export configurable
-			$tab[] = $line->piece_num;	// colonne 1 : numero de piece	ISTEA
-			$tab[] = $date_document;	// colonne 2 : date				ISTEA
-			$tab[] = $line->doc_ref;	// colonne 3 : reference piece 	ISTEA
-			$tab[] = array_key_exists($line->piece_num, $tiers) ? $tiers[$line->piece_num] : '';	// colonne 4 : nom tiers	ISTEA
-			$tab[] = length_accountg(($line->subledger_account && (substr($line->subledger_account, 0, 2) == substr($line->numero_compte, 0, 2))) ? $line->subledger_account : $line->numero_compte);	// colonne 5 : numero de compte	ISTEA
-			$tab[] = length_accountg($line->subledger_account ? $line->subledger_account : $line->numero_compte);	// colonne 6 : numero de compte
-			$tab[] = length_accountg($line->subledger_account ? $line->numero_compte : '');	// G					// colonne 7 : numero de compte principal (divers paiement ou 40100000 ou 41100000)
-			$tab[] = ($line->doc_type == 'bank') ? $label_operation : ($line->subledger_account ? $line->subledger_label : $line->label_compte);	// colonne 8 : label de l'operation		ISTEA
-			$tab[] = $label_operation;	// colonne 9 : label de l'operation (semble non prise en compte par ISTEA)
-			$tab[] = price2num($line->debit);	// colonne 10 : debit		ISTEA
-			$tab[] = price2num($line->credit);	// colonne 11 : credit		ISTEA
-			$tab[] = $line->code_journal;		// colonne 12 : journal		ISTEA
+			$tab[] = $line->piece_num; // colonne 1 : numero de piece	ISTEA
+			$tab[] = $date_document; // colonne 2 : date				ISTEA
+			$tab[] = $line->doc_ref; // colonne 3 : reference piece 	ISTEA
+			$tab[] = array_key_exists($line->piece_num, $tiers) ? $tiers[$line->piece_num] : ''; // colonne 4 : nom tiers	ISTEA
+			$tab[] = length_accountg(($line->subledger_account && (substr($line->subledger_account, 0, 2) == substr($line->numero_compte, 0, 2))) ? $line->subledger_account : $line->numero_compte); // colonne 5 : numero de compte	ISTEA
+			$tab[] = length_accountg($line->subledger_account ? $line->subledger_account : $line->numero_compte); // colonne 6 : numero de compte
+			$tab[] = length_accountg($line->subledger_account ? $line->numero_compte : ''); // G					// colonne 7 : numero de compte principal (divers paiement ou 40100000 ou 41100000)
+			$tab[] = ($line->doc_type == 'bank') ? $label_operation : ($line->subledger_account ? $line->subledger_label : $line->label_compte); // colonne 8 : label de l'operation		ISTEA
+			$tab[] = $label_operation; // colonne 9 : label de l'operation (semble non prise en compte par ISTEA)
+			$tab[] = price2num($line->debit); // colonne 10 : debit		ISTEA
+			$tab[] = price2num($line->credit); // colonne 11 : credit		ISTEA
+			$tab[] = $line->code_journal; // colonne 12 : journal		ISTEA
 
 			$output = mb_convert_encoding('"'.implode('"'.$separator.'"', $tab).'"'.$this->end_line, 'ISO-8859-1');
 			if ($exportFile) {
@@ -1581,7 +1581,7 @@ 
 							if (!getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_SUPPLIERINVOICE_SOURCE_FILE')) {
 								'@phan-var-force FactureFournisseur $invoice';
 								$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
-								$objectDirPath .= '/' . rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
+								$objectDirPath .= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 							}
 						}
 						$arrayofinclusion = array();
@@ -1801,7 +1801,7 @@ 
 							if (!getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_SUPPLIERINVOICE_SOURCE_FILE')) {
 								'@phan-var-force FactureFournisseur $invoice';
 								$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
-								$objectDirPath .= '/' . rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
+								$objectDirPath .= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 							}
 						}
 						$arrayofinclusion = array();
@@ -2124,7 +2124,7 @@ 
 			// MOPM
 			$tab[] = "";
 			// BONP
-			$tab[] =  "";
+			$tab[] = "";
 			// BQAF
 			$tab[] = "";
 			// ECES
@@ -2330,7 +2330,7 @@ 
 				}
 			} elseif ($line->doc_type == 'customer_invoice') {
 				if (($line->amount) < 0) {
-					$nature_piece = 'AC';		// Currently, only the sign of amount allows to know the type of invoice (standard or credit note). Other solution is to analyse debit/credit/role of account. TODO Add column doc_type_long or make amount mandatory with rule on sign.
+					$nature_piece = 'AC'; // Currently, only the sign of amount allows to know the type of invoice (standard or credit note). Other solution is to analyse debit/credit/role of account. TODO Add column doc_type_long or make amount mandatory with rule on sign.
 				} else {
 					$nature_piece = 'FC';
 				}
@@ -2539,8 +2539,8 @@ 
 						($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) {
 						if ($line->doc_type == 'customer_invoice') {
 							// Get new customer invoice ref and company name
-							$sql = 'SELECT f.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f';
-							$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid';
+							$sql = 'SELECT f.ref, s.nom FROM '.MAIN_DB_PREFIX.'facture as f';
+							$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON f.fk_soc = s.rowid';
 							$sql .= ' WHERE f.rowid = '.((int) $line->fk_doc);
 							$resql = $this->db->query($sql);
 							if ($resql) {
@@ -2553,8 +2553,8 @@ 
 							}
 						} else {
 							// Get new supplier invoice ref and company name
-							$sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff';
-							$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid';
+							$sql = 'SELECT ff.ref, s.nom FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+							$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON ff.fk_soc = s.rowid';
 							$sql .= ' WHERE ff.rowid = '.((int) $line->fk_doc);
 							$resql = $this->db->query($sql);
 							if ($resql) {
@@ -2592,7 +2592,7 @@ 
 				$tab[] = "";
 				//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"';
 				//Libellé manual
-				$tab[] = dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1);
+				$tab[] = dol_trunc(str_replace('"', '', $invoice_ref.(!empty($company_name) ? ' - ' : '').$company_name), 40, 'right', 'UTF-8', 1);
 				//Numéro de pièce
 				$tab[] = dol_trunc(str_replace('"', '', (string) $line->piece_num), 10, 'right', 'UTF-8', 1);
 				//Devise
@@ -2646,8 +2646,8 @@ 
 				}
 				$tab[] = "";
 				$tab[] = '"'.dol_trunc(str_replace('"', '', $line->label_operation), 40, 'right', 'UTF-8', 1).'"';
-				$tab[] = '"' . dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1) . '"';
-				$tab[] = '"' . dol_trunc(str_replace('"', '', (string) $line->piece_num), 10, 'right', 'UTF-8', 1) . '"';
+				$tab[] = '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"';
+				$tab[] = '"'.dol_trunc(str_replace('"', '', (string) $line->piece_num), 10, 'right', 'UTF-8', 1).'"';
 				$tab[] = price2num(abs($line->debit - $line->credit));
 				$tab[] = $line->sens;
 				$tab[] = $date_document;

htdocs/accountancy/class/accountingjournal.class.php

Spacing +63 added lines, -63 removed lines

@@ -115,7 +115,7 @@ 
 	{
 		$valid_nature = array(1, 2, 3, 4, 5, 8, 9);
 		if (!in_array((int) $this->nature, $valid_nature)) {
-			$this->error = get_class($this)."::Create Error invalid field nature '" . strval($this->nature) . "'";
+			$this->error = get_class($this)."::Create Error invalid field nature '".strval($this->nature)."'";
 			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
@@ -123,23 +123,23 @@ 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_journal";
 		$sql .= " (entity, code, label, nature, active)";
 		$sql .= " VALUES ("
-			. ((int) $this->entity)           .",'"
-			. $this->db->escape($this->code)  ."','"
-			. $this->db->escape($this->label) ."',"
-			. ((int) $this->nature)           .","
-			. ((int) $this->active)           .")";
+			. ((int) $this->entity).",'"
+			. $this->db->escape($this->code)."','"
+			. $this->db->escape($this->label)."',"
+			. ((int) $this->nature).","
+			. ((int) $this->active).")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->error = get_class($this)."::Create Error: " . $this->db->lasterror();
+			$this->error = get_class($this)."::Create Error: ".$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
 
 		$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_journal");
 		if ($id <= 0) {
-			$this->error = get_class($this)."::Create Error " . $id . ": " . $this->db->lasterror();
+			$this->error = get_class($this)."::Create Error ".$id.": ".$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			return -2;
 		}
@@ -181,7 +181,7 @@ 
 					$this->rowid		= $obj->rowid;
 
 					$this->code			= $obj->code;
-					$this->ref			= $obj->code;
+					$this->ref = $obj->code;
 					$this->label		= $obj->label;
 					$this->nature		= $obj->nature;
 					$this->active		= $obj->active;
@@ -425,10 +425,10 @@ 
 			return array();
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 
 		$langs->loadLangs(array("assets"));
 
@@ -444,22 +444,22 @@ 
 		$sql .= "SELECT ad.fk_asset AS rowid, a.ref AS asset_ref, a.label AS asset_label, a.acquisition_value_ht AS asset_acquisition_value_ht";
 		$sql .= ", a.disposal_date AS asset_disposal_date, a.disposal_amount_ht AS asset_disposal_amount_ht, a.disposal_subject_to_vat AS asset_disposal_subject_to_vat";
 		$sql .= ", ad.rowid AS depreciation_id, ad.depreciation_mode, ad.ref AS depreciation_ref, ad.depreciation_date, ad.depreciation_ht, ad.accountancy_code_debit, ad.accountancy_code_credit";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation as ad";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "asset as a ON a.rowid = ad.fk_asset";
-		$sql .= " WHERE a.entity IN (" . getEntity('asset', 0) . ')'; // We don't share object for accountancy, we use source object sharing
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation as ad";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."asset as a ON a.rowid = ad.fk_asset";
+		$sql .= " WHERE a.entity IN (".getEntity('asset', 0).')'; // We don't share object for accountancy, we use source object sharing
 		$sql .= " AND a.status > 0";
 		if ($in_bookkeeping == 'already') {
-			$sql .= " AND EXISTS (SELECT iab.fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
+			$sql .= " AND EXISTS (SELECT iab.fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
 		} elseif ($in_bookkeeping == 'notyet') {
-			$sql .= " AND NOT EXISTS (SELECT iab.fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
+			$sql .= " AND NOT EXISTS (SELECT iab.fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
 		}
 		$sql .= " AND ad.ref != ''"; // not reversal lines
 		if ($date_start && $date_end) {
-			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate($date_start) . "' AND ad.depreciation_date <= '" . $this->db->idate($date_end) . "'";
+			$sql .= " AND ad.depreciation_date >= '".$this->db->idate($date_start)."' AND ad.depreciation_date <= '".$this->db->idate($date_end)."'";
 		}
 		// Define begin binding date
 		if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING')) . "'";
+			$sql .= " AND ad.depreciation_date >= '".$this->db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING'))."'";
 		}
 		$sql .= " ORDER BY ad.depreciation_date";
 
@@ -526,7 +526,7 @@ 
 
 			$element = array(
 				'ref' => dol_trunc($element_static->ref, 16, 'right', 'UTF-8', 1),
-				'error' => array_key_exists('error', $pre_data_info) ? $pre_data_info['error'] : '',  // @phpstan-ignore-line
+				'error' => array_key_exists('error', $pre_data_info) ? $pre_data_info['error'] : '', // @phpstan-ignore-line
 				'blocks' => array(),
 			);
 
@@ -545,7 +545,7 @@ 
 					if ($type == 'view') {
 						$account_to_show = length_accountg($account);
 						if (($account_to_show == "") || $account_to_show == 'NotDefined') {
-							$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
+							$account_to_show = '<span class="error">'.$langs->trans("AssetInAccountNotDefined").'</span>';
 						}
 
 						$blocks[] = array(
@@ -553,7 +553,7 @@ 
 							'piece' => $element_link,
 							'account_accounting' => $account_to_show,
 							'subledger_account' => '',
-							'label_operation' => $label_operation . ' - ' . $depreciation_ref,
+							'label_operation' => $label_operation.' - '.$depreciation_ref,
 							'debit' => $mt < 0 ? price(-$mt) : '',
 							'credit' => $mt >= 0 ? price($mt) : '',
 						);
@@ -572,7 +572,7 @@ 
 								'subledger_label' => '',
 								'numero_compte' => $account,
 								'label_compte' => $account_infos['label'],
-								'label_operation' => $element_name_formatted_0 . ' - ' . $depreciation_ref,
+								'label_operation' => $element_name_formatted_0.' - '.$depreciation_ref,
 								'montant' => $mt,
 								'sens' => $mt < 0 ? 'D' : 'C',
 								'debit' => $mt < 0 ? -$mt : 0,
@@ -587,12 +587,12 @@ 
 						}
 					} else { // $type == 'csv'
 						$blocks[] = array(
-							$depreciation_date,                                   	// Date
-							$element_static->ref,                                	// Piece
-							$account_infos['code_formatted_1'],                		// AccountAccounting
-							$element_name_formatted_0 . ' - ' . $depreciation_ref,  // LabelOperation
-							$mt < 0 ? price(-$mt) : '',                        		// Debit
-							$mt >= 0 ? price($mt) : '',                        		// Credit
+							$depreciation_date, // Date
+							$element_static->ref, // Piece
+							$account_infos['code_formatted_1'], // AccountAccounting
+							$element_name_formatted_0.' - '.$depreciation_ref, // LabelOperation
+							$mt < 0 ? price(-$mt) : '', // Debit
+							$mt >= 0 ? price($mt) : '', // Credit
 						);
 					}
 				}
@@ -614,7 +614,7 @@ 
 
 					// Get accountancy codes
 					//---------------------------
-					require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 					$accountancy_codes = new AssetAccountancyCodes($this->db);
 					$result = $accountancy_codes->fetchAccountancyCodes($element_static->id);
 					if ($result < 0) {
@@ -665,7 +665,7 @@ 
 									if ($type == 'view') {
 										$account_to_show = length_accountg($account);
 										if (($account_to_show == "") || $account_to_show == 'NotDefined') {
-											$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
+											$account_to_show = '<span class="error">'.$langs->trans("AssetInAccountNotDefined").'</span>';
 										}
 
 										$blocks[] = array(
@@ -673,7 +673,7 @@ 
 											'piece' => $element_link,
 											'account_accounting' => $account_to_show,
 											'subledger_account' => '',
-											'label_operation' => $label_operation . ' - ' . $disposal_ref,
+											'label_operation' => $label_operation.' - '.$disposal_ref,
 											'debit' => $mt < 0 ? price(-$mt) : '',
 											'credit' => $mt >= 0 ? price($mt) : '',
 										);
@@ -692,7 +692,7 @@ 
 												'subledger_label' => '',
 												'numero_compte' => $account,
 												'label_compte' => $account_infos['label'],
-												'label_operation' => $element_name_formatted_0 . ' - ' . $disposal_ref,
+												'label_operation' => $element_name_formatted_0.' - '.$disposal_ref,
 												'montant' => $mt,
 												'sens' => $mt < 0 ? 'D' : 'C',
 												'debit' => $mt < 0 ? -$mt : 0,
@@ -707,12 +707,12 @@ 
 										}
 									} else { // $type == 'csv'
 										$blocks[] = array(
-											$disposal_date,                                    // Date
-											$element_static->ref,                              // Piece
-											$account_infos['code_formatted_1'],                // AccountAccounting
-											$element_name_formatted_0 . ' - ' . $disposal_ref, // LabelOperation
-											$mt < 0 ? price(-$mt) : '',                        // Debit
-											$mt >= 0 ? price($mt) : '',                        // Credit
+											$disposal_date, // Date
+											$element_static->ref, // Piece
+											$account_infos['code_formatted_1'], // AccountAccounting
+											$element_name_formatted_0.' - '.$disposal_ref, // LabelOperation
+											$mt < 0 ? price(-$mt) : '', // Debit
+											$mt >= 0 ? price($mt) : '', // Credit
 										);
 									}
 								}
@@ -801,7 +801,7 @@ 
 
 		// Accounting accounts
 		$acc_disc_granted = getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED');
-		$acc_vat_coll_def = getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT');			// Normal to apply vat default account for buy with customer's discount
+		$acc_vat_coll_def = getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT'); // Normal to apply vat default account for buy with customer's discount
 
 		while ($obj = $this->db->fetch_object($resql)) {
 			if ($invoice_static->fetch((int) $obj->rowid) <= 0) {
@@ -894,7 +894,7 @@ 
 						'piece' => $piece_link,
 						'account_accounting' => length_accountg($acc_disc_granted),
 						'subledger_account' => '',
-						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('HT')." (".$rateStr."%)",
 						'debit' => price($ht_part),
 						'credit' => '',
 					);
@@ -912,7 +912,7 @@ 
 						'subledger_label' => '',
 						'numero_compte' => $acc_disc_granted,
 						'label_compte' => $acc_info_discountgranted['label'],
-						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('HT')." (".$rateStr."%)",
 						'montant' => $ht_part,
 						'sens' => 'D',
 						'debit' => $ht_part,
@@ -935,7 +935,7 @@ 
 							'piece' => $piece_link,
 							'account_accounting' => length_accountg($acc_vat_coll),
 							'subledger_account' => '',
-							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('VAT')." (".$rateStr."%)",
 							'debit' => price($tva_part),
 							'credit' => '',
 						);
@@ -953,7 +953,7 @@ 
 							'subledger_label' => '',
 							'numero_compte' => $acc_vat_coll,
 							'label_compte' => $acc_info_vatbuy['label'],
-							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('VAT')." (".$rateStr."%)",
 							'montant' => $tva_part,
 							'sens' => 'D',
 							'debit' => $tva_part,
@@ -1010,16 +1010,16 @@ 
 					$element['blocks'][] = $lines_book;
 				} else { // CSV
 					$element['blocks'][] = array(
-						$docdate,                         // Date
-						$invoice_static->ref,             // Piece
+						$docdate, // Date
+						$invoice_static->ref, // Piece
 						length_accountg($acc_disc_granted), // Account
-						$label_discount." (".$rateStr."%)",   // Label
-						price($ht_part),                  // Debit
-						'',                               // Credit
+						$label_discount." (".$rateStr."%)", // Label
+						price($ht_part), // Debit
+						'', // Credit
 					);
 					if ($tva_part > 0) {
 						$element['blocks'][] = array(
-							$docdate, $invoice_static->ref, length_accountg($acc_vat_coll), $label_discount." ". $langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)", price($tva_part), ''
+							$docdate, $invoice_static->ref, length_accountg($acc_vat_coll), $label_discount." ".$langs->transnoentitiesnoconv('VAT')." (".$rateStr."%)", price($tva_part), ''
 						);
 					}
 					$element['blocks'][] = array(
@@ -1105,7 +1105,7 @@ 
 
 		// Accounting accounts
 		$acc_disc_recv    = getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED');
-		$acc_vat_ded_def  = getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT');			// Normal to apply vat default account for sold with supplier's discount
+		$acc_vat_ded_def  = getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT'); // Normal to apply vat default account for sold with supplier's discount
 
 		while ($obj = $this->db->fetch_object($resql)) {
 			if ($invoicesupplier_static->fetch((int) $obj->rowid) <= 0) {
@@ -1238,7 +1238,7 @@ 
 						'piece' => $piece_link,
 						'account_accounting' => length_accountg($acc_disc_recv),
 						'subledger_account' => '',
-						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('HT')." (".$rateStr."%)",
 						'debit' => '',
 						'credit' => price($ht_part),
 					);
@@ -1256,7 +1256,7 @@ 
 						'subledger_label' => '',
 						'numero_compte' => $acc_disc_recv,
 						'label_compte' => $acc_info_discountreceived['label'],
-						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('HT')." (".$rateStr."%)",
 						'montant' => $ht_part,
 						'sens' => 'C',
 						'debit' => 0,
@@ -1279,7 +1279,7 @@ 
 							'piece' => $piece_link,
 							'account_accounting' => length_accountg($acc_vat_ded),
 							'subledger_account' => '',
-							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('VAT')." (".$rateStr."%)",
 							'debit' => '',
 							'credit' => price($tva_part),
 						);
@@ -1298,7 +1298,7 @@ 
 							'subledger_label' => '',
 							'numero_compte' => $acc_vat_ded,
 							'label_compte' => $acc_info_vatbuy['label'],
-							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'label_operation' => $label_discount." - ".$langs->transnoentitiesnoconv('VAT')." (".$rateStr."%)",
 							'montant' => $tva_part,
 							'sens' => 'C',
 							'debit' => 0,
@@ -1327,7 +1327,7 @@ 
 				// CSV
 				if ($type == 'csv') {
 					$element['blocks'][] = array(
-						$docdate, $invoicesupplier_static->ref, length_accountg($acc_vat_ded), $label_discount." ". $langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)", '', $tva_part > 0 ? price($tva_part) : ''
+						$docdate, $invoicesupplier_static->ref, length_accountg($acc_vat_ded), $label_discount." ".$langs->transnoentitiesnoconv('VAT')." (".$rateStr."%)", '', $tva_part > 0 ? price($tva_part) : ''
 					);
 				}
 			}
@@ -1384,7 +1384,7 @@ 
 	public function writeIntoBookkeeping(User $user, &$journal_data = array(), $max_nb_errors = 10)
 	{
 		global $conf, $langs, $hookmanager;
-		require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
 		$error = 0;
 
@@ -1484,7 +1484,7 @@ 
 					$error++;
 					$error_for_line++;
 					$journal_data[$element_id]['error'] = 'amountsnotbalanced';
-					$this->errors[] = 'Try to insert a non balanced transaction in book for ' . json_encode($element['blocks']) . '. Canceled. Surely a bug.';
+					$this->errors[] = 'Try to insert a non balanced transaction in book for '.json_encode($element['blocks']).'. Canceled. Surely a bug.';
 				}
 
 				if (!$error_for_line) {
@@ -1582,12 +1582,12 @@ 
 			}
 
 			if (!empty($header)) {
-				$out .= '"' . implode('"' . $sep . '"', $header) . '"' . "\n";
+				$out .= '"'.implode('"'.$sep.'"', $header).'"'."\n";
 			}
 			foreach ($journal_data as $element_id => $element) {
 				foreach ($element['blocks'] as $lines) {
 					foreach ($lines as $line) {
-						$out .= '"' . implode('"' . $sep . '"', $line) . '"' . "\n";
+						$out .= '"'.implode('"'.$sep.'"', $line).'"'."\n";
 					}
 				}
 			}
@@ -1605,8 +1605,8 @@ 
 	public function getAccountingAccountInfos($account)
 	{
 		if (!isset(self::$accounting_account_cached[$account])) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 			$accountingaccount = new AccountingAccount($this->db);
 			$result = $accountingaccount->fetch(0, $account, true);
 			if ($result > 0) {