@@ -47,7 +47,7 @@ |
||
47 | 47 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeecard'; // To manage different context of search |
48 | 48 | $backtopage = GETPOST('backtopage', 'alpha'); |
49 | 49 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
50 | -$lineid = GETPOSTINT('lineid'); |
|
50 | +$lineid = GETPOSTINT('lineid'); |
|
51 | 51 | $mode = GETPOST('mode', 'alpha'); |
52 | 52 | |
53 | 53 | $conf_or_booth_id = GETPOSTINT('conforboothid'); |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | $langs->loadLangs(array("eventorganization", "other", "projects", "bills")); |
47 | 47 | |
48 | 48 | // Get Parameters |
49 | -$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
50 | -$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
51 | -$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
|
52 | -$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
53 | -$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
54 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
49 | +$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
50 | +$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
51 | +$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
|
52 | +$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
53 | +$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
54 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
55 | 55 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search |
56 | -$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
57 | -$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
56 | +$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
57 | +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
58 | 58 | $mode = GETPOST('mode', 'aZ'); |
59 | 59 | |
60 | 60 | $id = GETPOSTINT('id'); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | // Default sort order (if not yet defined by previous GETPOST) |
97 | 97 | if (!$sortfield) { |
98 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
98 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
99 | 99 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
100 | 100 | } |
101 | 101 | if (!$sortorder) { |
@@ -806,7 +806,7 @@ discard block |
||
806 | 806 | } |
807 | 807 | |
808 | 808 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
809 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
809 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
810 | 810 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
811 | 811 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
812 | 812 | |
@@ -898,7 +898,7 @@ discard block |
||
898 | 898 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
899 | 899 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
900 | 900 | } |
901 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
901 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
902 | 902 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
903 | 903 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
904 | 904 | $totalarray['nbfield']++; |
@@ -81,7 +81,7 @@ |
||
81 | 81 | // Turning on or off the ssl target certificate |
82 | 82 | if ($ssl_verifypeer < 0) { |
83 | 83 | global $dolibarr_main_prod; |
84 | - $ssl_verifypeer = ($dolibarr_main_prod ? true : false); |
|
84 | + $ssl_verifypeer = ($dolibarr_main_prod ? true : false); |
|
85 | 85 | } |
86 | 86 | if (getDolGlobalString('MAIN_CURL_DISABLE_VERIFYPEER')) { |
87 | 87 | $ssl_verifypeer = 0; |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | |
323 | 323 | if (!$error) { |
324 | 324 | // File transfer |
325 | - $object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was '' |
|
325 | + $object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was '' |
|
326 | 326 | } |
327 | 327 | } |
328 | 328 | if (!$error) { |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | |
705 | 705 | print load_fiche_titre($langs->trans('NewTicket'), '', 'ticket'); |
706 | 706 | |
707 | - $formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
707 | + $formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
708 | 708 | $formticket->withfromsocid = $socid ? $socid : $user->socid; |
709 | 709 | $formticket->withfromcontactid = $contactid ? $contactid : ''; |
710 | 710 | $formticket->withtitletopic = 1; |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | |
733 | 733 | print dol_get_fiche_head($head, 'tabTicket', $langs->trans('Ticket'), -1, 'ticket'); |
734 | 734 | |
735 | - $formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
735 | + $formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
736 | 736 | $formticket->withfromsocid = $object->socid; |
737 | 737 | $formticket->withtitletopic = 1; |
738 | 738 | // $formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (getDolGlobalString('TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION') ? 1 : 0)); |
@@ -971,8 +971,8 @@ discard block |
||
971 | 971 | $morehtmlref .= $formcontract->formSelectContract($_SERVER["PHP_SELF"] . '?id=' . $object->id, $object->socid, $object->fk_contract, 'contratid', 0, 1, 1, 1); |
972 | 972 | } else { |
973 | 973 | $morehtmlref .= '<a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=edit_contrat&token=' . newToken() . '&id=' . $object->id . '">'; |
974 | - $morehtmlref .= img_edit($langs->trans('SetContract')); |
|
975 | - $morehtmlref .= '</a>'; |
|
974 | + $morehtmlref .= img_edit($langs->trans('SetContract')); |
|
975 | + $morehtmlref .= '</a>'; |
|
976 | 976 | } |
977 | 977 | } else { |
978 | 978 | if (!empty($object->fk_contract)) { |
@@ -192,7 +192,9 @@ discard block |
||
192 | 192 | |
193 | 193 | if (($action == 'add' || ($action == 'update' && $object->status < Ticket::STATUS_CLOSED)) && $permissiontoadd) { |
194 | 194 | $ifErrorAction = $action == 'add' ? 'create' : 'edit'; |
195 | - if ($action == 'add') $object->track_id = null; |
|
195 | + if ($action == 'add') { |
|
196 | + $object->track_id = null; |
|
197 | + } |
|
196 | 198 | $error = 0; |
197 | 199 | |
198 | 200 | $fieldsToCheck = [ |
@@ -344,7 +346,9 @@ discard block |
||
344 | 346 | $db->rollback(); |
345 | 347 | setEventMessages($object->error, $object->errors, 'errors'); |
346 | 348 | } |
347 | - } else $action = $ifErrorAction; |
|
349 | + } else { |
|
350 | + $action = $ifErrorAction; |
|
351 | + } |
|
348 | 352 | } |
349 | 353 | |
350 | 354 | // Mark as Read |
@@ -987,7 +987,7 @@ discard block |
||
987 | 987 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
988 | 988 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
989 | 989 | } |
990 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
990 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
991 | 991 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
992 | 992 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
993 | 993 | $totalarray['nbfield']++; |
@@ -1156,11 +1156,11 @@ discard block |
||
1156 | 1156 | $should_show_warning = (getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE') || getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE')); |
1157 | 1157 | if ($is_open && $should_show_warning) { |
1158 | 1158 | $date_last_msg_sent = (int) $object->date_last_msg_sent; |
1159 | - $hour_diff = ($now - $date_last_msg_sent) / 3600 ; |
|
1159 | + $hour_diff = ($now - $date_last_msg_sent) / 3600; |
|
1160 | 1160 | |
1161 | 1161 | if (getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE') && $date_last_msg_sent == 0) { |
1162 | - $creation_date = $object->datec; |
|
1163 | - $hour_diff_creation = ($now - $creation_date) / 3600 ; |
|
1162 | + $creation_date = $object->datec; |
|
1163 | + $hour_diff_creation = ($now - $creation_date) / 3600; |
|
1164 | 1164 | if ($hour_diff_creation > getDolGlobalInt('TICKET_DELAY_BEFORE_FIRST_RESPONSE')) { |
1165 | 1165 | print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayForFirstResponseTooLong', getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE')), 'warning', 'style="color: red;"', false, 0, 0, '', ''); |
1166 | 1166 | } |
@@ -1256,7 +1256,7 @@ discard block |
||
1256 | 1256 | |
1257 | 1257 | print '</table>' . "\n"; |
1258 | 1258 | print '</div>' . "\n"; |
1259 | -print '</div>' . "\n"; // end div-responsive-inside |
|
1259 | +print '</div>' . "\n"; // end div-responsive-inside |
|
1260 | 1260 | |
1261 | 1261 | print '</form>' . "\n"; |
1262 | 1262 |
@@ -92,7 +92,7 @@ |
||
92 | 92 | accessforbidden(); |
93 | 93 | } |
94 | 94 | |
95 | -$permissiontoadd = $user->hasRight('ticket', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
95 | +$permissiontoadd = $user->hasRight('ticket', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
96 | 96 | |
97 | 97 | |
98 | 98 | /* |
@@ -69,21 +69,21 @@ |
||
69 | 69 | |
70 | 70 | |
71 | 71 | if (empty($fk_expense) || $fk_expense < 0) { |
72 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'); |
|
72 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense'); |
|
73 | 73 | } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) { |
74 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); |
|
74 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); |
|
75 | 75 | |
76 | 76 | $rep->response_status = 'error'; |
77 | 77 | } else { |
78 | 78 | // @see ndfp.class.php:3576 (method: compute_total_km) |
79 | 79 | $expense = new ExpenseReport($db); |
80 | 80 | if ($expense->fetch($fk_expense) <= 0) { |
81 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
81 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
82 | 82 | $rep->response_status = 'error'; |
83 | 83 | } else { |
84 | 84 | $userauthor = new User($db); |
85 | 85 | if ($userauthor->fetch($expense->fk_user_author) <= 0) { |
86 | - $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
86 | + $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound'); |
|
87 | 87 | $rep->response_status = 'error'; |
88 | 88 | } else { |
89 | 89 | $expense = new ExpenseReport($db); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | } |
154 | 154 | $result = restrictedArea($user, 'expensereport', $object->id, 'expensereport'); |
155 | 155 | |
156 | -$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
156 | +$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
157 | 157 | |
158 | 158 | |
159 | 159 | /* |
@@ -2384,7 +2384,7 @@ discard block |
||
2384 | 2384 | |
2385 | 2385 | // Quantity |
2386 | 2386 | print '<td class="right">'; |
2387 | - print '<input type="text" min="0" class="input_qty right maxwidth50" name="qty" value="' . dol_escape_htmltag($line->qty) . '" />'; // We must be able to enter decimal qty |
|
2387 | + print '<input type="text" min="0" class="input_qty right maxwidth50" name="qty" value="' . dol_escape_htmltag($line->qty) . '" />'; // We must be able to enter decimal qty |
|
2388 | 2388 | print '</td>'; |
2389 | 2389 | |
2390 | 2390 | //print '<td class="right">'.$langs->trans('AmountHT').'</td>'; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $search_date_endday = GETPOSTINT('search_date_endday'); |
68 | 68 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
69 | 69 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
70 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
70 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
71 | 71 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
72 | 72 | $search_user = GETPOST('search_user', 'alpha'); |
73 | 73 | $search_payment_type = GETPOST('search_payment_type'); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | 'pndf.amount' => array('label' => "Amount", 'checked' => 1, 'position' => 70), |
115 | 115 | ); |
116 | 116 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
117 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
117 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
118 | 118 | |
119 | 119 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
120 | 120 | $hookmanager->initHooks(array('paymentexpensereportlist')); |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | } |
421 | 421 | |
422 | 422 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
423 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
423 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
424 | 424 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
425 | 425 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
426 | 426 |