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

[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  f04b5bd4c83a6f69b54d1fea30359778febfd104 (commit)
      from  723589b01bcaa3092031a91849eedd95934c41a7 (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 f04b5bd4c83a6f69b54d1fea30359778febfd104
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 273978e..ef2b361 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -3556,11 +3556,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