@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('projet', 'creer')) { |
146 | 146 | $task_origin_id = GETPOSTINT('task_origin'); |
147 | - $task_origin = new Task($db); // The Task that we will delete |
|
147 | + $task_origin = new Task($db); // The Task that we will delete |
|
148 | 148 | |
149 | 149 | if ($task_origin_id <= 0) { |
150 | 150 | $langs->load('errors'); |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | |
261 | 261 | $title = $object->ref; |
262 | 262 | if (!empty($withproject)) { |
263 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '') ; |
|
263 | + $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : ''); |
|
264 | 264 | } |
265 | 265 | $help_url = ''; |
266 | 266 |
@@ -149,7 +149,7 @@ |
||
149 | 149 | |
150 | 150 | $title = $object->ref . ' - ' . $langs->trans("Contacts"); |
151 | 151 | if (!empty($withproject)) { |
152 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '') ; |
|
152 | + $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : ''); |
|
153 | 153 | } |
154 | 154 | $help_url = ''; |
155 | 155 |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $search_date_endday = GETPOSTINT('search_date_endday'); |
97 | 97 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
98 | 98 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
99 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
99 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
100 | 100 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
101 | 101 | $search_datelimit_startday = GETPOSTINT('search_datelimit_startday'); |
102 | 102 | $search_datelimit_startmonth = GETPOSTINT('search_datelimit_startmonth'); |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | $object->fields = dol_sort_array($object->fields, 'position'); |
188 | 188 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
189 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
189 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
190 | 190 | |
191 | 191 | $permissiontoread = $user->hasRight('projet', 'lire'); |
192 | 192 | $permissiontocreate = $user->hasRight('projet', 'creer'); |
@@ -589,7 +589,7 @@ discard block |
||
589 | 589 | // Direct jump if only one record found |
590 | 590 | if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) { |
591 | 591 | $obj = $db->fetch_object($resql); |
592 | - $id = $obj->id; // in select, task id has been aliases into 'id' |
|
592 | + $id = $obj->id; // in select, task id has been aliases into 'id' |
|
593 | 593 | header("Location: " . constant('BASE_URL') . '/projet/tasks/task.php?id=' . $id . '&withproject=1'); |
594 | 594 | exit; |
595 | 595 | } |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | // Output page |
599 | 599 | // -------------------------------------------------------------------- |
600 | 600 | |
601 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
601 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
602 | 602 | |
603 | 603 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
604 | 604 | |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | } |
838 | 838 | |
839 | 839 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
840 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
840 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
841 | 841 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
842 | 842 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
843 | 843 |
@@ -125,7 +125,7 @@ |
||
125 | 125 | |
126 | 126 | $title = $object->ref . ' - ' . $langs->trans("Documents"); |
127 | 127 | if (!empty($withproject)) { |
128 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '') ; |
|
128 | + $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : ''); |
|
129 | 129 | } |
130 | 130 | $help_url = ''; |
131 | 131 |
@@ -119,7 +119,7 @@ |
||
119 | 119 | |
120 | 120 | $title = $object->ref . ' - ' . $langs->trans("Notes"); |
121 | 121 | if (!empty($withproject)) { |
122 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '') ; |
|
122 | + $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : ''); |
|
123 | 123 | } |
124 | 124 | $help_url = ''; |
125 | 125 |
@@ -155,7 +155,7 @@ |
||
155 | 155 | while ($i < $num) { |
156 | 156 | $objp = $db->fetch_object($resql); |
157 | 157 | $listofoppstatus[$objp->rowid] = $objp->percent; |
158 | - $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
158 | + $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
159 | 159 | $listofoppcode[$objp->rowid] = $objp->code; |
160 | 160 | switch ($objp->code) { |
161 | 161 | case 'PROSP': |
@@ -151,8 +151,8 @@ |
||
151 | 151 | $id = GETPOSTINT('id'); |
152 | 152 | $ref = GETPOST('ref', 'alpha'); |
153 | 153 | $action = GETPOST('action', 'aZ09'); |
154 | -$datesrfc = GETPOST('datesrfc'); // deprecated |
|
155 | -$dateerfc = GETPOST('dateerfc'); // deprecated |
|
154 | +$datesrfc = GETPOST('datesrfc'); // deprecated |
|
155 | +$dateerfc = GETPOST('dateerfc'); // deprecated |
|
156 | 156 | $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear')); |
157 | 157 | $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear')); |
158 | 158 | if (empty($dates) && !empty($datesrfc)) { // deprecated |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php |
111 | 111 | $permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php |
112 | 112 | $permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->statut == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer'); |
113 | -$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
113 | +$permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
114 | 114 | $permissiontoedit = $permissiontoadd; |
115 | 115 | $permissiontoactivate = $user->hasRight('contrat', 'activer'); |
116 | 116 | $error = 0; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
157 | 157 | |
158 | - include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once |
|
158 | + include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once |
|
159 | 159 | |
160 | 160 | if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) { |
161 | 161 | $date_start = ''; |
@@ -533,8 +533,8 @@ discard block |
||
533 | 533 | $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); |
534 | 534 | if ($result) { |
535 | 535 | if (count($prodcustprice->lines) > 0) { |
536 | - $price_min = price($prodcustprice->lines[0]->price_min); |
|
537 | - $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc); |
|
536 | + $price_min = price($prodcustprice->lines[0]->price_min); |
|
537 | + $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc); |
|
538 | 538 | /*$tva_tx = $prodcustprice->lines[0]->tva_tx; |
539 | 539 | if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) { |
540 | 540 | $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')'; |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update) { |
712 | 712 | setEventMessages($langs->trans("Error") . ': ' . $langs->trans("DateStartPlanned") . ' > ' . $langs->trans("DateEndPlanned"), null, 'errors'); |
713 | 713 | $action = 'editline'; |
714 | - $_GET['rowid'] = GETPOST('elrowid'); // Keep $_GET here. Used by GETPOST('rowid') later |
|
714 | + $_GET['rowid'] = GETPOST('elrowid'); // Keep $_GET here. Used by GETPOST('rowid') later |
|
715 | 715 | $error++; |
716 | 716 | } |
717 | 717 | |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | // update price_ht with discount |
771 | 771 | // TODO Use object->updateline instead objectline->update |
772 | 772 | |
773 | - $price_ht = price2num(GETPOST('elprice'), 'MU'); |
|
773 | + $price_ht = price2num(GETPOST('elprice'), 'MU'); |
|
774 | 774 | $remise_percent = price2num(GETPOST('elremise_percent'), '', 2); |
775 | 775 | if ($remise_percent > 0) { |
776 | 776 | $remise = round(((float) $price_ht * (float) $remise_percent / 100), 2); |
@@ -875,7 +875,7 @@ discard block |
||
875 | 875 | } elseif ($action == 'confirm_activate' && $confirm == 'yes' && $user->hasRight('contrat', 'creer')) { |
876 | 876 | $date_start = dol_mktime(12, 0, 0, GETPOST('d_startmonth'), GETPOST('d_startday'), GETPOST('d_startyear')); |
877 | 877 | $date_end = dol_mktime(12, 0, 0, GETPOST('d_endmonth'), GETPOST('d_endday'), GETPOST('d_endyear')); |
878 | - $comment = GETPOST('comment', 'alpha'); |
|
878 | + $comment = GETPOST('comment', 'alpha'); |
|
879 | 879 | $result = $object->activateAll($user, $date_start, 0, $comment, $date_end); |
880 | 880 | if ($result < 0) { |
881 | 881 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -1504,7 +1504,7 @@ discard block |
||
1504 | 1504 | } |
1505 | 1505 | |
1506 | 1506 | |
1507 | - $arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error |
|
1507 | + $arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error |
|
1508 | 1508 | |
1509 | 1509 | /* |
1510 | 1510 | * Lines of contracts |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | |
154 | 154 | $object->fields = dol_sort_array($object->fields, 'position'); |
155 | 155 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
156 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
156 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
157 | 157 | |
158 | 158 | $permissiontoread = $user->hasRight('contrat', 'lire'); |
159 | 159 | $permissiontoadd = $user->hasRight('contrat', 'creer'); |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | } |
574 | 574 | |
575 | 575 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
576 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
576 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
577 | 577 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
578 | 578 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
579 | 579 |