Completed
Branch develop (806e3a)
by
unknown
17:40
created
htdocs/salaries/payments.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,8 +113,10 @@
 block discarded – undo
113 113
 $search_all = GETPOST("search_all", 'alpha');
114 114
 $search = array();
115 115
 foreach ($object->fields as $key => $val) {
116
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
117
-}
116
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
117
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
118
+	}
119
+	}
118 120
 
119 121
 // List of fields to search into when doing a "search in all"
120 122
 $fieldstosearchall = array();
Please login to merge, or discard this patch.
htdocs/core/modules/modWorkstation.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 		$this->menu = array();
264 264
 		$r = 0;
265 265
 		// Add here entries to declare new menus
266
-		$this->menu[$r++]=array(
266
+		$this->menu[$r++] = array(
267 267
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
268 268
 			'fk_menu'=>'fk_mainmenu=mrp',
269 269
 			// This is a Left menu entry
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 			'url'=>'',
276 276
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
277 277
 			'langs'=>'mrp',
278
-			'position'=>1100+$r,
278
+			'position'=>1100 + $r,
279 279
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
280 280
 			'enabled'=>'$conf->workstation->enabled',
281 281
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 			// 0=Menu for internal users, 1=external users, 2=both
285 285
 			'user'=>2,
286 286
 		);
287
-		$this->menu[$r++]=array(
287
+		$this->menu[$r++] = array(
288 288
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
289 289
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
290 290
 			// This is a Left menu entry
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 			'url'=>'/workstation/workstation_card.php?action=create',
296 296
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
297 297
 			'langs'=>'mrp',
298
-			'position'=>1100+$r,
298
+			'position'=>1100 + $r,
299 299
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
300 300
 			'enabled'=>'$conf->workstation->enabled',
301 301
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 			// 0=Menu for internal users, 1=external users, 2=both
305 305
 			'user'=>2
306 306
 		);
307
-		$this->menu[$r++]=array(
307
+		$this->menu[$r++] = array(
308 308
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
309 309
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
310 310
 			// This is a Left menu entry
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 			'url'=>'/workstation/workstation_list.php',
316 316
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
317 317
 			'langs'=>'mrp',
318
-			'position'=>1101+$r,
318
+			'position'=>1101 + $r,
319 319
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
320 320
 			'enabled'=>'$conf->workstation->enabled',
321 321
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
Please login to merge, or discard this patch.
htdocs/expensereport/list.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
 
81 81
 
82 82
 // Load variable for pagination
83
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
83
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
84 84
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
85 85
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
86
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
86
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
87 87
 if (empty($page) || $page == -1) {
88 88
 	$page = 0;
89 89
 }     // If $page is not defined, or '' or -1
@@ -98,34 +98,34 @@  discard block
 block discarded – undo
98 98
 }
99 99
 
100 100
 
101
-$sall			= trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
101
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
102 102
 
103 103
 $search_ref			= GETPOST('search_ref', 'alpha');
104 104
 $search_user		= GETPOST('search_user', 'int');
105
-$search_amount_ht	= GETPOST('search_amount_ht', 'alpha');
105
+$search_amount_ht = GETPOST('search_amount_ht', 'alpha');
106 106
 $search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
107 107
 $search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
108
-$search_status		= (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
108
+$search_status = (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
109 109
 
110
-$search_date_startday		= GETPOST('search_date_startday', 'int');
110
+$search_date_startday = GETPOST('search_date_startday', 'int');
111 111
 $search_date_startmonth		= GETPOST('search_date_startmonth', 'int');
112
-$search_date_startyear		= GETPOST('search_date_startyear', 'int');
112
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
113 113
 $search_date_startendday	= GETPOST('search_date_startendday', 'int');
114
-$search_date_startendmonth	= GETPOST('search_date_startendmonth', 'int');
115
-$search_date_startendyear	= GETPOST('search_date_startendyear', 'int');
116
-$search_date_start			= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
114
+$search_date_startendmonth = GETPOST('search_date_startendmonth', 'int');
115
+$search_date_startendyear = GETPOST('search_date_startendyear', 'int');
116
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
117 117
 $search_date_startend		= dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear);
118 118
 
119 119
 $search_date_endday			= GETPOST('search_date_endday', 'int');
120 120
 $search_date_endmonth		= GETPOST('search_date_endmonth', 'int');
121 121
 $search_date_endyear		= GETPOST('search_date_endyear', 'int');
122
-$search_date_endendday		= GETPOST('search_date_endendday', 'int');
122
+$search_date_endendday = GETPOST('search_date_endendday', 'int');
123 123
 $search_date_endendmonth	= GETPOST('search_date_endendmonth', 'int');
124 124
 $search_date_endendyear		= GETPOST('search_date_endendyear', 'int');
125
-$search_date_end			= dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);	// Use tzserver
126
-$search_date_endend			= dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
125
+$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver
126
+$search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
127 127
 
128
-$optioncss    = GETPOST('optioncss', 'alpha');
128
+$optioncss = GETPOST('optioncss', 'alpha');
129 129
 
130 130
 if ($search_status == '') {
131 131
 	$search_status = -1;
Please login to merge, or discard this patch.
htdocs/ticket/class/cticketcategory.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 	/**
99 99
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
100 100
 	 */
101
-	public $fields=array(
101
+	public $fields = array(
102 102
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
103 103
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1),
104 104
 		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
Please login to merge, or discard this patch.
htdocs/core/modules/modKnowledgeManagement.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 		*/
302 302
 		/* END MODULEBUILDER TOPMENU */
303 303
 
304
-		$this->menu[$r++]=array(
304
+		$this->menu[$r++] = array(
305 305
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
306 306
 			'fk_menu'=>'fk_mainmenu=ticket',
307 307
 			// This is a Left menu entry
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 			// 0=Menu for internal users, 1=external users, 2=both
323 323
 			'user'=>2,
324 324
 		);
325
-		$this->menu[$r++]=array(
325
+		$this->menu[$r++] = array(
326 326
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
327 327
 			'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
328 328
 			// This is a Left menu entry
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 			// 0=Menu for internal users, 1=external users, 2=both
343 343
 			'user'=>2,
344 344
 		);
345
-		$this->menu[$r++]=array(
345
+		$this->menu[$r++] = array(
346 346
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
347 347
 			'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
348 348
 			// This is a Left menu entry
Please login to merge, or discard this patch.
htdocs/compta/paiement/list.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 $search_date_endday = GETPOST('search_date_endday', 'int');
65 65
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
66 66
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
67
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
67
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
68 68
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
69 69
 $search_company = GETPOST("search_company", 'alpha');
70 70
 $search_paymenttype = GETPOST("search_paymenttype");
@@ -227,10 +227,10 @@  discard block
 block discarded – undo
227 227
 		$sql .= natural_search('p.ref', $search_ref);
228 228
 	}
229 229
 	if ($search_date_start) {
230
-		$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
230
+		$sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
231 231
 	}
232 232
 	if ($search_date_end) {
233
-		$sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'";
233
+		$sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
234 234
 	}
235 235
 	if ($search_account > 0) {
236 236
 		$sql .= " AND b.fk_account=".((int) $search_account);
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,9 @@
 block discarded – undo
51 51
 $userid = GETPOST('userid', 'int');
52 52
 
53 53
 // Security check
54
-if ($user->socid) $socid = $user->socid;
54
+if ($user->socid) {
55
+	$socid = $user->socid;
56
+}
55 57
 $result = restrictedArea($user, 'facture', $facid, '');
56 58
 
57 59
 $search_ref = GETPOST("search_ref", "alpha");
Please login to merge, or discard this patch.
htdocs/core/class/html.formintervention.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
108 108
 						} else {
109 109
 							$disabled = 0;
110
-							if (!$obj->fk_statut > 0 && ! $draftonly) {
110
+							if (!$obj->fk_statut > 0 && !$draftonly) {
111 111
 								$disabled = 1;
112 112
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
113 113
 							}
Please login to merge, or discard this patch.
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -81,7 +81,9 @@  discard block
 block discarded – undo
81 81
 				$sql .= " AND f.fk_soc = ".((int) $socid);
82 82
 			}
83 83
 		}
84
-		if ($draftonly) $sql .= " AND f.fk_statut = 0";
84
+		if ($draftonly) {
85
+			$sql .= " AND f.fk_statut = 0";
86
+		}
85 87
 
86 88
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
87 89
 		$resql = $this->db->query($sql);
@@ -89,8 +91,11 @@  discard block
 block discarded – undo
89 91
 			$out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">';
90 92
 			if ($showempty) {
91 93
 				$out .= '<option value="0">';
92
-				if (!is_numeric($showempty)) $out .= $showempty;
93
-				else $out .= '&nbsp;';
94
+				if (!is_numeric($showempty)) {
95
+					$out .= $showempty;
96
+				} else {
97
+					$out .= '&nbsp;';
98
+				}
94 99
 				$out .= '</option>';
95 100
 			}
96 101
 			$num = $this->db->num_rows($resql);
Please login to merge, or discard this patch.
htdocs/expensereport/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
 $dataseries = dol_sort_array($dataseries, 1, 'desc');
137 137
 
138 138
 // Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
139
-$KEEPNFIRST = 7;	// Keep first $KEEPNFIRST one + 1 with the remain
139
+$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain
140 140
 $i = 0;
141 141
 if (count($dataseries) > ($KEEPNFIRST + 1)) {
142 142
 	foreach ($dataseries as $key => $val) {
Please login to merge, or discard this patch.
htdocs/core/modules/product_batch/mod_sn_standard.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 		$sql .= " AND entity = ".$conf->entity;
92 92
 
93 93
 		$resql = $db->query($sql);
94
-		if ($resql)	{
94
+		if ($resql) {
95 95
 			$obj = $db->fetch_object($resql);
96 96
 			if ($obj) {
97 97
 				$max = intval($obj->max);
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		$sql .= " AND entity = ".$conf->entity;
128 128
 
129 129
 		$resql = $db->query($sql);
130
-		if ($resql)	{
130
+		if ($resql) {
131 131
 			$obj = $db->fetch_object($resql);
132 132
 			if ($obj) {
133 133
 				$max = intval($obj->max);
Please login to merge, or discard this patch.
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -143,8 +143,13 @@
 block discarded – undo
143 143
 		$date = dol_now();
144 144
 		$yymm = strftime("%y%m", $date);
145 145
 
146
-		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
147
-		else $num = sprintf("%04s", $max + 1);
146
+		if ($max >= (pow(10, 4) - 1)) {
147
+			$num = $max + 1;
148
+		}
149
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
150
+		else {
151
+			$num = sprintf("%04s", $max + 1);
152
+		}
148 153
 
149 154
 		dol_syslog("mod_sn_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
150 155
 		return $this->prefix.$yymm."-".$num;
Please login to merge, or discard this patch.