Passed
Branch develop (d85e4e)
by Laurent
84:36
created
htdocs/core/boxes/box_dolibarr_state_board.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
  *	\brief      Module Dolibarr state base
25 25
  */
26 26
 
27
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
28
-include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
27
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
28
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
29 29
 
30 30
 
31 31
 /**
@@ -161,52 +161,52 @@  discard block
 block discarded – undo
161 161
 				'dolresource' => 'Dolresource'
162 162
 			);
163 163
 			$includes = array(
164
-				'users' => DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
165
-				'members' => DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
166
-				'customers' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
167
-				'prospects' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
168
-				'suppliers' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
169
-				'contacts' => DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
170
-				'products' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
171
-				'services' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
172
-				'proposals' => DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
173
-				'orders' => DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
174
-				'invoices' => DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
175
-				'donations' => DOL_DOCUMENT_ROOT . "/don/class/don.class.php",
176
-				'contracts' => DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
177
-				'interventions' => DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
178
-				'supplier_orders' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
179
-				'supplier_invoices' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
180
-				'supplier_proposals' => DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
181
-				'projects' => DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
182
-				'expensereports' => DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
183
-				'holidays' => DOL_DOCUMENT_ROOT . "/holiday/class/holiday.class.php",
184
-				'ticket' => DOL_DOCUMENT_ROOT . "/ticket/class/ticket.class.php",
185
-				'dolresource' => DOL_DOCUMENT_ROOT . "/resource/class/dolresource.class.php"
164
+				'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",
165
+				'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
166
+				'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
167
+				'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
168
+				'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
169
+				'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
170
+				'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
171
+				'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
172
+				'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
173
+				'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
174
+				'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
175
+				'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",
176
+				'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
177
+				'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
178
+				'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
179
+				'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
180
+				'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
181
+				'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
182
+				'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
183
+				'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
184
+				'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php",
185
+				'dolresource' => DOL_DOCUMENT_ROOT."/resource/class/dolresource.class.php"
186 186
 			);
187 187
 			$links = array(
188
-				'users' => DOL_URL_ROOT . '/user/list.php',
189
-				'members' => DOL_URL_ROOT . '/adherents/list.php?statut=1&mainmenu=members',
190
-				'customers' => DOL_URL_ROOT . '/societe/list.php?type=c&mainmenu=companies',
191
-				'prospects' => DOL_URL_ROOT . '/societe/list.php?type=p&mainmenu=companies',
192
-				'suppliers' => DOL_URL_ROOT . '/societe/list.php?type=f&mainmenu=companies',
193
-				'contacts' => DOL_URL_ROOT . '/contact/list.php?mainmenu=companies',
194
-				'products' => DOL_URL_ROOT . '/product/list.php?type=0&mainmenu=products',
195
-				'services' => DOL_URL_ROOT . '/product/list.php?type=1&mainmenu=products',
196
-				'proposals' => DOL_URL_ROOT . '/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
197
-				'orders' => DOL_URL_ROOT . '/commande/list.php?mainmenu=commercial&leftmenu=orders',
198
-				'invoices' => DOL_URL_ROOT . '/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
199
-				'donations' => DOL_URL_ROOT . '/don/list.php?leftmenu=donations',
200
-				'contracts' => DOL_URL_ROOT . '/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
201
-				'interventions' => DOL_URL_ROOT . '/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
202
-				'supplier_orders' => DOL_URL_ROOT . '/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
203
-				'supplier_invoices' => DOL_URL_ROOT . '/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
204
-				'supplier_proposals' => DOL_URL_ROOT . '/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
205
-				'projects' => DOL_URL_ROOT . '/projet/list.php?mainmenu=project',
206
-				'expensereports' => DOL_URL_ROOT . '/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
207
-				'holidays' => DOL_URL_ROOT . '/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
208
-				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket',
209
-				'dolresource' => DOL_URL_ROOT . '/resource/list.php?mainmenu=tools',
188
+				'users' => DOL_URL_ROOT.'/user/list.php',
189
+				'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
190
+				'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
191
+				'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
192
+				'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
193
+				'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
194
+				'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
195
+				'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
196
+				'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
197
+				'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
198
+				'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
199
+				'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
200
+				'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
201
+				'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
202
+				'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
203
+				'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
204
+				'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
205
+				'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
206
+				'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
207
+				'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
208
+				'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket',
209
+				'dolresource' => DOL_URL_ROOT.'/resource/list.php?mainmenu=tools',
210 210
 			);
211 211
 			$titres = array(
212 212
 				'users' => "Users",
@@ -269,10 +269,10 @@  discard block
 block discarded – undo
269 269
 					$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
270 270
 
271 271
 					$text = $langs->trans($titres[$val]);
272
-					$boxstatItem .= '<a href="' . $links[$val] . '" class="boxstatsindicator thumbstat nobold nounderline">';
272
+					$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
273 273
 					$boxstatItem .= '<div class="boxstats">';
274
-					$boxstatItem .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
275
-					$boxstatItem .= '<span class="boxstatsindicator">' . img_object("", $board->picto, 'class="inline-block"') . ' ' . (!empty($board->nb[$val]) ? $board->nb[$val] : 0) . '</span>';
274
+					$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
275
+					$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.(!empty($board->nb[$val]) ? $board->nb[$val] : 0).'</span>';
276 276
 					$boxstatItem .= '</div>';
277 277
 					$boxstatItem .= '</a>';
278 278
 
Please login to merge, or discard this patch.
htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 	$h = 0;
38 38
 	$head = array();
39 39
 
40
-	$withProjectUrl='';
41
-	if ($with_project>0) {
40
+	$withProjectUrl = '';
41
+	if ($with_project > 0) {
42 42
 		$withProjectUrl = "&withproject=1";
43 43
 	}
44 44
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$head[$h][2] = 'conferenceorbooth';
132 132
 	// Enable caching of conf or booth count attendees
133 133
 	$nbAttendees = 0;
134
-	$nbConferenceOrBooth= 0;
134
+	$nbConferenceOrBooth = 0;
135 135
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
136 136
 	$cachekey = 'count_conferenceorbooth_project_'.$object->id;
137 137
 	$dataretrieved = dol_getcache($cachekey);
@@ -139,14 +139,14 @@  discard block
 block discarded – undo
139 139
 		$nbAttendees = $dataretrieved;
140 140
 	} else {
141 141
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
142
-		$conforbooth=new ConferenceOrBooth($db);
142
+		$conforbooth = new ConferenceOrBooth($db);
143 143
 		$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
144
-		if (!is_array($result) && $result<0) {
144
+		if (!is_array($result) && $result < 0) {
145 145
 			setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
146 146
 		} else {
147 147
 			$nbConferenceOrBooth = count($result);
148 148
 		}
149
-		dol_setcache($cachekey, $nbConferenceOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.
149
+		dol_setcache($cachekey, $nbConferenceOrBooth, 120); // If setting cache fails, this is not a problem, so we do not test result.
150 150
 	}
151 151
 	if ($nbConferenceOrBooth > 0) {
152 152
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbConferenceOrBooth.'</span>';
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
 		$nbAttendees = $dataretrieved;
166 166
 	} else {
167 167
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
168
-		$attendees=new ConferenceOrBoothAttendee($db);
168
+		$attendees = new ConferenceOrBoothAttendee($db);
169 169
 		$result = $attendees->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
170
-		if (!is_array($result) && $result<0) {
170
+		if (!is_array($result) && $result < 0) {
171 171
 			setEventMessages($attendees->error, $attendees->errors, 'errors');
172 172
 		} else {
173 173
 			$nbAttendees = count($result);
174 174
 		}
175
-		dol_setcache($cachekey, $nbAttendees, 120);	// If setting cache fails, this is not a problem, so we do not test result.
175
+		dol_setcache($cachekey, $nbAttendees, 120); // If setting cache fails, this is not a problem, so we do not test result.
176 176
 	}
177 177
 	if ($nbAttendees > 0) {
178 178
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbAttendees.'</span>';
Please login to merge, or discard this patch.
htdocs/eventorganization/conferenceorbooth_card.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 if ($user->socid > 0) {
91 91
 	accessforbidden();
92 92
 }
93
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
93
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
94 94
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
95 95
 
96 96
 if (!$permissiontoread) {
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	$projectstatic->fetch_thirdparty();
179 179
 }
180 180
 
181
-$withProjectUrl='';
181
+$withProjectUrl = '';
182 182
 $object->project = clone $projectstatic;
183 183
 
184 184
 if (!empty($withproject)) {
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
532 532
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
533 533
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
534
-	$keyforbreak='num_vote';
534
+	$keyforbreak = 'num_vote';
535 535
 
536 536
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
537 537
 
@@ -603,12 +603,12 @@  discard block
 block discarded – undo
603 603
 
604 604
 		$object->fetchObjectLinked();
605 605
 
606
-		if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
606
+		if (is_array($object->linkedObjects) && count($object->linkedObjects) > 0 && array_key_exists("facture", $object->linkedObjects)) {
607 607
 			foreach ($object->linkedObjects["facture"] as $fac) {
608 608
 				if (empty($fac->paye)) {
609 609
 					$key = 'paymentlink_'.$fac->id;
610 610
 
611
-					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
611
+					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')).' '.$fac->ref.'</span><br>';
612 612
 
613 613
 					$sourcetouse = 'boothlocation';
614 614
 					$reftouse = $fac->id;
Please login to merge, or discard this patch.
htdocs/eventorganization/conferenceorbooth_document.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 if ($user->socid > 0) {
100 100
 	accessforbidden();
101 101
 }
102
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
102
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
103 103
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
104 104
 
105 105
 if (!$permissiontoread) {
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	$projectstatic->fetch_thirdparty();
139 139
 }
140 140
 
141
-$withProjectUrl='';
141
+$withProjectUrl = '';
142 142
 $object->project = clone $projectstatic;
143 143
 
144 144
 if (!empty($withproject)) {
Please login to merge, or discard this patch.
htdocs/eventorganization/conferenceorbooth_contact.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 if ($user->socid > 0) {
70 70
 	accessforbidden();
71 71
 }
72
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
72
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
73 73
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
74 74
 
75 75
 $permissiontoread = $user->rights->eventorganization->read;
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 if ($user->socid > 0) {
84 84
 	accessforbidden();
85 85
 }
86
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
86
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
87 87
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
88 88
 
89 89
 if (!$permissiontoread) {
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
108 108
 
109 109
 	if ($result >= 0) {
110
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':''));
110
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : ''));
111 111
 		exit;
112 112
 	} else {
113 113
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	$result = $object->delete_contact($lineid);
126 126
 
127 127
 	if ($result >= 0) {
128
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':''));
128
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : ''));
129 129
 		exit;
130 130
 	} else {
131 131
 		dol_print_error($db);
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 if (!empty($projectstatic->socid)) {
162 162
 	$projectstatic->fetch_thirdparty();
163 163
 }
164
-$withProjectUrl='';
164
+$withProjectUrl = '';
165 165
 $object->project = clone $projectstatic;
166 166
 
167 167
 if (!empty($withproject)) {
Please login to merge, or discard this patch.
htdocs/workstation/workstation_card.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 $backtopage = GETPOST('backtopage', 'alpha');
45 45
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
46 46
 
47
-$groups	= GETPOST('groups', 'array:int');
48
-$resources	= GETPOST('resources', 'array:int');
47
+$groups = GETPOST('groups', 'array:int');
48
+$resources = GETPOST('resources', 'array:int');
49 49
 //$lineid   = GETPOST('lineid', 'int');
50 50
 
51 51
 // Initialize technical objects
@@ -394,11 +394,11 @@  discard block
 block discarded – undo
394 394
 		$g = new UserGroup($db);
395 395
 		foreach ($object->usergroups as $id_group) {
396 396
 			$g->fetch($id_group);
397
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
397
+			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$g->getNomUrl(1, '', 0, 'categtextwhite').'</li>';
398 398
 		}
399 399
 
400
-		print '<tr><td>' . $langs->trans('Groups') . '</td><td>';
401
-		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
400
+		print '<tr><td>'.$langs->trans('Groups').'</td><td>';
401
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
402 402
 		print '</td></tr>';
403 403
 	}
404 404
 
@@ -408,11 +408,11 @@  discard block
 block discarded – undo
408 408
 		$r = new Dolresource($db);
409 409
 		foreach ($object->resources as $id_resource) {
410 410
 			$r->fetch($id_resource);
411
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
411
+			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$r->getNomUrl(1, '', '', 0, 'categtextwhite').'</li>';
412 412
 		}
413 413
 
414
-		print '<tr><td>' . $langs->trans('Machines') . '</td><td>';
415
-		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
414
+		print '<tr><td>'.$langs->trans('Machines').'</td><td>';
415
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
416 416
 		print '</td></tr>';
417 417
 	}
418 418
 
Please login to merge, or discard this patch.
htdocs/compta/bank/releve.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 					$balancestart[$objp->numr] = $obj->amount;
348 348
 					$db->free($resql);
349 349
 				}
350
-				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>';
350
+				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
351 351
 
352 352
 				// Calculate end amount
353 353
 				$sql = "SELECT sum(b.amount) as amount";
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 					$content[$objp->numr] = $obj->amount;
361 361
 					$db->free($resql);
362 362
 				}
363
-				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>';
363
+				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
364 364
 
365 365
 				print '<td class="center">';
366 366
 				if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
Please login to merge, or discard this patch.
htdocs/admin/tools/listevents.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 }
43 43
 
44 44
 // Load translation files required by the page
45
-$langs->loadLangs(array("companies", "admin", "users", "other","withdrawals"));
45
+$langs->loadLangs(array("companies", "admin", "users", "other", "withdrawals"));
46 46
 
47 47
 // Load variable for pagination
48 48
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 if ($date_start !== '') {
211 211
 	$sql .= " AND e.dateevent >= '".$db->idate($date_start)."'";
212 212
 }
213
-if ($date_end !== '' ) {
213
+if ($date_end !== '') {
214 214
 	$sql .= " AND e.dateevent <= '".$db->idate($date_end)."'";
215 215
 }
216 216
 if ($search_code) {
Please login to merge, or discard this patch.
htdocs/core/modules/takepos/mod_takepos_ref_simple.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	public function getExample()
78 78
 	{
79
-		return $this->prefix.'0-0501-0001';		// TC0-0501-0001
79
+		return $this->prefix.'0-0501-0001'; // TC0-0501-0001
80 80
 	}
81 81
 
82 82
 	/**
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
 		$pryymm = '';
93 93
 		$max = '';
94 94
 
95
-		$pos_source = 0;	// POS source = Terminal ID
95
+		$pos_source = 0; // POS source = Terminal ID
96 96
 
97 97
 		// First, we get the max value
98
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
98
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
99 99
 
100 100
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
101 101
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
135 135
 	{
136 136
 		global $db;
137 137
 
138
-		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;	// POS source = Terminal ID
138
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID
139 139
 
140 140
 		// First, we get the max value
141
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
141
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
142 142
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
143 143
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
144 144
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'";
Please login to merge, or discard this patch.