Completed
Branch develop (4a2db9)
by
unknown
18:09
created
htdocs/hrm/skill_note.php 1 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/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/commande/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 
74 74
 $object = new Commande($db);
75 75
 
76
-$usercancreate  =  $user->hasRight("commande", "creer");
76
+$usercancreate = $user->hasRight("commande", "creer");
77 77
 $permissiontoadd = $usercancreate;
78 78
 
79 79
 // Security check
Please login to merge, or discard this patch.
htdocs/asset/depreciation.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 
25 25
 // Load Dolibarr environment
26 26
 require '../main.inc.php';
27
-require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
28
-require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
29
-require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
27
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
28
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
29
+require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
30 30
 
31 31
 // Load translation files required by the page
32 32
 $langs->loadLangs(array("assets", "companies"));
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 $extrafields->fetch_name_optionals_label($object->table_element);
49 49
 
50 50
 // Load object
51
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
51
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
52 52
 if ($id > 0 || !empty($ref)) {
53
-	$upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
53
+	$upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
54 54
 }
55 55
 
56 56
 // Security check (enable the most restrictive one)
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 	// Object card
100 100
 	// ------------------------------------------------------------
101
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
101
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
102 102
 
103 103
 	$morehtmlref = '<div class="refidno">';
104 104
 	$morehtmlref .= '</div>';
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
134 134
 				print '<div class="fichecenter">';
135 135
 				print '<div class="fichehalfleft">';
136 136
 				print '<div class="underbanner clearboth"></div>';
137
-				print '<table class="border centpercent tableforfield">' . "\n";
138
-				print '<tr><td class="titlefield">' . $langs->trans('AssetBaseDepreciationHT') . '</td><td>' . price($depreciation_info['base_depreciation_ht']) . '</td></tr>';
139
-				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationBeginDate') . '</td><td>' . dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day') . '</td></tr>';
137
+				print '<table class="border centpercent tableforfield">'."\n";
138
+				print '<tr><td class="titlefield">'.$langs->trans('AssetBaseDepreciationHT').'</td><td>'.price($depreciation_info['base_depreciation_ht']).'</td></tr>';
139
+				print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationBeginDate').'</td><td>'.dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day').'</td></tr>';
140 140
 				print '</table>';
141 141
 
142 142
 				// We close div and reopen for second column
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 
146 146
 				print '<div class="underbanner clearboth"></div>';
147 147
 				print '<table class="border centpercent tableforfield">';
148
-				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationDuration') . '</td><td>' . $depreciation_info['duration'] . ' ( ' . $depreciation_info['duration_type'] . ' )</td></tr>';
149
-				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationRate') . '</td><td>' . $depreciation_info['rate'] . '</td></tr>';
148
+				print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationDuration').'</td><td>'.$depreciation_info['duration'].' ( '.$depreciation_info['duration_type'].' )</td></tr>';
149
+				print '<tr><td class="titlefield">'.$langs->trans('AssetDepreciationRate').'</td><td>'.$depreciation_info['rate'].'</td></tr>';
150 150
 				print '</table>';
151 151
 				print '</div>';
152 152
 				print '</div>';
@@ -160,21 +160,21 @@  discard block
 block discarded – undo
160 160
 
161 161
 				print '<tr class="liste_titre">';
162 162
 				print '<td class="width20"></td>';
163
-				print '<td>' . $langs->trans("Ref") . '</td>';
164
-				print '<td class="center">' . $langs->trans("AssetDepreciationDate") . '</td>';
165
-				print '<td class="right">' . $langs->trans("AssetDepreciationHT") . '</td>';
166
-				print '<td class="right">' . $langs->trans("AssetCumulativeDepreciationHT") . '</td>';
167
-				print '<td class="right">' . $langs->trans("AssetResidualHT") . '</td>';
163
+				print '<td>'.$langs->trans("Ref").'</td>';
164
+				print '<td class="center">'.$langs->trans("AssetDepreciationDate").'</td>';
165
+				print '<td class="right">'.$langs->trans("AssetDepreciationHT").'</td>';
166
+				print '<td class="right">'.$langs->trans("AssetCumulativeDepreciationHT").'</td>';
167
+				print '<td class="right">'.$langs->trans("AssetResidualHT").'</td>';
168 168
 				print '</tr>';
169 169
 
170 170
 				if (empty($lines)) {
171
-					print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';
171
+					print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
172 172
 				} else {
173 173
 					foreach ($lines as $line) {
174 174
 						print '<tr class="oddeven">';
175
-						print '<td>' . ($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')) . '</td>';
176
-						print '<td >' . (empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']) . '</td>';
177
-						print '<td class="center">' . dol_print_date($line['depreciation_date'], 'day') . '</td>';
175
+						print '<td>'.($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')).'</td>';
176
+						print '<td >'.(empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']).'</td>';
177
+						print '<td class="center">'.dol_print_date($line['depreciation_date'], 'day').'</td>';
178 178
 						print '<td class="right">';
179 179
 						print price($line['depreciation_ht']);
180 180
 						print '</td>';
Please login to merge, or discard this patch.
htdocs/comm/mailing/class/advtargetemailing.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$customerStatic->loadCacheOfProspStatus();
126 126
 		if (!empty($customerStatic->cacheprospectstatus)) {
127 127
 			foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) {
128
-				$this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label'];
128
+				$this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label'];
129 129
 			}
130 130
 		} else {
131 131
 			$this->type_statuscommprospect = array(
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 						}
629 629
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
630 630
 						if ($arrayquery['options_'.$key] > 0) {
631
-							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
631
+							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
632 632
 						}
633 633
 					} else {
634 634
 						if (is_array($arrayquery['options_'.$key])) {
Please login to merge, or discard this patch.
htdocs/accountancy/class/accountancycategory.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
627 627
 		if (is_array($cpt)) {
628 628
 			$listofaccount = '';
629 629
 			foreach ($cpt as $cptcursor) {
630
-				if (! is_null($cptcursor)) {
630
+				if (!is_null($cptcursor)) {
631 631
 					if ($listofaccount) {
632 632
 						$listofaccount .= ",";
633 633
 					}
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
 
777 777
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens";
778 778
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
779
-		$sql .= " WHERE c.active = " . (int) $active;
779
+		$sql .= " WHERE c.active = ".(int) $active;
780 780
 		$sql .= " AND c.entity = ".$conf->entity;
781 781
 		if ($categorytype >= 0) {
782 782
 			$sql .= " AND c.category_type = 1";
Please login to merge, or discard this patch.