[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 0400e3f88e490b78ee116c0924e9a3cba73423d0

[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_2 has been updated
       via  0400e3f88e490b78ee116c0924e9a3cba73423d0 (commit)
      from  7eed14fed8e2a37cb6b360015aab7a99360e897b (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 0400e3f88e490b78ee116c0924e9a3cba73423d0
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Mar 29 09:41:44 2013 -0400

    LP1076411 Return updated circ object from checkin
    
    Retrieve an updated copy of the circulation object to return to the
    caller during checkin.  This ensures the data in the circ object, in
    particular date fields, are consistent with the database.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

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 e696934..badfe5c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -3477,11 +3477,17 @@ sub checkin_flesh_events {
     }
 
     if($self->circ) {
-        # if we checked in a circulation, flesh the billing summary data
-        $self->circ->billable_transaction(
-            $self->editor->retrieve_money_billable_transaction([
-                $self->circ->id,
-                {flesh => 1, flesh_fields => {mbt => ['summary']}}
+        # update our copy of the circ object and 
+        # flesh the billing summary data
+        $self->circ(
+            $self->editor->retrieve_action_circulation([
+                $self->circ->id, {
+                    flesh => 2,
+                    flesh_fields => {
+                        circ => ['billable_transaction'],
+                        mbt => ['summary']
+                    }
+                }
             ])
         );
     }

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

Summary of changes:
 .../lib/OpenILS/Application/Circ/Circulate.pm      |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS