Completed
Branch develop (edaab5)
by
unknown
17:45
created
htdocs/hrm/job_agenda.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
34
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
35
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
34
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
35
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
37 37
 
38 38
 // Load translation files required by the page
39 39
 $langs->loadLangs(array('hrm', 'other'));
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
152 152
 
153 153
 	$morehtmlref = '<div class="refid">';
154
-	$morehtmlref.= $object->label;
154
+	$morehtmlref .= $object->label;
155 155
 	$morehtmlref .= '</div>';
156 156
 
157 157
 
Please login to merge, or discard this patch.
htdocs/hrm/job_document.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
33 33
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
34 34
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
35
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
35
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
37 37
 
38 38
 // Load translation files required by the page
39 39
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132 132
 
133 133
 	$morehtmlref = '<div class="refid">';
134
-	$morehtmlref.= $object->label;
134
+	$morehtmlref .= $object->label;
135 135
 	$morehtmlref .= '</div>';
136 136
 
137 137
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
Please login to merge, or discard this patch.
htdocs/hrm/position_note.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
31
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
Please login to merge, or discard this patch.
htdocs/hrm/skill_note.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
105 105
 
106 106
 	$morehtmlref = '<div class="refid">';
107
-	$morehtmlref.= $object->label;
107
+	$morehtmlref .= $object->label;
108 108
 	$morehtmlref .= '</div>';
109 109
 
110 110
 
Please login to merge, or discard this patch.
htdocs/hrm/job_note.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31 31
 
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
107 107
 
108 108
 	$morehtmlref = '<div class="refid">';
109
-	$morehtmlref.= $object->label;
109
+	$morehtmlref .= $object->label;
110 110
 	$morehtmlref .= '</div>';
111 111
 
112 112
 
Please login to merge, or discard this patch.
htdocs/hrm/position_agenda.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,12 @@
 block discarded – undo
136 136
 //if ($user->socid > 0) $socid = $user->socid;
137 137
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138 138
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139
-if (empty($conf->hrm->enabled)) accessforbidden();
140
-if (!$permissiontoread) accessforbidden();
139
+if (empty($conf->hrm->enabled)) {
140
+	accessforbidden();
141
+}
142
+if (!$permissiontoread) {
143
+	accessforbidden();
144
+}
141 145
 
142 146
 
143 147
 /*
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
35 35
 require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
36 36
 require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
37
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
37
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
38 38
 
39 39
 
40 40
 // Load translation files required by the page
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 		$filters['search_agenda_label'] = $search_agenda_label;
228 228
 		$filters['search_rowid'] = $search_rowid;
229 229
 
230
-		$object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
230
+		$object->fields['label'] = array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
231 231
 
232 232
 		// TODO Replace this with same code than into list.php
233 233
 		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
Please login to merge, or discard this patch.
htdocs/adherents/stats/geo.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
 llxHeader('', $title, '', '', 0, 0, $arrayjs);
78 78
 
79
-print load_fiche_titre($title, '',  $memberstatic->picto);
79
+print load_fiche_titre($title, '', $memberstatic->picto);
80 80
 
81 81
 //dol_mkdir($dir);
82 82
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 			if ($mode == 'memberbyregion') { //+
173 173
 				$data[] = array(
174 174
 					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
175
-					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
175
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
176 176
 					'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
177 177
 					'nb'=>$obj->nb,
178 178
 					'lastdate'=>$db->jdate($obj->lastdate),
Please login to merge, or discard this patch.
htdocs/adherents/cartes/carte.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@
 block discarded – undo
156 156
 				$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
157 157
 
158 158
 				if (is_numeric($foruserid) || $foruserlogin) {
159
-					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];	// $_Avery_Labels is defined into an include
159
+					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include
160 160
 					if ($nb <= 0) {
161 161
 						$nb = 1; // Protection to avoid empty page
162 162
 					}
Please login to merge, or discard this patch.
htdocs/adherents/type_translation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 
75 75
 	// update of object
76 76
 	if ($forcelangprod == $current_lang) {
77
-		$object->label		 = GETPOST("libelle", 'alphanohtml');
77
+		$object->label = GETPOST("libelle", 'alphanohtml');
78 78
 		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
79 79
 		//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
80 80
 	} else {
Please login to merge, or discard this patch.