[open-ils-commits] r18500 - trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-10-27 14:21:10 -0400 (Wed, 27 Oct 2010)
New Revision: 18500

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Log:
Move generate_fines_finish even further down the do_checkin path

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-10-27 18:18:49 UTC (rev 18499)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-10-27 18:21:10 UTC (rev 18500)
@@ -2207,14 +2207,6 @@
     $self->push_events($self->check_copy_alert());
     $self->push_events($self->check_checkin_copy_status());
 
-    # gather any updates to the circ after fine generation, if there was a circ
-    $self->generate_fines_finish if ($self->circ);
-
-    # if the circ is marked as 'claims returned', add the event to the list
-    $self->push_events(OpenILS::Event->new('CIRC_CLAIMS_RETURNED'))
-        if ($self->circ and $self->circ->stop_fines 
-                and $self->circ->stop_fines eq OILS_STOP_FINES_CLAIMSRETURNED);
-
     $self->check_circ_deposit();
 
     # handle the overridable events 
@@ -2395,6 +2387,16 @@
             unless @{$self->events};
     }
 
+    # gather any updates to the circ after fine generation, if there was a circ
+    $self->generate_fines_finish if ($self->circ);
+
+    # if the circ is marked as 'claims returned', add the event to the list
+    $self->push_events(OpenILS::Event->new('CIRC_CLAIMS_RETURNED'))
+        if ($self->circ and $self->circ->stop_fines 
+                and $self->circ->stop_fines eq OILS_STOP_FINES_CLAIMSRETURNED);
+
+    $self->override_events; # One final time to handle CIRC_CLAIMS_RETURNED
+
     OpenILS::Utils::Penalty->calculate_penalties(
         $self->editor, $self->patron->id, $self->circ_lib) if $self->patron;