Dolibarr / dolibarr

htdocs/admin/remotestore/class/externalModules.class.php

Spacing +29 added lines, -29 removed lines

@@ -139,9 +139,9 @@ 
 		$this->url       = DOL_URL_ROOT.'/admin/modules.php?mode=marketplace';
 
 		// For dolistore modules
-		$this->dolistore_api_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV', 'https://www.dolistore.com/api/');	// 'https://www.dolistore.com/api/', 'https://admin2.dolibarr.org/api/index.php/marketplace/'
+		$this->dolistore_api_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV', 'https://www.dolistore.com/api/'); // 'https://www.dolistore.com/api/', 'https://admin2.dolibarr.org/api/index.php/marketplace/'
 		$this->dolistore_api_key = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_KEY', 'dolistorepublicapi');
-		$this->shop_url  = getDolGlobalString('MAIN_MODULE_DOLISTORE_SHOP_URL', 'https://www.dolistore.com');
+		$this->shop_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_SHOP_URL', 'https://www.dolistore.com');
 
 		// For community modules
 		$this->file_source_url = "https://raw.githubusercontent.com/Dolibarr/dolibarr-community-modules/refs/heads/main/index.yaml";
@@ -204,12 +204,12 @@ 
 			$httpheader[] = 'Authorization: Basic '.base64_encode($basicAuthLogin.':'.$basicAuthPassword);
 		}
 
-		$url = $this->dolistore_api_url . (preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/') . $resource;
+		$url = $this->dolistore_api_url.(preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/').$resource;
 
 		$options['apikey'] = $this->dolistore_api_key;
 
 		if ($options) {
-			$url .= '?' . http_build_query($options);
+			$url .= '?'.http_build_query($options);
 		}
 
 		$response = getURLContent($url, 'GET', '', 1, $httpheader, array('https'), 0, -1, 5, 5);
@@ -251,13 +251,13 @@ 
 		$modules = array();
 
 		if (!empty($this->cache_file) && file_exists($this->cache_file)) {
-			dol_syslog(__METHOD__ . " - Loading cache file: " . $this->cache_file, LOG_DEBUG);
+			dol_syslog(__METHOD__." - Loading cache file: ".$this->cache_file, LOG_DEBUG);
 
 			$content = file_get_contents($this->cache_file);
 			if ($content !== false) {
 				$modules = $this->readYaml($content);
 			} else {
-				dol_syslog(__METHOD__ . " - Error reading cache file", LOG_ERR);
+				dol_syslog(__METHOD__." - Error reading cache file", LOG_ERR);
 			}
 		}
 
@@ -285,20 +285,20 @@ 
 		if (isset($resCategories['response']) && is_array($resCategories['response'])) {
 			$organized_tree = $resCategories['response'];
 		} else {
-			return $html ;
+			return $html;
 		}
 
 		$html = '';
 		foreach ($organized_tree as $key => $value) {
 			if ($value['label'] != "Versions" && $value['label'] != "Specials") {
-				$html .= '<li' . ($current == $value['rowid'] ? ' class="active"' : '') . '>';
-				$html .= '<a href="?mode=marketplace&categorie=' . $value['rowid'] . '">' . $value['label'] . '</a>';
+				$html .= '<li'.($current == $value['rowid'] ? ' class="active"' : '').'>';
+				$html .= '<a href="?mode=marketplace&categorie='.$value['rowid'].'">'.$value['label'].'</a>';
 				if (isset($value['children'])) {
 					$html .= '<ul>';
 					usort($value['children'], $this->buildSorter('position'));
 					foreach ($value['children'] as $key_children => $value_children) {
-						$html .= '<li' . ($current == $value_children['rowid'] ? ' class="active"' : '') . '>';
-						$html .= '<a href="?mode=marketplace&categorie=' . $value_children['rowid'] . '" title="' . dol_escape_htmltag(strip_tags($value_children['description'])) . '">' . $value_children['label'] . '</a>';
+						$html .= '<li'.($current == $value_children['rowid'] ? ' class="active"' : '').'>';
+						$html .= '<a href="?mode=marketplace&categorie='.$value_children['rowid'].'" title="'.dol_escape_htmltag(strip_tags($value_children['description'])).'">'.$value_children['label'].'</a>';
 						$html .= '</li>';
 					}
 					$html .= '</ul>';
@@ -321,7 +321,7 @@ 
 
 		$html       = "";
 		$last_month = dol_now() - (30 * 24 * 60 * 60);
-		$dolibarrversiontouse = DOL_VERSION;	// full string with version
+		$dolibarrversiontouse = DOL_VERSION; // full string with version
 
 		$this->products = array();
 
@@ -330,7 +330,7 @@ 
 		$this->no_page  = $options['no_page'] ?? 1;
 		$this->search    = $options['search'] ?? '';
 
-		$this->per_page = 11;	// We fix number of products per page to 11
+		$this->per_page = 11; // We fix number of products per page to 11
 
 		// Length of $search must be at least 2 characters
 		if (!empty($this->search) && strlen(str_replace(' ', '', (string) $this->search)) < 2) {
@@ -371,7 +371,7 @@ 
 		$fileProducts = array();
 		$fileProductsTotal = 0;
 		if (!empty($this->githubFileStatus) && getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY')) {
-			$fileProducts = $this->fetchModulesFromFile($data);			// Return an array with all modules from the cache filecontent in $data
+			$fileProducts = $this->fetchModulesFromFile($data); // Return an array with all modules from the cache filecontent in $data
 
 			$fileProducts = $this->adaptData($fileProducts, 'githubcommunity');
 
@@ -429,7 +429,7 @@ 
 					$download_link .= img_picto('', 'file-code', 'class="size2x paddingright colorgrey"');
 					$download_link .= '</a>';
 
-					$urlview = $product["dolistore-download"];		// In a future, we will have the download to the zip file
+					$urlview = $product["dolistore-download"]; // In a future, we will have the download to the zip file
 					if ($urlview) {
 						$download_link .= '<a class="paddingleft paddingright" target="_blank" title="'.$langs->trans("View").'" href="'.$urlview.'" rel="noopener noreferrer">';
 						$download_link .= img_picto('', 'url', 'class="size2x"');
@@ -447,7 +447,7 @@ 
 						}
 					}
 				} elseif ($product['source'] === 'dolistore') {
-					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p=' . $product['id'];
+					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$product['id'];
 					$download_link = '<a class="paddingleft paddingright" target="_blank" title="'.$langs->trans("View").'" href="'.$this->shop_url.'/product.php?id='.((int) $product["id"]).'">';
 					$download_link .= img_picto('', 'url', 'class="size2x"');
 					$download_link .= '</a>';
@@ -505,12 +505,12 @@ 
 			// Output the line
 			$html .= '<tr class="app oddeven nohover '.dol_escape_htmltag($compatible).'">';
 			$html .= '<td class="center width150"><div class="newAppParent">';
-			$html .= $newapp.$images;	// No dol_escape_htmltag, it is already escape html
+			$html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html
 			$html .= '</div></td>';
 			$html .= '<td class="margeCote"><h2 class="appTitle">';
 			$html .= dolPrintHTML(dol_string_nohtmltag($product["label"]));
 			$html .= '<br><small>';
-			$html .= $version;			// No dol_escape_htmltag, it is already escape html
+			$html .= $version; // No dol_escape_htmltag, it is already escape html
 			$html .= '</small></h2>';
 			$html .= '<small> ';
 			if (empty($product['tms'])) {
@@ -543,7 +543,7 @@ 
 
 		$this->numberOfProducts = count($this->products);
 
-		return $html ;
+		return $html;
 	}
 
 	/**
@@ -560,7 +560,7 @@ 
 		 * @param array<string, mixed> $b
 		 * @return int
 		 */
-		function (array $a, array $b) use ($key) {
+		function(array $a, array $b) use ($key) {
 			$valA = isset($a[$key]) && is_scalar($a[$key]) ? (string) $a[$key] : '';
 			$valB = isset($b[$key]) && is_scalar($b[$key]) ? (string) $b[$key] : '';
 
@@ -721,7 +721,7 @@ 
 				$pagelist .= '<li class="pagination">';
 				$pagelist .= '<label for="page_input">Page </label>';
 				if ($this->categorie != 0) {
-					$pagelist .= '<input type="hidden" name="categorie" value="' . $this->categorie . '">';
+					$pagelist .= '<input type="hidden" name="categorie" value="'.$this->categorie.'">';
 				}
 				$pagelist .= '<input type="text" id="page_input" name="no_page" value="'.($page).'" min="1" max="'.$nbpages.'" class="width40 page_input" oninput="if(this.value > '.$nbpages.') this.value='.$nbpages.'">';
 				$pagelist .= ' / '.$nbpages;
@@ -771,17 +771,17 @@ 
 		}
 
 		// Get the predefined error message or use a default one
-		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: ' . $request['status_code'];
+		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: '.$request['status_code'];
 
 		// Append error details if available
 		if (!empty($request['response']) && isset($request['response']['errors']) && is_array($request['response']['errors'])) {
 			foreach ($request['response']['errors'] as $error) {
-				$error_message .= ' - (Code ' . $error['code'] . '): ' . $error['message'];
+				$error_message .= ' - (Code '.$error['code'].'): '.$error['message'];
 			}
 		}
 
 		if (!empty($request['curl_error_msg'])) {
-			$error_message .= ' - ' . $request['curl_error_msg'];
+			$error_message .= ' - '.$request['curl_error_msg'];
 		}
 
 		// Return the formatted error message
@@ -809,7 +809,7 @@ 
 		if (!file_exists($cache_file) || filemtime($cache_file) < (dol_now() - $cache_time)) {
 			// We get remote url
 			$addheaders = array();
-			$result = getURLContent($file_source_url, 'GET', '', 1, $addheaders);	// TODO Force timeout to 5 s on both connect and response.
+			$result = getURLContent($file_source_url, 'GET', '', 1, $addheaders); // TODO Force timeout to 5 s on both connect and response.
 			if (!empty($result) && $result['http_code'] == 200) {
 				$yaml = $result['content'];
 				file_put_contents($cache_file, $yaml);
@@ -914,7 +914,7 @@ 
 					continue;
 				}
 				$adaptedPackage = [
-					'ref' => str_replace(' ', '', $package['modulename'] . '-' . $package['current_version'] . '@' .
+					'ref' => str_replace(' ', '', $package['modulename'].'-'.$package['current_version'].'@'.
 						(array_key_exists('author', $package) ? $package['author'] : 'unkownauthor')),
 					'label' => !empty($package['label'][substr($this->lang, 0, 2)])
 						? $package['label'][substr($this->lang, 0, 2)]
@@ -1019,7 +1019,7 @@ 
 			 *
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -1034,7 +1034,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return stripos($package['label'], $options['search']) !== false || stripos($package['description'], $options['search']) !== false;
 				}
 			);
@@ -1050,7 +1050,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return in_array($options['categorieid'], $package['category']);
 				}
 			);

htdocs/admin/dict.php

Spacing +18 added lines, -18 removed lines

@@ -110,7 +110,7 @@ 
 
 $id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
-$entity = GETPOST('entity', 'alpha');	// Do not use GETPOSTINT here. Should be '', 0 or >0.
+$entity = GETPOST('entity', 'alpha'); // Do not use GETPOSTINT here. Should be '', 0 or >0.
 $code = GETPOST('code', 'alpha');
 $from = GETPOST('from', 'alpha');
 
@@ -579,7 +579,7 @@ 
 $tabcond[DICT_STCOMM] = isModEnabled("societe");
 $tabcond[DICT_HOLIDAY_TYPES] = isModEnabled('holiday');
 $tabcond[DICT_LEAD_STATUS] = isModEnabled('project');
-$tabcond[DICT_FORMAT_CARDS] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member'));	// stickers format dictionary
+$tabcond[DICT_FORMAT_CARDS] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member')); // stickers format dictionary
 $tabcond[DICT_INVOICE_SUBTYPE] = ((isModEnabled('invoice') || isModEnabled('supplier_invoice')) && $mysoc->country_code == 'GR');
 $tabcond[DICT_HRM_PUBLIC_HOLIDAY] = (isModEnabled('holiday') || isModEnabled('hrm'));
 $tabcond[DICT_HRM_DEPARTMENT] = isModEnabled('hrm');
@@ -716,7 +716,7 @@ 
 		'project_task' => img_picto('', 'projecttask', 'class="pictofixedwidth"').$langs->trans('Task'),
 		'propal' => img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans('Proposal'),
 		'commande' => img_picto('', 'order', 'class="pictofixedwidth"').$langs->trans('Order'),
-		'shipping' => img_picto('', 'dolly', 'class="pictofixedwidth"') . $langs->trans('Shipment'),
+		'shipping' => img_picto('', 'dolly', 'class="pictofixedwidth"').$langs->trans('Shipment'),
 		'facture' => img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('Bill'),
 		'fichinter' => img_picto('', 'intervention', 'class="pictofixedwidth"').$langs->trans('InterventionCard'),
 		'contrat' => img_picto('', 'contract', 'class="pictofixedwidth"').$langs->trans('Contract'),
@@ -997,7 +997,7 @@ 
 				if ($value == 'price' || preg_match('/^amount/i', $value)) {
 					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
 				} elseif ($value == 'taux' || $value == 'localtax1') {
-					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8); // Note that localtax2 can be a list of rates separated by coma like X:Y:Z
 				} elseif ($value == 'entity') {
 					$_POST[$keycode] = getEntity($tablename);
 				}
@@ -1066,7 +1066,7 @@ 
 				if ($field == 'price' || preg_match('/^amount/i', $field)) {
 					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
 				} elseif ($field == 'taux' || $field == 'localtax1') {
-					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8); // Note that localtax2 can be a list of rates separated by coma like X:Y:Z
 				} elseif ($field == 'entity') {
 					$_POST[$keycode] = getEntity($tablename);
 				}
@@ -2645,7 +2645,7 @@ 
 							}
 							// Show value for field
 							if ($showfield) {
-								print '<!-- field value '. $value .' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dolPrintHTMLForAttribute($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
+								print '<!-- field value '.$value.' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dolPrintHTMLForAttribute($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
 							}
 						}
 
@@ -2841,7 +2841,7 @@ 
 			// Special case for c_actioncomm (field that should not be modified)
 			$hidden = (!empty($obj->{$value}) ? $obj->{$value} : '');
 			print '<td>';
-			print '<input type="hidden" name="'. $value .'" value="'.$hidden.'">';
+			print '<input type="hidden" name="'.$value.'" value="'.$hidden.'">';
 			print $langs->trans($hidden);
 			print '</td>';
 		} elseif ($value == 'country') {
@@ -2862,7 +2862,7 @@ 
 			if (!in_array('country', $fieldlist)) {	// If there is already a field country, we don't show country_id (avoid duplicate)
 				$country_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
 				print '<td class="tdoverflowmax100">';
-				print '<input type="hidden" name="'. $value .'" value="'.$country_id.'">';
+				print '<input type="hidden" name="'.$value.'" value="'.$country_id.'">';
 				print '</td>';
 			}
 		} elseif ($value == 'region') {
@@ -2872,7 +2872,7 @@ 
 		} elseif ($value == 'region_id') {
 			$region_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
 			print '<td>';
-			print '<input type="hidden" name="'. $value .'" value="'.$region_id.'">';
+			print '<input type="hidden" name="'.$value.'" value="'.$region_id.'">';
 			print '</td>';
 		} elseif ($value == 'department_buyer') {
 			if ($context == 'edit') {
@@ -2946,7 +2946,7 @@ 
 				$class = "center"; // Fields aligned on right
 			}
 			print '<td class="'.$class.'">';
-			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'. $value .'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'.$value.'">';
 			print '</td>';
 		} elseif (in_array($value, array('libelle_facture'))) {
 			print '<td>';
@@ -2956,7 +2956,7 @@ 
 			if ($tabname == 'c_payment_term') {
 				$langs->load("bills");
 				if (isset($obj->code) && !empty($obj->code)) {
-					$transkey = "PaymentCondition" . strtoupper($obj->code);
+					$transkey = "PaymentCondition".strtoupper($obj->code);
 					if ($langs->trans($transkey) != $transkey) {
 						$transfound = 1;
 						print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
@@ -2964,21 +2964,21 @@ 
 				}
 			}
 			if (!$transfound) {
-				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'. $value .'">'.(empty($obj->{$value}) ? '' : $obj->{$value}).'</textarea>';
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$value.'">'.(empty($obj->{$value}) ? '' : $obj->{$value}).'</textarea>';
 			} else {
-				print '<input type="hidden" name="'. $value .'" value="'.$transkey.'">';
+				print '<input type="hidden" name="'.$value.'" value="'.$transkey.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'price' || preg_match('/^amount/i', (string) $value)) {
-			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'. $value .'"></td>';
+			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'.$value.'"></td>';
 		} elseif ($value == 'code' && isset($obj->{$value})) {
 			print '<td>';
 			if ($tabname == 'c_paiement' && in_array($obj->{$value}, array('LIQ', 'CB', 'CHQ', 'VIR'))) {
 				// Case of code that should not be modified
-				print '<input type="hidden" class="flat minwidth75 maxwidth100" value="'.(empty($obj->{$value}) ? '' : $obj->{$value}).'" name="'. $value .'">';
+				print '<input type="hidden" class="flat minwidth75 maxwidth100" value="'.(empty($obj->{$value}) ? '' : $obj->{$value}).'" name="'.$value.'">';
 				print $obj->{$value};
 			} else {
-				print '<input type="text" class="flat minwidth75 maxwidth100" value="'.(empty($obj->{$value}) ? '' : $obj->{$value}).'" name="'. $value .'">';
+				print '<input type="text" class="flat minwidth75 maxwidth100" value="'.(empty($obj->{$value}) ? '' : $obj->{$value}).'" name="'.$value.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'unit') {
@@ -3006,10 +3006,10 @@ 
 			if (isModEnabled('accounting')) {
 				$fieldname = $value;
 				$accountancy_account = (empty($obj->$fieldname) ? 0 : $obj->$fieldname);
-				print $formaccounting->select_account($accountancy_account, '.'. $value, 1, array(), 1, 1, 'maxwidth125 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, '.'.$value, 1, array(), 1, 1, 'maxwidth125 maxwidthonsmartphone');
 			} else {
 				$fieldname = $value;
-				print '<input type="text" class="flat minwidth100" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'. $value .'">';
+				print '<input type="text" class="flat minwidth100" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$value.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'fk_tva') {

htdocs/mrp/class/mo.class.php

Spacing +12 added lines, -12 removed lines

@@ -108,7 +108,7 @@ 
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010),
 		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'default' => '0', 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'InProgress', '3' => 'StatusMOProduced', '9' => 'Canceled')),
-		'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1,'showoncombobox' => 0),
+		'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1, 'showoncombobox' => 0),
 	);
 
 	/**
@@ -350,7 +350,7 @@ 
 		}
 
 		if (!$error) {
-			$result = $this->createProduction($user, $notrigger);	// Insert lines from BOM
+			$result = $this->createProduction($user, $notrigger); // Insert lines from BOM
 			if ($result <= 0) {
 				$error++;
 			}
@@ -853,7 +853,7 @@ 
 		$oldQty = $this->oldQty;
 		$newQty = $this->qty;
 		if ($newQty != $oldQty && !empty($this->oldQty)) {
-			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "mrp_production WHERE fk_mo = " . (int) $this->id;
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production WHERE fk_mo = ".(int) $this->id;
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				while ($obj = $this->db->fetch_object($resql)) {
@@ -942,7 +942,7 @@ 
 		}
 		$productstatic = new Product($this->db);
 
-		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);	// Get lines consumed under the one to delete
+		$arrayoflines = $this->fetchLinesLinked('consumed', $idline); // Get lines consumed under the one to delete
 
 		$result = 0;
 
@@ -1045,7 +1045,7 @@ 
 		if (getDolGlobalString('MRP_MO_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('MRP_MO_ADDON') . ".php";
+			$file = getDolGlobalString('MRP_MO_ADDON').".php";
 			$classname = getDolGlobalString('MRP_MO_ADDON');
 
 			// Include file with class
@@ -1319,8 +1319,8 @@ 
 			return 1;
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 		$error = 0;
 		$langs->load('stocks');
 
@@ -1441,13 +1441,13 @@ 
 			$datas['qty'] = '<br><b>'.$langs->trans('QtyToProduce').':</b> '.$this->qty;
 		}
 		if (!$nofetch && isset($this->fk_product)) {
-			require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$product = new Product($this->db);
 			$product->fetch($this->fk_product);
 			$datas['product'] = '<br><b>'.$langs->trans('Product').':</b> '.$product->getNomUrl(1, '', 0, -1, 1);
 		}
 		if (!$nofetch && isset($this->fk_warehouse)) {
-			require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 			$warehouse = new Entrepot($this->db);
 			$warehouse->fetch($this->fk_warehouse);
 			$datas['warehouse'] = '<br><b>'.$langs->trans('WarehouseForProduction').':</b> '.$warehouse->getNomUrl(1, '', 0, 1);
@@ -1835,7 +1835,7 @@ 
 		$this->tpl['efficiency'] = $line->efficiency;
 
 
-		global $conf;	// used into template
+		global $conf; // used into template
 		include DOL_DOCUMENT_ROOT.'/mrp/tpl/originproductline.tpl.php';
 	}
 
@@ -1996,14 +1996,14 @@ 
 		$now = dol_now();
 
 		$sql = "SELECT rowid, date_end_planned FROM ".$this->db->prefix()."mrp_mo";
-		$sql .= " WHERE status IN (" . self::STATUS_VALIDATED . ", " . self::STATUS_INPROGRESS .")"; // 1 = Ouvert, 2 = En cours
+		$sql .= " WHERE status IN (".self::STATUS_VALIDATED.", ".self::STATUS_INPROGRESS.")"; // 1 = Ouvert, 2 = En cours
 		$sql .= " AND entity IN (".getEntity('mrp_mo').")";
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$langs->load("mrp");
 			$response = new WorkboardResponse();
-			$warning_delay = $conf->mrp->progress->warning_delay ;
+			$warning_delay = $conf->mrp->progress->warning_delay;
 			$response->warning_delay = $warning_delay / 86400;
 			$response->label = $langs->trans("MOProgress");
 			$response->labelShort = $langs->trans("MOProgress");

htdocs/bom/class/bom.class.php

Spacing +7 added lines, -7 removed lines

@@ -461,7 +461,7 @@ 
 		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product";
 		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
-		$sql .= " AND p.fk_product_type = ". ((int) $typeproduct);
+		$sql .= " AND p.fk_product_type = ".((int) $typeproduct);
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}
@@ -879,7 +879,7 @@ 
 		if (getDolGlobalString('BOM_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('BOM_ADDON') . ".php";
+			$file = getDolGlobalString('BOM_ADDON').".php";
 			$classname = getDolGlobalString('BOM_ADDON');
 
 			// Include file with class
@@ -997,15 +997,15 @@ 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
-				$dirsource = getMultidirOutput($this) . '/'.$oldref;
-				$dirdest = getMultidirOutput($this) . '/'.$newref;
+				$dirsource = getMultidirOutput($this).'/'.$oldref;
+				$dirdest = getMultidirOutput($this).'/'.$newref;
 				if (!$error && file_exists($dirsource)) {
 					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
 
 					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
-						$listoffiles = dol_dir_list(getMultidirOutput($this) . '/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						$listoffiles = dol_dir_list(getMultidirOutput($this).'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
 						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
 							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
@@ -1415,7 +1415,7 @@ 
 			foreach ($this->lines as &$line) {
 				$tmpproduct->cost_price = 0;
 				$tmpproduct->pmp = 0;
-				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
+				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading
 
 				$unit_cost = (float) (is_null($tmpproduct->cost_price) ? $tmpproduct->pmp : $tmpproduct->cost_price);
 				if (empty($unit_cost)) {	// @phpstan-ignore-line phpstan thinks this is always false. No,if unit_cost is 0, it is not.
@@ -1643,7 +1643,7 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$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"' : '').'>';
 		}

htdocs/core/lib/functions2.lib.php

Spacing +20 added lines, -20 removed lines

@@ -498,9 +498,9 @@ 
 		if (!empty($object->date_rappro)) {	// Note: date_rappro is not found on Dolibarr classes
 			print ' - ';
 			print '<div class="valignmiddle inline-block">';
-			print dol_print_date($object->date_rappro, 'dayhour', 'tzserver');  // @phan-suppress-current-line PhanUndeclaredProperty
+			print dol_print_date($object->date_rappro, 'dayhour', 'tzserver'); // @phan-suppress-current-line PhanUndeclaredProperty
 			if ($deltadateforuser) {
-				print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';  // @phan-suppress-current-line PhanUndeclaredProperty
+				print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>'; // @phan-suppress-current-line PhanUndeclaredProperty
 			}
 			print '</div>';
 		}
@@ -1022,13 +1022,13 @@ 
 			}
 		} else { // if reset is for a specific month in year, we need year
 			if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) {
-				$posy = 3;	//index in regex
+				$posy = 3; //index in regex
 				$posm = 2;
 			} elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {
-				$posy = 2;	//index in regex
+				$posy = 2; //index in regex
 				$posm = 3;
 			} elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) {
-				$posy = 2;	//index in regex
+				$posy = 2; //index in regex
 				$posm = 0;
 			} else {
 				return 'ErrorCantUseRazIfNoYearInMask';
@@ -1130,7 +1130,7 @@ 
 		$maskLike = preg_replace('/\{yyyy\}/i', $yearcomp, $maskLike);
 		$maskLike = preg_replace('/\{yy\}/i', $yearcomp, $maskLike);
 		$maskLike = preg_replace('/\{y\}/i', $yearcomp, $maskLike);
-		$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);		// we can't include the month in the filter
+		$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); // we can't include the month in the filter
 	} else {
 		$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
 		$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
@@ -1161,14 +1161,14 @@ 
 	$counter = 0;
 	$sql = "SELECT MAX(".$sqlstring.") as val";
 	$sql .= " FROM ".MAIN_DB_PREFIX.$db->sanitize($table);
-	$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
+	$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskLike).(getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "")."'";
 	$sql .= " AND ".$db->sanitize($field)." NOT LIKE '(PROV%)'";
 
 	// To ensure that all variables within the MAX() brackets are integers
 	// This avoid bad detection of max when data are noised with non numeric values at the position of the numero
 	if (getDolGlobalInt('MAIN_NUMBERING_FILTER_ON_INT_ONLY')) {
 		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-		$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', 1);
+		$sql .= " AND ".$db->regexpsql($sqlstring, '^[0-9]+$', 1);
 	}
 
 	if ($bentityon) { // only if entity enable
@@ -1230,7 +1230,7 @@ 
 		$ref = '';
 		$sql = "SELECT ".$db->sanitize($field)." as ref";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$db->sanitize($table);
-		$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
+		$sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskLike).(getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "")."'";
 		$sql .= " AND ".$db->sanitize($field)." NOT LIKE '%PROV%'";
 		if ($bentityon) { // only if entity enable
 			$sql .= " AND entity IN (".getEntity($sharetable).")";
@@ -1293,7 +1293,7 @@ 
 			// Get counter in database
 			$maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
 			$maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
-			$maskrefclient_sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskrefclient_maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
+			$maskrefclient_sql .= " WHERE ".$db->sanitize($field)." LIKE '".$db->escape($maskrefclient_maskLike).(getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "")."'";
 			if ($bentityon) { // only if entity enable
 				$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
 			} elseif (!empty($forceentity)) {
@@ -2956,7 +2956,7 @@ 
 	$string = trim($string);
 
 	// If string does not start and end with parenthesis, we return $string as is.
-	if (! preg_match('/^\(.*\)$/', $string)) {
+	if (!preg_match('/^\(.*\)$/', $string)) {
 		return $string;
 	}
 
@@ -2994,15 +2994,15 @@ 
 function getArrayOfEmojiBis()
 {
 	$arrayofcommonemoji = array(
-		'misc' => array('2600', '26FF'),		// Miscellaneous Symbols
-		'ding' => array('2700', '27BF'),		// Dingbats
-		'????' => array('9989', '9989'),		// Variation Selectors
-		'vars' => array('FE00', 'FE0F'),		// Variation Selectors
-		'pict' => array('1F300', '1F5FF'),		// Miscellaneous Symbols and Pictographs
-		'emot' => array('1F600', '1F64F'),		// Emoticons
-		'tran' => array('1F680', '1F6FF'),		// Transport and Map Symbols
-		'flag' => array('1F1E0', '1F1FF'),		// Flags (note: may be 1F1E6 instead of 1F1E0)
-		'supp' => array('1F900', '1F9FF'),		// Supplemental Symbols and Pictographs
+		'misc' => array('2600', '26FF'), // Miscellaneous Symbols
+		'ding' => array('2700', '27BF'), // Dingbats
+		'????' => array('9989', '9989'), // Variation Selectors
+		'vars' => array('FE00', 'FE0F'), // Variation Selectors
+		'pict' => array('1F300', '1F5FF'), // Miscellaneous Symbols and Pictographs
+		'emot' => array('1F600', '1F64F'), // Emoticons
+		'tran' => array('1F680', '1F6FF'), // Transport and Map Symbols
+		'flag' => array('1F1E0', '1F1FF'), // Flags (note: may be 1F1E6 instead of 1F1E0)
+		'supp' => array('1F900', '1F9FF'), // Supplemental Symbols and Pictographs
 	);
 
 	return $arrayofcommonemoji;

htdocs/fourn/recap-fourn.php

Spacing +34 added lines, -34 removed lines

@@ -27,9 +27,9 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
 /**
  * @var Conf $conf
@@ -99,18 +99,18 @@ 
 		// Add parameter for sorting
 		$param = '';
 		if ($socid > 0) {
-			$param .= '&socid=' . $socid;
+			$param .= '&socid='.$socid;
 		}
 
 		print '<table class="noborder tagtable liste centpercent">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-		print '<td>' . $langs->trans("Element") . '</td>';
-		print '<td>' . $langs->trans("Status") . '</td>';
-		print '<td class="right">' . $langs->trans("Debit") . '</td>';
-		print '<td class="right">' . $langs->trans("Credit") . '</td>';
-		print '<td class="right">' . $langs->trans("Balance") . '</td>';
-		print '<td class="right">' . $langs->trans("Author") . '</td>';
+		print '<td>'.$langs->trans("Element").'</td>';
+		print '<td>'.$langs->trans("Status").'</td>';
+		print '<td class="right">'.$langs->trans("Debit").'</td>';
+		print '<td class="right">'.$langs->trans("Credit").'</td>';
+		print '<td class="right">'.$langs->trans("Balance").'</td>';
+		print '<td class="right">'.$langs->trans("Author").'</td>';
 		print '</tr>';
 
 		/** @var array<string|int,mixed> $TData */
@@ -119,9 +119,9 @@ 
 		$sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.total_ttc, f.datef as df,";
 		$sql .= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
 		$sql .= " u.login, u.rowid as userid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s," . MAIN_DB_PREFIX . "facture_fourn as f," . MAIN_DB_PREFIX . "user as u";
-		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int) $societe->id);
-		$sql .= " AND f.entity IN (" . getEntity("facture_fourn") . ")"; // Recognition of the entity attributed to this invoice for Multicompany
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".((int) $societe->id);
+		$sql .= " AND f.entity IN (".getEntity("facture_fourn").")"; // Recognition of the entity attributed to this invoice for Multicompany
 		$sql .= " AND f.fk_user_valid = u.rowid";
 		$sql .= $db->order($sortfield, $sortorder);
 
@@ -136,7 +136,7 @@ 
 				$fac = new FactureFournisseur($db);
 				$ret = $fac->fetch($objf->facid);
 				if ($ret < 0) {
-					print $fac->error . "<br>";
+					print $fac->error."<br>";
 					continue;
 				}
 				$totalpaid = $fac->getSommePaiement();
@@ -147,7 +147,7 @@ 
 				$values = array(
 					'fk_facture' => $objf->facid,
 					'date' => $fac->date,
-					'datefieldforsort' => $fac->date . '-' . $fac->ref,
+					'datefieldforsort' => $fac->date.'-'.$fac->ref,
 					'link' => $fac->getNomUrl(1),
 					'status' => $fac->getLibStatut(2, $totalpaid),
 					'amount' => $fac->total_ttc,
@@ -159,11 +159,11 @@ 
 				// Payments
 				$sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
 				$sql .= " p.fk_user_author, u.login, u.rowid as userid";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as pf,";
-				$sql .= " " . MAIN_DB_PREFIX . "paiementfourn as p";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u ON p.fk_user_author = u.rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
+				$sql .= " ".MAIN_DB_PREFIX."paiementfourn as p";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
 				$sql .= " WHERE pf.fk_paiementfourn = p.rowid";
-				$sql .= " AND pf.fk_facturefourn = " . ((int) $fac->id);
+				$sql .= " AND pf.fk_facturefourn = ".((int) $fac->id);
 				$sql .= " ORDER BY p.datep ASC, p.rowid ASC";
 
 				$resqlp = $db->query($sql);
@@ -183,8 +183,8 @@ 
 						$values = array(
 							'fk_paiement' => $objp->rowid,
 							'date' => $db->jdate($objp->dp),
-							'datefieldforsort' => $db->jdate($objp->dp) . '-' . $fac->ref,
-							'link' => $langs->trans("Payment") . ' ' . $paymentstatic->getNomUrl(1),
+							'datefieldforsort' => $db->jdate($objp->dp).'-'.$fac->ref,
+							'link' => $langs->trans("Payment").' '.$paymentstatic->getNomUrl(1),
 							'status' => '',
 							'amount' => -$objp->amount,
 							'author' => $userstatic->getLoginUrl(1)
@@ -205,7 +205,7 @@ 
 		}
 
 		if (empty($TData)) {
-			print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">' . $langs->trans("NoInvoice") . '</span></td></tr>';
+			print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("NoInvoice").'</span></td></tr>';
 		} else {
 			// Sort array by date ASC to calculate balance
 			$TData = dol_sort_array($TData, 'datefieldforsort', 'ASC');
@@ -230,34 +230,34 @@ 
 			foreach ($TData as $data) {
 				$html_class = '';
 				if (!empty($data['fk_facture'])) {
-					$html_class = 'facid-' . $data['fk_facture'];
+					$html_class = 'facid-'.$data['fk_facture'];
 				} elseif (!empty($data['fk_paiement'])) {
-					$html_class = 'payid-' . $data['fk_paiement'];
+					$html_class = 'payid-'.$data['fk_paiement'];
 				}
 
-				print '<tr class="oddeven ' . $html_class . '">';
+				print '<tr class="oddeven '.$html_class.'">';
 
 				$datedetail = dol_print_date($data['date'], 'dayhour');
 				if (!empty($data['fk_facture'])) {
 					$datedetail = dol_print_date($data['date'], 'day');
 				}
-				print '<td class="center" title="' . dol_escape_htmltag($datedetail) . '">';
+				print '<td class="center" title="'.dol_escape_htmltag($datedetail).'">';
 				print dol_print_date($data['date'], 'day');
 				print "</td>\n";
 
-				print '<td>' . $data['link'] . "</td>\n";
+				print '<td>'.$data['link']."</td>\n";
 
-				print '<td class="left">' . $data['status'] . '</td>';
+				print '<td class="left">'.$data['status'].'</td>';
 
-				print '<td class="right">' . (($data['amount'] > 0) ? price(abs($data['amount'])) : '') . "</td>\n";
+				print '<td class="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n";
 
 				$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
 
-				print '<td class="right">' . (($data['amount'] > 0) ? '' : price(abs($data['amount']))) . "</td>\n";
+				print '<td class="right">'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))."</td>\n";
 				$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
 
 				// Balance
-				print '<td class="right"><span class="amount">' . price($data['balance']) . "</span></td>\n";
+				print '<td class="right"><span class="amount">'.price($data['balance'])."</span></td>\n";
 
 				// Author
 				print '<td class="nowrap right">';
@@ -269,9 +269,9 @@ 
 
 			print '<tr class="liste_total">';
 			print '<td colspan="3">&nbsp;</td>';
-			print '<td class="right">' . price($totalDebit) . '</td>';
-			print '<td class="right">' . price($totalCredit) . '</td>';
-			print '<td class="right">' . price(price2num($totalDebit - $totalCredit, 'MT')) . '</td>';
+			print '<td class="right">'.price($totalDebit).'</td>';
+			print '<td class="right">'.price($totalCredit).'</td>';
+			print '<td class="right">'.price(price2num($totalDebit - $totalCredit, 'MT')).'</td>';
 			print '<td></td>';
 			print "</tr>\n";
 		}

htdocs/public/webportal/tpl/menu.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -116,7 +116,7 @@ 
 	$navUserMenu['user_logout'] = array(
 		'id' => 'user_logout',
 		'rank' => 99999,
-		'url' => $context->getControllerUrl() . 'logout.php',
+		'url' => $context->getControllerUrl().'logout.php',
 		'name' => img_picto($langs->trans('Logout'), 'logout', 'class="pictofixedwidth"'),
 	);
 }
@@ -145,7 +145,7 @@ 
 	'maxTopMenu' => & $maxTopMenu
 );
 
-$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook
 if ($reshook < 0) {
 	$context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -206,9 +206,9 @@ 
 		$brandTitle = getDolGlobalString('WEBPORTAL_TITLE') ? getDolGlobalString('WEBPORTAL_TITLE') : getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
 		print '<a class="brand__logo-link" href="'.$context->getControllerUrl().'" >';
 		if (!empty($context->theme->menuLogoUrl)) {
-			print '<img class="brand__logo-img" src="' . dol_escape_htmltag($context->theme->menuLogoUrl) . '" alt="' . dol_escape_htmltag($brandTitle) . '">';
+			print '<img class="brand__logo-img" src="'.dol_escape_htmltag($context->theme->menuLogoUrl).'" alt="'.dol_escape_htmltag($brandTitle).'">';
 		} else {
-			print '<span class="brand__name">' . $brandTitle . '</span>';
+			print '<span class="brand__name">'.$brandTitle.'</span>';
 		}
 		print '</a>';
 		?>