]> git.evergreen-ils.org Git - Evergreen.git/commit
Booking: finish the forward-port from rel_1_6
authorsenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 20 Aug 2010 21:51:03 +0000 (21:51 +0000)
committersenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 20 Aug 2010 21:51:03 +0000 (21:51 +0000)
commitcb732994b4ae5eddde855692b9c8336e8c35a17f
tree9fba8731fcab5b14f4e56d718bf23321ef051289
parentd96a1424d075aedfd9e924f4f7a3ba6901c2ce55
Booking: finish the forward-port from rel_1_6

This /should/ complete the forward port of booking from the rel_1_6 branch,
which means that booking in trunk should work just how it does in the latest
1.6.1.* releases.

Most of the changes in this commit were to Circ/Circulate.pm, and cursory
tests don't indicate any problems in the circulation logic overall, but the
lay of the land there is quite different now in trunk than it was when Booking
was initially developed, so I'd be somewhat wary for a little while.

Going forward, trunk can accept improvements/bug fixes/etc for booking, and
those changes can be *back*ported to branches in the usual way.  Yay!

git-svn-id: svn://svn.open-ils.org/ILS/trunk@17297 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Open-ILS/xul/staff_client/server/circ/util.js
Open-ILS/xul/staff_client/server/locale/en-US/circ.properties