diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 4bedd36fc3c..6e2d9b1cfdb 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1631,32 +1631,36 @@ else
print "\n";
// Expense report validator
- print '
';
- $text = $langs->trans("ForceUserExpenseValidator");
- print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
- print ' ';
- print '';
- if (!empty($object->fk_user_expense_validator)) {
- $evuser = new User($db);
- $evuser->fetch($object->fk_user_expense_validator);
- print $evuser->getNomUrl(1);
+ if (!empty($conf->expensereport->enabled)) {
+ print ' ';
+ $text = $langs->trans("ForceUserExpenseValidator");
+ print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
+ print ' ';
+ print '';
+ if (!empty($object->fk_user_expense_validator)) {
+ $evuser = new User($db);
+ $evuser->fetch($object->fk_user_expense_validator);
+ print $evuser->getNomUrl(1);
+ }
+ print ' ';
+ print " \n";
}
- print '';
- print "\n";
// Holiday request validator
- print '';
- $text = $langs->trans("ForceUserHolidayValidator");
- print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
- print ' ';
- print '';
- if (!empty($object->fk_user_holiday_validator)) {
- $hvuser = new User($db);
- $hvuser->fetch($object->fk_user_holiday_validator);
- print $hvuser->getNomUrl(1);
+ if (!empty($conf->holiday->enabled)) {
+ print ' ';
+ $text = $langs->trans("ForceUserHolidayValidator");
+ print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
+ print ' ';
+ print '';
+ if (!empty($object->fk_user_holiday_validator)) {
+ $hvuser = new User($db);
+ $hvuser->fetch($object->fk_user_holiday_validator);
+ print $hvuser->getNomUrl(1);
+ }
+ print ' ';
+ print " \n";
}
- print '';
- print "\n";
// Default warehouse
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 "\n";
// Expense report validator
- print '';
- $text = $langs->trans("ForceUserExpenseValidator");
- print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
- print ' ';
- print '';
- 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');
+ if (!empty($conf->expensereport->enabled)) {
+ print ' ';
+ $text = $langs->trans("ForceUserExpenseValidator");
+ print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
+ print ' ';
+ print '';
+ 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');
+ } else {
+ print ' ';
+ $evuser = new User($db);
+ $evuser->fetch($object->fk_user_expense_validator);
+ print $evuser->getNomUrl(1);
+ }
+ print ' ';
+ print " \n";
}
- else
- {
- print ' ';
- $evuser = new User($db);
- $evuser->fetch($object->fk_user_expense_validator);
- print $evuser->getNomUrl(1);
- }
- print '';
- print "\n";
// Holiday request validator
- print '';
- $text = $langs->trans("ForceUserHolidayValidator");
- print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
- print ' ';
- print '';
- 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');
+ if (!empty($conf->holiday->enabled)) {
+ print ' ';
+ $text = $langs->trans("ForceUserHolidayValidator");
+ print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
+ print ' ';
+ print '';
+ 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');
+ } else {
+ print ' ';
+ $hvuser = new User($db);
+ $hvuser->fetch($object->fk_user_holiday_validator);
+ print $hvuser->getNomUrl(1);
+ }
+ print ' ';
+ print " \n";
}
- else
- {
- print ' ';
- $hvuser = new User($db);
- $hvuser->fetch($object->fk_user_holiday_validator);
- print $hvuser->getNomUrl(1);
- }
- print '';
- print "\n";
print '