@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; |
50 | 50 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
51 | 51 | $sortorder = GETPOST('sortorder', 'aZ09comma'); |
52 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
52 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
53 | 53 | $confirm = GETPOST('confirm', 'alpha'); |
54 | 54 | |
55 | 55 | $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); |
@@ -267,12 +267,12 @@ discard block |
||
267 | 267 | foreach ($typeleaves as $key => $val) { |
268 | 268 | $labeltypes[$val['id']] = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']); |
269 | 269 | } |
270 | - $formquestion [] = array( 'type' => 'other', |
|
270 | + $formquestion [] = array('type' => 'other', |
|
271 | 271 | 'name' => 'typeofholiday', |
272 | 272 | 'label' => $langs->trans("Type"), |
273 | 273 | 'value' => $form->selectarray('typeholiday', $labeltypes, GETPOST('typeholiday', 'alpha'), 1) |
274 | 274 | ); |
275 | - $formquestion [] = array( 'type' => 'other', |
|
275 | + $formquestion [] = array('type' => 'other', |
|
276 | 276 | 'name' => 'nbdaysholydays', |
277 | 277 | 'label' => $langs->trans("NumberDayAddMass"), |
278 | 278 | 'value' => '<input name="nbdaysholidays" class="maxwidth75" id="nbdaysholidays" value="' . GETPOSTINT('nbdaysholidays') . '">' |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | |
506 | 506 | // option to warn the validator in case of too short delay |
507 | 507 | if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY')) { |
508 | - $delayForRequest = 0; // TODO Set delay depending of holiday leave type |
|
508 | + $delayForRequest = 0; // TODO Set delay depending of holiday leave type |
|
509 | 509 | if ($delayForRequest) { |
510 | 510 | $nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd'); |
511 | 511 | |
@@ -1213,7 +1213,7 @@ discard block |
||
1213 | 1213 | $result = $object->fetch($id, $ref); |
1214 | 1214 | |
1215 | 1215 | $approverexpected = new User($db); |
1216 | - $approverexpected->fetch($object->fk_validator); // Use that should be the approver |
|
1216 | + $approverexpected->fetch($object->fk_validator); // Use that should be the approver |
|
1217 | 1217 | |
1218 | 1218 | $userRequest = new User($db); |
1219 | 1219 | $userRequest->fetch($object->fk_user); |
@@ -1448,7 +1448,7 @@ discard block |
||
1448 | 1448 | print '</tr>'; |
1449 | 1449 | } else { |
1450 | 1450 | print '<tr>'; |
1451 | - print '<td class="titlefield">' . $langs->trans('ReviewedByCP') . '</td>'; // Will be approved by |
|
1451 | + print '<td class="titlefield">' . $langs->trans('ReviewedByCP') . '</td>'; // Will be approved by |
|
1452 | 1452 | print '<td>'; |
1453 | 1453 | $include_users = $object->fetch_users_approver_holiday(); |
1454 | 1454 | if (!in_array($object->fk_validator, $include_users)) { // Add the current validator to the list to not lose it when editing. |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | if (!$error) { |
168 | - $users = GETPOST('users', 'array'); |
|
169 | - $groups = GETPOST('groups', 'array'); |
|
168 | + $users = GETPOST('users', 'array'); |
|
169 | + $groups = GETPOST('groups', 'array'); |
|
170 | 170 | |
171 | 171 | $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year')); |
172 | 172 | $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year')); |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | |
733 | 733 | // option to warn the validator in case of too short delay |
734 | 734 | if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY')) { |
735 | - $delayForRequest = 0; // TODO Set delay depending of holiday leave type |
|
735 | + $delayForRequest = 0; // TODO Set delay depending of holiday leave type |
|
736 | 736 | if ($delayForRequest) { |
737 | 737 | $nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd'); |
738 | 738 |
@@ -586,7 +586,7 @@ discard block |
||
586 | 586 | } |
587 | 587 | |
588 | 588 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
589 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
589 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
590 | 590 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
591 | 591 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
592 | 592 | |
@@ -877,7 +877,7 @@ discard block |
||
877 | 877 | $starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning'; |
878 | 878 | $endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon'; |
879 | 879 | |
880 | - $nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday); // user jdate(..., 1) because num_open_day need UTC dates |
|
880 | + $nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday); // user jdate(..., 1) because num_open_day need UTC dates |
|
881 | 881 | $totalduration += $nbopenedday; |
882 | 882 | |
883 | 883 | if ($mode == 'kanban') { |
@@ -160,7 +160,7 @@ |
||
160 | 160 | $sql .= " AND cp.statut = " . Holiday::STATUS_APPROVED; |
161 | 161 | $sql .= " AND ("; |
162 | 162 | $sql .= " (date_format(cp.date_debut, '%Y-%m') = '" . $db->escape($year_month) . "' OR date_format(cp.date_fin, '%Y-%m') = '" . $db->escape($year_month) . "')"; |
163 | -$sql .= " OR"; // For leave over several months |
|
163 | +$sql .= " OR"; // For leave over several months |
|
164 | 164 | $sql .= " (date_format(cp.date_debut, '%Y-%m') < '" . $db->escape($year_month) . "' AND date_format(cp.date_fin, '%Y-%m') > '" . $db->escape($year_month) . "') "; |
165 | 165 | $sql .= " )"; |
166 | 166 | if (!empty($search_ref)) { |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
44 | 44 | $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
45 | -$mode = GETPOST('mode', 'alpha'); |
|
45 | +$mode = GETPOST('mode', 'alpha'); |
|
46 | 46 | $show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
47 | 47 | $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
48 | 48 | $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | $include = ''; |
316 | 316 | |
317 | 317 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
318 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
318 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
319 | 319 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
320 | 320 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
321 | 321 |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | print '<datalist id="pcg_type_datalist">'; |
257 | 257 | $sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account"; |
258 | 258 | $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'"; |
259 | - $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
259 | + $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
260 | 260 | $sql .= ' LIMIT 50000'; // just as a sanity check |
261 | 261 | $resql = $db->query($sql); |
262 | 262 | if ($resql) { |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | print '<datalist id="pcg_type_datalist">'; |
334 | 334 | $sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account'; |
335 | 335 | $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'"; |
336 | - $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
336 | + $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
337 | 337 | $sql .= ' LIMIT 50000'; // just as a sanity check |
338 | 338 | $resql = $db->query($sql); |
339 | 339 | if ($resql) { |
@@ -461,7 +461,7 @@ |
||
461 | 461 | print '<br>'; |
462 | 462 | |
463 | 463 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
464 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
464 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
465 | 465 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
466 | 466 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
467 | 467 |
@@ -335,7 +335,7 @@ |
||
335 | 335 | print '<div class="info">' . $langs->trans("WarningCreateSubAccounts") . '</div>'; |
336 | 336 | |
337 | 337 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
338 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
338 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
339 | 339 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
340 | 340 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
341 | 341 |