[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 18f40ebb25221e77b610b3349a4c610e6c406807

[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, rel_2_1 has been updated
       via  18f40ebb25221e77b610b3349a4c610e6c406807 (commit)
      from  c939a54bf867d7de5b8236610115f85ed4159608 (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 18f40ebb25221e77b610b3349a4c610e6c406807
Author: James Fournie <jfournie at sitka.bclibraries.ca>
Date:   Wed Dec 7 11:27:45 2011 -0800

    Acq fix for LP#901378
    
    Proratable invoice charges do not have a fund_debit, we need to check for
    this before attempting to delete the charge.  If there's no fund_debit
    we can generally assume that there's no corresponding debit to this charge
    and skip trying to delete it.
    
    Signed-off-by: James Fournie <jfournie at sitka.bclibraries.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Invoice.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Invoice.pm
index 305bd07..9d59b6a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Invoice.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Invoice.pm
@@ -133,7 +133,7 @@ sub build_invoice_api {
                     my $debit = $e->retrieve_acq_fund_debit($item->fund_debit);
                     $debit->encumbrance('t');
                     $e->update_acq_fund_debit($debit) or return $e->die_event;
-                } else {
+                } elsif($item->fund_debit) {
                     $e->delete_acq_fund_debit($e->retrieve_acq_fund_debit($item->fund_debit))
                         or return $e->die_event;
                 }

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

Summary of changes:
 .../lib/OpenILS/Application/Acq/Invoice.pm         |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS