Completed
Branch develop (a99e44)
by
unknown
15:19
created
htdocs/admin/expensereport.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $action = GETPOST('action', 'aZ09');
45 45
 $value = GETPOST('value', 'alpha');
46
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
46
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
47 47
 
48 48
 $label = GETPOST('label', 'alpha');
49 49
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	$amounts = GETPOST('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', 'int');
159 159
 	$res5 = dolibarr_set_const($db, 'EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', intval($amounts), 'chaine', 0, '', $conf->entity);
160 160
 
161
-	if (!($res1 > 0) || !($res2 > 0) || !($res3 >= 0) || !($res4 >0) || !($res5 >0)) {
161
+	if (!($res1 > 0) || !($res2 > 0) || !($res3 >= 0) || !($res4 > 0) || !($res5 > 0)) {
162 162
 		$error++;
163 163
 	}
164 164
 
Please login to merge, or discard this patch.
htdocs/admin/expedition.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 
47 47
 $action = GETPOST('action', 'aZ09');
48 48
 $value = GETPOST('value', 'alpha');
49
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
49
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
50 50
 
51 51
 $label = GETPOST('label', 'alpha');
52 52
 $scandir = GETPOST('scan_dir', 'alpha');
Please login to merge, or discard this patch.
htdocs/admin/mrp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 
47 47
 $action = GETPOST('action', 'aZ09');
48 48
 $value = GETPOST('value', 'alpha');
49
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
49
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
50 50
 
51 51
 $label = GETPOST('label', 'alpha');
52 52
 $scandir = GETPOST('scan_dir', 'alpha');
Please login to merge, or discard this patch.
htdocs/admin/reception_setup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 
47 47
 $action = GETPOST('action', 'aZ09');
48 48
 $value = GETPOST('value', 'alpha');
49
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
49
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
50 50
 
51 51
 $label = GETPOST('label', 'alpha');
52 52
 $scandir = GETPOST('scan_dir', 'alpha');
Please login to merge, or discard this patch.
htdocs/admin/usergroup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
 $action = GETPOST('action', 'aZ09');
44 44
 $value = GETPOST('value', 'alpha');
45
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
45
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
46 46
 
47 47
 $type = 'group';
48 48
 
Please login to merge, or discard this patch.
htdocs/public/test/test_exec.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,13 +66,13 @@
 block discarded – undo
66 66
 
67 67
 print "*** TEST READ OF /tmp/test.txt FILE<br>\n";
68 68
 
69
-$out='';
70
-$ret=0;
69
+$out = '';
70
+$ret = 0;
71 71
 
72 72
 $file = '/tmp/test.txt';
73
-$f=fopen($file, 'r');
73
+$f = fopen($file, 'r');
74 74
 if ($f) {
75
-	$s=fread($f, 4096);
75
+	$s = fread($f, 4096);
76 76
 	print $s;
77 77
 	fclose($f);
78 78
 } else {
Please login to merge, or discard this patch.
htdocs/admin/agenda_other.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
 $action = GETPOST('action', 'aZ09');
38 38
 $value = GETPOST('value', 'alpha');
39
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
39
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
40 40
 
41 41
 $param = GETPOST('param', 'alpha');
42 42
 $cancel = GETPOST('cancel', 'alpha');
Please login to merge, or discard this patch.
htdocs/core/lib/tax.lib.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
801 801
 			while ($assoc = $db->fetch_array($resql)) {
802 802
 				$rate_key = $assoc['rate'];
803 803
 				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
804
-					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
804
+					$rate_key .= ' ('.$assoc['vat_src_code'].')';
805 805
 				}
806 806
 
807 807
 				// Code to avoid warnings when array entry not defined
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
 			while ($assoc = $db->fetch_array($resql)) {
987 987
 				$rate_key = $assoc['rate'];
988 988
 				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
989
-					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
989
+					$rate_key .= ' ('.$assoc['vat_src_code'].')';
990 990
 				}
991 991
 
992 992
 				// Code to avoid warnings when array entry not defined
@@ -1113,7 +1113,7 @@  discard block
 block discarded – undo
1113 1113
 				while ($assoc = $db->fetch_array($resql)) {
1114 1114
 					$rate_key = $assoc['rate'];
1115 1115
 					if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
1116
-						$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
1116
+						$rate_key .= ' ('.$assoc['vat_src_code'].')';
1117 1117
 					}
1118 1118
 
1119 1119
 					// Code to avoid warnings when array entry not defined
Please login to merge, or discard this patch.
htdocs/product/reassort.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
 	}
160 160
 	$sql .= "(";
161 161
 	$sql .= " SELECT cp.fk_categorie, cp.fk_product";
162
-	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
162
+	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cp";
163 163
 	$sql .= " WHERE cp.fk_product = p.rowid"; // Join for the needed table to filter by categ
164 164
 	if ($search_categ > 0) {
165
-		$sql .= " AND cp.fk_categorie = " . ((int) $search_categ);
165
+		$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
166 166
 	}
167 167
 	$sql .= ")";
168 168
 }
@@ -210,8 +210,8 @@  discard block
 block discarded – undo
210 210
 }
211 211
 if ($search_stock_physique != '') {
212 212
 	//$natural_search_physique = natural_search('HAVING SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
213
-	$natural_search_physique = natural_search('SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
214
-	$natural_search_physique = " " . substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
213
+	$natural_search_physique = natural_search('SUM('.$db->ifsql('s.reel IS NULL', '0', 's.reel').')', $search_stock_physique, 1, 1);
214
+	$natural_search_physique = " ".substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
215 215
 	if (!empty($sql_having)) {
216 216
 		$sql_having .= " AND";
217 217
 	} else {
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 		$param .= "&sbarcode=".urlencode($sbarcode);
299 299
 	}
300 300
 	if ($search_stock_physique) {
301
-		$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
301
+		$param .= '&search_stock_physique='.urlencode($search_stock_physique);
302 302
 	}
303 303
 
304 304
 	llxHeader("", $texte, $helpurl);
Please login to merge, or discard this patch.