Completed
Branch develop (de12a6)
by
unknown
21:25
created
test/phpunit/AccountancySystemTest.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,9 @@
 block discarded – undo
61 61
 		$mysoc = $soc;
62 62
 
63 63
 		/* Errors are caught in later tests. */
64
-		if ($socid <= 0)
65
-			return;
64
+		if ($socid <= 0) {
65
+					return;
66
+		}
66 67
 	}
67 68
 
68 69
 	/**
Please login to merge, or discard this patch.
htdocs/includes/odtphp/zip/PclZipProxy.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,10 @@
 block discarded – undo
34 34
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
35 35
 			 is required for using PclZipProxy'); ;
36 36
 		}
37
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
37
+		if ($forcedir) {
38
+			$this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);
39
+		}
40
+		// $this->tmpdir must not contains / at the end
38 41
 	}
39 42
 
40 43
 	/**
Please login to merge, or discard this patch.
htdocs/core/lib/propal.lib.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -222,7 +222,9 @@
 block discarded – undo
222 222
 	$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
223 223
 
224 224
 	$propalstatic = new Propal($db);
225
-	if ($user->socid > 0) $socid = $user->socid;
225
+	if ($user->socid > 0) {
226
+		$socid = $user->socid;
227
+	}
226 228
 	$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
227 229
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
228 230
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
Please login to merge, or discard this patch.
htdocs/core/lib/order.lib.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,9 @@
 block discarded – undo
240 240
 	/*
241 241
 	 * Statistics
242 242
 	 */
243
-	if ($user->socid > 0) $socid = $user->socid;
243
+	if ($user->socid > 0) {
244
+		$socid = $user->socid;
245
+	}
244 246
 	$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
245 247
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
246 248
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
Please login to merge, or discard this patch.
htdocs/admin/modules.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1341,7 +1341,10 @@
 block discarded – undo
1341 1341
 								<?php endif ?>
1342 1342
 
1343 1343
 								<?php if ($remotestore->githubFileStatus > 0 && $remotestore->numberOfProviders > 1) : ?>
1344
-									<input type="checkbox" name="search_source_github" id="search_source_github" value="1" <?php if (!empty($search_source_github) || $checkAllSources == 1) echo 'checked'; ?>>
1344
+									<input type="checkbox" name="search_source_github" id="search_source_github" value="1" <?php if (!empty($search_source_github) || $checkAllSources == 1) {
1345
+	echo 'checked';
1346
+}
1347
+?>>
1345 1348
 									<label for="search_source_github"><?php print $langs->trans("communityRepo"); ?></label>
1346 1349
 								<?php endif ?>
1347 1350
 
Please login to merge, or discard this patch.
htdocs/product/class/productcustomerprice.class.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -187,9 +187,15 @@
 block discarded – undo
187 187
 		$sql .= "  OR t.date_begin = '" . $this->db->idate($this->date_end) . "' OR t.date_end = '" . $this->db->idate($this->date_end) . "'";
188 188
 		$sql .= "  OR (t.date_begin <= '" . $this->db->idate($this->date_begin) . "' AND '" . $this->db->idate($this->date_begin) . "' <= t.date_end)";
189 189
 		$sql .= "  OR (t.date_begin <= '" . $this->db->idate($this->date_end) . "' AND '" . $this->db->idate($this->date_end) . "' <= t.date_end))";
190
-		if ($this->fk_product > 0) $sql .= " AND t.fk_product = " . ((int) $this->fk_product);
191
-		if ($this->fk_soc > 0) $sql .= " AND t.fk_soc = " . ((int) $this->fk_soc);
192
-		if ($this->id > 0) $sql .= " AND t.rowid != " . ((int) $this->id);
190
+		if ($this->fk_product > 0) {
191
+			$sql .= " AND t.fk_product = " . ((int) $this->fk_product);
192
+		}
193
+		if ($this->fk_soc > 0) {
194
+			$sql .= " AND t.fk_soc = " . ((int) $this->fk_soc);
195
+		}
196
+		if ($this->id > 0) {
197
+			$sql .= " AND t.rowid != " . ((int) $this->id);
198
+		}
193 199
 
194 200
 		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
195 201
 		$resql = $this->db->query($sql);
Please login to merge, or discard this patch.