diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a70c5159370..3f0b8af0e4e 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2115,6 +2115,7 @@ else
print '
';
- print ' | ';
+ print ' | ';
- // Select date
- print '';
- print $form->selectDate($line->date, 'date');
- print ' | ';
+ // Select date
+ print '';
+ print $form->selectDate($line->date, 'date');
+ print ' | ';
- // Select project
- if (! empty($conf->projet->enabled))
- {
- print '';
- $formproject->select_projects(-1, $line->fk_project, 'fk_projet', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
- print ' | ';
- }
-
- if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
- {
- print '';
- $params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
- print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
- print ' | ';
- }
-
- // Select type
- print '';
- select_type_fees_id($line->fk_c_type_fees, 'fk_c_type_fees');
- print ' | ';
-
- // Add comments
+ // Select project
+ if (! empty($conf->projet->enabled))
+ {
print '';
- print '';
+ $formproject->select_projects(-1, $line->fk_project, 'fk_projet', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
print ' | ';
+ }
- // VAT
- print '';
- print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$line->vatrate), $mysoc, '', 0, 0, '', false, 1);
+ if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+ {
+ print ' | ';
+ $params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
+ print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
print ' | ';
+ }
- // Unit price
- print '';
- print '';
- print ' | ';
+ // Select type
+ print '';
+ select_type_fees_id($line->fk_c_type_fees, 'fk_c_type_fees');
+ print ' | ';
- // Unit price with tax
- print '';
- print '';
- print ' | ';
+ // Add comments
+ print '';
+ print '';
+ print ' | ';
- // Quantity
- print '';
- print '';
- print ' | ';
+ // VAT
+ print '';
+ print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$line->vatrate), $mysoc, '', 0, 0, '', false, 1);
+ print ' | ';
- if ($action != 'editline')
- {
- print ''.$langs->trans('AmountHT').' | ';
- print ''.$langs->trans('AmountTTC').' | ';
- }
+ // Unit price
+ print '';
+ print '';
+ print ' | ';
- // Picture
- print '';
- //print $line->fk_ecm_files;
- print ' | ';
+ // Unit price with tax
+ print '';
+ print '';
+ print ' | ';
- print '';
- print '';
- print '';
- print ' ';
- print ' | ';
+ // Quantity
+ print '';
+ print '';
+ print ' | ';
+
+ if ($action != 'editline')
+ {
+ print ''.$langs->trans('AmountHT').' | ';
+ print ''.$langs->trans('AmountTTC').' | ';
+ }
+
+ // Picture
+ print '';
+ //print $line->fk_ecm_files;
+ print ' | ';
+
+ print '';
+ print '';
+ print '';
+ print ' ';
+ print ' | ';
}
$i++;
@@ -2378,8 +2422,6 @@ else
else
{
$modulepart='expensereport';
- //$conf->global->MAIN_DISABLE_PDF_THUMBS=1;
-
print '';
$thumbshown=0;
if (preg_match('/\.pdf$/i', $file['name']))