LP 1198465: Account for overdues voided the old way

The code for the particular case of "void"-overdues-for-lost is incomplete.
This is the one case in the new code where it now always adjusts rather
than voids, but the new restore code still needs to recognize cases where
the voiding happened under the old code.

Signed-off-by: Remington Steed <rjs7@calvin.edu>

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 20ff28d..4dac75e 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CircCommon.pm
@@ -708,7 +708,7 @@ sub bill_payment_map_for_xact {
 
     # find all bills in order
     my $bill_search = [
-        {xact => $xact->id()},
+        { xact => $xact->id(), voided => 'f' },
         { order_by => { mb => { billing_ts => { direction => 'asc' } } } },
     ];
 

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index a4af80e..b128119 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -4052,13 +4052,23 @@ sub checkin_handle_lost_or_lo_now_found_restore_od {
     if ($ods && @$ods) {
         my $void_amount = 0;
         my $void_max = $self->circ->max_fine();
+        # search for overdues voided the new way (aka "adjusted")
         my @billings = map {$_->id()} @$ods;
         my $voids = $self->editor->search_money_adjustment_payment(
             {
                 billing => \@billings
             }
         );
-        map {$void_amount += $_->amount()} @$voids;
+        if (@$voids) {
+            map {$void_amount += $_->amount()} @$voids;
+        } else {
+            # if no adjustments found, assume they were voided the old way (aka "voided")
+            for my $bill (@$ods) {
+                if( $U->is_true($bill->voided) ) {
+                    $void_amount += $bill->amount();
+                }
+            }
+        }
         $CC->create_bill(
             $self->editor,
             ($void_amount < $void_max ? $void_amount : $void_max),