]> git.evergreen-ils.org Git - Evergreen.git/commit
Backport some booking related commits from trunk.
authorsenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 30 Nov 2010 15:53:18 +0000 (15:53 +0000)
committersenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 30 Nov 2010 15:53:18 +0000 (15:53 +0000)
commitaa6c7fef7f50d7124f60109791d0f37bfa01ecd7
tree2e293692d5063034cfb4dbdc3b0c23e601162533
parent9b6cf0f7c744261cb91393fd2e1a88f4bbde04e3
Backport some booking related commits from trunk.

r17563: Booking: stop the "new resource type" dialog from executing a naughty
query

The dialog will no longer offer a field for selecting a bibliographic record,
but then again you wouldn't need it.  Bibliographically-based resource types
can be set up through a context menu option in the staff OPAC browser, whereas
this interface is only suited to non-bib-based resource types, like meeting
rooms, laptops, etc.
--
r17980: more transaction cleanups
--
r18502: Booking: make the circ module avoid booking code if the booking service
isn't up

Previously, it was not possible to turn the booking service off and have
working circ.  Now you should be able to turn it off if you don't need it.
--
r18514: If we already know we're not using booking, skip a redundant and
expensive test for the possibility of capturing a hold. We're just going to
try actually doing it a little farther down.
--
r18580: Patch from Steve Callender to address a booking-related collection
agency reporting problem

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18874 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/money.pm
Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2