Completed
Branch develop (936be1)
by
unknown
15:34
created
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.
htdocs/hrm/skill_agenda.php 1 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/skill.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.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/skill.class.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
37 37
 
38 38
 
39 39
 // Load translation files required by the page
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
153 153
 
154 154
 	$morehtmlref = '<div class="refid">';
155
-	$morehtmlref.= $object->label;
155
+	$morehtmlref .= $object->label;
156 156
 	$morehtmlref .= '</div>';
157 157
 
158 158
 
Please login to merge, or discard this patch.
htdocs/hrm/skill_document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
34 34
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
35 35
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
36
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
37
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
36
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
37
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
38 38
 
39 39
 // Load translation files required by the page
40 40
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?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/job_document.php 1 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/lib/hrm.lib.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 	$h = 0;
46 46
 	$head = array();
47
-	$head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php";
47
+	$head[$h][0] = DOL_URL_ROOT."/admin/hrm.php";
48 48
 	$head[$h][1] = $langs->trans("Settings");
49 49
 	$head[$h][2] = 'settings';
50 50
 	$h++;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	$head[$h][2] = 'establishments';
55 55
 	$h++;
56 56
 
57
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
57
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/skill_extrafields.php';
58 58
 	$head[$h][1] = $langs->trans("SkillsExtraFields");
59 59
 	$nbExtrafields = $extrafields->attributes['hrm_skill']['count'];
60 60
 	if ($nbExtrafields > 0) {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	$head[$h][2] = 'skillsAttributes';
64 64
 	$h++;
65 65
 
66
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
66
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/job_extrafields.php';
67 67
 	$head[$h][1] = $langs->trans("JobsExtraFields");
68 68
 	$nbExtrafields = $extrafields->attributes['hrm_job']['count'];
69 69
 	if ($nbExtrafields > 0) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	$head[$h][2] = 'jobsAttributes';
73 73
 	$h++;
74 74
 
75
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
75
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/evaluation_extrafields.php';
76 76
 	$head[$h][1] = $langs->trans("EvaluationsExtraFields");
77 77
 	$nbExtrafields = $extrafields->attributes['hrm_evaluation']['count'];
78 78
 	if ($nbExtrafields > 0) {
Please login to merge, or discard this patch.
htdocs/variants/ajax/orderAttribute.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Load Dolibarr environment
39 39
 require '../../main.inc.php';
40
-require DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
40
+require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
41 41
 
42 42
 // Security check
43 43
 if (!isModEnabled('variants')) {
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 if (GETPOST('roworder', 'alpha', 3)) {
62 62
 	$roworder = GETPOST('roworder', 'alpha', 3);
63 63
 
64
-	dol_syslog("AjaxOrderAttribute roworder=" . $roworder, LOG_DEBUG);
64
+	dol_syslog("AjaxOrderAttribute roworder=".$roworder, LOG_DEBUG);
65 65
 
66 66
 	$rowordertab = explode(',', $roworder);
67 67
 	$newrowordertab = array();
Please login to merge, or discard this patch.
htdocs/public/datapolicy/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 $idc = GETPOST('c', 'int');
41 41
 $ids = GETPOST('s', 'int');
42 42
 $ida = GETPOST('a', 'int');
43
-$action = GETPOST('action', 'aZ09');	// 1 or 2
43
+$action = GETPOST('action', 'aZ09'); // 1 or 2
44 44
 $l = GETPOST('l', 'alpha');
45 45
 $securitykey = GETPOST('key', 'alpha');
46 46
 
Please login to merge, or discard this patch.
htdocs/bom/tpl/objectline_edit.tpl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -133,16 +133,16 @@
 block discarded – undo
133 133
 	}
134 134
 
135 135
 	$coldisplay++;
136
-	print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')) . '>';
136
+	print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"'.(GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')).'>';
137 137
 	print '</td>';
138 138
 
139 139
 	$coldisplay++;
140
-	print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')) . '">';
140
+	print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"'.(GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')).'">';
141 141
 	print '</td>';
142 142
 
143 143
 	$coldisplay++;
144 144
 	print '<td class="nobottom nowrap linecollost right">';
145
-	print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="' . $line->efficiency . '"></td>';
145
+	print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
146 146
 
147 147
 	$coldisplay++;
148 148
 	print '<td class="nobottom nowrap linecolcostprice right">';
Please login to merge, or discard this patch.
htdocs/compta/bank/line.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 
56 56
 $id = GETPOST('rowid', 'int');
57 57
 $rowid = GETPOST("rowid", 'int');
58
-$accountoldid = GETPOST('account', 'int');		// GETPOST('account') is old account id
59
-$accountid = GETPOST('accountid', 'int');		// GETPOST('accountid') is new account id
58
+$accountoldid = GETPOST('account', 'int'); // GETPOST('account') is old account id
59
+$accountid = GETPOST('accountid', 'int'); // GETPOST('accountid') is new account id
60 60
 $ref = GETPOST('ref', 'alpha');
61 61
 $action = GETPOST('action', 'aZ09');
62 62
 $confirm = GETPOST('confirm', 'alpha');
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
 	$result = $object->fetch($rowid);
132 132
 	if ($result <= 0) {
133
-		dol_syslog('Failed to read bank line with id '.$rowid, LOG_WARNING);	// This happens due to old bug that has set fk_account to null.
133
+		dol_syslog('Failed to read bank line with id '.$rowid, LOG_WARNING); // This happens due to old bug that has set fk_account to null.
134 134
 		$object->id = $rowid;
135 135
 	}
136 136
 
Please login to merge, or discard this patch.