From 806ecaaf37da2162d8cb507b2a20254c53fea531 Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Mon, 1 Oct 2012 17:10:25 -0400 Subject: [PATCH 1/1] LP#980296: Add void of lost processing fee on claims returned. Signed-off-by: Jason Stephenson Signed-off-by: Ben Shum Signed-off-by: Kathy Lussier --- Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm | 11 +++++++++++ .../lib/OpenILS/Application/Circ/CircCommon.pm | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 9 +++++++++ .../XXXX.data.coust_void_lost_on_claimsreturned.sql | 9 +++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm index 3e8dc15044..8cbe1b642c 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm @@ -486,6 +486,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 d518dad1f0..f4bfed90ad 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 107906d47d..cace52b85c 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -14145,4 +14145,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; -- 2.43.2