@@ -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 | |
@@ -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') . '">' |
@@ -101,8 +101,8 @@ |
||
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | // List of targets fields |
| 104 | -$headerlinefields = array(); // Array of fields (label to show) |
|
| 105 | -$contentlinevalues = array(); // Array of example values |
|
| 104 | +$headerlinefields = array(); // Array of fields (label to show) |
|
| 105 | +$contentlinevalues = array(); // Array of example values |
|
| 106 | 106 | $i = 0; |
| 107 | 107 | foreach ($fieldstarget as $code => $label) { |
| 108 | 108 | $withoutstar = preg_replace('/\*/', '', $fieldstarget[$code]); |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $endatlinenb = (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : ''); |
| 144 | 144 | $updatekeys = (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array()); |
| 145 | 145 | $separator = (GETPOST('separator', 'alphanohtml') ? GETPOST('separator', 'alphanohtml', 3) : ''); |
| 146 | -$enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept " |
|
| 146 | +$enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept " |
|
| 147 | 147 | $charset = GETPOST('charset', 'aZ09'); |
| 148 | 148 | $separator_used = str_replace('\t', "\t", $separator); |
| 149 | 149 | |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | $maxfilesizearray = getMaxFileSizeArray(); |
| 644 | 644 | $maxmin = $maxfilesizearray['maxmin']; |
| 645 | 645 | if ($maxmin > 0) { |
| 646 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 646 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 647 | 647 | } |
| 648 | 648 | print '<input type="file" name="userfile" size="20" maxlength="80"> '; |
| 649 | 649 | $out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : ''); |
@@ -762,7 +762,7 @@ discard block |
||
| 762 | 762 | //var_dump($_SESSION["dol_array_match_file_to_database_select"]); |
| 763 | 763 | $serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database_select"]) ? $_SESSION["dol_array_match_file_to_database_select"] : ''; |
| 764 | 764 | $fieldsarray = explode(',', $serialized_array_match_file_to_database); |
| 765 | - $array_match_file_to_database = array(); // Same than $fieldsarray but with mapped value only (col1 => 's.fielda', col2 => 's.fieldb'...) |
|
| 765 | + $array_match_file_to_database = array(); // Same than $fieldsarray but with mapped value only (col1 => 's.fielda', col2 => 's.fieldb'...) |
|
| 766 | 766 | foreach ($fieldsarray as $elem) { |
| 767 | 767 | $tabelem = explode('=', $elem, 2); |
| 768 | 768 | $key = $tabelem[0]; |
@@ -1116,7 +1116,7 @@ discard block |
||
| 1116 | 1116 | foreach ($fieldstarget as $code => $line) { |
| 1117 | 1117 | //var_dump($line); |
| 1118 | 1118 | |
| 1119 | - $tmparray = explode('|', $line["label"]); // If label of field is several translation keys separated with | |
|
| 1119 | + $tmparray = explode('|', $line["label"]); // If label of field is several translation keys separated with | |
|
| 1120 | 1120 | $labeltoshow = ''; |
| 1121 | 1121 | foreach ($tmparray as $tmpkey => $tmpval) { |
| 1122 | 1122 | $labeltoshow .= ($labeltoshow ? ' ' . $langs->trans('or') . ' ' : '') . $langs->transnoentities($tmpval); |
@@ -1146,7 +1146,7 @@ discard block |
||
| 1146 | 1146 | //var_dump($fieldssource); |
| 1147 | 1147 | //var_dump($fieldstarget); |
| 1148 | 1148 | |
| 1149 | - $modetoautofillmapping = 'session'; // Use setup in session |
|
| 1149 | + $modetoautofillmapping = 'session'; // Use setup in session |
|
| 1150 | 1150 | if ($initialloadofstep4) { |
| 1151 | 1151 | $modetoautofillmapping = 'guess'; |
| 1152 | 1152 | } |
@@ -1358,7 +1358,7 @@ discard block |
||
| 1358 | 1358 | // - Then we set to disabled all fields that are selected |
| 1359 | 1359 | print 'function setOptionsToDisabled() {' . "\n"; |
| 1360 | 1360 | print ' console.log("Remove the disabled flag everywhere");' . "\n"; |
| 1361 | - print ' $("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);' . "\n"; // Enable all options |
|
| 1361 | + print ' $("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);' . "\n"; // Enable all options |
|
| 1362 | 1362 | print ' arrayofselectedvalues = [];' . "\n"; |
| 1363 | 1363 | |
| 1364 | 1364 | print ' $("select.targetselectchange").each(function(){' . "\n"; |
@@ -1375,7 +1375,7 @@ discard block |
||
| 1375 | 1375 | print ' $.each(arrayofselectedvalues, function(key, value) {' . "\n"; // Loop on each selected value |
| 1376 | 1376 | print ' if (value != -1) {' . "\n"; |
| 1377 | 1377 | print ' console.log("Process key="+key+" value="+value+" to disable.");' . "\n"; |
| 1378 | - print ' $("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);' . "\n"; // Set to disabled except if currently selected |
|
| 1378 | + print ' $("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);' . "\n"; // Set to disabled except if currently selected |
|
| 1379 | 1379 | print ' }' . "\n"; |
| 1380 | 1380 | print ' });' . "\n"; |
| 1381 | 1381 | print '}' . "\n"; |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | // Output page |
| 354 | 354 | // -------------------------------------------------------------------- |
| 355 | 355 | |
| 356 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
| 356 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
| 357 | 357 | |
| 358 | 358 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
| 359 | 359 | |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | $userstatic->login = $obj->login; |
| 643 | 643 | $userstatic->email = $obj->email; |
| 644 | 644 | $userstatic->socid = $obj->fk_soc; |
| 645 | - $userstatic->statut = $obj->status; // deprecated |
|
| 645 | + $userstatic->statut = $obj->status; // deprecated |
|
| 646 | 646 | $userstatic->status = $obj->status; |
| 647 | 647 | $userstatic->photo = $obj->photo; |
| 648 | 648 | |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | dol_print_error($db, 'Failed to get payment id ' . $id); |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | -restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary |
|
| 58 | +restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | /* |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | // Create a line of payments |
| 301 | 301 | $paiement = new PaymentSalary($db); |
| 302 | 302 | $paiement->fk_salary = $object->id; |
| 303 | - $paiement->chid = $object->id; // deprecated |
|
| 303 | + $paiement->chid = $object->id; // deprecated |
|
| 304 | 304 | $paiement->datep = $datep; |
| 305 | 305 | $paiement->datev = $datev; |
| 306 | 306 | $paiement->amounts = array($object->id => $amount); // Tableau de montant |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | |
| 622 | 622 | // Auto create payment |
| 623 | 623 | print '<tr><td><label for="auto_create_paiement">' . $langs->trans('AutomaticCreationPayment') . '</label></td>'; |
| 624 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>' . "\n"; // Date payment |
|
| 624 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>' . "\n"; // Date payment |
|
| 625 | 625 | |
| 626 | 626 | // Bank |
| 627 | 627 | if (isModEnabled("bank")) { |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | // Create a line of payments |
| 109 | 109 | $paiement = new PaymentSalary($db); |
| 110 | 110 | $paiement->fk_salary = $id; |
| 111 | - $paiement->chid = $id; // deprecated |
|
| 111 | + $paiement->chid = $id; // deprecated |
|
| 112 | 112 | $paiement->datep = $datepaye; |
| 113 | 113 | $paiement->amounts = $amounts; // Tableau de montant |
| 114 | 114 | $paiement->fk_typepayment = GETPOSTINT("paiementtype"); |