From 15d20497c878b29ab5c1be27d6f8a230dcb26cad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 May 2017 17:28:33 +0200
Subject: [PATCH] FIX #6795 #6796
---
htdocs/compta/facture/class/facture.class.php | 7 +++---
.../core/class/commondocgenerator.class.php | 23 ++++++++++++++-----
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index bc4cf3626a4..912a18979bc 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3560,10 +3560,11 @@ class Facture extends CommonInvoice
/**
- * Create a withdrawal request for a standing order
+ * Create a withdrawal request for a standing order.
+ * Use the remain to pay excluding all existing open direct debit requests.
*
- * @param User $fuser User asking standing order
- * @param float $amount Amount we request withdraw for
+ * @param User $fuser User asking the direct debit transfer
+ * @param float $amount Amount we request direct debit for
* @return int <0 if KO, >0 if OK
*/
function demande_prelevement($fuser, $amount=0)
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f338aca7be8..bb806257d01 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -333,7 +333,7 @@ abstract class CommonDocGenerator
{
global $conf;
- $sumpayed=''; $alreadypayed='';
+ $sumpayed=$sumdeposit=$sumcreditnote='';
if ($object->element == 'facture')
{
$invoice_source=new Facture($this->db);
@@ -342,7 +342,8 @@ abstract class CommonDocGenerator
$invoice_source->fetch($object->fk_facture_source);
}
$sumpayed = $object->getSommePaiement();
- $alreadypayed=price($sumpayed,0,$outputlangs);
+ $sumdeposit = $object->getSumDepositsUsed();
+ $sumcreditnote = $object->getSumCreditNotesUsed();
}
$resarray=array(
@@ -385,11 +386,21 @@ abstract class CommonDocGenerator
$array_key.'_note_private'=>$object->note,
$array_key.'_note_public'=>$object->note_public,
$array_key.'_note'=>$object->note_public, // For backward compatibility
+
// Payments
- $array_key.'_already_payed_locale'=>price($alreadypayed, 0, $outputlangs),
- $array_key.'_remain_to_pay_locale'=>price($object->total_ttc - $sumpayed, 0, $outputlangs),
- $array_key.'_already_payed'=>$alreadypayed,
- $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed)
+ $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
+ $array_key.'_already_payed'=>price2num($sumpayed),
+ $array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
+ $array_key.'_already_deposit'=>price2num($sumdeposit),
+ $array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
+ $array_key.'_already_creditnote'=>price2num($sumcreditnote),
+
+ $array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
+ $array_key.'already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
+
+ // Remain to pay with all know infrmation (except open direct debit requests)
+ $array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
+ $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
);
// Add vat by rates
--
GitLab