merge r17614 from trunk for customizable circ modifier rendering in staff client
authorphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sun, 12 Sep 2010 19:31:11 +0000 (19:31 +0000)
committerphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sun, 12 Sep 2010 19:31:11 +0000 (19:31 +0000)
commita35d7e8d043cf0afd3a55f932bee2cba40448fe6
tree4f3f5d2734f3727bf841c3cb16a66e40c86c53e3
parente46ff26896a873f29189af3c1078e6458e62b12e
merge r17614 from trunk for customizable circ modifier rendering in staff client

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@17618 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
Open-ILS/xul/staff_client/server/cat/copy_editor.js
Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
Open-ILS/xul/staff_client/server/circ/util.js
Open-ILS/xul/staff_client/server/locale/en-US/common.properties
Open-ILS/xul/staff_client/server/serial/batch_receive.js