@@ -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 |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | |
| 319 | 319 | if (!$error) { |
| 320 | 320 | // File transfer |
| 321 | - $object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was '' |
|
| 321 | + $object->copyFilesForTicket(''); // trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was '' |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | if (!$error) { |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | |
| 701 | 701 | print load_fiche_titre($langs->trans('NewTicket'), '', 'ticket'); |
| 702 | 702 | |
| 703 | - $formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 703 | + $formticket->trackid = ''; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 704 | 704 | $formticket->withfromsocid = $socid ? $socid : $user->socid; |
| 705 | 705 | $formticket->withfromcontactid = $contactid ? $contactid : ''; |
| 706 | 706 | $formticket->withtitletopic = 1; |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | |
| 729 | 729 | print dol_get_fiche_head($head, 'tabTicket', $langs->trans('Ticket'), -1, 'ticket'); |
| 730 | 730 | |
| 731 | - $formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 731 | + $formticket->trackid = $object->track_id; // TODO Use a unique key 'tic' to avoid conflict in upload file feature |
|
| 732 | 732 | $formticket->withfromsocid = $object->socid; |
| 733 | 733 | $formticket->withtitletopic = 1; |
| 734 | 734 | // $formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (getDolGlobalString('TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION') ? 1 : 0)); |
@@ -873,9 +873,9 @@ discard block |
||
| 873 | 873 | } |
| 874 | 874 | |
| 875 | 875 | if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) { |
| 876 | - $object->next_prev_filter = "te.fk_user_assign = " . ((int)$user->id); |
|
| 876 | + $object->next_prev_filter = "te.fk_user_assign = " . ((int) $user->id); |
|
| 877 | 877 | } elseif ($user->socid > 0) { |
| 878 | - $object->next_prev_filter = "te.fk_soc = " . ((int)$user->socid); |
|
| 878 | + $object->next_prev_filter = "te.fk_soc = " . ((int) $user->socid); |
|
| 879 | 879 | } |
| 880 | 880 | |
| 881 | 881 | $head = ticket_prepare_head($object); |
@@ -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 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $search_date_startendday = GETPOSTINT('search_date_startendday'); |
| 118 | 118 | $search_date_startendmonth = GETPOSTINT('search_date_startendmonth'); |
| 119 | 119 | $search_date_startendyear = GETPOSTINT('search_date_startendyear'); |
| 120 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 120 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 121 | 121 | $search_date_startend = dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear); |
| 122 | 122 | |
| 123 | 123 | $search_date_endday = GETPOSTINT('search_date_endday'); |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | $search_date_endendday = GETPOSTINT('search_date_endendday'); |
| 127 | 127 | $search_date_endendmonth = GETPOSTINT('search_date_endendmonth'); |
| 128 | 128 | $search_date_endendyear = GETPOSTINT('search_date_endendyear'); |
| 129 | -$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
| 129 | +$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
| 130 | 130 | $search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear); |
| 131 | 131 | |
| 132 | -$optioncss = GETPOST('optioncss', 'alpha'); |
|
| 132 | +$optioncss = GETPOST('optioncss', 'alpha'); |
|
| 133 | 133 | |
| 134 | 134 | if ($search_status == '') { |
| 135 | 135 | $search_status = -1; |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | } |
| 589 | 589 | |
| 590 | 590 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 591 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 591 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 592 | 592 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 593 | 593 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 594 | 594 | |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | -$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 99 | +$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 100 | 100 | |
| 101 | 101 | |
| 102 | 102 | /* |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | $dataseries = dol_sort_array($dataseries, 1, 'desc'); |
| 142 | 142 | |
| 143 | 143 | // Merge all entries after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic). |
| 144 | -$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 144 | +$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 145 | 145 | $i = 0; |
| 146 | 146 | if (count($dataseries) > ($KEEPNFIRST + 1)) { |
| 147 | 147 | foreach ($dataseries as $key => $val) { |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | 'maxTopMenu' => & $maxTopMenu |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | -$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
| 116 | +$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
| 117 | 117 | if ($reshook < 0) { |
| 118 | 118 | $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 119 | 119 | } |
@@ -49,7 +49,9 @@ |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // Not sure this is required |
| 52 | -if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
| 52 | +if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) { |
|
| 53 | + unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
| 54 | +} |
|
| 53 | 55 | |
| 54 | 56 | if (GETPOST('noredirect')) { |
| 55 | 57 | return; |