";
print "";
- print " | ";
print "" . $langs->trans("Date") . " | ";
print "" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ") | ";
print "" . $langs->trans("AccountAccounting") . " | ";
print "" . $langs->trans("SubledgerAccount") . " | ";
print "" . $langs->trans("LabelOperation") . " | ";
- print "" . $langs->trans("Debit") . " | ";
- print "" . $langs->trans("Credit") . " | ";
+ print "" . $langs->trans("Debit") . " | ";
+ print "" . $langs->trans("Credit") . " | ";
print "
\n";
$r = '';
@@ -830,7 +829,7 @@ if (empty($action) || $action == 'view') {
if ($replacedinvoice == 1)
{
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -851,7 +850,7 @@ if (empty($action) || $action == 'view') {
if ($errorforinvoice[$key] == 'somelinesarenotbound')
{
print '
';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -872,7 +871,7 @@ if (empty($action) || $action == 'view') {
foreach ($tabttc[$key] as $k => $mt) {
//if ($mt) {
print '
';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -894,8 +893,8 @@ if (empty($action) || $action == 'view') {
else print $accountoshow;
print '';
print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . " | ";
- print ''. ($mt < 0 ? price(- $mt) : '') . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print ''. ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
print "
";
//}
}
@@ -907,7 +906,7 @@ if (empty($action) || $action == 'view') {
//if ($mt) {
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -925,8 +924,8 @@ if (empty($action) || $action == 'view') {
$companystatic->id = $tabcompany[$key]['id'];
$companystatic->name = $tabcompany[$key]['name'];
print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $accountingaccount->label . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
print "
";
//}
}
@@ -941,7 +940,7 @@ if (empty($action) || $action == 'view') {
foreach ($arrayofvat[$key] as $k => $mt) {
if ($mt) {
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -959,8 +958,8 @@ if (empty($action) || $action == 'view') {
print "";
print $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT"). ' '.join(', ', $def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
print " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
print "
";
}
}
@@ -972,7 +971,7 @@ if (empty($action) || $action == 'view') {
foreach ($tabother[$key] as $k => $mt) {
if ($mt) {
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -988,8 +987,8 @@ if (empty($action) || $action == 'view') {
print "";
print ' | ';
print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart) | ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
print "
";
}
}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 08df2e71b32..da1f14dade5 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -720,14 +720,13 @@ if (empty($action) || $action == 'view') {
print '';
print "
";
print "";
- print " | ";
print "" . $langs->trans("Date") . " | ";
print "" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ") | ";
print "" . $langs->trans("AccountAccounting") . " | ";
print "" . $langs->trans("SubledgerAccount") . " | ";
print "" . $langs->trans("LabelOperation") . " | ";
- print "" . $langs->trans("Debit") . " | ";
- print "" . $langs->trans("Credit") . " | ";
+ print "" . $langs->trans("Debit") . " | ";
+ print "" . $langs->trans("Credit") . " | ";
print "
\n";
$r = '';
@@ -765,7 +764,7 @@ if (empty($action) || $action == 'view') {
if ($replacedinvoice == 1)
{
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -786,7 +785,7 @@ if (empty($action) || $action == 'view') {
if ($errorforinvoice[$key] == 'somelinesarenotbound')
{
print '
';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -808,7 +807,7 @@ if (empty($action) || $action == 'view') {
{
//if ($mt) {
print '
';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -830,8 +829,8 @@ if (empty($action) || $action == 'view') {
else print $accountoshow;
print '';
print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
print "
";
//}
}
@@ -844,7 +843,7 @@ if (empty($action) || $action == 'view') {
//if ($mt) {
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -862,8 +861,8 @@ if (empty($action) || $action == 'view') {
$companystatic->id = $tabcompany[$key]['id'];
$companystatic->name = $tabcompany[$key]['name'];
print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label . " | ";
- print "" . ($mt < 0 ? price(- $mt) : '') . " | ";
- print "" . ($mt >= 0 ? price($mt) : '') . " | ";
+ print "" . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print "" . ($mt >= 0 ? price($mt) : '') . " | ";
print "
";
//}
}
@@ -879,7 +878,7 @@ if (empty($action) || $action == 'view') {
foreach ($arrayofvat[$key] as $k => $mt) {
if ($mt) {
print '';
- print " | ";
+ print "";
print "" . $date . " | ";
print "" . $invoicestatic->getNomUrl(1) . " | ";
// Account
@@ -896,8 +895,8 @@ if (empty($action) || $action == 'view') {
print '';
print "" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ', $def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
print " | ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
print "
";
}
}
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 21480a8496d..9372ec84cfe 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -472,11 +472,11 @@ if ($action == 'new')
print ''."\n";
print '';
- print '| '.$langs->trans("DateChequeReceived").' | '."\n";
- print ''.$langs->trans("ChequeNumber")." | \n";
- print ''.$langs->trans("CheckTransmitter")." | \n";
- print ''.$langs->trans("Bank")." | \n";
- print ''.$langs->trans("Amount")." | \n";
+ print ''.$langs->trans("DateChequeReceived").' | '."\n";
+ print ''.$langs->trans("ChequeNumber")." | \n";
+ print ''.$langs->trans("CheckTransmitter")." | \n";
+ print ''.$langs->trans("Bank")." | \n";
+ print ''.$langs->trans("Amount")." | \n";
print ''.$langs->trans("Payment")." | \n";
print ''.$langs->trans("LineRecord")." | \n";
print ''.$langs->trans("Select")." ";
|