From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 11 Sep 2006 13:54:12 +0000 (+0000)
Subject: billing code fixes, including history billing
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=27c257eea20dd6b48b8515bb454fc03424949ef2;p=Evergreen.git

billing code fixes, including history billing


git-svn-id: svn://svn.open-ils.org/ILS/trunk@6061 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index 96c04fcb14..0dd6aa0126 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -1675,7 +1675,6 @@ sub _checked_out {
 			usr => $userid, 
 			checkin_time => undef, 
 			xact_finish => undef, 
-			stop_fines => OILS_STOP_FINES_MAX_FINES 
 		});
 
 	
@@ -1709,7 +1708,7 @@ sub _checked_out {
 	my $open = $e->search_action_circulation(
 		{
 			usr				=> $userid, 
-			stop_fines		=> { '!=' => undef }, 
+			stop_fines		=> { in => [ qw/LOST CLAIMSRETURNED LONGOVERDUE/ ] }, 
 			xact_finish		=> undef,
 			checkin_time	=> undef,
 		}
@@ -1920,7 +1919,7 @@ sub user_transaction_history {
 	return $e->event unless $e->allowed('VIEW_USER_TRANSACTIONS');
 
 	my $api = $self->api_name;
-	my @xact_finish  = (xact_finish => undef ) if ($api !~ /history$/);
+	my @xact_finish  = (xact_finish => undef ) if ($api /history.still_open$/);
 
 	my @xacts = @{ $e->search_money_billable_transaction(
 		[	{ usr => $userid, @xact_finish },