if alerting on empty bibs and not overriding, return the alert. if overriding or...

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm
index 29258c6..bd9a4d4 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm
@@ -379,14 +379,14 @@ sub remove_empty_objects {
             $editor->update_asset_call_number($vol) or return $editor->event;
         }
 
+        return OpenILS::Event->new('TITLE_LAST_COPY', payload => $vol->record ) 
+            if $aoe and not $override;
+
         unless($koe) {
             # delete the bib record if the keep-on-empty setting is not set
             my $evt = OpenILS::Application::Cat::BibCommon->delete_rec($editor, $vol->record);
             return $evt if $evt;
         }
-
-        # return the empty alert if the alert-on-empty setting is set
-        return OpenILS::Event->new('TITLE_LAST_COPY', payload => $vol->record ) if $aoe;
        }
 
        return undef;