Dolibarr / dolibarr

htdocs/adherents/partnership.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies","members","partnership", "other"));
+$langs->loadLangs(array("companies", "members", "partnership", "other"));
 
 // Get parameters
 $id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
@@ -52,9 +52,9 @@ 
 }
 
 // Initialize technical objects
-$object 		= new Partnership($db);
-$extrafields 	= new ExtraFields($db);
-$adht 			= new AdherentType($db);
+$object = new Partnership($db);
+$extrafields = new ExtraFields($db);
+$adht = new AdherentType($db);
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
 

htdocs/asset/depreciation.php

Spacing +20 added lines, -20 removed lines

@@ -24,9 +24,9 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
-require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "companies"));
@@ -48,9 +48,9 @@ 
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+	$upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
 }
 
 // Security check (enable the most restrictive one)
@@ -98,7 +98,7 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
@@ -134,9 +134,9 @@ 
 				print '<div class="fichecenter">';
 				print '<div class="fichehalfleft">';
 				print '<div class="underbanner clearboth"></div>';
-				print '<table class="border centpercent tableforfield">' . "\n";
-				print '<tr><td class="titlefield">' . $langs->trans('AssetBaseDepreciationHT') . '</td><td>' . price($depreciation_info['base_depreciation_ht']) . '</td></tr>';
-				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationBeginDate') . '</td><td>' . dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day') . '</td></tr>';
+				print '<table class="border centpercent tableforfield">'."\n";
+				print '<tr><td class="titlefield">'.$langs->trans('AssetBaseDepreciationHT').'</td><td>'.price($depreciation_info['base_depreciation_ht']).'</td></tr>';
+				print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationBeginDate').'</td><td>'.dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day').'</td></tr>';
 				print '</table>';
 
 				// We close div and reopen for second column
@@ -145,8 +145,8 @@ 
 
 				print '<div class="underbanner clearboth"></div>';
 				print '<table class="border centpercent tableforfield">';
-				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationDuration') . '</td><td>' . $depreciation_info['duration'] . ' ( ' . $depreciation_info['duration_type'] . ' )</td></tr>';
-				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationRate') . '</td><td>' . $depreciation_info['rate'] . '</td></tr>';
+				print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationDuration').'</td><td>'.$depreciation_info['duration'].' ( '.$depreciation_info['duration_type'].' )</td></tr>';
+				print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationRate').'</td><td>'.$depreciation_info['rate'].'</td></tr>';
 				print '</table>';
 				print '</div>';
 				print '</div>';
@@ -160,21 +160,21 @@ 
 
 				print '<tr class="liste_titre">';
 				print '<td class="width20"></td>';
-				print '<td>' . $langs->trans("Ref") . '</td>';
-				print '<td class="center">' . $langs->trans("AssetDepreciationDate") . '</td>';
-				print '<td class="right">' . $langs->trans("AssetDepreciationHT") . '</td>';
-				print '<td class="right">' . $langs->trans("AssetCumulativeDepreciationHT") . '</td>';
-				print '<td class="right">' . $langs->trans("AssetResidualHT") . '</td>';
+				print '<td>'.$langs->trans("Ref").'</td>';
+				print '<td class="center">'.$langs->trans("AssetDepreciationDate").'</td>';
+				print '<td class="right">'.$langs->trans("AssetDepreciationHT").'</td>';
+				print '<td class="right">'.$langs->trans("AssetCumulativeDepreciationHT").'</td>';
+				print '<td class="right">'.$langs->trans("AssetResidualHT").'</td>';
 				print '</tr>';
 
 				if (empty($lines)) {
-					print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';
+					print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 				} else {
 					foreach ($lines as $line) {
 						print '<tr class="oddeven">';
-						print '<td>' . ($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')) . '</td>';
-						print '<td >' . (empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']) . '</td>';
-						print '<td class="center">' . dol_print_date($line['depreciation_date'], 'day') . '</td>';
+						print '<td>'.($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')).'</td>';
+						print '<td >'.(empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']).'</td>';
+						print '<td class="center">'.dol_print_date($line['depreciation_date'], 'day').'</td>';
 						print '<td class="right">';
 						print price($line['depreciation_ht']);
 						print '</td>';

htdocs/asset/tpl/accountancy_codes_view.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 }
 
 if (empty($reshook)) {
-	if (isModEnabled('accounting')) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+	if (isModEnabled('accounting')) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 	foreach ($assetaccountancycodes->accountancy_codes_fields as $mode_key => $mode_info) {
 		//if (empty($object->enabled_modes[$mode_key])) continue;
@@ -60,7 +60,7 @@ 
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
-			print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">';
+			print '<tr><td class="titlefieldcreate">'.$langs->trans($field_info['label']).'</td><td colspan="3">';
 			if (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key])) {
 				$accountancy_code = $assetaccountancycodes->accountancy_codes[$mode_key][$field_key];
 				if (isModEnabled('accounting')) {

htdocs/asset/tpl/accountancy_codes_edit.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 }
 
 if (isModEnabled('accounting') && !is_object($formaccounting)) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -63,13 +63,13 @@ 
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
-			$html_name = $mode_key . '_' . $field_key;
-			print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">';
+			$html_name = $mode_key.'_'.$field_key;
+			print '<tr><td class="titlefieldcreate">'.$langs->trans($field_info['label']).'</td><td colspan="3">';
 			$accountancy_code = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key]) ? $assetaccountancycodes->accountancy_codes[$mode_key][$field_key] : '');
 			if (isModEnabled('accounting')) {
 				print $formaccounting->select_account($accountancy_code, $html_name, 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 			} else {
-				print '<input name="' . $html_name . '" class="maxwidth200" value="' . dol_escape_htmltag($accountancy_code) . '">';
+				print '<input name="'.$html_name.'" class="maxwidth200" value="'.dol_escape_htmltag($accountancy_code).'">';
 			}
 			print '</td></tr>';
 		}

htdocs/asset/card.php

Spacing +10 added lines, -10 removed lines

@@ -181,7 +181,7 @@ 
 	}
 	if (GETPOSTISSET('supplier_invoice_id')) {
 		$object->fields['supplier_invoice_id'] = array('type' => 'integer:FactureFournisseur:fourn/class/fournisseur.facture.class.php:1:entity IN (__SHARED_ENTITIES__)', 'label' => 'SupplierInvoice', 'enabled' => '1', 'noteditable' => '1', 'position' => 280, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => '1',);
-		print '<input type="hidden" name="supplier_invoice_id" value="' . GETPOST('supplier_invoice_id', 'int') . '">';
+		print '<input type="hidden" name="supplier_invoice_id" value="'.GETPOST('supplier_invoice_id', 'int').'">';
 	}
 
 	print dol_get_fiche_head(array(), '');
@@ -284,7 +284,7 @@ 
 			array('type' => 'checkbox', 'name' => 'disposal_depreciated', 'label' => $langs->trans("AssetDisposalDepreciated"), 'value' => $disposal_depreciated),
 			array('type' => 'checkbox', 'name' => 'disposal_subject_to_vat', 'label' => $langs->trans("AssetDisposalSubjectToVat"), 'value' => $disposal_subject_to_vat),
 		);
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('AssetDisposal'), $langs->trans('AssetConfirmDisposalAsk', $object->ref . ' - ' . $object->label), 'confirm_disposal', $formquestion, 'yes', 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AssetDisposal'), $langs->trans('AssetConfirmDisposalAsk', $object->ref.' - '.$object->label), 'confirm_disposal', $formquestion, 'yes', 1);
 	} elseif ($action == 'reopen') {
 		// Re-open
 		// Create an array for form
@@ -328,7 +328,7 @@ 
 	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	$keyforbreak='date_acquisition';	// We change column just before this field
+	$keyforbreak = 'date_acquisition'; // We change column just before this field
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
@@ -346,7 +346,7 @@ 
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-		print '<div class="tabsAction">' . "\n";
+		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) {
@@ -356,26 +356,26 @@ 
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init&token=' . newToken() . '#formmailbeforetitle');
+				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
 			}
 
 			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 			}
 
 			// Clone
 			//print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=clone&token=' . newToken(), '', false && $permissiontoadd);
 
 			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction($langs->trans('AssetDisposal'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disposal&token=' . newToken(), '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('AssetDisposal'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disposal&token='.newToken(), '', $permissiontoadd);
 			} else {
-				print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=reopen&token=' . newToken(), '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken(), '', $permissiontoadd);
 			}
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
-		print '</div>' . "\n";
+		print '</div>'."\n";
 	}
 
 	// Select mail models is same action as presend

htdocs/asset/class/asset.class.php

Spacing +67 added lines, -67 removed lines

@@ -60,8 +60,8 @@ 
 	 */
 	public $picto = 'asset';
 
-	const STATUS_DRAFT = 0; 	// In progress
-	const STATUS_DISPOSED = 9;	// Disposed
+	const STATUS_DRAFT = 0; // In progress
+	const STATUS_DISPOSED = 9; // Disposed
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -94,7 +94,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
@@ -536,11 +536,11 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if (empty($this->fk_asset_model)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -551,7 +551,7 @@ 
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options_model = new AssetDepreciationOptions($this->db);
 		$result = $options_model->fetchDeprecationOptions(0, $this->fk_asset_model);
 		if ($result < 0) {
@@ -586,7 +586,7 @@ 
 		// Get accountancy codes
 		//---------------------------
 		if (!$error) {
-			require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 			$accountancy_codes_model = new AssetAccountancyCodes($this->db);
 			$result = $accountancy_codes_model->fetchAccountancyCodes(0, $this->fk_asset_model);
 			if ($result < 0) {
@@ -645,7 +645,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -668,15 +668,15 @@ 
 		*/
 
 		$sql = "SELECT ad.rowid, ad.depreciation_mode, ad.ref, ad.depreciation_date, ad.depreciation_ht, ad.cumulative_depreciation_ht";
-		$sql .= ", " . $this->db->ifsql('iab.fk_docdet IS NOT NULL', 1, 0) . " AS bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= ", ".$this->db->ifsql('iab.fk_docdet IS NOT NULL', 1, 0)." AS bookkeeping";
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " ORDER BY ad.depreciation_date ASC";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -711,7 +711,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -733,14 +733,14 @@ 
 		*/
 
 		$sql = "SELECT COUNT(*) AS has_bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " AND iab.fk_docdet IS NOT NULL";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -778,28 +778,28 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
 			return -1;
 		}
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
 		$sql .= " VALUES ( ";
-		$sql .= " " . (int) $this->id;
-		$sql .= ", '" . $this->db->escape($mode) . "'";
-		$sql .= ", '" . $this->db->escape($ref) . "'";
-		$sql .= ", '" . $this->db->idate($depreciation_date) . "'";
-		$sql .= ", " . (double) $depreciation_ht;
-		$sql .= ", " . (double) $cumulative_depreciation_ht;
-		$sql .= ", '" . $this->db->escape($accountancy_code_debit) . "'";
-		$sql .= ", '" . $this->db->escape($accountancy_code_credit) . "'";
+		$sql .= " ".(int) $this->id;
+		$sql .= ", '".$this->db->escape($mode)."'";
+		$sql .= ", '".$this->db->escape($ref)."'";
+		$sql .= ", '".$this->db->idate($depreciation_date)."'";
+		$sql .= ", ".(double) $depreciation_ht;
+		$sql .= ", ".(double) $cumulative_depreciation_ht;
+		$sql .= ", '".$this->db->escape($accountancy_code_debit)."'";
+		$sql .= ", '".$this->db->escape($accountancy_code_credit)."'";
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -822,7 +822,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -831,7 +831,7 @@ 
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 		$result = $options->fetchDeprecationOptions($this->id);
 		if ($result < 0) {
@@ -842,7 +842,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($this->id);
 		if ($result < 0) {
@@ -858,20 +858,20 @@ 
 		foreach ($options->deprecation_options as $mode_key => $fields) {
 			$modes[$mode_key] = $this->db->escape($mode_key);
 		}
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE fk_asset = " . (int) $this->id;
-		$sql .= " AND depreciation_mode NOT IN ('" . $this->db->sanitize(implode("', '", $modes)) . "')";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE fk_asset = ".(int) $this->id;
+		$sql .= " AND depreciation_mode NOT IN ('".$this->db->sanitize(implode("', '", $modes))."')";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error) {
 			// Get fiscal period
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$dates = getDefaultDatesForTransfer();
 			$init_fiscal_period_start = $dates['date_start'];
 			$init_fiscal_period_end = $dates['date_end'];
@@ -904,17 +904,17 @@ 
 				*/
 
 				$sql = "SELECT ad.depreciation_date, ad.cumulative_depreciation_ht";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-				$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
-				$sql .= " AND ad.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+				$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
+				$sql .= " AND ad.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND iab.fk_docdet IS NOT NULL";
 				$sql .= " ORDER BY ad.depreciation_date DESC";
 				$sql .= " LIMIT 1";
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key) . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key).': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -926,26 +926,26 @@ 
 				}
 
 				// Set last cumulative depreciation
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-				$sql .= " SET total_amount_last_depreciation_ht = " . (empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
-				$sql .= " WHERE fk_asset = " . (int) $this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+				$sql .= " SET total_amount_last_depreciation_ht = ".(empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
+				$sql .= " WHERE fk_asset = ".(int) $this->id;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
 
 				// Delete old lines
-				$sql = "DELETE " . MAIN_DB_PREFIX . "asset_depreciation FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = " . MAIN_DB_PREFIX . "asset_depreciation.rowid";
-				$sql .= " WHERE " . MAIN_DB_PREFIX . "asset_depreciation.fk_asset = " . (int) $this->id;
-				$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql = "DELETE ".MAIN_DB_PREFIX."asset_depreciation FROM ".MAIN_DB_PREFIX."asset_depreciation";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = ".MAIN_DB_PREFIX."asset_depreciation.rowid";
+				$sql .= " WHERE ".MAIN_DB_PREFIX."asset_depreciation.fk_asset = ".(int) $this->id;
+				$sql .= " AND ".MAIN_DB_PREFIX."asset_depreciation.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND ab.fk_docdet IS NULL";
-				if ($last_depreciation_date !== "") $sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+				if ($last_depreciation_date !== "") $sql .= " AND ".MAIN_DB_PREFIX."asset_depreciation.ref != ''";
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -1012,7 +1012,7 @@ 
 				$first_period_found = false;
 				$first_period_date = isset($begin_period) && $begin_period > $fiscal_period_start ? $begin_period : $fiscal_period_start;
 
-				$ref_date_format = "%Y" . ($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '') . ($fields['duration_type'] == 2 ? '-%d' : '');
+				$ref_date_format = "%Y".($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '').($fields['duration_type'] == 2 ? '-%d' : '');
 
 				// Loop security
 				$idx_loop = 0;
@@ -1032,9 +1032,9 @@ 
 
 						$period_begin = dol_print_date($fiscal_period_start, $ref_date_format);
 						$period_end = dol_print_date($fiscal_period_end, $ref_date_format);
-						$ref = $period_begin . ($period_begin != $period_end ? ' - ' . $period_end : '');
+						$ref = $period_begin.($period_begin != $period_end ? ' - '.$period_end : '');
 						if ($fiscal_period_start <= $disposal_date && $disposal_date <= $fiscal_period_end) {
-							$ref .= ' - ' . $langs->transnoentitiesnoconv('AssetDisposal');
+							$ref .= ' - '.$langs->transnoentitiesnoconv('AssetDisposal');
 						}
 
 						$begin_date = $fiscal_period_start < $start_date && $start_date <= $fiscal_period_end ? $start_date : $fiscal_period_start;
@@ -1113,7 +1113,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($asset_depreciation_id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -1122,28 +1122,28 @@ 
 
 		$this->db->begin();
 
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 
 		// Get last depreciation lines save in bookkeeping
 		//-----------------------------------------------------
 		$sql = "SELECT fk_asset, depreciation_mode, cumulative_depreciation_ht";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE rowid = " . (int) $asset_depreciation_id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE rowid = ".(int) $asset_depreciation_id;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation').': '.$this->db->lasterror();
 			$error++;
 		} else {
 			if ($obj = $this->db->fetch_object($resql)) {
 				$mode_key = $obj->depreciation_mode;
 				if (!empty($options->deprecation_options_fields[$mode_key])) {
-					$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-					$sql .= " SET total_amount_last_depreciation_ht = " . $obj->cumulative_depreciation_ht;
-					$sql .= " WHERE fk_asset = " . (int) $obj->fk_asset;
+					$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+					$sql .= " SET total_amount_last_depreciation_ht = ".$obj->cumulative_depreciation_ht;
+					$sql .= " WHERE fk_asset = ".(int) $obj->fk_asset;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 						$error++;
 					}
 				}
@@ -1388,7 +1388,7 @@ 
 		if ($withpicto != 2) {
 			$name = $this->ref;
 			if ($option == 'label') $name = $this->label;
-			elseif ($option == 'with_label') $name .= ' - ' . $this->label;
+			elseif ($option == 'with_label') $name .= ' - '.$this->label;
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
 
@@ -1396,7 +1396,7 @@ 
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		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) {

htdocs/theme/eldy/btn.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	print "/* For dark mode */\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
 	}

htdocs/theme/md/style.css.php

Spacing +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
 $butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
-$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
+$textbutaction = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -360,7 +360,7 @@ 
 if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	print "/* For dark mode */\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
 	}

htdocs/comm/remx.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  *		\brief      Page to edit absolute discounts for a customer
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 require '../main.inc.php';
@@ -330,7 +330,7 @@ 
 	print '</table>';
 	print '</div>';
 
-	print '</div>';	// close fichecenter
+	print '</div>'; // close fichecenter
 
 	print dol_get_fiche_end();