@@ -18,7 +18,7 @@ |
||
18 | 18 | if (getDolGlobalString('THEME_DARKMODEENABLED')) { |
19 | 19 | print "/* For dark mode */\n"; |
20 | 20 | if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) { |
21 | - print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
21 | + print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
22 | 22 | } else { |
23 | 23 | print "@media not print {"; |
24 | 24 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXT') ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT); |
194 | 194 | $colortextlink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTLINK') ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK); |
195 | 195 | $butactionbg = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BTNACTION') ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION); |
196 | -$textbutaction = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION); |
|
196 | +$textbutaction = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION); |
|
197 | 197 | $fontsize = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE1') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1); |
198 | 198 | $fontsizesmaller = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE2') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2); |
199 | 199 | $heightrow = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (empty($user->conf->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%'); |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | if (getDolGlobalString('THEME_DARKMODEENABLED')) { |
378 | 378 | print "/* For dark mode */\n"; |
379 | 379 | if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) { |
380 | - print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
380 | + print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
381 | 381 | } else { |
382 | 382 | print "@media not print {"; |
383 | 383 | } |
@@ -3034,7 +3034,7 @@ discard block |
||
3034 | 3034 | if (preg_match('/^fa\-/', $iconformodule)) { |
3035 | 3035 | // This is a fa icon |
3036 | 3036 | } else { |
3037 | - $url = dol_buildpath('/' . $val . '/img/' . $iconformodule . '.png', 1); |
|
3037 | + $url = dol_buildpath('/' . $val . '/img/' . $iconformodule . '.png', 1); |
|
3038 | 3038 | } |
3039 | 3039 | $found = 1; |
3040 | 3040 | } else { |
@@ -18,7 +18,7 @@ |
||
18 | 18 | if (getDolGlobalString('THEME_DARKMODEENABLED')) { |
19 | 19 | print "/* For dark mode */\n"; |
20 | 20 | if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) { |
21 | - print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
21 | + print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes |
|
22 | 22 | } else { |
23 | 23 | print "@media not print {"; |
24 | 24 | } |
@@ -286,7 +286,7 @@ |
||
286 | 286 | if ($action != 'editline') { |
287 | 287 | print '<div class="tabsAction">' . "\n"; |
288 | 288 | $parameters = array(); |
289 | - $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
289 | + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
290 | 290 | if ($reshook < 0) { |
291 | 291 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
292 | 292 | } |
@@ -778,7 +778,7 @@ |
||
778 | 778 | <div style="text-align: center"> |
779 | 779 | <input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) { |
780 | 780 | print ' disabled="disabled"'; |
781 | - } ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans("Save") ?>" class="button button-save"> |
|
781 | + } ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans("Save") ?>" class="button button-save"> |
|
782 | 782 | |
783 | 783 | <input type="submit" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>" class="button button-cancel"> |
784 | 784 | </div> |
@@ -30,12 +30,12 @@ |
||
30 | 30 | |
31 | 31 | $langs->loadLangs(array("products", "other")); |
32 | 32 | |
33 | -$id = GETPOSTINT('id'); // ID of the parent Product |
|
33 | +$id = GETPOSTINT('id'); // ID of the parent Product |
|
34 | 34 | $ref = GETPOST('ref', 'alpha'); |
35 | 35 | |
36 | -$combination_id = GETPOSTINT('combination_id'); // ID of the combination |
|
36 | +$combination_id = GETPOSTINT('combination_id'); // ID of the combination |
|
37 | 37 | |
38 | -$reference = GETPOST('reference', 'alpha'); // Reference of the variant Product |
|
38 | +$reference = GETPOST('reference', 'alpha'); // Reference of the variant Product |
|
39 | 39 | |
40 | 40 | $weight_impact = GETPOSTFLOAT('weight_impact', 2); |
41 | 41 | $price_impact_percent = (bool) GETPOST('price_impact_percent'); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | |
144 | 144 | $object->fields = dol_sort_array($object->fields, 'position'); |
145 | 145 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
146 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
146 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
147 | 147 | |
148 | 148 | $permissiontoread = $user->hasRight('variants', 'read'); |
149 | 149 | $permissiontoadd = $user->hasRight('variants', 'write'); |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | //} |
325 | 325 | // Add where from hooks |
326 | 326 | $parameters = array(); |
327 | -$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook |
|
327 | +$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook |
|
328 | 328 | $sql .= $hookmanager->resPrint; |
329 | 329 | $sql = preg_replace("/,\s*$/", "", $sql); |
330 | 330 | |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | } |
514 | 514 | |
515 | 515 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
516 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
516 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
517 | 517 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
518 | 518 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
519 | 519 | |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | } 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'])) { |
618 | 618 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
619 | 619 | } |
620 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
620 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
621 | 621 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
622 | 622 | 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"; |
623 | 623 | $totalarray['nbfield']++; |
@@ -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]); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $endatlinenb = (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : ''); |
146 | 146 | $updatekeys = (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array()); |
147 | 147 | $separator = (GETPOST('separator', 'nohtml') ? GETPOST('separator', 'nohtml', 3) : ''); |
148 | -$enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept " |
|
148 | +$enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept " |
|
149 | 149 | $charset = GETPOST('charset', 'aZ09'); |
150 | 150 | $separator_used = str_replace('\t', "\t", $separator); |
151 | 151 | |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | $maxfilesizearray = getMaxFileSizeArray(); |
616 | 616 | $maxmin = $maxfilesizearray['maxmin']; |
617 | 617 | if ($maxmin > 0) { |
618 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
618 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
619 | 619 | } |
620 | 620 | print '<input type="file" name="userfile" size="20" maxlength="80"> '; |
621 | 621 | $out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : ''); |
@@ -734,7 +734,7 @@ discard block |
||
734 | 734 | //var_dump($_SESSION["dol_array_match_file_to_database_select"]); |
735 | 735 | $serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database_select"]) ? $_SESSION["dol_array_match_file_to_database_select"] : ''; |
736 | 736 | $fieldsarray = explode(',', $serialized_array_match_file_to_database); |
737 | - $array_match_file_to_database = array(); // Same than $fieldsarray but with mapped value only (col1 => 's.fielda', col2 => 's.fieldb'...) |
|
737 | + $array_match_file_to_database = array(); // Same than $fieldsarray but with mapped value only (col1 => 's.fielda', col2 => 's.fieldb'...) |
|
738 | 738 | foreach ($fieldsarray as $elem) { |
739 | 739 | $tabelem = explode('=', $elem, 2); |
740 | 740 | $key = $tabelem[0]; |
@@ -1088,7 +1088,7 @@ discard block |
||
1088 | 1088 | foreach ($fieldstarget as $code => $line) { |
1089 | 1089 | //var_dump($line); |
1090 | 1090 | |
1091 | - $tmparray = explode('|', $line["label"]); // If label of field is several translation keys separated with | |
|
1091 | + $tmparray = explode('|', $line["label"]); // If label of field is several translation keys separated with | |
|
1092 | 1092 | $labeltoshow = ''; |
1093 | 1093 | foreach ($tmparray as $tmpkey => $tmpval) { |
1094 | 1094 | $labeltoshow .= ($labeltoshow ? ' ' . $langs->trans('or') . ' ' : '') . $langs->transnoentities($tmpval); |
@@ -1118,7 +1118,7 @@ discard block |
||
1118 | 1118 | //var_dump($fieldssource); |
1119 | 1119 | //var_dump($fieldstarget); |
1120 | 1120 | |
1121 | - $modetoautofillmapping = 'session'; // Use setup in session |
|
1121 | + $modetoautofillmapping = 'session'; // Use setup in session |
|
1122 | 1122 | if ($initialloadofstep4) { |
1123 | 1123 | $modetoautofillmapping = 'guess'; |
1124 | 1124 | } |
@@ -1330,7 +1330,7 @@ discard block |
||
1330 | 1330 | // - Then we set to disabled all fields that are selected |
1331 | 1331 | print 'function setOptionsToDisabled() {' . "\n"; |
1332 | 1332 | print ' console.log("Remove the disabled flag everywhere");' . "\n"; |
1333 | - print ' $("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);' . "\n"; // Enable all options |
|
1333 | + print ' $("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);' . "\n"; // Enable all options |
|
1334 | 1334 | print ' arrayofselectedvalues = [];' . "\n"; |
1335 | 1335 | |
1336 | 1336 | print ' $("select.targetselectchange").each(function(){' . "\n"; |
@@ -1347,7 +1347,7 @@ discard block |
||
1347 | 1347 | print ' $.each(arrayofselectedvalues, function(key, value) {' . "\n"; // Loop on each selected value |
1348 | 1348 | print ' if (value != -1) {' . "\n"; |
1349 | 1349 | print ' console.log("Process key="+key+" value="+value+" to disable.");' . "\n"; |
1350 | - print ' $("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);' . "\n"; // Set to disabled except if currently selected |
|
1350 | + print ' $("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);' . "\n"; // Set to disabled except if currently selected |
|
1351 | 1351 | print ' }' . "\n"; |
1352 | 1352 | print ' });' . "\n"; |
1353 | 1353 | print '}' . "\n"; |
@@ -39,15 +39,15 @@ discard block |
||
39 | 39 | $langs->loadLangs(array('other')); |
40 | 40 | |
41 | 41 | // Get Parameters |
42 | -$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
43 | -$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
44 | -$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
|
45 | -$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
46 | -$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
47 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
48 | -$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // To manage different context of search |
|
49 | -$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
50 | -$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
42 | +$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
|
43 | +$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
|
44 | +$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
|
45 | +$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
|
46 | +$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
|
47 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
48 | +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // To manage different context of search |
|
49 | +$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
|
50 | +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
51 | 51 | $mode = GETPOST('mode', 'aZ'); |
52 | 52 | if (empty($mode)) { |
53 | 53 | $mode = 'modulesetup'; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | // Default sort order (if not yet defined by previous GETPOST) |
84 | 84 | if (!$sortfield) { |
85 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
85 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
86 | 86 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
87 | 87 | } |
88 | 88 | if (!$sortorder) { |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | } |
519 | 519 | |
520 | 520 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
521 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
521 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
522 | 522 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
523 | 523 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
524 | 524 | |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | } 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'])) { |
613 | 613 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
614 | 614 | } |
615 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
615 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
616 | 616 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
617 | 617 | 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"; |
618 | 618 | $totalarray['nbfield']++; |