Completed
Branch develop (05527d)
by
unknown
15:23
created
htdocs/accountancy/tpl/export_journal.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,5 +72,5 @@
 block discarded – undo
72 72
 }
73 73
 
74 74
 if (empty($downloadMode)) {
75
-	header('Content-Disposition: attachment;filename=' . $completefilename);
75
+	header('Content-Disposition: attachment;filename='.$completefilename);
76 76
 }
Please login to merge, or discard this patch.
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/facture/card-rec.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
779 779
 		// Define special_code for special lines
780 780
 		$special_code = GETPOST('special_code', 'int');
781 781
 		if ($special_code == 3) {
782
-			$special_code = 0;	// Options should not exists on invoices
782
+			$special_code = 0; // Options should not exists on invoices
783 783
 		}
784 784
 
785 785
 		/*$line = new FactureLigne($db);
@@ -1626,10 +1626,10 @@  discard block
 block discarded – undo
1626 1626
 
1627 1627
 		// Lines
1628 1628
 		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">';
1629
-		print '<input type="hidden" name="token" value="' . newToken().'">';
1630
-		print '<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">';
1629
+		print '<input type="hidden" name="token" value="'.newToken().'">';
1630
+		print '<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">';
1631 1631
 		print '<input type="hidden" name="mode" value="">';
1632
-		print '<input type="hidden" name="id" value="' . $object->id.'">';
1632
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
1633 1633
 		print '<input type="hidden" name="page_y" value="">';
1634 1634
 
1635 1635
 		if (!empty($conf->use_javascript_ajax) && $object->statut == 0) {
@@ -1681,16 +1681,16 @@  discard block
 block discarded – undo
1681 1681
 			if (empty($object->suspended)) {
1682 1682
 				if ($user->hasRight('facture', 'creer')) {
1683 1683
 					if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
1684
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("MaxGenerationReached")) . '">' . $langs->trans("CreateBill") . '</a></div>';
1684
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
1685 1685
 					} else {
1686 1686
 						if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
1687
-							print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $object->thirdparty->id . '&fac_rec=' . $object->id . '">' . $langs->trans("CreateBill") . '</a></div>';
1687
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
1688 1688
 						} else {
1689
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("DateIsNotEnough")) . '">' . $langs->trans("CreateBill") . '</a></div>';
1689
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
1690 1690
 						}
1691 1691
 					}
1692 1692
 				} else {
1693
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans("CreateBill") . '</a></div>';
1693
+					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
1694 1694
 				}
1695 1695
 			}
1696 1696
 
@@ -1703,7 +1703,7 @@  discard block
 block discarded – undo
1703 1703
 			}
1704 1704
 
1705 1705
 			// Delete
1706
-			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete&token=' . newToken(), 'delete', $user->hasRight('facture', 'supprimer'));
1706
+			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $user->hasRight('facture', 'supprimer'));
1707 1707
 		}
1708 1708
 		print '</div>';
1709 1709
 
Please login to merge, or discard this patch.
htdocs/compta/tva/list.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
46 46
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
47 47
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
48
-$contextpage				= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
48
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
49 49
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
50 50
 $optioncss = GETPOST('optioncss', 'alpha');
51 51
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
52 52
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
53 53
 
54
-$search_ref					= GETPOST('search_ref', 'alpha');
54
+$search_ref = GETPOST('search_ref', 'alpha');
55 55
 $search_label = GETPOST('search_label', 'alpha');
56 56
 $search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
57 57
 $search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
 // Build and execute select
173 173
 // --------------------------------------------------------------------
174 174
 $sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.paye as status, t.fk_typepayment as type, t.fk_account,';
175
-$sql.= ' ba.label as blabel, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,';
176
-$sql.= ' t.num_payment, pst.code as payment_code,';
175
+$sql .= ' ba.label as blabel, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,';
176
+$sql .= ' t.num_payment, pst.code as payment_code,';
177 177
 $sql .= ' SUM(ptva.amount) as alreadypayed';
178 178
 
179 179
 $sqlfields = $sql; // $sql fields to remove for count total
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 
707 707
 		// Amount
708 708
 		if (!empty($arrayfields['t.amount']['checked'])) {
709
-			print '<td class="nowrap right"><span class="amount">' . price($obj->amount) . '</span></td>';
709
+			print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
710 710
 			if (!$i) {
711 711
 				$totalarray['nbfield']++;
712 712
 			}
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 		}
720 720
 
721 721
 		if (!empty($arrayfields['t.status']['checked'])) {
722
-			print '<td class="nowrap right">' . $tva_static->getLibStatut(5, $obj->alreadypayed) . '</td>';
722
+			print '<td class="nowrap right">'.$tva_static->getLibStatut(5, $obj->alreadypayed).'</td>';
723 723
 			if (!$i) {
724 724
 				$totalarray['nbfield']++;
725 725
 			}
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/stats/supplier_turnover.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
 	$month_current = dol_print_date(dol_now(), "%m");
49 49
 	$year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
50 50
 }
51
-$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
52
-$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
51
+$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
52
+$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
53 53
 
54 54
 // We define date_start and date_end
55 55
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	$sql .= " AND b.numero_compte = aa.account_number";
241 241
 	$sql .= " AND aa.entity = ".$conf->entity;
242 242
 	$sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
243
-	$sql .= " AND aa.pcg_type = 'EXPENSE'";		// TODO Be able to use a custom group
243
+	$sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group
244 244
 }
245 245
 //print $sql;
246 246
 
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/bank/bankentries_list.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -161,12 +161,12 @@  discard block
 block discarded – undo
161 161
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
162 162
 
163 163
 $arrayfields = array(
164
-	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1,'position'=>10),
165
-	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1,'position'=>20),
166
-	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1,'position'=>30),
167
-	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1,'position'=>40),
168
-	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1,'position'=>50),
169
-	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1,'position'=>60),
164
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
165
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1, 'position'=>20),
166
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1, 'position'=>30),
167
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1, 'position'=>40),
168
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>50),
169
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1, 'position'=>60),
170 170
 	'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>70),
171 171
 	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>80),
172 172
 	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>90),
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 
410 410
 $companystatic = new Societe($db);
411 411
 $bankaccountstatic = new Account($db);
412
-$userstatic= new User($db);
412
+$userstatic = new User($db);
413 413
 
414 414
 $banktransferstatic = new BonPrelevement($db);
415 415
 $societestatic = new Societe($db);
@@ -643,21 +643,21 @@  discard block
 block discarded – undo
643 643
 	$sql .= " AND b.rappro = ".((int) $search_conciliated);
644 644
 }
645 645
 if ($search_fk_bordereau > 0) {
646
-	$sql .= " AND b.fk_bordereau = " . ((int) $search_fk_bordereau);
646
+	$sql .= " AND b.fk_bordereau = ".((int) $search_fk_bordereau);
647 647
 }
648 648
 if ($search_thirdparty_user) {
649
-	$sql.= " AND (b.rowid IN ";
650
-	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
651
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
652
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
653
-	$sql.= "	  WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
654
-
655
-	$sql.= " OR b.rowid IN ";
656
-	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
657
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
658
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
659
-	$sql.= "	  WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
660
-	$sql.= "))";
649
+	$sql .= " AND (b.rowid IN ";
650
+	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
651
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
652
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
653
+	$sql .= "	  WHERE ".natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
654
+
655
+	$sql .= " OR b.rowid IN ";
656
+	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
657
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
658
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
659
+	$sql .= "	  WHERE ".natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
660
+	$sql .= "))";
661 661
 }
662 662
 if ($search_description) {
663 663
 	$search_description_to_use = $search_description;
@@ -1367,10 +1367,10 @@  discard block
 block discarded – undo
1367 1367
 			$backgroundcolor = "class='oddeven'";
1368 1368
 		} else {
1369 1369
 			if ($objp->amount < 0) {
1370
-				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
1370
+				$color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
1371 1371
 				$backgroundcolor = 'style="background: '.$color.';"';
1372 1372
 			} else {
1373
-				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
1373
+				$color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
1374 1374
 				$backgroundcolor = 'style="background: '.$color.';"';
1375 1375
 			}
1376 1376
 		}
@@ -1507,7 +1507,7 @@  discard block
 block discarded – undo
1507 1507
 				}
1508 1508
 			}
1509 1509
 
1510
-			print $labeltoshow;	// Already escaped
1510
+			print $labeltoshow; // Already escaped
1511 1511
 
1512 1512
 			print '</td>';
1513 1513
 			if (!$i) {
@@ -1738,8 +1738,8 @@  discard block
 block discarded – undo
1738 1738
 		}
1739 1739
 
1740 1740
 		// Fields from hook
1741
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
1742
-		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp);    // Note that $action and $objecttmpect may have been modified by hook
1741
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
1742
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
1743 1743
 		print $hookmanager->resPrint;
1744 1744
 
1745 1745
 		// Action edit/delete and select
Please login to merge, or discard this patch.