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

[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  f040814c7507291c388a35a23c8878293a2524e4 (commit)
      from  335f8899ef9bd807823796d977f31bd3cc8b6ba6 (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 f040814c7507291c388a35a23c8878293a2524e4
Author: Liam Whalen <whalen.ld at gmail.com>
Date:   Sun Jul 14 21:00:14 2013 -0700

    Fixes error with generate_fines for overdues returned after closed date
    
    If an overdue is returned after a closed date, the generate_fines code
    will not generate fines for those items because the section of code that
    checks for closed dates returns from the function if a closed date is
    encountered.
    
    For example, if an item is due on June 29th, but is not returned until
    after July 1st (Canada Day), then when fines are generated for the item,
    generate fines creates a fine for the 30th of June, but when it
    gets to the 1st of July it encouters a closed date and executes a
    'return' statement which exits the generate_fines code causing the
    fine from June 30th to be rolled back as well as preventing
    further fines from being generated.
    
    This fix replaces the 'return' statements inside the 'for' loop that is
    nested within the eval with 'next' statements.
    
    Signed-off-by: Liam Whalen <whalen.ld at gmail.com>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 9c06c62..9692f27 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1186,7 +1186,7 @@ sub generate_fines {
                     my $dow_close = "dow_${dow}_close";
 
                     if (my $h = $hoo{$c->$circ_lib_method}) {
-                        return if ( $h->$dow_open eq '00:00:00' and $h->$dow_close eq '00:00:00');
+                        next if ( $h->$dow_open eq '00:00:00' and $h->$dow_close eq '00:00:00');
                     }
     
                     my @cl = actor::org_unit::closed_date->search_where(
@@ -1194,7 +1194,7 @@ sub generate_fines {
                               close_end => { '>=' => $timestamptz },
                               org_unit  => $c->$circ_lib_method }
                     );
-                    return if (@cl);
+                    next if (@cl);
                 }
 
                 # The billing amount for this billing normally ought to be the recurring fine amount.

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

Summary of changes:
 .../Application/Storage/Publisher/action.pm        |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS