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

Fix: Si facture pay, on affiche pas le reste pay (uniformit avec facture clients)

Browse Source
This commit is contained in:
Laurent Destailleur 2005-11-09 21:27:37 +00:00
parent 26dd1d1cc9
commit 0820d8fb33
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/fourn/facture/fiche.php
View File

@ -502,18 +502,17 @@ else
print '</td><td valign="top">'; print '</td><td valign="top">';
/*
* Liste des paiements
*/
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('DateEcheance').'</td><td>'; print '<td>'.$langs->trans('DateEcheance').'</td><td>';
print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y').'</td></tr>'; print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y').'</td></tr>';
print '<tr><td colspan="2">'.$langs->trans('Payments').'</td></tr>'; /*
* Liste des paiements
*/
print '<tr><td colspan="2">';
print $langs->trans('Payments').' :<br>';
$sql = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,'; $sql = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,';
$sql .= ' c.libelle as paiement_type, p.num_paiement, p.rowid'; $sql .= ' c.libelle as paiement_type, p.num_paiement, p.rowid';
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p'; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
@ -526,11 +525,8 @@ else
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $totalpaye = 0;
print '<tr><td colspan="2">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Date').'</td>'; print '<td>'.$langs->trans('Date').'</td>';
print '<td>'.$langs->trans('Type').'</td>'; print '<td>'.$langs->trans('Type').'</td>';
@ -560,22 +556,22 @@ else
} }
print '</tr>'; print '</tr>';
$total = $total + $objp->amount; $totalpaye += $objp->amount;
$i++; $i++;
} }
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans('Total').' :</td><td align="right"><b>'.price($total).'</b></td><td'.$tdsup.'>'.$langs->trans('Currency'.$conf->monnaie)."</td></tr>\n";
if ($fac->paye == 0)
if ($fac->statut > 0)
{ {
$resteapayer = abs($fac->total_ttc - $total); print '<tr><td colspan="2" align="right">'.$langs->trans('AlreadyPayed').' :</td><td align="right"><b>'.price($totalpaye).'</b></td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans('RemainderToPay').' :</td>'; print '<tr><td colspan="2" align="right">'.$langs->trans("Billed").' :</td><td align="right" style="border: 1px solid;">'.price($fac->total_ttc).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
print '<td align="right"><b>'.price($resteapayer).'</b></td><td'.$tdsup.'>'.$langs->trans('Currency'.$conf->monnaie).'</td>';
print '</tr>';
}
$resteapayer = $fac->total_ttc - $totalpaye;
print '<tr><td colspan="2" align="right">'.$langs->trans('RemainderToPay').' :</td>';
print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayer).'</b></td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
}
print '</table>'; print '</table>';
$db->free(); $db->free($result);
} }
else else
{ {

2
htdocs/fourn/facture/paiement.php
View File

@ -271,7 +271,7 @@ if ($action == 'create' || $action == 'add_paiement')
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Bill').'</td><td align="center">'.$langs->trans('Date').'</td>'; print '<td>'.$langs->trans('Bill').'</td><td align="center">'.$langs->trans('Date').'</td>';
print '<td align="right">'.$langs->trans('AmountTTC').'</td>'; print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
print '<td align="right">'.$langs->trans('Paied').'</td>'; print '<td align="right">'.$langs->trans('AlreadyPayed').'</td>';
print '<td align="right">'.$langs->trans('RemainderToPay').'</td>'; print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
print '<td align="center">'.$langs->trans('Amount').'</td>'; print '<td align="center">'.$langs->trans('Amount').'</td>';
print '</tr>'; print '</tr>';