overrideing lost after transit receive.. only returning not-cataloged on precat ...

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
index ff2870d..41f8ab3 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
@@ -1173,7 +1173,11 @@ sub do_checkin {
                
                if( my $e = $self->check_checkin_copy_status() ) {
                        # If the original copy status is special, alert the caller
-                       return $self->bail_on_events($e);       
+                       my $ev = $self->events;
+                       $self->events([$e]);
+                       $self->override_events;
+                       return if $self->bail_out;
+                       $self->events($ev);
                }
 
 
@@ -1602,6 +1606,12 @@ sub check_checkin_copy_status {
 sub checkin_flesh_events {
        my $self = shift;
 
+       if( grep { $_->{textcode} eq 'SUCCESS' } @{$self->events} 
+               and grep { $_->{textcode} eq 'ITEM_NOT_CATALOGED' } @{$self->events} ) {
+                       $self->events([grep { $_->{textcode} eq 'ITEM_NOT_CATALOGED' } @{$self->events}]);
+       }
+
+
        for my $evt (@{$self->events}) {
 
                my $payload          = {};