diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index 6799ab339bd..1146232dca3 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.php @@ -185,31 +185,31 @@ if ($action != 'edit') { echo '
| ' . $langs->trans('ExpenseReportApplyTo') . ' | '; - echo '' . $langs->trans('Type') . ' | '; - echo '' . $langs->trans('ExpenseReportLimitOn') . ' | '; - echo '' . $langs->trans('ExpenseReportDateStart') . ' | '; - echo '' . $langs->trans('ExpenseReportDateEnd') . ' | '; - echo '' . $langs->trans('ExpenseReportLimitAmount') . ' | '; - echo '' . $langs->trans('ExpenseReportRestrictive') . ' | '; + echo '|||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ' . $langs->trans('ExpenseReportApplyTo') . ' | '; + echo '' . $langs->trans('Type') . ' | '; + echo '' . $langs->trans('ExpenseReportLimitOn') . ' | '; + echo '' . $langs->trans('ExpenseReportDateStart') . ' | '; + echo '' . $langs->trans('ExpenseReportDateEnd') . ' | '; + echo '' . $langs->trans('ExpenseReportLimitAmount') . ' | '; + echo '' . $langs->trans('ExpenseReportRestrictive') . ' | '; echo ''; echo ' | ||||||
| ';
- echo ' ' . $form->selectarray('apply_to', $tab_apply, '', 0) . ' ';
- echo '' . $form->select_dolusers('', 'fk_user') . ' ';
- echo '' . $form->select_dolgroups('', 'fk_usergroup') . ' ';
+ echo '' . $form->selectarray('apply_to', $tab_apply, '', 0) . ' ';
+ echo '' . $form->select_dolusers('', 'fk_user') . ' ';
+ echo '' . $form->select_dolgroups('', 'fk_usergroup') . ' ';
echo ' | ';
- echo '' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . ' | '; - echo '' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . ' | '; - echo '' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0) . ' | '; - echo '' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0) . ' | '; - echo '' . $conf->currency . ' | '; - echo '' . $form->selectyesno('restrictive', 0, 1) . ' | '; - echo ''; + echo ' | ' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . ' | '; + echo '' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . ' | '; + echo '' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0) . ' | '; + echo '' . $conf->currency . ' | '; + echo '' . $form->selectyesno('restrictive', 0, 1) . ' | '; + echo ''; echo ' |
| ' . $langs->trans('ExpenseReportApplyTo') . ' | '; - echo '' . $langs->trans('Type') . ' | '; - echo '' . $langs->trans('ExpenseReportLimitOn') . ' | '; - echo '' . $langs->trans('ExpenseReportDateStart') . ' | '; - echo '' . $langs->trans('ExpenseReportDateEnd') . ' | '; - echo '' . $langs->trans('ExpenseReportLimitAmount') . ' | '; - echo '' . $langs->trans('ExpenseReportRestrictive') . ' | '; + echo '|||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ' . $langs->trans('ExpenseReportApplyTo') . ' | '; + echo '' . $langs->trans('Type') . ' | '; + echo '' . $langs->trans('ExpenseReportLimitOn') . ' | '; + echo '' . $langs->trans('ExpenseReportDateStart') . ' | '; + echo '' . $langs->trans('ExpenseReportDateEnd') . ' | '; + echo '' . $langs->trans('ExpenseReportLimitAmount') . ' | '; + echo '' . $langs->trans('ExpenseReportRestrictive') . ' | '; echo ''; echo ' | ||||||
| '; + echo ' | ';
if ($action == 'edit' && $object->id == $rule->id) {
$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
echo ' ' . $form->selectarray('apply_to', $tab_apply, $selected, 0) . ' ';
@@ -259,7 +259,7 @@ foreach ($rules as $rule) {
echo ' | ';
- echo ''; + echo ' | '; if ($action == 'edit' && $object->id == $rule->id) { echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1); } else { @@ -278,7 +278,7 @@ foreach ($rules as $rule) { echo ' | '; - echo ''; + echo ' | '; if ($action == 'edit' && $object->id == $rule->id) { echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0); } else { @@ -287,7 +287,7 @@ foreach ($rules as $rule) { echo ' | '; - echo ''; + echo ' | '; if ($action == 'edit' && $object->id == $rule->id) { print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0); } else { @@ -296,7 +296,7 @@ foreach ($rules as $rule) { echo ' | '; - echo ''; + echo ' | '; if ($action == 'edit' && $object->id == $rule->id) { print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0); } else { @@ -305,7 +305,7 @@ foreach ($rules as $rule) { echo ' | '; - echo ''; + echo ' | '; if ($action == 'edit' && $object->id == $rule->id) { echo '' . $conf->currency; } else { @@ -314,7 +314,7 @@ foreach ($rules as $rule) { echo ' | '; - echo ''; + echo ' | '; if ($action == 'edit' && $object->id == $rule->id) { echo $form->selectyesno('restrictive', $object->restrictive, 1); } else { |