Passed
Branch develop (fc1365)
by Laurent
84:32
created
htdocs/core/modules/import/import_csv.modules.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -894,7 +894,10 @@
 block discarded – undo
894 894
 									if ($num_rows == 1) {
895 895
 										$res = $this->db->fetch_object($resql);
896 896
 										$lastinsertid = $res->rowid;
897
-										if ($is_table_category_link) $lastinsertid = 'linktable'; // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
897
+										if ($is_table_category_link) {
898
+											$lastinsertid = 'linktable';
899
+										}
900
+										// used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
898 901
 										$last_insert_id_array[$tablename] = $lastinsertid;
899 902
 									} elseif ($num_rows > 1) {
900 903
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
Please login to merge, or discard this patch.
htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php 1 patch
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -46,18 +46,26 @@  discard block
 block discarded – undo
46 46
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
47 47
 		$head[$h][0] = dol_buildpath('/product/stock/stocktransfer/stocktransfer_contact.php', 1).'?id='.$object->id;
48 48
 		$head[$h][1] = $langs->trans('ContactsAddresses');
49
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
49
+		if ($nbContact > 0) {
50
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
51
+		}
50 52
 		$head[$h][2] = 'contact';
51 53
 		$h++;
52 54
 	}
53 55
 
54 56
 	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
55 57
 		$nbNote = 0;
56
-		if (!empty($object->note_private)) $nbNote++;
57
-		if (!empty($object->note_public)) $nbNote++;
58
+		if (!empty($object->note_private)) {
59
+			$nbNote++;
60
+		}
61
+		if (!empty($object->note_public)) {
62
+			$nbNote++;
63
+		}
58 64
 		$head[$h][0] = dol_buildpath('/product/stock/stocktransfer/stocktransfer_note.php', 1).'?id='.$object->id;
59 65
 		$head[$h][1] = $langs->trans('Notes');
60
-		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
66
+		if ($nbNote > 0) {
67
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
68
+		}
61 69
 		$head[$h][2] = 'note';
62 70
 		$h++;
63 71
 	}
@@ -69,7 +77,9 @@  discard block
 block discarded – undo
69 77
 	$nbLinks = Link::count($db, $object->element, $object->id);
70 78
 	$head[$h][0] = dol_buildpath("/product/stock/stocktransfer/stocktransfer_document.php", 1).'?id='.$object->id;
71 79
 	$head[$h][1] = $langs->trans('Documents');
72
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
80
+	if (($nbFiles + $nbLinks) > 0) {
81
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
82
+	}
73 83
 	$head[$h][2] = 'document';
74 84
 	$h++;
75 85
 
Please login to merge, or discard this patch.
htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -134,8 +134,11 @@  discard block
 block discarded – undo
134 134
 		$resql = $db->query($sql);
135 135
 		if ($resql) {
136 136
 			$obj = $db->fetch_object($resql);
137
-			if ($obj) $max = intval($obj->max);
138
-			else $max = 0;
137
+			if ($obj) {
138
+				$max = intval($obj->max);
139
+			} else {
140
+				$max = 0;
141
+			}
139 142
 		} else {
140 143
 			dol_syslog("mod_stocktransfer_standard::getNextValue", LOG_DEBUG);
141 144
 			return -1;
@@ -145,8 +148,13 @@  discard block
 block discarded – undo
145 148
 		$date = $object->date_creation;
146 149
 		$yymm = strftime("%y%m", $date);
147 150
 
148
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
149
-		else $num = sprintf("%04s", $max + 1);
151
+		if ($max >= (pow(10, 4) - 1)) {
152
+			$num = $max + 1;
153
+		}
154
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
155
+		else {
156
+			$num = sprintf("%04s", $max + 1);
157
+		}
150 158
 
151 159
 		dol_syslog("mod_stocktransfer_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
152 160
 		return $this->prefix.$yymm."-".$num;
Please login to merge, or discard this patch.
htdocs/core/modules/stocktransfer/modules_stocktransfer.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -92,10 +92,18 @@
 block discarded – undo
92 92
 		global $langs;
93 93
 		$langs->load("admin");
94 94
 
95
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
96
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
97
-		if ($this->version == 'dolibarr') return DOL_VERSION;
98
-		if ($this->version) return $this->version;
95
+		if ($this->version == 'development') {
96
+			return $langs->trans("VersionDevelopment");
97
+		}
98
+		if ($this->version == 'experimental') {
99
+			return $langs->trans("VersionExperimental");
100
+		}
101
+		if ($this->version == 'dolibarr') {
102
+			return DOL_VERSION;
103
+		}
104
+		if ($this->version) {
105
+			return $this->version;
106
+		}
99 107
 		return $langs->trans("NotAvailable");
100 108
 	}
101 109
 }
Please login to merge, or discard this patch.
htdocs/intracommreport/card.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,12 @@
 block discarded – undo
77 77
 //if ($user->socid > 0) $socid = $user->socid;
78 78
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
79 79
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
80
-if (empty($conf->intracommreport->enabled)) accessforbidden();
81
-if (!$permissiontoread) accessforbidden();
80
+if (empty($conf->intracommreport->enabled)) {
81
+	accessforbidden();
82
+}
83
+if (!$permissiontoread) {
84
+	accessforbidden();
85
+}
82 86
 
83 87
 
84 88
 
Please login to merge, or discard this patch.
htdocs/compta/prelevement/card.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -315,16 +315,25 @@
 block discarded – undo
315 315
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
316 316
 		if (empty($reshook)) {
317 317
 			if (empty($object->date_trans)) {
318
-				if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->send);
319
-				else print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->send);
318
+				if ($object->type == 'bank-transfer') {
319
+					print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->send);
320
+				} else {
321
+					print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->send);
322
+				}
320 323
 			}
321 324
 			if (!empty($object->date_trans) && empty($object->date_credit)) {
322
-				if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->debit);
323
-				else print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->credit);
325
+				if ($object->type == 'bank-transfer') {
326
+					print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->debit);
327
+				} else {
328
+					print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->credit);
329
+				}
324 330
 			}
325 331
 
326
-			if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->create);
327
-			else print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->creer);
332
+			if ($object->type == 'bank-transfer') {
333
+				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->create);
334
+			} else {
335
+				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->creer);
336
+			}
328 337
 		}
329 338
 		print '</div>';
330 339
 	}
Please login to merge, or discard this patch.
htdocs/accountancy/journal/bankjournal.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -314,7 +314,9 @@
 block discarded – undo
314 314
 			}
315 315
 			// Now loop on each link of record in bank (code similar to bankentries_list.php)
316 316
 			foreach ($links as $key => $val) {
317
-				if ($links[$key]['type'] == 'user' && !$is_sc) continue;
317
+				if ($links[$key]['type'] == 'user' && !$is_sc) {
318
+					continue;
319
+				}
318 320
 				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) {
319 321
 					// So we excluded 'company' and 'user' here. We want only payment lines
320 322
 
Please login to merge, or discard this patch.
htdocs/webhook/target_list.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -192,13 +192,19 @@
 block discarded – undo
192 192
 }
193 193
 
194 194
 // Security check (enable the most restrictive one)
195
-if ($user->socid > 0) accessforbidden();
195
+if ($user->socid > 0) {
196
+	accessforbidden();
197
+}
196 198
 //if ($user->socid > 0) accessforbidden();
197 199
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
198 200
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
199 201
 //restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
200
-if (empty($conf->webhook->enabled)) accessforbidden('Module not enabled');
201
-if (!$permissiontoread) accessforbidden();
202
+if (empty($conf->webhook->enabled)) {
203
+	accessforbidden('Module not enabled');
204
+}
205
+if (!$permissiontoread) {
206
+	accessforbidden();
207
+}
202 208
 
203 209
 
204 210
 /*
Please login to merge, or discard this patch.
htdocs/webhook/target_card.php 1 patch
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -146,8 +146,12 @@  discard block
 block discarded – undo
146 146
 //if ($user->socid > 0) $socid = $user->socid;
147 147
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
148 148
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
149
-if (empty($conf->webhook->enabled)) accessforbidden();
150
-if (!$permissiontoread) accessforbidden();
149
+if (empty($conf->webhook->enabled)) {
150
+	accessforbidden();
151
+}
152
+if (!$permissiontoread) {
153
+	accessforbidden();
154
+}
151 155
 
152 156
 
153 157
 /*
@@ -483,9 +487,12 @@  discard block
 block discarded – undo
483 487
 
484 488
 				$parameters = array();
485 489
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
486
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
487
-				if (empty($reshook))
488
-					$object->formAddObjectLine(1, $mysoc, $soc);
490
+				if ($reshook < 0) {
491
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
492
+				}
493
+				if (empty($reshook)) {
494
+									$object->formAddObjectLine(1, $mysoc, $soc);
495
+				}
489 496
 			}
490 497
 		}
491 498
 
Please login to merge, or discard this patch.