lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing test on module enabled for user validators

Browse Source
This commit is contained in:
Maxime Kohlhaas 2020-06-03 23:30:06 +02:00
parent f91e7e4917
commit e19f496d62
1 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/user/card.php
View File

@ -1631,6 +1631,7 @@ else
print "</tr>\n"; print "</tr>\n";
// Expense report validator // Expense report validator
if (!empty($conf->expensereport->enabled)) {
print '<tr><td>'; print '<tr><td>';
$text = $langs->trans("ForceUserExpenseValidator"); $text = $langs->trans("ForceUserExpenseValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@ -1643,8 +1644,10 @@ else
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
}
// Holiday request validator // Holiday request validator
if (!empty($conf->holiday->enabled)) {
print '<tr><td>'; print '<tr><td>';
$text = $langs->trans("ForceUserHolidayValidator"); $text = $langs->trans("ForceUserHolidayValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@ -1657,6 +1660,7 @@ else
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
}
// Default warehouse // Default warehouse
if (!empty($conf->stock->enabled) && !empty($conf->global->USER_DEFAULT_WAREHOUSE)) // TODO What is goal of this. How it is used ? if (!empty($conf->stock->enabled) && !empty($conf->global->USER_DEFAULT_WAREHOUSE)) // TODO What is goal of this. How it is used ?
@ -2345,44 +2349,42 @@ else
print "</tr>\n"; print "</tr>\n";
// Expense report validator // Expense report validator
if (!empty($conf->expensereport->enabled)) {
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
$text = $langs->trans("ForceUserExpenseValidator"); $text = $langs->trans("ForceUserExpenseValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield) {
{
print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300'); print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
} } else {
else print '<input type="hidden" name="fk_user_expense_validator" value="' . $object->fk_user_expense_validator . '">';
{
print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
$evuser = new User($db); $evuser = new User($db);
$evuser->fetch($object->fk_user_expense_validator); $evuser->fetch($object->fk_user_expense_validator);
print $evuser->getNomUrl(1); print $evuser->getNomUrl(1);
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
}
// Holiday request validator // Holiday request validator
if (!empty($conf->holiday->enabled)) {
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
$text = $langs->trans("ForceUserHolidayValidator"); $text = $langs->trans("ForceUserHolidayValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if ($caneditfield) if ($caneditfield) {
{
print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300'); print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
} } else {
else print '<input type="hidden" name="fk_user_holiday_validator" value="' . $object->fk_user_holiday_validator . '">';
{
print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
$hvuser = new User($db); $hvuser = new User($db);
$hvuser->fetch($object->fk_user_holiday_validator); $hvuser->fetch($object->fk_user_holiday_validator);
print $hvuser->getNomUrl(1); print $hvuser->getNomUrl(1);
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
}
print '</table><hr><table class="border centpercent">'; print '</table><hr><table class="border centpercent">';