Completed
Branch develop (1d589f)
by
unknown
21:18
created
htdocs/projet/tasks/task.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 
226 226
 $title = $object->ref;
227 227
 if (!empty($withproject)) {
228
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
228
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
229 229
 }
230 230
 $help_url = '';
231 231
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 		// Title
267 267
 		$morehtmlref .= $projectstatic->title;
268 268
 		// Thirdparty
269
-		if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) {
269
+		if (!empty($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
270 270
 			$morehtmlref .= '<br>'.$projectstatic->thirdparty->getNomUrl(1, 'project');
271 271
 		}
272 272
 		$morehtmlref .= '</div>';
Please login to merge, or discard this patch.
htdocs/knowledgemanagement/knowledgerecord_card.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search
45 45
 $backtopage = GETPOST('backtopage', 'alpha');
46 46
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
47
-$lineid   = GETPOST('lineid', 'int');
47
+$lineid = GETPOST('lineid', 'int');
48 48
 
49 49
 // Initialize technical objects
50 50
 $object = new KnowledgeRecord($db);
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 	print '<table class="border centpercent tableforfield">'."\n";
426 426
 
427 427
 	// Common attributes
428
-	$keyforbreak='fk_c_ticket_category';	// We change column just before this field
428
+	$keyforbreak = 'fk_c_ticket_category'; // We change column just before this field
429 429
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
430 430
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
431 431
 	$object->fields['answer']['enabled'] = 0;
Please login to merge, or discard this patch.
htdocs/takepos/receipt.php 2 patches
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -331,7 +331,10 @@
 block discarded – undo
331 331
 
332 332
 <script type="text/javascript">
333 333
 	<?php
334
-	if ($facid) print 'window.print();'; //Avoid print when is specimen
334
+	if ($facid) {
335
+		print 'window.print();';
336
+	}
337
+	//Avoid print when is specimen
335 338
 	?>
336 339
 </script>
337 340
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);
87 87
 if (!empty($hookmanager->resPrint)) {
88 88
 	print $hookmanager->resPrint;
89
-	return;	// Receipt page can be called by the takepos/send.php page that use ob_start/end so we must use return and not exit to stop page
89
+	return; // Receipt page can be called by the takepos/send.php page that use ob_start/end so we must use return and not exit to stop page
90 90
 }
91 91
 
92 92
 // IMPORTANT: This file is sended to 'Takepos Printing' application. Keep basic file. No external files as css, js... If you need images use absolute path.
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 <?php
130 130
 print $langs->trans('Date')." ".dol_print_date($object->date, 'day').'<br>';
131 131
 if (getDolGlobalString('TAKEPOS_RECEIPT_NAME')) {
132
-	print getDolGlobalString('TAKEPOS_RECEIPT_NAME') . " ";
132
+	print getDolGlobalString('TAKEPOS_RECEIPT_NAME')." ";
133 133
 }
134 134
 if ($object->statut == Facture::STATUS_DRAFT) {
135 135
 	print str_replace(")", "", str_replace("-", " ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref)));
@@ -177,13 +177,13 @@  discard block
 block discarded – undo
177 177
 	if ($action == 'without_details') {
178 178
 		$qty = GETPOST('qty', 'int') > 0 ? GETPOST('qty', 'int') : 1;
179 179
 		print '<tr>';
180
-		print '<td>' . GETPOST('label', 'alphanohtml') . '</td>';
181
-		print '<td class="right">' . $qty . '</td>';
182
-		print '<td class="right">' . price(price2num($object->total_ttc / $qty, 'MU'), 1) . '</td>';
180
+		print '<td>'.GETPOST('label', 'alphanohtml').'</td>';
181
+		print '<td class="right">'.$qty.'</td>';
182
+		print '<td class="right">'.price(price2num($object->total_ttc / $qty, 'MU'), 1).'</td>';
183 183
 		if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) {
184
-			print '<td class="right">' . price($object->total_ht, 1) . '</td>';
184
+			print '<td class="right">'.price($object->total_ht, 1).'</td>';
185 185
 		}
186
-		print '<td class="right">' . price($object->total_ttc, 1) . '</td>';
186
+		print '<td class="right">'.price($object->total_ttc, 1).'</td>';
187 187
 		print '</tr>';
188 188
 	} else {
189 189
 		foreach ($object->lines as $line) {
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 				if ((!isModEnabled('multicurrency') || $object->multicurrency_tx == 1) && $row->code == "LIQ" && $row->pos_change > 0) {
342 342
 					echo '<tr>';
343 343
 					echo '<td class="right">';
344
-					echo $langs->trans("Change");	// ChangeBack ?
344
+					echo $langs->trans("Change"); // ChangeBack ?
345 345
 					echo '</td>';
346 346
 					echo '<td class="right">';
347 347
 					echo price($row->pos_change, 1, '', 1, - 1, - 1, $currency);
Please login to merge, or discard this patch.
htdocs/partnership/partnership_document.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,10 +83,18 @@
 block discarded – undo
83 83
 //if ($user->socid > 0) accessforbidden();
84 84
 //if ($user->socid > 0) $socid = $user->socid;
85 85
 //$result = restrictedArea($user, 'partnership', $object->id);
86
-if (empty($conf->partnership->enabled)) accessforbidden();
87
-if (empty($permissiontoread)) accessforbidden();
88
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
89
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
86
+if (empty($conf->partnership->enabled)) {
87
+	accessforbidden();
88
+}
89
+if (empty($permissiontoread)) {
90
+	accessforbidden();
91
+}
92
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
93
+	accessforbidden();
94
+}
95
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
96
+	accessforbidden();
97
+}
90 98
 
91 99
 
92 100
 
Please login to merge, or discard this patch.
htdocs/partnership/partnership_note.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,10 +66,18 @@
 block discarded – undo
66 66
 //if ($user->socid > 0) accessforbidden();
67 67
 //if ($user->socid > 0) $socid = $user->socid;
68 68
 //$result = restrictedArea($user, 'partnership', $object->id);
69
-if (empty($conf->partnership->enabled)) accessforbidden();
70
-if (empty($permissiontoread)) accessforbidden();
71
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
72
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
69
+if (empty($conf->partnership->enabled)) {
70
+	accessforbidden();
71
+}
72
+if (empty($permissiontoread)) {
73
+	accessforbidden();
74
+}
75
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
76
+	accessforbidden();
77
+}
78
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
79
+	accessforbidden();
80
+}
73 81
 
74 82
 
75 83
 /*
Please login to merge, or discard this patch.
htdocs/expedition/list.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 
216 216
 // If massaction is close
217 217
 if ($massaction == 'classifyclose') {
218
-	$error=0;
218
+	$error = 0;
219 219
 	$selectids = GETPOST('toselect', 'array');
220 220
 	foreach ($selectids as $selectid) {
221 221
 		//	$object->fetch($selectid);
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
420 420
 			if ($searchCategoryProductOperator == 0) {
421 421
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
422 422
 			} else {
423
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
423
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
424 424
 			}
425 425
 		}
426 426
 	}
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
536 536
 	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
537 537
 }
538
-if ($search_datedelivery_start)	{
538
+if ($search_datedelivery_start) {
539 539
 	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
540 540
 }
541 541
 if ($search_datedelivery_end) {
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 
892 892
 	$shipment->id = $obj->rowid;
893 893
 	$shipment->ref = $obj->ref;
894
-	$shipment->shipping_method_id=$obj->fk_shipping_method;
894
+	$shipment->shipping_method_id = $obj->fk_shipping_method;
895 895
 
896 896
 	$companystatic->id = $obj->socid;
897 897
 	$companystatic->ref = $obj->name;
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
1027 1027
 		}
1028 1028
 		if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
1029 1029
 			// Get code using getLabelFromKey
1030
-			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
1030
+			$code = $langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
1031 1031
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
1032 1032
 			if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
1033 1033
 			print '</td>';
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1032,7 +1032,9 @@
 block discarded – undo
1032 1032
 			// Get code using getLabelFromKey
1033 1033
 			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
1034 1034
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
1035
-			if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
1035
+			if ($shipment->shipping_method_id > 0) {
1036
+				print $langs->trans("SendingMethod".strtoupper($code));
1037
+			}
1036 1038
 			print '</td>';
1037 1039
 			if (!$i) {
1038 1040
 				$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/debugbar/class/DataCollector/DolPhpCollector.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	{
61 61
 		$messages = $this->messages;
62 62
 
63
-		usort($messages, function ($itemA, $itemB) {
63
+		usort($messages, function($itemA, $itemB) {
64 64
 			if ($itemA['time'] === $itemB['time']) {
65 65
 				return 0;
66 66
 			}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			if ($type = $severity & (2 ** $i)) {
120 120
 				$label = $this->friendlyErrorType($type);
121 121
 				$this->messages[] = [
122
-					'message' => $message . ' (' . $fileName . ':' . $line . ')',
122
+					'message' => $message.' ('.$fileName.':'.$line.')',
123 123
 					'message_html' => null,
124 124
 					'is_string' => true,
125 125
 					'label' => $label,
Please login to merge, or discard this patch.
htdocs/hrm/evaluation_card.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,9 @@
 block discarded – undo
97 97
 if (!isModEnabled("hrm")) {
98 98
 	accessforbidden();
99 99
 }
100
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
100
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
101
+	accessforbidden();
102
+}
101 103
 
102 104
 
103 105
 /*
Please login to merge, or discard this patch.
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 
42 42
 // Load translation files required by the page
43
-$langs->loadLangs(array('hrm', 'other', 'products'));  // why products?
43
+$langs->loadLangs(array('hrm', 'other', 'products')); // why products?
44 44
 
45 45
 // Get parameters
46 46
 $id = GETPOST('id', 'int');
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'evaluationcard'; // To manage different context of search
52 52
 $backtopage = GETPOST('backtopage', 'alpha');
53 53
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
54
-$lineid   = GETPOST('lineid', 'int');
54
+$lineid = GETPOST('lineid', 'int');
55 55
 
56 56
 // Initialize technical objects
57 57
 $object = new Evaluation($db);
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	if ($action == 'close') {
170 170
 		// save evaldet lines to user;
171 171
 		$sk = new SkillRank($db);
172
-		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, array("customsql"=>"fk_object = ".$object->fk_user ." AND objecttype ='".SkillRank::SKILLRANK_TYPE_USER."'"), 'AND');
172
+		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, array("customsql"=>"fk_object = ".$object->fk_user." AND objecttype ='".SkillRank::SKILLRANK_TYPE_USER."'"), 'AND');
173 173
 
174 174
 		$errors = 0;
175 175
 		// we go through the evaldets of the eval
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		}
213 213
 	}
214 214
 
215
-	if ($action == 'reopen' ) {
215
+	if ($action == 'reopen') {
216 216
 		// no update here we just change the evaluation status
217 217
 		$object->setStatut(Evaluation::STATUS_VALIDATED);
218 218
 	}
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 
260 260
 // Part to create
261 261
 if ($action == 'create') {
262
-	print load_fiche_titre($langs->trans("NewEval"), '', 'object_' . $object->picto);
262
+	print load_fiche_titre($langs->trans("NewEval"), '', 'object_'.$object->picto);
263 263
 
264 264
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
265 265
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -423,9 +423,9 @@  discard block
 block discarded – undo
423 423
 	print '<div class="underbanner clearboth"></div>';
424 424
 	print '<table class="border centpercent tableforfield">'."\n";
425 425
 
426
-	$object->fields['label']['visible']=0; // Already in banner
427
-	$object->fields['fk_user']['visible']=0; // Already in banner
428
-	$object->fields['fk_job']['visible']=0; // Already in banner
426
+	$object->fields['label']['visible'] = 0; // Already in banner
427
+	$object->fields['fk_user']['visible'] = 0; // Already in banner
428
+	$object->fields['fk_job']['visible'] = 0; // Already in banner
429 429
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
430 430
 
431 431
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
464 464
 		}
465 465
 
466
-		$conf->modules_parts['tpl']['hrm']='/hrm/core/tpl/'; // Pour utilisation du tpl hrm sur cet écran
466
+		$conf->modules_parts['tpl']['hrm'] = '/hrm/core/tpl/'; // Pour utilisation du tpl hrm sur cet écran
467 467
 
468 468
 		print '<div class="div-table-responsive-no-min">';
469 469
 		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
@@ -524,14 +524,14 @@  discard block
 block discarded – undo
524 524
 		$sql .= '  skdet_user.description as "userRankForSkillDesc",';
525 525
 		$sql .= '  skdet_required.description as "required_rank_desc"';
526 526
 
527
-		$sql .= '  FROM ' . MAIN_DB_PREFIX . 'hrm_evaluation as e';
528
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_evaluationdet as ed ON  e.rowid = ed.fk_evaluation';
529
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_job as j ON e.fk_job = j.rowid';
530
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skill as sk ON ed.fk_skill = sk.rowid';
531
-		$sql .= '  INNER JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rankorder = ed.rankorder)';
527
+		$sql .= '  FROM '.MAIN_DB_PREFIX.'hrm_evaluation as e';
528
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_evaluationdet as ed ON  e.rowid = ed.fk_evaluation';
529
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_job as j ON e.fk_job = j.rowid';
530
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skill as sk ON ed.fk_skill = sk.rowid';
531
+		$sql .= '  INNER JOIN '.MAIN_DB_PREFIX.'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rankorder = ed.rankorder)';
532 532
 		//$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "hrm_skillrank as skr ON (j.rowid = skr.fk_object AND skr.fk_skill = ed.fk_skill AND skr.objecttype = 'job')";
533
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rankorder = ed.required_rank)';
534
-		$sql .= " WHERE e.rowid =" . ((int) $object->id);
533
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rankorder = ed.required_rank)';
534
+		$sql .= " WHERE e.rowid =".((int) $object->id);
535 535
 
536 536
 		//      echo $sql;
537 537
 
@@ -547,21 +547,21 @@  discard block
 block discarded – undo
547 547
 				$Tab[$num]->skill_id = $obj->fk_skill;
548 548
 				$Tab[$num]->skilllabel = $obj->skilllabel;
549 549
 				$Tab[$num]->description = $obj->description;
550
-				$Tab[$num]->userRankForSkill = '<span title="'.$obj->userRankForSkillDesc.'" class="radio_js_bloc_number TNote_1">' . $obj->userRankForSkill . '</span>';
551
-				$Tab[$num]->required_rank = '<span title="'.$obj->required_rank_desc.'" class="radio_js_bloc_number TNote_1">' . $obj->required_rank . '</span>';
550
+				$Tab[$num]->userRankForSkill = '<span title="'.$obj->userRankForSkillDesc.'" class="radio_js_bloc_number TNote_1">'.$obj->userRankForSkill.'</span>';
551
+				$Tab[$num]->required_rank = '<span title="'.$obj->required_rank_desc.'" class="radio_js_bloc_number TNote_1">'.$obj->required_rank.'</span>';
552 552
 
553 553
 				if ($obj->userRankForSkill > $obj->required_rank) {
554
-					$title=$langs->trans('MaxlevelGreaterThanShort');
554
+					$title = $langs->trans('MaxlevelGreaterThanShort');
555 555
 					$class .= 'veryhappy diffnote';
556 556
 				} elseif ($obj->userRankForSkill == $obj->required_rank) {
557
-					$title=$langs->trans('MaxLevelEqualToShort');
557
+					$title = $langs->trans('MaxLevelEqualToShort');
558 558
 					$class .= 'happy diffnote';
559 559
 				} elseif ($obj->userRankForSkill < $obj->required_rank) {
560
-					$title=$langs->trans('MaxLevelLowerThanShort');
560
+					$title = $langs->trans('MaxLevelLowerThanShort');
561 561
 					$class .= 'sad';
562 562
 				}
563 563
 
564
-				$Tab[$num]->result = '<span title="'.$title.'" class="classfortooltip ' . $class . ' note">&nbsp;</span>';
564
+				$Tab[$num]->result = '<span title="'.$title.'" class="classfortooltip '.$class.' note">&nbsp;</span>';
565 565
 
566 566
 				$num++;
567 567
 			}
@@ -572,12 +572,12 @@  discard block
 block discarded – undo
572 572
 			print '<table id="tablelines" class="noborder noshadow centpercent">';
573 573
 
574 574
 			print '<tr class="liste_titre">';
575
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("TypeSkill") . ' </th>';
576
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Label") . '</th>';
577
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Description") . '</th>';
578
-			print '<th style="width:auto;text-align:center" class="liste_titre">' . $langs->trans("EmployeeRank") . '</th>';
579
-			print '<th style="width:auto;text-align:center" class="liste_titre">' . $langs->trans("RequiredRank") . '</th>';
580
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Result") . ' ' .$form->textwithpicto('', GetLegendSkills(), 1) .'</th>';
575
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("TypeSkill").' </th>';
576
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("Label").'</th>';
577
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("Description").'</th>';
578
+			print '<th style="width:auto;text-align:center" class="liste_titre">'.$langs->trans("EmployeeRank").'</th>';
579
+			print '<th style="width:auto;text-align:center" class="liste_titre">'.$langs->trans("RequiredRank").'</th>';
580
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("Result").' '.$form->textwithpicto('', GetLegendSkills(), 1).'</th>';
581 581
 			print '</tr>';
582 582
 
583 583
 			$sk = new Skill($db);
@@ -585,12 +585,12 @@  discard block
 block discarded – undo
585 585
 				$sk->fetch($t->skill_id);
586 586
 
587 587
 				print '<tr>';
588
-				print ' <td>' . Skill::typeCodeToLabel($t->skill_type) . '</td>';
589
-				print ' <td>' . $sk->getNomUrl(1) . '</td>';
590
-				print ' <td>' . $t->description . '</td>';
591
-				print ' <td align="center">' . $t->userRankForSkill . '</td>';
592
-				print ' <td align="center">' . $t->required_rank . '</td>';
593
-				print ' <td>' . $t->result . '</td>';
588
+				print ' <td>'.Skill::typeCodeToLabel($t->skill_type).'</td>';
589
+				print ' <td>'.$sk->getNomUrl(1).'</td>';
590
+				print ' <td>'.$t->description.'</td>';
591
+				print ' <td align="center">'.$t->userRankForSkill.'</td>';
592
+				print ' <td align="center">'.$t->required_rank.'</td>';
593
+				print ' <td>'.$t->result.'</td>';
594 594
 				print '</tr>';
595 595
 			}
596 596
 
Please login to merge, or discard this patch.
htdocs/hrm/evaluation_note.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
 // Load Dolibarr environment
29 29
 require '../main.inc.php';
30 30
 
31
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
31
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_evaluation.lib.php';
34 34
 
35 35
 
36 36
 // Load translation files required by the page
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 // Permissions
63 63
 $permissionnote   = $user->rights->hrm->evaluation->write; // Used by the include of actions_setnotes.inc.php
64
-$permissiontoread = $user->rights->hrm->evaluation->read;  // Used by the include of actions_addupdatedelete.inc.php
64
+$permissiontoread = $user->rights->hrm->evaluation->read; // Used by the include of actions_addupdatedelete.inc.php
65 65
 
66 66
 // Security check (enable the most restrictive one)
67 67
 //if ($user->socid > 0) accessforbidden();
Please login to merge, or discard this patch.