lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: all amount must be without tax

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-13 19:11:23 +02:00
parent 97cdc55839
commit 39e4f52497
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/card.php
View File

@ -854,7 +854,7 @@ if ($id > 0)
$facturestatic = new Facture($db);
$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount';
$sql.= ', f.total';
$sql.= ', f.total as total_ht';
$sql.= ', f.tva as total_tva';
$sql.= ', f.total_ttc';
$sql.= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
@ -896,7 +896,7 @@ if ($id > 0)
$facturestatic->id = $objp->facid;
$facturestatic->ref = $objp->facnumber;
$facturestatic->type = $objp->type;
$facturestatic->total_ht = $objp->total;
$facturestatic->total_ht = $objp->total_ht;
$facturestatic->total_tva = $objp->total_tva;
$facturestatic->total_ttc = $objp->total_ttc;
print $facturestatic->getNomUrl(1);
@ -909,7 +909,7 @@ if ($id > 0)
{
print '<td align="right"><b>!!!</b></td>';
}
print '<td align="right" width="120">'.price($objp->total_ttc).'</td>';
print '<td align="right" width="120">'.price($objp->total_ht).'</td>';
print '<td align="right" class="nowrap" width="100" >'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
print "</tr>\n";