From: Jason Stephenson <jstephenson@mvlc.org>
Date: Mon, 1 Oct 2012 21:10:25 +0000 (-0400)
Subject: Add voiding of lost processing fee on claims returned.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e21ea5c98c4cea859677c916f304f781945a539c;p=working%2FEvergreen.git

Add voiding of lost processing fee on claims returned.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
index 9fbdf9b11c..d42e517e95 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
@@ -494,6 +494,17 @@ sub set_circ_claims_returned {
         return $result if ($result);
     }
 
+    # Check if the copy circ lib wants lost processing fees voided on
+    # claims returned.
+    if ($U->is_true($U->ou_ancestor_setting_value($copy->circ_lib, 'circ.void_lost_proc_fee_on_claimsreturned', $e))) {
+        my $result = OpenILS::Application::Circ::CircCommon->void_lost(
+            $e,
+            $circ,
+            4
+        );
+        return $result if ($result);
+    }
+
     $e->commit;
     return 1;
 }
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
index e31112d39a..84f5cefdf1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
@@ -95,7 +95,7 @@ sub void_lost {
             my $note = ($bill->note) ? $bill->note . "\n" : '';
             $bill->note("${note}System: VOIDED FOR LOST ITEM RETURNED");
 
-            return $e->die_event
+            return $e->event
                 unless $e->update_money_billing($bill);
         }
     }
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 51b980473e..2a10117cb3 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -11854,4 +11854,13 @@ INSERT INTO config.org_unit_setting_type
          oils_i18n_gettext('circ.void_lost_on_claimsreturned',
              'Void lost item billing when claims returned',
              'coust', 'description'),
+         'bool'),
+        ('circ.void_lost_proc_fee_on_claimsreturned',
+         'circ',
+         oils_i18n_gettext('circ.void_lost_proc_fee_on_claimsreturned',
+             'Void lost item processing fee when claims returned',
+             'coust', 'label'),
+         oils_i18n_gettext('circ.void_lost_proc_fee_on_claimsreturned',
+             'Void lost item processing fee when claims returned',
+             'coust', 'description'),
          'bool');
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_void_lost_on_claimsreturned.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_void_lost_on_claimsreturned.sql
index 4180672269..e8114842c0 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_void_lost_on_claimsreturned.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.coust_void_lost_on_claimsreturned.sql
@@ -13,6 +13,15 @@ INSERT INTO config.org_unit_setting_type
          oils_i18n_gettext('circ.void_lost_on_claimsreturned',
              'Void lost item billing when claims returned',
              'coust', 'description'),
+         'bool'),
+        ('circ.void_lost_proc_fee_on_claimsreturned',
+         'circ',
+         oils_i18n_gettext('circ.void_lost_proc_fee_on_claimsreturned',
+             'Void lost item processing fee when claims returned',
+             'coust', 'label'),
+         oils_i18n_gettext('circ.void_lost_proc_fee_on_claimsreturned',
+             'Void lost item processing fee when claims returned',
+             'coust', 'description'),
          'bool');
 
 COMMIT;