diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index c6d87acef4d..922d493864a 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1892,9 +1892,9 @@ else
print '| ' . $langs->trans('Date') . ' | ';
print '' . $langs->trans('Type') . ' | ';
if (! empty($conf->banque->enabled)) {
- print '' . $langs->trans('BankAccount') . ' | ';
+ print '' . $langs->trans('BankAccount') . ' | ';
}
- print '' . $langs->trans('Amount') . ' | ';
+ print '' . $langs->trans('Amount') . ' | ';
print ' | ';
print '';
@@ -1948,12 +1948,12 @@ else
$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
}
- print '';
+ print ' | ';
if ($bankaccountstatic->id)
print $bankaccountstatic->getNomUrl(1, 'transactions');
print ' | ';
}
- print ''.price($objp->amount)." | ";
+ print ''.price($objp->amount)." | ";
print ' | ';
print "";
$totalpaid += $objp->amount;
@@ -1975,10 +1975,10 @@ else
{
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
- print '| '.$langs->trans("AlreadyPaid").': | '.price($totalpaid).' | |
';
- print '| '.$langs->trans("AmountExpected").': | '.price($object->total_ttc).' | |
';
+ print '| '.$langs->trans("AlreadyPaid").': | '.price($totalpaid).' | |
';
+ print '| '.$langs->trans("AmountExpected").': | '.price($object->total_ttc).' | |
';
- print '| '.$langs->trans("RemainderToPay").': | ';
+ print '
| '.$langs->trans("RemainderToPay").': | ';
print ''.price($resteapayeraffiche).' | |
';
$db->free($resql);
@@ -2014,26 +2014,26 @@ else
$i = 0;$total = 0;
print '';
- print '| '.$langs->trans('LineNb').' | ';
- //print ''.$langs->trans('Piece').' | ';
- print ''.$langs->trans('Date').' | ';
+ print ''.$langs->trans('LineNb').' | ';
+ //print ''.$langs->trans('Piece').' | ';
+ print ''.$langs->trans('Date').' | ';
if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' | ';
if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''.$langs->trans('CarCategory').' | ';
- print ''.$langs->trans('Type').' | ';
- print ''.$langs->trans('Description').' | ';
- print ''.$langs->trans('VAT').' | ';
- print ''.$langs->trans('PriceUHT').' | ';
- print ''.$langs->trans('PriceUTTC').' | ';
- print ''.$langs->trans('Qty').' | ';
+ print ''.$langs->trans('Type').' | ';
+ print ''.$langs->trans('Description').' | ';
+ print ''.$langs->trans('VAT').' | ';
+ print ''.$langs->trans('PriceUHT').' | ';
+ print ''.$langs->trans('PriceUTTC').' | ';
+ print ''.$langs->trans('Qty').' | ';
if ($action != 'editline')
{
- print ''.$langs->trans('AmountHT').' | ';
- print ''.$langs->trans('AmountTTC').' | ';
+ print ''.$langs->trans('AmountHT').' | ';
+ print ''.$langs->trans('AmountTTC').' | ';
}
// Ajout des boutons de modification/suppression
if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
{
- print ' | ';
+ print ' | ';
}
print '
';
@@ -2045,16 +2045,16 @@ else
{
print '';
- print '| ';
+ print ' | ';
print $numline;
print ' | ';
- /*print '';
+ /*print ' | ';
print img_picto($langs->trans("Document"), "object_generic");
print ' '.$piece_comptable.'';
print ' | ';*/
- print ''.dol_print_date($db->jdate($line->date), 'day').' | ';
+ print ''.dol_print_date($db->jdate($line->date), 'day').' | ';
if (! empty($conf->projet->enabled))
{
print '';
@@ -2076,10 +2076,10 @@ else
$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
print $labeltype;
print ' | ';
- print ''.dol_escape_htmltag($line->comments).' | ';
- print ''.vatrate($line->vatrate, true).' | ';
+ print ''.dol_escape_htmltag($line->comments).' | ';
+ print ''.vatrate($line->vatrate, true).' | ';
// Unit price HT
- print '';
+ print ' | ';
if (! empty($line->value_unit_ht))
{
print price($line->value_unit_ht);
@@ -2092,20 +2092,20 @@ else
}
print ' | ';
- print ''.price($line->value_unit).' | ';
+ print ''.price($line->value_unit).' | ';
- print ''.dol_escape_htmltag($line->qty).' | ';
+ print ''.dol_escape_htmltag($line->qty).' | ';
if ($action != 'editline')
{
- print ''.price($line->total_ht).' | ';
- print ''.price($line->total_ttc).' | ';
+ print ''.price($line->total_ht).' | ';
+ print ''.price($line->total_ttc).' | ';
}
// Ajout des boutons de modification/suppression
if (($object->fk_statut < ExpenseReport::STATUS_VALIDATED || $object->fk_statut == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
{
- print '';
+ print ' | ';
print 'rowid.'#'.$line->rowid.'">';
print img_edit();
@@ -2158,32 +2158,32 @@ else
print ' | ';
// VAT
- print '';
+ print ' | ';
print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$line->vatrate), $mysoc, '', 0, 0, '', false, 1);
print ' | ';
// Unit price
- print '';
+ print ' | ';
print '';
print ' | ';
// Unit price with tax
- print '';
+ print ' | ';
print '';
print ' | ';
// Quantity
- print '';
+ print ' | ';
print '';
print ' | ';
if ($action != 'editline')
{
- print ''.$langs->trans('AmountHT').' | ';
- print ''.$langs->trans('AmountTTC').' | ';
+ print ''.$langs->trans('AmountHT').' | ';
+ print ''.$langs->trans('AmountTTC').' | ';
}
- print '';
+ print ' | ';
print '';
print '';
print '
';
@@ -2253,15 +2253,15 @@ else
print ' |
';
print ' | ';
- print ''.$langs->trans('Date').' | ';
+ print ''.$langs->trans('Date').' | ';
if (! empty($conf->projet->enabled)) print ''.$langs->trans('Project').' | ';
if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''.$langs->trans('CarCategory').' | ';
- print ''.$langs->trans('Type').' | ';
+ print ''.$langs->trans('Type').' | ';
print ''.$langs->trans('Description').' | ';
- print ''.$langs->trans('VAT').' | ';
- print ''.$langs->trans('PriceUHT').' | ';
- print ''.$langs->trans('PriceUTTC').' | ';
- print ''.$langs->trans('Qty').' | ';
+ print ''.$langs->trans('VAT').' | ';
+ print ''.$langs->trans('PriceUHT').' | ';
+ print ''.$langs->trans('PriceUTTC').' | ';
+ print ''.$langs->trans('Qty').' | ';
print ' | ';
print '
';
@@ -2271,7 +2271,7 @@ else
print ' | ';
// Select date
- print '';
+ print ' | ';
print $form->selectDate($date?$date:-1, 'date', 0, 0, 0, '', 1, 1);
print ' | ';
@@ -2292,7 +2292,7 @@ else
}
// Select type
- print '';
+ print ' | ';
select_type_fees_id($fk_c_type_fees, 'fk_c_type_fees', 1);
print ' | ';
@@ -2302,34 +2302,34 @@ else
print '';
// Select VAT
- print '';
+ print ' | ';
$defaultvat=-1;
if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false, 1);
print ' | ';
// Unit price net
- print '';
+ print ' | ';
print '';
print ' | ';
// Unit price with tax
- print '';
+ print ' | ';
print '';
print ' | ';
// Quantity
- print '';
+ print ' | ';
print ''; // We must be able to enter decimal qty
print ' | ';
if ($action != 'editline')
{
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
}
- print ' | ';
+ print ' | ';
print '';