From ae7f49b5d81d0cd44528738e9ef129bcc600ea59 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 21 Dec 2016 18:40:05 +0100
Subject: [PATCH] FIX: Deposits and credit notes weren't added in the received
and pending columns
---
htdocs/compta/facture/list.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index d9e5ae8ce23..8d0cc61d5d6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1216,6 +1216,12 @@ if ($resql)
$facturestatic->type=$obj->type;
$facturestatic->statut=$obj->fk_statut;
$facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
+
+ $paiement = $facturestatic->getSommePaiement();
+ $totalcreditnotes = $facturestatic->getSumCreditNotesUsed();
+ $totaldeposits = $facturestatic->getSumDepositsUsed();
+ $totalpay = $paiement + $totalcreditnotes + $totaldeposits;
+ $remaintopay = $obj->total_ttc - $totalpay;
print '<tr '.$bc[$var].'>';
if (! empty($arrayfields['f.facnumber']['checked']))
@@ -1223,9 +1229,7 @@ if ($resql)
print '<td class="nowrap">';
$notetoshow=dol_string_nohtmltag(($user->societe_id>0?$obj->note_public:$obj->note_private),1);
- $paiement = $facturestatic->getSommePaiement();
- $remaintopay = $obj->total_ttc - $paiement;
-
+
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td class="nobordernopadding nowrap">';
@@ -1372,10 +1376,10 @@ if ($resql)
if (! empty($arrayfields['dynamount_payed']['checked']))
{
- print '<td align="right">'.(! empty($paiement)?price($paiement,0,$langs):' ').'</td>'; // TODO Use a denormalized field
+ print '<td align="right">'.(! empty($totalpay)?price($totalpay,0,$langs):' ').'</td>'; // TODO Use a denormalized field
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
- $totalarray['totalam'] += $paiement;
+ $totalarray['totalam'] += $totalpay;
}
if (! empty($arrayfields['rtp']['checked']))
--
GitLab