[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. 9b691ffa235da8c7028ee28d16f4fd1d72697e88

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_10 has been updated
       via  9b691ffa235da8c7028ee28d16f4fd1d72697e88 (commit)
      from  e9373ffd2c4d97d3063d9e0b29941d77d54892a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b691ffa235da8c7028ee28d16f4fd1d72697e88
Author: Michele Morgan <mmorgan at noblenet.org>
Date:   Tue Feb 7 13:21:48 2017 -0500

    LP#1661754 - Prevent staff users from marking a Long Overdue item Lost
    
    Prevents circulations that are already Lost or Long Overdue from being
    marked Lost or Long Overdue. Avoiding patrons being billed twice for the
    same item.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
index 50a4fc3..a07c9be 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
@@ -722,6 +722,7 @@ sub set_item_lost {
         $e, $copy_id,
         perm => 'SET_CIRC_LOST',
         status => OILS_COPY_STATUS_LOST,
+        alt_status => 16, #Long Overdue,
         ous_proc_fee => OILS_SETTING_LOST_PROCESSING_FEE,
         ous_void_od => OILS_SETTING_VOID_OVERDUE_ON_LOST,
         bill_type => 3,
@@ -741,6 +742,7 @@ sub set_item_long_overdue {
         $e, $copy_id,
         perm => 'SET_CIRC_LONG_OVERDUE',
         status => 16, # Long Overdue
+        alt_status => OILS_COPY_STATUS_LOST,
         ous_proc_fee => 'circ.longoverdue_materials_processing_fee',
         ous_void_od => 'circ.void_overdue_on_longoverdue',
         bill_type => 10,
@@ -774,7 +776,7 @@ sub set_item_lost_or_lod {
     $e->allowed($args{perm}, $circ->circ_lib) or return $e->die_event;
 
     return $e->die_event(OpenILS::Event->new($args{event}))
-	    if $copy->status == $args{status};
+	    if ($copy->status == $args{status} || $copy->status == $args{alt_status});
 
     # ---------------------------------------------------------------------
     # fetch the related org settings

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Cat/AssetCommon.pm     |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS