Merge branch 'nkupdates3' into 'master'

More updates

See merge request !32

wiaflos/server/core/GL.pm

@@ -719,7 +719,7 @@ sub getGLTransactions
 	# Return list of GL transactions
 	my $sth = DBSelect("
 		SELECT
-			ID, TransactionDate, Reference, Type, Posted
+			gl_transactions.ID AS ID, TransactionDate, gl_transactions.Reference AS Reference, Type, Posted
 		FROM
 			gl_transactions $extraTables
 		WHERE

wiaflos/server/core/Reporting.pm

@@ -470,6 +470,9 @@ sub sendReport
 			$tmp->{'EndDate'} = $detail->{'EndDate'};
 			$tmp->{'Type'} = $types;
 			my $transactions = wiaflos::server::core::GL::getGLTransactions($tmp);
+			if (ref($transactions) ne "ARRAY") {
+				wiaflos::server::core::templating::abort('api_gl_transactions',$accounts,wiaflos::server::core::GL::Error());
+			}
 			# Sort based on transaction date
 			@{$transactions} = sort { $a->{'TransactionDate'} cmp $b->{'TransactionDate'} } @{$transactions};
 			# Loop and process