From 05c9e97fe40f805a17eb3468e3668aea9b8a1db1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Aug 2019 00:45:02 +0200
Subject: [PATCH] The deprecated method get_OutstandingBill has been removed.
 You can use getOutstandingBills() instead.

---
 ChangeLog                              |  3 ++
 htdocs/comm/propal/card.php            |  3 +-
 htdocs/commande/card.php               |  3 +-
 htdocs/compta/facture/card.php         | 65 +++++++++++++-------------
 htdocs/don/card.php                    |  3 +-
 htdocs/societe/class/societe.class.php | 63 +++----------------------
 htdocs/supplier_proposal/card.php      |  3 +-
 7 files changed, 50 insertions(+), 93 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ca4df10d38..54b40dc0f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@ Following changes may create regressions for some external modules, but were nec
 * Removed the method liste_array() of project class. It was not used by core code.
 * The function show_theme() hase been renamed into showSkins()
 * Rename 'module_part' parameter into 'modulepart' into document APIs, for consistency.
+* The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.
+
+
 
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 2ae67888658..9adc0bff336 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2248,7 +2248,8 @@ $formquestion = array_merge($formquestion, array(
 		print '<tr><td>';
 		print $langs->trans('OutstandingBill');
 		print '</td><td class="right">';
-		print price($soc->get_OutstandingBill()) . ' / ';
+		$arrayoutstandingbills = $soc->getOutstandingBills();
+		print price($arrayoutstandingbills['opened']) . ' / ';
 		print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 031d2c95235..bc728067b5f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2138,7 +2138,8 @@ if ($action == 'create' && $usercancreate)
 			print '<tr><td class="titlefield">';
 			print $langs->trans('OutstandingBill');
 			print '</td><td>';
-			print price($soc->get_OutstandingBill()) . ' / ';
+			$arrayoutstandingbills = $soc->getOutstandingBills();
+			print price($arrayoutstandingbills['opened']) . ' / ';
 			print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
 			print '</td>';
 			print '</tr>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 54c339284a5..ff5a280a118 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -315,7 +315,7 @@ if (empty($reshook))
 	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
 	    $result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
 	    if ($result < 0) dol_print_error($db, $object->error);
-	    
+
 	    $old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
 	    $new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
 	    if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
@@ -323,7 +323,7 @@ if (empty($reshook))
 	    $result = $object->update($user);
 	    if ($result < 0) dol_print_error($db, $object->error);
 	}
-	
+
 	elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
@@ -331,7 +331,7 @@ if (empty($reshook))
 	    if ($result < 0)
 	        dol_print_error($db, $object->error);
 	}
-	
+
 	elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
@@ -339,7 +339,7 @@ if (empty($reshook))
 	    if ($result < 0)
 	        dol_print_error($db, $object->error);
 	}
-	
+
 
 	// Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
@@ -1237,11 +1237,11 @@ if (empty($reshook))
 					$object->situation_counter = 1;
 					$object->situation_final = 0;
 					$object->situation_cycle_ref = $object->newCycle();
-					
-					
+
+
 					$object->retained_warranty  = GETPOST('retained_warranty', 'int');
 					$object->retained_warranty_fk_cond_reglement  = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-					
+
 				    $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
 				    if(!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)){
 				        $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
@@ -2761,7 +2761,8 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 		// Outstanding Bill
-		$outstandingBills = $soc->get_OutstandingBill();
+		$arrayoutstandingbills = $soc->getOutstandingBills();
+		$outstandingBills = $arrayoutstandingbills['opened'];
 		print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
 		print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
 		if ($soc->outstanding_limit != '')
@@ -3188,25 +3189,25 @@ if ($action == 'create')
 	if (! empty($conf->global->INVOICE_USE_SITUATION))
 	{
 	    if($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY){
-	        
+
 	        $rwStyle = 'display:none;';
 	        if(GETPOST('type', 'int') == Facture::TYPE_SITUATION){
 	            $rwStyle = '';
 	        }
-	        
-	        
+
+
 	        $retained_warranty = GETPOST('retained_warranty', 'int');
 	        $retained_warranty = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">' . $langs->trans('RetainedWarranty') . '</td><td colspan="2">';
 	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
-	    
+
 	        // Retained warranty payment term
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">' . $langs->trans('PaymentConditionsShortRetainedWarranty') . '</td><td colspan="2">';
 	        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
 	        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement)? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
 	        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 	        print '</td></tr>';
-	        
+
 	        print '<script type="text/javascript" language="javascript">
     		$(document).ready(function() {
     			$("[name=\'type\'").change(function() {
@@ -4109,9 +4110,9 @@ elseif ($id > 0 || ! empty($ref))
 	            }
 	        }
 	    }
-	    
-	    
-	    
+
+
+
     	// Retained Warranty
     	print '<tr class="retained-warranty-lines"  ><td>';
     	print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
@@ -4120,7 +4121,7 @@ elseif ($id > 0 || ! empty($ref))
     	if ($action != 'editretainedwarranty' && $user->rights->facture->creer){
     	    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editretainedwarranty&amp;facid=' . $object->id . '">' . img_edit($langs->trans('setretainedwarranty'), 1) . '</a></td>';
     	}
-    	    
+
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editretainedwarranty')
@@ -4137,7 +4138,7 @@ elseif ($id > 0 || ! empty($ref))
             print price($object->retained_warranty).'%';
         }
         print '</td></tr>';
-        
+
         // Retained warranty payment term
         print '<tr class="retained-warranty-lines"  ><td>';
         print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
@@ -4146,14 +4147,14 @@ elseif ($id > 0 || ! empty($ref))
         if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer){
             print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editretainedwarrantypaymentterms&amp;facid=' . $object->id . '">' . img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1) . '</a></td>';
         }
-        
+
         print '</tr></table>';
         print '</td><td>';
         $defaultDate =  !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
         if($object->date > $defaultDate){
             $defaultDate = $object->date;
         }
-        
+
         if ($action == 'editretainedwarrantypaymentterms')
         {
             //date('Y-m-d',$object->date_lim_reglement)
@@ -4175,10 +4176,10 @@ elseif ($id > 0 || ! empty($ref))
             }
         }
         print '</td></tr>';
-        
-        
-        
-        
+
+
+
+
         if($displayWarranty)
         {
             // Retained Warranty payment date limit
@@ -4189,14 +4190,14 @@ elseif ($id > 0 || ! empty($ref))
             if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer){
                 print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editretainedwarrantydatelimit&amp;facid=' . $object->id . '">' . img_edit($langs->trans('setretainedwarrantyDateLimit'), 1) . '</a></td>';
             }
-            
+
             print '</tr></table>';
             print '</td><td>';
             $defaultDate =  !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
             if($object->date > $defaultDate){
                 $defaultDate = $object->date;
             }
-            
+
             if ($action == 'editretainedwarrantydatelimit')
             {
                 //date('Y-m-d',$object->date_lim_reglement)
@@ -4214,8 +4215,8 @@ elseif ($id > 0 || ! empty($ref))
             print '</td></tr>';
         }
 	}
-	
-	
+
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -4663,7 +4664,7 @@ elseif ($id > 0 || ! empty($ref))
 
 		// Retained warranty : usualy use on construction industry
 		if(!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty){
-		    
+
 		    // Billed - retained warranty
 		    if($object->type == Facture::TYPE_SITUATION)
 		    {
@@ -4674,11 +4675,11 @@ elseif ($id > 0 || ! empty($ref))
 		        // Because one day retained warranty could be used on standard invoices
 		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
 		    }
-		    
+
 		    $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
-		    
+
 		    print '<tr><td colspan="' . $nbcols . '" align="right">' . $langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')) . ' :</td><td align="right">' . price($billedWithRetainedWarranty) . '</td><td>&nbsp;</td></tr>';
-		    
+
 		    // retained warranty
 		    print '<tr><td colspan="' . $nbcols . '" align="right">';
 		    print $langs->trans("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 6e6bab0cf57..ef130f931e5 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -343,7 +343,8 @@ if ($action == 'create')
 			print $soc->getNomUrl(1);
 			print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 			// Outstanding Bill
-			$outstandingBills = $soc->get_OutstandingBill();
+			$arrayoutstandingbills = $soc->getOutstandingBills();
+			$outstandingBills = $arrayoutstandingbills['opened'];
 			print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
 			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
 			if ($soc->outstanding_limit != '')
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 374cebb8583..57b142b80cf 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3913,20 +3913,17 @@ class Societe extends CommonObject
 			while($obj=$this->db->fetch_object($resql)) {
                 $tmpobject->id=$obj->rowid;
 
-
-
-
-				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+				if ($obj->fk_statut != Facture::STATUS_DRAFT                                           // Not a draft
+					&& ! ($obj->fk_statut == Facture::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
 					$outstandingTotal+= $obj->total_ht;
 					$outstandingTotalIncTax+= $obj->total_ttc;
 				}
 				if ($obj->paye == 0
-					&& $obj->fk_statut != 0    // Not a draft
-					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
+					&& $obj->fk_statut != Facture::STATUS_DRAFT    		// Not a draft
+					&& $obj->fk_statut != Facture::STATUS_ABANDONED	    // Not abandonned
+					&& $obj->fk_statut != Facture::STATUS_CLOSED)   	// Not classified as paid
 				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 				{
 					$paiement = $tmpobject->getSommePaiement();
@@ -3947,54 +3944,6 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return amount of bill not paid
-     *
-     *  @return		int				Amount in debt for thirdparty
-     *  @deprecated
-     *  @see getOutstandingBills()
-     */
-    public function get_OutstandingBill()
-    {
-        // phpcs:enable
-		/* Accurate value of remain to pay is to sum remaintopay for each invoice
-	     $paiement = $invoice->getSommePaiement();
-	     $creditnotes=$invoice->getSumCreditNotesUsed();
-	     $deposits=$invoice->getSumDepositsUsed();
-	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
-	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
-	     */
-		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		$sql .= " AND entity IN (".getEntity('invoice').")";
-		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
-		$sql .= " AND entity IN (".getEntity('invoice').")";
-		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
-
-		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingAmount = 0;
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$tmpobject=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
-				$paiement = $tmpobject->getSommePaiement();
-				$creditnotes = $tmpobject->getSumCreditNotesUsed();
-				$deposits = $tmpobject->getSumDepositsUsed();
-				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
-			}
-			return $outstandingAmount;
-		}
-		else
-			return 0;
-	}
-
 	/**
 	 * Return label of status customer is prospect/customer
 	 *
@@ -4007,7 +3956,7 @@ class Societe extends CommonObject
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Renvoi le libelle d'un statut donne
+	 *  Return the label of the customer/prospect status
 	 *
 	 *  @param	int		$statut         Id statut
 	 *  @return	string          		Libelle du statut
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 60034cc7bc0..efb480370cd 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1616,7 +1616,8 @@ if ($action == 'create')
 		print '<tr><td>';
 		print $langs->trans('OutstandingBill');
 		print '</td><td class=right colspan="3">';
-		print price($soc->get_OutstandingBill()) . ' / ';
+		$arrayoutstandingbills = $soc->getOutstandingBills('supplier');
+		$outstandingBills = $arrayoutstandingbills['opened'];
 		print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
 		print '</td>';
 		print '</tr>';