Completed
Branch develop (2e938f)
by
unknown
19:39
created
htdocs/accountancy/admin/card.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
77 77
 			$action = 'create';
78 78
 		} else {
79
-			$sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
79
+			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
80 80
 
81
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
81
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
82 82
 			$result = $db->query($sql);
83 83
 			$obj = $db->fetch_object($result);
84 84
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			if (!$error) {
124 124
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
125 125
 				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
126
-				header("Location: " . $urltogo);
126
+				header("Location: ".$urltogo);
127 127
 				exit;
128 128
 			}
129 129
 		}
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 
142 142
 			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
143 143
 
144
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
144
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
145 145
 			$result2 = $db->query($sql);
146 146
 			$obj = $db->fetch_object($result2);
147 147
 
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
171 171
 			$result = $object->update($user);
172 172
 
173 173
 			if ($result > 0) {
174
-				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
175
-				header("Location: " . $urltogo);
174
+				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
175
+				header("Location: ".$urltogo);
176 176
 				exit();
177 177
 			} elseif ($result == -2) {
178 178
 				setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors');
@@ -264,14 +264,14 @@  discard block
 block discarded – undo
264 264
 	print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
265 265
 	// autosuggest from existing account types if found
266 266
 	print '<datalist id="pcg_type_datalist">';
267
-	$sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account";
268
-	$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
269
-	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
267
+	$sql = "SELECT DISTINCT pcg_type FROM ".MAIN_DB_PREFIX."accounting_account";
268
+	$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
269
+	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
270 270
 	$sql .= ' LIMIT 50000'; // just as a sanity check
271 271
 	$resql = $db->query($sql);
272 272
 	if ($resql) {
273 273
 		while ($obj = $db->fetch_object($resql)) {
274
-			print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
274
+			print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
275 275
 		}
276 276
 	}
277 277
 	print '</datalist>';
@@ -341,14 +341,14 @@  discard block
 block discarded – undo
341 341
 			print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
342 342
 			// autosuggest from existing account types if found
343 343
 			print '<datalist id="pcg_type_datalist">';
344
-			$sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
345
-			$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
346
-			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
344
+			$sql = 'SELECT DISTINCT pcg_type FROM '.MAIN_DB_PREFIX.'accounting_account';
345
+			$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
346
+			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
347 347
 			$sql .= ' LIMIT 50000'; // just as a sanity check
348 348
 			$resql = $db->query($sql);
349 349
 			if ($resql) {
350 350
 				while ($obj = $db->fetch_object($resql)) {
351
-					print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
351
+					print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
352 352
 				}
353 353
 			}
354 354
 			print '</datalist>';
Please login to merge, or discard this patch.
htdocs/compta/tva/card.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 				}
253 253
 			}
254 254
 			if (empty($error)) {
255
-				header("Location: card.php?id=" . $object->id);
255
+				header("Location: card.php?id=".$object->id);
256 256
 				exit;
257 257
 			}
258 258
 		}
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 		} else {
308 308
 			$result = $object->fetch($id);
309 309
 
310
-			$object->amount	= $amount;
310
+			$object->amount = $amount;
311 311
 
312 312
 			$result = $object->update($user);
313 313
 			if ($result <= 0) {
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 
470 470
 	// Auto create payment
471 471
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
472
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";
472
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n";
473 473
 
474 474
 	print '<tr class="hide_if_no_auto_create_payment">';
475 475
 	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
@@ -609,9 +609,9 @@  discard block
 block discarded – undo
609 609
 	print '</td></tr>';
610 610
 
611 611
 	if ($action == 'edit') {
612
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
612
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
613 613
 	} else {
614
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>';
614
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
615 615
 	}
616 616
 
617 617
 	// Mode of payment
Please login to merge, or discard this patch.
htdocs/compta/stats/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 	$month_current = dol_print_date(dol_now(), "%m");
53 53
 	$year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
54 54
 }
55
-$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver');	// We use timezone of server so report is same from everywhere
56
-$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver');		// We use timezone of server so report is same from everywhere
55
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere
56
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere
57 57
 
58 58
 // We define date_start and date_end
59 59
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	$sql .= " AND b.doc_type = 'customer_invoice'";
256 256
 	$sql .= " AND aa.entity = ".$conf->entity;
257 257
 	$sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
258
-	$sql .= " AND aa.pcg_type = 'INCOME'";		// TODO Be able to use a custom group
258
+	$sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group
259 259
 }
260 260
 $sql .= " GROUP BY dm";
261 261
 $sql .= " ORDER BY dm";
Please login to merge, or discard this patch.
htdocs/compta/bank/class/paymentvarious.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 				$this->type_payment         = $obj->fk_typepayment;
307 307
 				$this->num_payment          = $obj->num_payment;
308 308
 				$this->label                = $obj->label;
309
-				$this->note                 = $obj->note_private;	// For backward compatibility
309
+				$this->note                 = $obj->note_private; // For backward compatibility
310 310
 				$this->note_private         = $obj->note_private;
311 311
 				$this->subledger_account    = $obj->subledger_account;
312 312
 				$this->accountancy_code     = $obj->accountancy_code;
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
487 487
 		$sql .= ", ".((int) $user->id);
488 488
 		$sql .= ", '".$this->db->idate($now)."'";
489
-		$sql .= ", NULL";	// Filled later
489
+		$sql .= ", NULL"; // Filled later
490 490
 		$sql .= ", ".((int) $conf->entity);
491 491
 		$sql .= ")";
492 492
 
Please login to merge, or discard this patch.
htdocs/compta/prelevement/class/ligneprelevement.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@
 block discarded – undo
45 45
 
46 46
 	const STATUS_DRAFT = 0;
47 47
 	const STATUS_NOT_USED = 1;
48
-	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
49
-	const STATUS_DEBITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
48
+	const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
49
+	const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
50 50
 	const STATUS_REJECTED = 3;
51 51
 
52 52
 
Please login to merge, or discard this patch.
htdocs/compta/localtax/clients.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
 
143 143
 $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local;
144 144
 // Affiche en-tete du rapport
145
-$description='';
145
+$description = '';
146 146
 if ($calc == 0 || $calc == 1) {	// Calculate on invoice for goods and services
147 147
 	$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
148 148
 	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
Please login to merge, or discard this patch.
htdocs/fichinter/contact.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,8 +124,8 @@
 block discarded – undo
124 124
 	// Ref customer
125 125
 	//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1);
126 126
 	//$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
127
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
128
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
127
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
128
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
129 129
 	// Thirdparty
130 130
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
131 131
 	// Project
Please login to merge, or discard this patch.
htdocs/user/logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	unset($_SESSION["dol_login"]);
51 51
 	unset($_SESSION['dol_entity']);
52 52
 	unset($_SESSION['urlfrom']);
53
-	die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]);	// TODO Really ? It at least delete the session file ?!
53
+	die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?!
54 54
 }
55 55
 
56 56
 //global $conf, $langs, $user;
Please login to merge, or discard this patch.
htdocs/user/passwordforgotten.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -142,12 +142,12 @@
 block discarded – undo
142 142
 			$messagewarning .= '</div>';
143 143
 
144 144
 			if ($result <= 0 && $edituser->error == 'USERNOTFOUND') {
145
-				usleep(20000);	// add delay to simulate setPassword() and send_password() actions delay (0.02s)
145
+				usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s)
146 146
 				$message .= $messagewarning;
147 147
 				$username = '';
148 148
 			} else {
149 149
 				if (empty($edituser->email)) {
150
-					usleep(20000);	// add delay to simulate setPassword() and send_password() actions delay (0.02s)
150
+					usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s)
151 151
 					$message .= $messagewarning;
152 152
 				} else {
153 153
 					$newpassword = $edituser->setPassword($user, '', 1);
Please login to merge, or discard this patch.