diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index f7e41bdc997..60215005446 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -145,9 +145,9 @@ if ($prev_id > 0 || $ref)
// List of invoices
-$sql = "SELECT pf.rowid";
-$sql.= ",f.rowid as facid, f.facnumber as ref, f.total_ttc";
-$sql.= ", s.rowid as socid, s.nom as name, pl.statut";
+$sql = "SELECT pf.rowid,";
+$sql.= " f.rowid as facid, f.facnumber as ref, f.total_ttc,";
+$sql.= " s.rowid as socid, s.nom as name, pl.statut, pl.amount as amount_requested";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -202,14 +202,14 @@ if ($result)
print '
';
print_liste_field_titre("Bill",$_SERVER["PHP_SELF"],"p.ref",'',$param,'',$sortfield,$sortorder);
print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"s.nom",'',$param,'',$sortfield,$sortorder);
- print_liste_field_titre("Amount",$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre("AmountInvoice",$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre("AmountRequested",$_SERVER["PHP_SELF"],"pl.amount_requested","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre("StatusDebitCredit",$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre('');
print "
\n";
- $var=false;
-
- $total = 0;
+ $totalinvoices = 0;
+ $totalamount_requested = 0;
while ($i < min($num, $limit))
{
@@ -231,9 +231,12 @@ if ($result)
print $thirdpartytmp->getNomUrl(1);
print "\n";
- // Amount
+ // Amount of invoice
print ''.price($obj->total_ttc)." | \n";
+ // Amount requested
+ print ''.price($obj->amount_requested)." | \n";
+
// Status of requests
print '';
@@ -256,7 +259,8 @@ if ($result)
print "\n";
- $total += $obj->total_ttc;
+ $totalinvoices += $obj->total_ttc;
+ $totalamount_requested += $obj->amount_requested;
$i++;
}
@@ -267,8 +271,11 @@ if ($result)
print ' | '.$langs->trans("Total").' | ';
print ' | ';
print '';
- if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
- print price($total);
+ //if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); // It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
+ if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+ print " | \n";
+ print '';
+ print price($totalamount_requested);
print " | \n";
print ' | ';
print ' | ';
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 29b5766215b..308987575f5 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -72,7 +72,7 @@ IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one
DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
WithdrawalFile=Withdrawal file
SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
StatisticsByLineStatus=Statistics by status of lines
RUM=UMR
RUMLong=Unique Mandate Reference
@@ -95,6 +95,7 @@ ModeRECUR=Reccurent payment
ModeFRST=One-off payment
PleaseCheckOne=Please check one only
DirectDebitOrderCreated=Direct debit order %s created
+AmountRequested=Amount requested
### Notifications
InfoCreditSubject=Payment of direct debit payment order %s by the bank