@@ -42,7 +42,7 @@ |
||
| 42 | 42 | |
| 43 | 43 | $action = GETPOST('action', 'aZ09'); |
| 44 | 44 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 46 | 46 | |
| 47 | 47 | $value = GETPOST('value', 'alpha'); |
| 48 | 48 | $label = GETPOST('label', 'alpha'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | // Default sort order (if not yet defined by previous GETPOST) |
| 77 | 77 | if (!$sortfield) { |
| 78 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 78 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 79 | 79 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
| 80 | 80 | } |
| 81 | 81 | if (!$sortorder) { |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 543 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 543 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 544 | 544 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 545 | 545 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 546 | 546 | |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | } 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'])) { |
| 631 | 631 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 632 | 632 | } |
| 633 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 633 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 634 | 634 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 635 | 635 | 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"; |
| 636 | 636 | $totalarray['nbfield']++; |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | setEventMessages($langs->trans("ErrorValueCantBeNull", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors'); |
| 100 | 100 | $action = 'edit'; |
| 101 | 101 | } |
| 102 | - if (! $error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) { |
|
| 102 | + if (!$error && ((float) $valmainmaxdecimalsshown < $valmainmaxdecimalsunit || (float) $valmainmaxdecimalsshown < $valmainmaxdecimalstot)) { |
|
| 103 | 103 | $langs->load("errors"); |
| 104 | 104 | $error++; |
| 105 | 105 | setEventMessages($langs->trans("ErrorValueForTooLow", dol_trunc(dol_string_nohtmltag($langs->transnoentitiesnoconv("MAIN_MAX_DECIMALS_SHOWN")), 40)), null, 'errors'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | $langs->loadLangs(array("admin", "other", "trips", "errors", "dict")); |
| 38 | 38 | |
| 39 | 39 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
| 40 | -$hookmanager->initHooks(array('admin', 'dictionaryadmin','expensereport_rules')); |
|
| 40 | +$hookmanager->initHooks(array('admin', 'dictionaryadmin', 'expensereport_rules')); |
|
| 41 | 41 | |
| 42 | 42 | $object = new ExpenseReportRule($db); |
| 43 | 43 | |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | $type = GETPOST('type', 'alpha'); |
| 46 | 46 | $value = GETPOST('value', 'alpha'); |
| 47 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 47 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 48 | 48 | |
| 49 | 49 | $label = GETPOST('label', 'alpha'); |
| 50 | 50 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $action = GETPOST('action', 'aZ09'); |
| 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'); |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | print '</form>'; |
| 818 | 818 | |
| 819 | 819 | |
| 820 | -print '<tr class="oddeven"><td>' . $langs->trans("InvoiceCheckPosteriorDate") . ' ' ; |
|
| 820 | +print '<tr class="oddeven"><td>' . $langs->trans("InvoiceCheckPosteriorDate") . ' '; |
|
| 821 | 821 | print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help') . '</td>'; |
| 822 | 822 | print '<td class="left" colspan="2">'; |
| 823 | 823 | print ajax_constantonoff('INVOICE_CHECK_POSTERIOR_DATE'); |