@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | $type = GETPOST('type', 'alpha'); |
47 | 47 | $value = GETPOST('value', 'alpha'); |
48 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
48 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
49 | 49 | |
50 | 50 | $label = GETPOST('label', 'alpha'); |
51 | 51 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | |
551 | 551 | |
552 | 552 | // Disallow to classify billed a supplier order without invoice |
553 | -print '<tr class="oddeven"><td>' . $langs->trans("SupplierOrderClassifyBilledWithoutInvoice") . ' ' ; |
|
553 | +print '<tr class="oddeven"><td>' . $langs->trans("SupplierOrderClassifyBilledWithoutInvoice") . ' '; |
|
554 | 554 | print $form->textwithpicto('', $langs->trans("SupplierOrderClassifyBilledWithoutInvoiceHelp"), 1, 'help') . '</td>'; |
555 | 555 | print '<td class="left" colspan="2">'; |
556 | 556 | print ajax_constantonoff('SUPPLIER_ORDER_DISABLE_CLASSIFY_BILLED_FROM_SUPPLIER_ORDER'); |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | print '<tr class="oddeven"><td>' . $langs->trans("MAIN_MAIL_SENDMODE") . '</td><td>'; |
371 | 371 | |
372 | 372 | // SuperAdministrator access only |
373 | - if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
373 | + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
374 | 374 | print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail')); |
375 | 375 | } else { |
376 | 376 | $text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE')]; |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | print '<tr class="oddeven smtp_oauth_service"><td>' . $langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE") . '</td><td>'; |
513 | 513 | |
514 | 514 | // SuperAdministrator access only |
515 | - if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
515 | + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
516 | 516 | print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE); |
517 | 517 | } else { |
518 | 518 | $text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE')]; |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | $action = GETPOST('action', 'alpha'); |
48 | 48 | $value = GETPOST('value', 'alpha'); |
49 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
49 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
50 | 50 | |
51 | 51 | $label = GETPOST('label', 'alpha'); |
52 | 52 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -1110,7 +1110,7 @@ discard block |
||
1110 | 1110 | print '<tr class="oddeven nohover" id="tr-aaa-' . $rowid . '">'; |
1111 | 1111 | print '<td colspan="10">'; |
1112 | 1112 | |
1113 | - $fieldsforcontent = array('topic', 'email_from','joinfiles', 'content'); |
|
1113 | + $fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content'); |
|
1114 | 1114 | if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) { |
1115 | 1115 | $fieldsforcontent[] = 'content_lines'; |
1116 | 1116 | } |
@@ -1183,7 +1183,7 @@ discard block |
||
1183 | 1183 | continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled) |
1184 | 1184 | } |
1185 | 1185 | // Test on 'enabled' |
1186 | - if (! (int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
1186 | + if (!(int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
1187 | 1187 | $i++; |
1188 | 1188 | continue; // Email template not qualified |
1189 | 1189 | } |
@@ -1657,7 +1657,7 @@ |
||
1657 | 1657 | 70 => array('lang' => 'interventions', 'enabled' => isModEnabled("intervention"), 'perm' => $user->hasRight('fichinter', 'creer'), 'label' => 'AddIntervention', 'url' => '/fichinter/card.php?action=create&projectid=' . $object->id . '&socid=' . $object->socid), |
1658 | 1658 | 80 => array('lang' => 'contracts', 'enabled' => isModEnabled("contract"), 'perm' => $user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url' => '/contrat/card.php?action=create&projectid=' . $object->id . '&socid=' . $object->socid), |
1659 | 1659 | 90 => array('lang' => 'trips', 'enabled' => isModEnabled("expensereport"), 'perm' => $user->hasRight('expensereport', 'creer'), 'label' => 'AddTrip', 'url' => '/expensereport/card.php?action=create&projectid=' . $object->id . '&socid=' . $object->socid), |
1660 | - 100 => array('lang' => 'donations', 'enabled' => isModEnabled("don"), 'perm' => $user->hasRight('don', 'creer'), 'label' => 'AddDonation', 'url' => '/don/card.php?action=create&projectid=' . $object->id . '&socid=' . $object->socid), |
|
1660 | + 100 => array('lang' => 'donations', 'enabled' => isModEnabled("don"), 'perm' => $user->hasRight('don', 'creer'), 'label' => 'AddDonation', 'url' => '/don/card.php?action=create&projectid=' . $object->id . '&socid=' . $object->socid), |
|
1661 | 1661 | ); |
1662 | 1662 | |
1663 | 1663 | $params = array('backtopage' => $_SERVER["PHP_SELF"] . '?id=' . $object->id); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | $permissiontoadd = $user->hasRight('projet', 'creer'); |
113 | 113 | $permissiontodelete = $user->hasRight('projet', 'supprimer'); |
114 | -$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php |
|
114 | +$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php |
|
115 | 115 | |
116 | 116 | |
117 | 117 | /* |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $action = ''; |
163 | 163 | } |
164 | 164 | |
165 | - include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
165 | + include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
166 | 166 | |
167 | 167 | // Action setdraft object |
168 | 168 | if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $confirm = GETPOST('confirm', 'alpha'); |
53 | 53 | $cancel = GETPOST('cancel', 'aZ09'); |
54 | 54 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projecttasklist'; |
55 | -$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
55 | +$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
56 | 56 | //$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used |
57 | 57 | //$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha'); |
58 | 58 | $optioncss = GETPOST('optioncss', 'aZ'); |
@@ -94,20 +94,20 @@ discard block |
||
94 | 94 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
95 | 95 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
96 | 96 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
97 | -$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
97 | +$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
98 | 98 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
99 | 99 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
100 | 100 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
101 | -$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
101 | +$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
102 | 102 | |
103 | 103 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
104 | 104 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
105 | 105 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
106 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
106 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
107 | 107 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
108 | 108 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
109 | 109 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
110 | -$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
110 | +$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
111 | 111 | |
112 | 112 | //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects |
113 | 113 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; |
186 | 186 | |
187 | 187 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
188 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
188 | +'@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 | 189 | |
190 | 190 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
191 | 191 |
@@ -187,7 +187,7 @@ |
||
187 | 187 | } else { |
188 | 188 | $error++; |
189 | 189 | } |
190 | - } elseif (! ($contactid > 0)) { |
|
190 | + } elseif (!($contactid > 0)) { |
|
191 | 191 | $error++; |
192 | 192 | $langs->load("errors"); |
193 | 193 | setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors'); |
@@ -766,7 +766,7 @@ |
||
766 | 766 | if (empty($totalforeachday[$tmpday])) { |
767 | 767 | $totalforeachday[$tmpday] = empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday]; |
768 | 768 | } else { |
769 | - $totalforeachday[$tmpday] += empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday]; |
|
769 | + $totalforeachday[$tmpday] += empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday]; |
|
770 | 770 | } |
771 | 771 | } |
772 | 772 | } |
@@ -147,38 +147,38 @@ discard block |
||
147 | 147 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
148 | 148 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
149 | 149 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
150 | -$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
150 | +$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
151 | 151 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
152 | 152 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
153 | 153 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
154 | -$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
154 | +$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
155 | 155 | |
156 | 156 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
157 | 157 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
158 | 158 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
159 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
159 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
160 | 160 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
161 | 161 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
162 | 162 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
163 | -$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
163 | +$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
164 | 164 | |
165 | 165 | $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
166 | 166 | $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
167 | 167 | $search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
168 | -$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
168 | +$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
169 | 169 | $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
170 | 170 | $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
171 | 171 | $search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
172 | -$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
172 | +$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
173 | 173 | |
174 | 174 | $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth'); |
175 | 175 | $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear'); |
176 | 176 | $search_date_modif_startday = GETPOSTINT('search_date_modif_startday'); |
177 | -$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
177 | +$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
178 | 178 | $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth'); |
179 | 179 | $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear'); |
180 | 180 | $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); |
181 | -$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
181 | +$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
182 | 182 | |
183 | 183 | $search_category_array = array(); |
184 | 184 | |
@@ -264,14 +264,14 @@ discard block |
||
264 | 264 | |
265 | 265 | $object->fields = dol_sort_array($object->fields, 'position'); |
266 | 266 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
267 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
267 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
268 | 268 | |
269 | 269 | // Add a groupby field. Set $groupby and $groupbyvalues. |
270 | 270 | // TODO Move this into a inc file |
271 | 271 | $groupbyvalues = array(); |
272 | 272 | if ($mode == 'kanban') { |
273 | 273 | $groupbyold = null; |
274 | - $groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut' |
|
274 | + $groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut' |
|
275 | 275 | $groupbyfield = preg_replace('/[a-z]\./', '', $groupby); |
276 | 276 | if (!empty($object->fields[$groupbyfield]['alias'])) { |
277 | 277 | $groupbyfield = $object->fields[$groupbyfield]['alias']; |
@@ -1192,7 +1192,7 @@ discard block |
||
1192 | 1192 | } |
1193 | 1193 | |
1194 | 1194 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1195 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1195 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1196 | 1196 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1197 | 1197 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1198 | 1198 | |
@@ -1653,7 +1653,7 @@ discard block |
||
1653 | 1653 | |
1654 | 1654 | if (!empty($groupby)) { |
1655 | 1655 | if (is_null($groupbyold)) { |
1656 | - print '<div class="box-flex-container-columns kanban">'; // Start div for all kanban columns |
|
1656 | + print '<div class="box-flex-container-columns kanban">'; // Start div for all kanban columns |
|
1657 | 1657 | } |
1658 | 1658 | // Start kanban column |
1659 | 1659 | if (is_null($obj->$groupbyfield)) { |
@@ -1669,7 +1669,7 @@ discard block |
||
1669 | 1669 | // |
1670 | 1670 | //var_dump($groupbyvalues); |
1671 | 1671 | //var_dump($obj->$groupbyfield); |
1672 | - print '<div class="box-flex-container-column kanban column" data-html="column_' . preg_replace('/[^a-z0-9]/', '', $groupbyvalue) . '">'; // Start new column |
|
1672 | + print '<div class="box-flex-container-column kanban column" data-html="column_' . preg_replace('/[^a-z0-9]/', '', $groupbyvalue) . '">'; // Start new column |
|
1673 | 1673 | } |
1674 | 1674 | $groupbyold = $groupbyvalue; |
1675 | 1675 | } elseif ($i == 0) { |