Finance: fix bulk exporting invoice fees for Pending invoices

GibbonEdu · Jun 30, 2024 · de5cd2f · de5cd2f
1 parent ae03c82
commit de5cd2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -39,6 +39,7 @@ v28.0.00
         User Admin: added the names of users who made changes to the User Status Log
 
     Bug Fixes
+        Finance: fixed bulk exporting invoice fees for Pending invoices
         Form Groups: fixed Year Group Summary list when looking at non-current school years
         Timetable: fixed permission checking before displaying user status info in View Timetables list
 

diff --git a/modules/Finance/invoices_manage_processBulkExportContents.php b/modules/Finance/invoices_manage_processBulkExportContents.php
@@ -185,10 +185,10 @@
             $fees = [];
 			$dataTotal=array("gibbonFinanceInvoiceID"=>$row["gibbonFinanceInvoiceID"]);
 			if ($row["status"]=="Pending") {
-				$sqlTotal="SELECT gibbonFinanceInvoiceFee.fee AS fee, gibbonFinanceFee.fee AS fee2, gibbonFinanceInvoiceFee.name, gibbonFinanceFeeCategory.name as category
+				$sqlTotal="SELECT gibbonFinanceInvoiceFee.fee AS fee, gibbonFinanceFee.fee AS fee2, gibbonFinanceFee.name, gibbonFinanceFeeCategory.name as category
 					FROM gibbonFinanceInvoiceFee
 						LEFT JOIN gibbonFinanceFee ON (gibbonFinanceInvoiceFee.gibbonFinanceFeeID=gibbonFinanceFee.gibbonFinanceFeeID)
-                        LEFT JOIN gibbonFinanceFeeCategory ON (gibbonFinanceFeeCategory.gibbonFinanceFeeCategoryID=gibbonFinanceInvoiceFee.gibbonFinanceFeeCategoryID)
+                        LEFT JOIN gibbonFinanceFeeCategory ON (gibbonFinanceFeeCategory.gibbonFinanceFeeCategoryID=gibbonFinanceFee.gibbonFinanceFeeCategoryID)
 					WHERE gibbonFinanceInvoiceID=:gibbonFinanceInvoiceID" ;
 			}
 			else {