[open-ils-commits] r11599 - in branches/rel_1_4/Open-ILS/src: perlmods/OpenILS/Application/Circ support-scripts

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-12-17 09:19:06 -0500 (Wed, 17 Dec 2008)
New Revision: 11599

Modified:
   branches/rel_1_4/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm
   branches/rel_1_4/Open-ILS/src/support-scripts/generate_circ_notices.pl
Log:
keep the "what is checked out and overdue" counting consistent

Modified: branches/rel_1_4/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm
===================================================================
--- branches/rel_1_4/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm	2008-12-17 14:14:26 UTC (rev 11598)
+++ branches/rel_1_4/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm	2008-12-17 14:19:06 UTC (rev 11599)
@@ -206,7 +206,7 @@
 		my $circ_counts = 
 			OpenILS::Application::Actor::_checked_out(1, $e, $patron->id);
 
-		$ctx->{patronOverdue} = $circ_counts->{overdue} || 0;
+		$ctx->{patronOverdue} = $circ_counts->{overdue}  + $circ_counts->{long_overdue};
 		my $out = $ctx->{patronOverdue} + $circ_counts->{out};
 
 		$ctx->{patronItemsOut} = $out 

Modified: branches/rel_1_4/Open-ILS/src/support-scripts/generate_circ_notices.pl
===================================================================
--- branches/rel_1_4/Open-ILS/src/support-scripts/generate_circ_notices.pl	2008-12-17 14:14:26 UTC (rev 11598)
+++ branches/rel_1_4/Open-ILS/src/support-scripts/generate_circ_notices.pl	2008-12-17 14:19:06 UTC (rev 11599)
@@ -190,7 +190,7 @@
             '+circ' => {
                 checkin_time => undef, 
                 '-or' => [
-                    {stop_fines => {'not in' => ["LOST","LONGOVERDUE","CLAIMSRETURNED"]}},
+                    {stop_fines => ["MAXFINES","LONGOVERDUE"]},
                     {stop_fines => undef}
                 ],
 				due_date => {between => [$start_date, $end_date]}