keep the "what is checked out and overdue" counting consistent

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm
index 6d74e2e..719d920 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/ScriptBuilder.pm
@@ -206,7 +206,7 @@ sub fetch_user_data {
                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 

diff --git a/Open-ILS/src/support-scripts/generate_circ_notices.pl b/Open-ILS/src/support-scripts/generate_circ_notices.pl
index e0ace2a..46a3ae4 100755 (executable)
--- a/Open-ILS/src/support-scripts/generate_circ_notices.pl
+++ b/Open-ILS/src/support-scripts/generate_circ_notices.pl
@@ -190,7 +190,7 @@ sub generate_notice_set {
             '+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]}