@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $object = new UserGroup($db); |
65 | 65 | $extrafields = new ExtraFields($db); |
66 | 66 | //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; |
67 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
67 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
68 | 68 | |
69 | 69 | // Fetch optionals attributes and labels |
70 | 70 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -323,8 +323,8 @@ discard block |
||
323 | 323 | print '</div>'; |
324 | 324 | } |
325 | 325 | |
326 | -$varpage=empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
|
327 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
326 | +$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
|
327 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
328 | 328 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
329 | 329 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
330 | 330 |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $object = new Don($db); |
73 | 73 | $extrafields = new ExtraFields($db); |
74 | 74 | $diroutputmassaction = $conf->don->dir_output.'/temp/massgeneration/'.$user->id; |
75 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
75 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
76 | 76 | |
77 | 77 | // Fetch optionals attributes and labels |
78 | 78 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | |
181 | 181 | $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p"; |
182 | 182 | $sql .= " ON p.rowid = d.fk_projet"; |
183 | -$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe AS s ON s.rowid = d.fk_soc"; |
|
184 | -$sql .= " WHERE d.entity IN (". getEntity('donation') . ")"; |
|
183 | +$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON s.rowid = d.fk_soc"; |
|
184 | +$sql .= " WHERE d.entity IN (".getEntity('donation').")"; |
|
185 | 185 | |
186 | 186 | if ($search_status != '' && $search_status != '-4') { |
187 | 187 | $sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")"; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | // Output page |
253 | 253 | // -------------------------------------------------------------------- |
254 | 254 | |
255 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-donation page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
255 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-donation page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
256 | 256 | |
257 | 257 | // Example : Adding jquery code |
258 | 258 | // print '<script type="text/javascript"> |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | } |
354 | 354 | |
355 | 355 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
356 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
356 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
357 | 357 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
358 | 358 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
359 | 359 |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $form = new Form($db); |
146 | 146 | $now = dol_now(); |
147 | 147 | |
148 | -$help_url="EN:Module_Loan|FR:Module_Emprunt"; |
|
148 | +$help_url = "EN:Module_Loan|FR:Module_Emprunt"; |
|
149 | 149 | $help_url = ''; |
150 | 150 | $title = $langs->trans('Loans'); |
151 | 151 | |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | } |
321 | 321 | |
322 | 322 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
323 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
323 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
324 | 324 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
325 | 325 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
326 | 326 | |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | print '<div class="box-flex-container kanban">'; |
421 | 421 | } |
422 | 422 | // Output Kanban |
423 | - $object->datestart= $obj->datestart; |
|
423 | + $object->datestart = $obj->datestart; |
|
424 | 424 | $object->dateend = $obj->dateend; |
425 | 425 | $object->capital = $obj->capital; |
426 | 426 | $object->totalpaid = $obj->paid; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $search_date_endday = GETPOSTINT('search_date_endday'); |
83 | 83 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
84 | 84 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
85 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
85 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
86 | 86 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
87 | 87 | $search_date_when_startday = GETPOSTINT('search_date_when_startday'); |
88 | 88 | $search_date_when_startmonth = GETPOSTINT('search_date_when_startmonth'); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $search_date_when_endday = GETPOSTINT('search_date_when_endday'); |
91 | 91 | $search_date_when_endmonth = GETPOSTINT('search_date_when_endmonth'); |
92 | 92 | $search_date_when_endyear = GETPOSTINT('search_date_when_endyear'); |
93 | -$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver |
|
93 | +$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver |
|
94 | 94 | $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear); |
95 | 95 | $search_recurring = GETPOST('search_recurring', 'intcomma'); |
96 | 96 | $search_frequency = GETPOST('search_frequency', 'alpha'); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | $object->fields = dol_sort_array($object->fields, 'position'); |
164 | 164 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
165 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
165 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
166 | 166 | |
167 | 167 | if ($socid > 0) { |
168 | 168 | $tmpthirdparty = new Societe($db); |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | $massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend' => $langs->trans("SendByMail"), 'builddoc' => $langs->trans("PDFMerge"))); |
536 | 536 | |
537 | 537 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
538 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
538 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
539 | 539 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
540 | 540 | //$selectedfields.=$form->showCheckAddButtons('checkforselect', 1); |
541 | 541 |
@@ -46,20 +46,20 @@ discard block |
||
46 | 46 | $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
47 | 47 | $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
48 | 48 | $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
49 | -$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist'; |
|
49 | +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist'; |
|
50 | 50 | $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
51 | 51 | $optioncss = GETPOST('optioncss', 'alpha'); |
52 | 52 | $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
53 | 53 | $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) |
54 | 54 | |
55 | -$search_ref = GETPOST('search_ref', 'alpha'); |
|
55 | +$search_ref = GETPOST('search_ref', 'alpha'); |
|
56 | 56 | $search_label = GETPOST('search_label', 'alpha'); |
57 | 57 | $search_dateend_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateend_startmonth'), GETPOSTINT('search_dateend_startday'), GETPOSTINT('search_dateend_startyear')); |
58 | 58 | $search_dateend_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateend_endmonth'), GETPOSTINT('search_dateend_endday'), GETPOSTINT('search_dateend_endyear')); |
59 | 59 | $search_datepayment_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datepayment_startmonth'), GETPOSTINT('search_datepayment_startday'), GETPOSTINT('search_datepayment_startyear')); |
60 | 60 | $search_datepayment_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datepayment_endmonth'), GETPOSTINT('search_datepayment_endday'), GETPOSTINT('search_datepayment_endyear')); |
61 | 61 | $search_type = GETPOST('search_type', 'intcomma'); |
62 | -$search_account = GETPOST('search_account', 'alpha'); |
|
62 | +$search_account = GETPOST('search_account', 'alpha'); |
|
63 | 63 | $search_amount = GETPOST('search_amount', 'alpha'); |
64 | 64 | $search_status = GETPOST('search_status', 'intcomma'); |
65 | 65 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
99 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
99 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
100 | 100 | |
101 | 101 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
102 | 102 | $hookmanager->initHooks(array('salestaxeslist')); |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | } |
403 | 403 | |
404 | 404 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
405 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
405 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
406 | 406 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
407 | 407 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
408 | 408 | |
@@ -714,7 +714,7 @@ discard block |
||
714 | 714 | |
715 | 715 | // Amount |
716 | 716 | if (!empty($arrayfields['t.amount']['checked'])) { |
717 | - print '<td class="nowrap right"><span class="amount">' . price($obj->amount) . '</span></td>'; |
|
717 | + print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>'; |
|
718 | 718 | if (!$i) { |
719 | 719 | $totalarray['nbfield']++; |
720 | 720 | } |
@@ -727,7 +727,7 @@ discard block |
||
727 | 727 | } |
728 | 728 | |
729 | 729 | if (!empty($arrayfields['t.status']['checked'])) { |
730 | - print '<td class="nowrap right">' . $tva_static->getLibStatut(5, $obj->alreadypayed) . '</td>'; |
|
730 | + print '<td class="nowrap right">'.$tva_static->getLibStatut(5, $obj->alreadypayed).'</td>'; |
|
731 | 731 | if (!$i) { |
732 | 732 | $totalarray['nbfield']++; |
733 | 733 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $object = new PaymentVarious($db); |
94 | 94 | $extrafields = new ExtraFields($db); |
95 | 95 | //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; |
96 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
96 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
97 | 97 | |
98 | 98 | // Fetch optionals attributes and labels |
99 | 99 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | ); |
175 | 175 | |
176 | 176 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
177 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
177 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
178 | 178 | |
179 | 179 | // Security check |
180 | 180 | $socid = GETPOSTINT("socid"); |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | $moreforfilter = ''; |
469 | 469 | |
470 | 470 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
471 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
471 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
472 | 472 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
473 | 473 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
474 | 474 |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | |
127 | 127 | $object->fields = dol_sort_array($object->fields, 'position'); |
128 | 128 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
129 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
129 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
130 | 130 | |
131 | 131 | $permissiontoadd = $user->hasRight('banque', 'modifier'); |
132 | 132 | $permissiontodelete = $user->hasRight('banque', 'configurer'); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | } |
160 | 160 | |
161 | 161 | if (empty($reshook)) { |
162 | - include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php'; |
|
162 | + include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; |
|
163 | 163 | |
164 | 164 | // Purge search criteria |
165 | 165 | if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $objectclass = 'Account'; |
175 | 175 | $objectlabel = 'FinancialAccount'; |
176 | 176 | $uploaddir = $conf->banque->dir_output; |
177 | - include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php'; |
|
177 | + include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | /* |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | if ($searchCategoryBankOperator == 0) { |
241 | 241 | $searchCategoryBankSqlList[] = " EXISTS (SELECT ck.fk_account FROM ".MAIN_DB_PREFIX."categorie_account as ck WHERE b.rowid = ck.fk_account AND ck.fk_categorie = ".((int) $searchCategoryBank).")"; |
242 | 242 | } else { |
243 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryBank); |
|
243 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryBank); |
|
244 | 244 | } |
245 | 245 | } |
246 | 246 | } |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | if (isModEnabled('category') && $user->hasRight('banque', 'modifier')) { |
359 | 359 | $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); |
360 | 360 | } |
361 | -if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
361 | +if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
362 | 362 | $arrayofmassactions = array(); |
363 | 363 | } |
364 | 364 | $massactionbutton = $form->selectMassAction('', $arrayofmassactions); |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | } |
426 | 426 | |
427 | 427 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
428 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
428 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
429 | 429 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
430 | 430 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
431 | 431 |
@@ -150,12 +150,12 @@ discard block |
||
150 | 150 | $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_'); |
151 | 151 | |
152 | 152 | $arrayfields = array( |
153 | - 'b.rowid' => array('label' => $langs->trans("Ref"), 'checked' => 1,'position' => 10), |
|
154 | - 'b.label' => array('label' => $langs->trans("Description"), 'checked' => 1,'position' => 20), |
|
155 | - 'b.dateo' => array('label' => $langs->trans("DateOperationShort"), 'checked' => -1,'position' => 30), |
|
156 | - 'b.datev' => array('label' => $langs->trans("DateValueShort"), 'checked' => 1,'position' => 40), |
|
157 | - 'type' => array('label' => $langs->trans("Type"), 'checked' => 1,'position' => 50), |
|
158 | - 'b.num_chq' => array('label' => $langs->trans("Numero"), 'checked' => 1,'position' => 60), |
|
153 | + 'b.rowid' => array('label' => $langs->trans("Ref"), 'checked' => 1, 'position' => 10), |
|
154 | + 'b.label' => array('label' => $langs->trans("Description"), 'checked' => 1, 'position' => 20), |
|
155 | + 'b.dateo' => array('label' => $langs->trans("DateOperationShort"), 'checked' => -1, 'position' => 30), |
|
156 | + 'b.datev' => array('label' => $langs->trans("DateValueShort"), 'checked' => 1, 'position' => 40), |
|
157 | + 'type' => array('label' => $langs->trans("Type"), 'checked' => 1, 'position' => 50), |
|
158 | + 'b.num_chq' => array('label' => $langs->trans("Numero"), 'checked' => 1, 'position' => 60), |
|
159 | 159 | 'bu.label' => array('label' => $langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked' => 1, 'position' => 70), |
160 | 160 | 'ba.ref' => array('label' => $langs->trans("BankAccount"), 'checked' => (($id > 0 || !empty($ref)) ? 0 : 1), 'position' => 80), |
161 | 161 | 'b.debit' => array('label' => $langs->trans("Debit"), 'checked' => 1, 'position' => 90), |
@@ -652,20 +652,20 @@ discard block |
||
652 | 652 | $sql .= " AND b.rappro = ".((int) $search_conciliated); |
653 | 653 | } |
654 | 654 | if ($search_fk_bordereau > 0) { |
655 | - $sql .= " AND b.fk_bordereau = " . ((int) $search_fk_bordereau); |
|
655 | + $sql .= " AND b.fk_bordereau = ".((int) $search_fk_bordereau); |
|
656 | 656 | } |
657 | 657 | if ($search_thirdparty_user) { |
658 | 658 | $sql .= " AND (b.rowid IN "; |
659 | 659 | $sql .= " ( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu"; |
660 | 660 | $sql .= " JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank"; |
661 | 661 | $sql .= " JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)"; |
662 | - $sql .= " WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")"; |
|
662 | + $sql .= " WHERE ".natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")"; |
|
663 | 663 | |
664 | 664 | $sql .= " OR b.rowid IN "; |
665 | 665 | $sql .= " ( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu"; |
666 | 666 | $sql .= " JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank"; |
667 | 667 | $sql .= " JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)"; |
668 | - $sql .= " WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1); |
|
668 | + $sql .= " WHERE ".natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1); |
|
669 | 669 | $sql .= "))"; |
670 | 670 | } |
671 | 671 | if ($search_description) { |
@@ -1085,7 +1085,7 @@ discard block |
||
1085 | 1085 | } |
1086 | 1086 | |
1087 | 1087 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1088 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1088 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1089 | 1089 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1090 | 1090 | $selectedfields .= ($action == 'reconcile' ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1091 | 1091 | |
@@ -1442,10 +1442,10 @@ discard block |
||
1442 | 1442 | $backgroundcolor = "class='oddeven'"; |
1443 | 1443 | } else { |
1444 | 1444 | if ($objp->amount < 0) { |
1445 | - $color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955'); |
|
1445 | + $color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955'); |
|
1446 | 1446 | $backgroundcolor = 'style="background: '.$color.';"'; |
1447 | 1447 | } else { |
1448 | - $color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86'); |
|
1448 | + $color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86'); |
|
1449 | 1449 | $backgroundcolor = 'style="background: '.$color.';"'; |
1450 | 1450 | } |
1451 | 1451 | } |
@@ -1594,7 +1594,7 @@ discard block |
||
1594 | 1594 | } |
1595 | 1595 | } |
1596 | 1596 | |
1597 | - print $labeltoshow; // Already escaped |
|
1597 | + print $labeltoshow; // Already escaped |
|
1598 | 1598 | |
1599 | 1599 | print '</td>'; |
1600 | 1600 | if (!$i) { |
@@ -1820,7 +1820,7 @@ discard block |
||
1820 | 1820 | |
1821 | 1821 | // Fields from hook |
1822 | 1822 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $objp, 'i' => $i, 'totalarray' => &$totalarray); |
1823 | - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook |
|
1823 | + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook |
|
1824 | 1824 | print $hookmanager->resPrint; |
1825 | 1825 | |
1826 | 1826 | // Action edit/delete and select |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | } |
202 | 202 | } |
203 | 203 | if ($search_company) { |
204 | - $sql .= natural_search(array("u.firstname","u.lastname"), $search_company); |
|
204 | + $sql .= natural_search(array("u.firstname", "u.lastname"), $search_company); |
|
205 | 205 | } |
206 | 206 | } |
207 | 207 | // Count total nb of records |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) { |
210 | 210 | /* The fast and low memory method to get and count full list converts the sql into a sql count */ |
211 | 211 | if ($type == 'bank-transfer') { |
212 | - $sqlforcount = "SELECT COUNT(*) as nbtotalofrecords FROM (" . $sql . ") AS combined_results"; |
|
212 | + $sqlforcount = "SELECT COUNT(*) as nbtotalofrecords FROM (".$sql.") AS combined_results"; |
|
213 | 213 | } else { |
214 | 214 | $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql); |
215 | 215 | $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount); |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | } |
324 | 324 | |
325 | 325 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
326 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
326 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
327 | 327 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
328 | 328 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
329 | 329 |