';
- print '| ' . $langs->trans("Total") . ' | ';
+ print '
| ' . $langs->trans("Total") . ' | ';
for($i = 1; $i <= 12; $i ++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
if ($j > 12) $j-=12;
- print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' | ';
+ print '' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . ' | ';
}
- print '' . $langs->trans("Total") . ' |
';
+ print '' . $langs->trans("Total") . ' | ';
$sql = "SELECT '" . $langs->trans("TotalExpenseReport") . "' AS label,";
for($i = 1; $i <= 12; $i ++) {
@@ -331,9 +331,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
while ($row = $db->fetch_row($resql)) {
print '| ' . $row[0] . ' | ';
for($i = 1; $i <= 12; $i ++) {
- print '' . price($row[$i]) . ' | ';
+ print '' . price($row[$i]) . ' | ';
}
- print '' . price($row[13]) . ' | ';
+ print '' . price($row[13]) . ' | ';
print '
';
}
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index d8dd122150c..c617f984af3 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -319,7 +319,7 @@ if ($result) {
print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->comments);
print '';
- print '' . price($objp->total_ht) . ' | ';
+ print '' . price($objp->total_ht) . ' | ';
print '' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . ' | ';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 8057c9809f2..6977d76845d 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -376,12 +376,12 @@ if ($result) {
print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->comments);
print '';
- print '';
+ print ' | ';
print price($objp->price);
print ' | ';
// Vat rate
- print '';
+ print ' | ';
print vatrate($objp->tva_tx_line.($objp->vat_src_code?' ('.$objp->vat_src_code.')':''));
print ' | ';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 3147339601c..fc5d4062b43 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -601,8 +601,8 @@ if (empty($action) || $action == 'view') {
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 = '';
@@ -644,8 +644,8 @@ if (empty($action) || $action == 'view') {
$userstatic->id = $tabuser[$key]['id'];
$userstatic->name = $tabuser[$key]['name'];
print "" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $accountingaccount->label . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
- print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? price(- $mt) : '') . " | ";
print "";
}
}
@@ -677,8 +677,8 @@ if (empty($action) || $action == 'view') {
else print $accountoshow;
print '';
print "" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("SubledgerAccount") . " | ";
- print '' . ($mt < 0 ? - price(- $mt) : '') . " | ";
- print '' . ($mt >= 0 ? price($mt) : '') . " | ";
+ print '' . ($mt < 0 ? - price(- $mt) : '') . " | ";
+ print '' . ($mt >= 0 ? price($mt) : '') . " | ";
print "";
}
@@ -709,8 +709,8 @@ if (empty($action) || $action == 'view') {
print '';
print "" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $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/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 28d4916884f..37f1f9d9eae 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -788,8 +788,8 @@ if (empty($action) || $action == 'view') {
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 = '';
@@ -841,8 +841,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " | ";
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
print "";
continue;
@@ -862,8 +862,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " | ";
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
print "";
}
@@ -893,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 "";
//}
}
@@ -924,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 "";
//}
}
@@ -958,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 "";
}
}
@@ -987,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 243c9fb943c..09bc9a18e9a 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -725,8 +725,8 @@ if (empty($action) || $action == 'view') {
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 = '';
@@ -776,8 +776,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " | ";
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
print "";
continue;
@@ -797,8 +797,8 @@ if (empty($action) || $action == 'view') {
print '';
print "";
print " | ";
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
print "";
}
@@ -829,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 "";
//}
}
@@ -861,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 "";
//}
}
@@ -895,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 "";
}
}