Completed
Branch develop (bd8b97)
by
unknown
26:41
created
htdocs/categories/viewcat.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1381,7 +1381,9 @@
 block discarded – undo
1381 1381
 				$i = 0;
1382 1382
 				foreach ($fichinters as $fichinter) {
1383 1383
 					$i++;
1384
-					if ($i > $limit) break;
1384
+					if ($i > $limit) {
1385
+						break;
1386
+					}
1385 1387
 
1386 1388
 					print "\t".'<tr class="oddeven">'."\n";
1387 1389
 					print '<td class="nowrap tdtop">';
Please login to merge, or discard this patch.
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/invoice.lib.php 1 patch
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -569,7 +569,9 @@  discard block
 block discarded – undo
569 569
 	$result = '';
570 570
 
571 571
 	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
572
-		if ($user->socid > 0) $socid = $user->socid;
572
+		if ($user->socid > 0) {
573
+			$socid = $user->socid;
574
+		}
573 575
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
574 576
 
575 577
 		$tmpinvoice = new Facture($db);
@@ -721,7 +723,9 @@  discard block
 block discarded – undo
721 723
 	$result = '';
722 724
 
723 725
 	if ((isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('facture', 'lire')) {
724
-		if ($user->socid > 0) $socid = $user->socid;
726
+		if ($user->socid > 0) {
727
+			$socid = $user->socid;
728
+		}
725 729
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
726 730
 
727 731
 		$facturesupplierstatic = new FactureFournisseur($db);
@@ -854,7 +858,9 @@  discard block
 block discarded – undo
854 858
 function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
855 859
 {
856 860
 	global $conf, $db, $langs, $user;
857
-	if ($user->socid > 0) $socid = $user->socid;
861
+	if ($user->socid > 0) {
862
+		$socid = $user->socid;
863
+	}
858 864
 	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datec,";
859 865
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
860 866
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -963,7 +969,9 @@  discard block
 block discarded – undo
963 969
 function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
964 970
 {
965 971
 	global $conf, $db, $langs, $user;
966
-	if ($user->socid > 0) $socid = $user->socid;
972
+	if ($user->socid > 0) {
973
+		$socid = $user->socid;
974
+	}
967 975
 	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.datec,";
968 976
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
969 977
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -1081,7 +1089,9 @@  discard block
 block discarded – undo
1081 1089
 	$result = '';
1082 1090
 
1083 1091
 	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
1084
-		if ($user->socid > 0) $socid = $user->socid;
1092
+		if ($user->socid > 0) {
1093
+			$socid = $user->socid;
1094
+		}
1085 1095
 		$tmpinvoice = new Facture($db);
1086 1096
 
1087 1097
 		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms";
@@ -1271,7 +1281,9 @@  discard block
 block discarded – undo
1271 1281
 	$result = '';
1272 1282
 
1273 1283
 	if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {
1274
-		if ($user->socid > 0) $socid = $user->socid;
1284
+		if ($user->socid > 0) {
1285
+			$socid = $user->socid;
1286
+		}
1275 1287
 		$facstatic = new FactureFournisseur($db);
1276 1288
 
1277 1289
 		$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
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.