From 6deba39c6a9d67826297d7422f8130bb95133b35 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 12 Apr 2019 10:16:13 +0200
Subject: [PATCH] FIX credit note can be split

---
 htdocs/core/class/commoninvoice.class.php | 23 ++++++++++++
 htdocs/core/class/discount.class.php      | 43 +++++++++++++++++++++++
 htdocs/fourn/facture/list.php             |  7 ++--
 htdocs/societe/class/societe.class.php    |  8 ++---
 4 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 3aa8eb4e1ab..35ec6ad283e 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -195,6 +195,29 @@ abstract class CommonInvoice extends CommonObject
 	    }
 	}
 
+	/**
+	 *    	Return amount (with tax) of all converted amount for this credit note
+	 *
+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	function getSumFromThisCreditNotesNotUsed($multicurrency=0)
+	{
+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+	    $discountstatic=new DiscountAbsolute($this->db);
+	    $result=$discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);
+	    if ($result >= 0)
+	    {
+	        return $result;
+	    }
+	    else
+	    {
+	        $this->error=$discountstatic->error;
+	        return -1;
+	    }
+	}
+
 	/**
 	 *	Renvoie tableau des ids de facture avoir issus de la facture
 	 *
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index cfe7ac24dea..2e99a83ec42 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -568,6 +568,49 @@ class DiscountAbsolute
             return -1;
         }
     }
+    /**
+     *    	Return amount (with tax) of all converted amount for this credit note
+     *
+     *	@param		CommonInvoice	  $invoice	    	Object invoice
+	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+     *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
+     */
+    function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency=0)
+    {
+        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+        {
+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+            $sql.= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
+        }
+        else if ($invoice->element == 'invoice_supplier')
+        {
+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+            $sql.= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
+        }
+        else
+        {
+            $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+            dol_print_error($this->error);
+            return -1;
+        }
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($multicurrency) return $obj->multicurrency_amount;
+			else return $obj->amount;
+        }
+        else
+        {
+            $this->error = $this->db->lasterror();
+            return -1;
+        }
+    }
 
     /**
      *	Return clickable ref of object (with picto or not)
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3e1827d6818..d8e18257d23 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -852,8 +852,11 @@ if ($resql)
 			$remaintopay = $obj->total_ttc - $totalpay;
 
             //If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
-            if($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE && $facturestatic->statut == FactureFournisseur::STATUS_CLOSED) {
-                if($facturestatic->isCreditNoteUsed())$remaintopay=0;
+            if($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+
+                if($facturestatic->isCreditNoteUsed()){
+                    $remaintopay=-$facturestatic->getSumFromThisCreditNotesNotUsed();
+                }
             }
 
 			print '<tr class="oddeven">';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7d54e7ad01e..87c4956e48e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3778,11 +3778,11 @@ class Societe extends CommonObject
 
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
+				
+                //if credit note is converted but not used
+                if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE  && $tmpobject->isCreditNoteUsed())$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed();
+
 
-                if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $obj->fk_statut == FactureFournisseur::STATUS_CLOSED && !$tmpobject->isCreditNoteUsed()) { //if credit note is converted but not used
-                    if(empty($paiement)) $paiement = $tmpobject->getSommePaiement();
-                    $outstandingOpened+=$obj->total_ttc-$paiement;
-                }
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
 		}