admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #0001328: Problème affichage totaux achat

Browse source
This commit is contained in:
Dany De Bontridder 2017-10-31 23:54:06 +01:00
parent ce1c513893
commit 360fa51a13
2 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/class/acc_ledger_purchase.class.php
View file

@ -1551,6 +1551,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$tot=nbm($tot);
$str_tot=_('Totaux');
$tot_amount=nbm($tot_amount);
if ( $g_parameter->MY_TVA_USE == 'Y') {
$r.=<<<EOF
<tr class="highlight">
{$decalage}
@ -1567,6 +1568,25 @@ class Acc_Ledger_Purchase extends Acc_Ledger
{$tot}
</td>
EOF;
} else {
$r.=<<<EOF
<tr class="highlight">
{$decalage}
<td>
{$str_tot}
</td>
<td class="num">
{$tot_amount}
</td>
<td class="num">
</td>
<td class="num">
{$tot}
</td>
EOF;
}
$r.='</table>';
$r.='</p>';

20
include/class/acc_ledger_sold.class.php
View file

@ -826,6 +826,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$tot=nbm($tot);
$str_tot=_('Totaux');
$tot_amount=nbm($tot_amount);
if ( $g_parameter->MY_TVA_USE=="Y") {
$r.=<<<EOF
<tr class="highlight">
{$decalage}
@ -842,7 +843,24 @@ class Acc_Ledger_Sold extends Acc_Ledger {
{$tot}
</td>
EOF;
} else {
$r.=<<<EOF
<tr class="highlight">
{$decalage}
<td>
{$str_tot}
</td>
<td class="num">
</td>
<td class="num">
</td>
<td class="num">
{$tot}
</td>
EOF;
}
$r.='</table>';
$r.='</p>';
if ($g_parameter->MY_ANALYTIC != 'nu' && ! $p_summary) // use of AA