|
@@ -1,7 +1,7 @@
|
|
|
<?php
|
|
|
/* Copyright (C) 2016 Olivier Geffroy <jeff@jeffinfo.com>
|
|
|
* Copyright (C) 2016 Florian Henry <florian.henry@open-concept.pro>
|
|
|
- * Copyright (C) 2016-2018 Alexandre Spangaro <aspangaro@zendsi.com>
|
|
|
+ * Copyright (C) 2016-2019 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
|
|
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
|
|
*
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
@@ -164,7 +164,7 @@ if ($action == 'export_csv')
|
|
|
print $object->get_compte_desc($line->numero_compte) . $sep;
|
|
|
print price($line->debit) . $sep;
|
|
|
print price($line->credit) . $sep;
|
|
|
- print price($line->credit - $line->debit) . $sep;
|
|
|
+ print price($line->debit - $line->credit) . $sep;
|
|
|
print "\n";
|
|
|
}
|
|
|
|
|
@@ -235,7 +235,7 @@ if ($action != 'export_csv')
|
|
|
print $langs->trans('to');
|
|
|
print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
|
|
|
print '</td>';
|
|
|
- print '<td align="right" class="liste_titre">';
|
|
|
+ print '<td class="liste_titre right">';
|
|
|
$searchpicto=$form->showFilterAndCheckAddButtons(0);
|
|
|
print $searchpicto;
|
|
|
print '</td>';
|
|
@@ -274,7 +274,7 @@ if ($action != 'export_csv')
|
|
|
{
|
|
|
// Affiche un Sous-Total par compte comptable
|
|
|
if ($displayed_account != "") {
|
|
|
- print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
|
|
|
+ print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
|
|
|
print "<td> </td>\n";
|
|
|
print '</tr>';
|
|
|
}
|
|
@@ -293,10 +293,10 @@ if ($action != 'export_csv')
|
|
|
|
|
|
print '<td>' . length_accountg($line->numero_compte) . '</td>';
|
|
|
print '<td>' . $description . '</td>';
|
|
|
- print '<td align="right">' . price($line->debit) . '</td>';
|
|
|
- print '<td align="right">' . price($line->credit) . '</td>';
|
|
|
- print '<td align="right">' . price($line->credit - $line->debit) . '</td>';
|
|
|
- print '<td align="center">' . $link;
|
|
|
+ print '<td class="nowrap right">' . price($line->debit) . '</td>';
|
|
|
+ print '<td class="nowrap right">' . price($line->credit) . '</td>';
|
|
|
+ print '<td class="nowrap right">' . price($line->debit - $line->credit) . '</td>';
|
|
|
+ print '<td class="center">' . $link;
|
|
|
print '</td>';
|
|
|
print "</tr>\n";
|
|
|
|
|
@@ -305,11 +305,11 @@ if ($action != 'export_csv')
|
|
|
$sous_total_credit += $line->credit;
|
|
|
}
|
|
|
|
|
|
- print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
|
|
|
+ print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit)) . '</td>';
|
|
|
print "<td> </td>\n";
|
|
|
print '</tr>';
|
|
|
|
|
|
- print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap" align="right">' . price($total_debit) . '</td><td class="nowrap" align="right">' . price($total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($total_credit - $total_debit)) . '</td>';
|
|
|
+ print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap right">' . price($total_debit) . '</td><td class="nowrap right">' . price($total_credit) . '</td><td class="nowrap right">' . price(price2num($total_debit - $total_credit)) . '</td>';
|
|
|
print "<td> </td>\n";
|
|
|
print '</tr>';
|
|
|
|