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

114
htdocs/user/card.php
View File

@ -1631,32 +1631,36 @@ else
print "</tr>\n"; print "</tr>\n";
// Expense report validator // Expense report validator
print '<tr><td>'; if (!empty($conf->expensereport->enabled)) {
$text = $langs->trans("ForceUserExpenseValidator"); print '<tr><td>';
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); $text = $langs->trans("ForceUserExpenseValidator");
print '</td>'; print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
print '<td>'; print '</td>';
if (!empty($object->fk_user_expense_validator)) { print '<td>';
$evuser = new User($db); if (!empty($object->fk_user_expense_validator)) {
$evuser->fetch($object->fk_user_expense_validator); $evuser = new User($db);
print $evuser->getNomUrl(1); $evuser->fetch($object->fk_user_expense_validator);
print $evuser->getNomUrl(1);
}
print '</td>';
print "</tr>\n";
} }
print '</td>';
print "</tr>\n";
// Holiday request validator // Holiday request validator
print '<tr><td>'; if (!empty($conf->holiday->enabled)) {
$text = $langs->trans("ForceUserHolidayValidator"); print '<tr><td>';
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); $text = $langs->trans("ForceUserHolidayValidator");
print '</td>'; print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
print '<td>'; print '</td>';
if (!empty($object->fk_user_holiday_validator)) { print '<td>';
$hvuser = new User($db); if (!empty($object->fk_user_holiday_validator)) {
$hvuser->fetch($object->fk_user_holiday_validator); $hvuser = new User($db);
print $hvuser->getNomUrl(1); $hvuser->fetch($object->fk_user_holiday_validator);
print $hvuser->getNomUrl(1);
}
print '</td>';
print "</tr>\n";
} }
print '</td>';
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
print '<tr><td class="titlefield">'; if (!empty($conf->expensereport->enabled)) {
$text = $langs->trans("ForceUserExpenseValidator"); print '<tr><td class="titlefield">';
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); $text = $langs->trans("ForceUserExpenseValidator");
print '</td>'; print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
print '<td>'; print '</td>';
if ($caneditfield) print '<td>';
{ 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 {
print '<input type="hidden" name="fk_user_expense_validator" value="' . $object->fk_user_expense_validator . '">';
$evuser = new User($db);
$evuser->fetch($object->fk_user_expense_validator);
print $evuser->getNomUrl(1);
}
print '</td>';
print "</tr>\n";
} }
else
{
print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
$evuser = new User($db);
$evuser->fetch($object->fk_user_expense_validator);
print $evuser->getNomUrl(1);
}
print '</td>';
print "</tr>\n";
// Holiday request validator // Holiday request validator
print '<tr><td class="titlefield">'; if (!empty($conf->holiday->enabled)) {
$text = $langs->trans("ForceUserHolidayValidator"); print '<tr><td class="titlefield">';
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help'); $text = $langs->trans("ForceUserHolidayValidator");
print '</td>'; print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
print '<td>'; print '</td>';
if ($caneditfield) print '<td>';
{ 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 {
print '<input type="hidden" name="fk_user_holiday_validator" value="' . $object->fk_user_holiday_validator . '">';
$hvuser = new User($db);
$hvuser->fetch($object->fk_user_holiday_validator);
print $hvuser->getNomUrl(1);
}
print '</td>';
print "</tr>\n";
} }
else
{
print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
$hvuser = new User($db);
$hvuser->fetch($object->fk_user_holiday_validator);
print $hvuser->getNomUrl(1);
}
print '</td>';
print "</tr>\n";
print '</table><hr><table class="border centpercent">'; print '</table><hr><table class="border centpercent">';