[open-ils-commits] [GIT] Evergreen ILS branch master updated. aa4d367a99869da5cc3a1fb52c54feaeae5a4a5c

[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, master has been updated
       via  aa4d367a99869da5cc3a1fb52c54feaeae5a4a5c (commit)
       via  940d1acc79830f291fc5680dbb6758b8320c3563 (commit)
       via  98477d3f2f72fbd67693172836582196777e7bfe (commit)
      from  f8cbc52c5a40eddfe30cac0955fd2c23e09a59d9 (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 aa4d367a99869da5cc3a1fb52c54feaeae5a4a5c
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Tue Feb 9 10:22:46 2016 -0500

    LP#1526547 Re-broaden backdate note setting
    
    The previous commit missed a case where we still want the backdate
    message to appear.  Let's recentralize it, but at a different level.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
index 5e256b1..3e438ce 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
@@ -604,7 +604,7 @@ sub post_checkin_backdate_circ_impl {
     $e->update_action_circulation($circ) or return $e->die_event;
 
     # now void the overdues "erased" by the back-dating
-    my $evt = OpenILS::Application::Circ::CircCommon->void_or_zero_overdues($e, $circ, {backdate => $backdate, note => 'System: OVERDUE REVERSED FOR BACKDATE'});
+    my $evt = OpenILS::Application::Circ::CircCommon->void_or_zero_overdues($e, $circ, {backdate => $backdate});
     return $evt if $evt;
 
     # If the circ was closed before and the balance owned !=0, re-open the transaction
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 f06a9ee..4947a19 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
@@ -38,6 +38,7 @@ sub void_or_zero_overdues {
 
     if( $opts->{backdate} ) {
         my $backdate = $opts->{backdate};
+        $opts->{note} = 'System: OVERDUE REVERSED FOR BACKDATE' if !$opts->{note};
         # ------------------------------------------------------------------
         # Fines for overdue materials are assessed up to, but not including,
         # one fine interval after the fines are applicable.  Here, we add

commit 940d1acc79830f291fc5680dbb6758b8320c3563
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu Jan 28 14:49:42 2016 -0500

    LP#1526547 Improve note setting for backdates
    
    The backdate note was the default note for voiding and adjusting, but
    this proved to be an unexpected default.
    
    Let's set the note only where we need it, and also genericize the
    wording to cover both voiding and adjusting.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
index 3e438ce..5e256b1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
@@ -604,7 +604,7 @@ sub post_checkin_backdate_circ_impl {
     $e->update_action_circulation($circ) or return $e->die_event;
 
     # now void the overdues "erased" by the back-dating
-    my $evt = OpenILS::Application::Circ::CircCommon->void_or_zero_overdues($e, $circ, {backdate => $backdate});
+    my $evt = OpenILS::Application::Circ::CircCommon->void_or_zero_overdues($e, $circ, {backdate => $backdate, note => 'System: OVERDUE REVERSED FOR BACKDATE'});
     return $evt if $evt;
 
     # If the circ was closed before and the balance owned !=0, re-open the transaction
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 62b5b57..f06a9ee 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
@@ -879,7 +879,7 @@ sub void_bills {
         $bill->voider($e->requestor->id);
         $bill->void_time('now');
         my $n = ($bill->note) ? sprintf("%s\n", $bill->note) : "";
-        $bill->note(sprintf("$n%s", ($note) ? $note : "System: VOIDED FOR BACKDATE"));
+        $bill->note(sprintf("$n%s", $note));
 
         $e->update_money_billing($bill) or return $e->die_event;
         my $evt = $U->check_open_xact($e, $bill->xact, $xact);

commit 98477d3f2f72fbd67693172836582196777e7bfe
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Dec 14 13:39:21 2012 -0500

    LP#1526547 Prevent bogus notes when adjusting lost/lod overdues
    
    If you void/adjust an overdue, but don't supply a reason, the code
    automatically adds "VOIDED FOR BACKDATE" to the billing note. This is
    obviously wrong for overdues adjusted or voided due to lost (or long
    overdue) processing.
    
    This commit simply adds a more appropriate note.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    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 626595b..50a4fc3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
@@ -815,7 +815,7 @@ sub set_item_lost_or_lod {
     # ---------------------------------------------------------------------
     # zero out overdue fines on this circ if configured
     if( $void_overdue ) {
-        my $evt = OpenILS::Application::Circ::CircCommon->void_or_zero_overdues($e, $circ, {force_zero => 1});
+        my $evt = OpenILS::Application::Circ::CircCommon->void_or_zero_overdues($e, $circ, {force_zero => 1, note => "System: OVERDUE REVERSED for " . $args{bill_note} . " Processing"});
         return $evt if $evt;
     }
 

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

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


hooks/post-receive
-- 
Evergreen ILS