assume auto-checkin for now for Mark Item Damaged

git-svn-id: svn://svn.open-ils.org/ILS/trunk@12696 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 6fbb48c..0a73e17 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -314,6 +314,8 @@ cat.util.mark_item_damaged = function(copy_ids) {
                                 if (! my_circ.checkin_time() ) {
                                     var due_date = my_circ.due_date() ? my_circ.due_date().substr(0,10) : null;
                                     var auto_checkin = String( data.hash.aous['circ.auto_checkin_on_mark_damage'] ) == 'true';
+                                    /* short-circuit this behavior.  We don't want to mark an item damaged and still have it circulating.  At least for now.  Wait until someone asks for it. */
+                                    auto_checkin = true; 
                                     JSAN.use('patron.util');
                                     var patron_obj = patron.util.retrieve_fleshed_au_via_id( ses(), my_circ.usr() );
                                     var patron_name = ( patron_obj.prefix() ? patron_obj.prefix() + ' ' : '') +

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index 27112b2..99eaa72 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -334,7 +334,7 @@ staff.cat.util.mark_item_damaged.af_message=Action failed.  One or more of these
 staff.cat.util.mark_item_damaged.af_title=Action failed.
 staff.cat.util.mark_item_damaged.af_ok_label=OK
 staff.cat.util.mark_item_damaged.af_confirm_action=Check here to confirm this message
-staff.cat.util.mark_item_damaged.md_message=Change the status for these items to Damaged?  You will have to manually retrieve the last circulation if you need to bill a patron.  Barcodes: %1$s
+staff.cat.util.mark_item_damaged.md_message=Change the status for these items to Damaged?  Barcodes: %1$s
 staff.cat.util.mark_item_damaged.md_title=Mark Damaged
 staff.cat.util.mark_item_damaged.md_ok_label=OK
 staff.cat.util.mark_item_damaged.md_cancel_label=Cancel
@@ -345,7 +345,7 @@ staff.cat.util.mark_item_damaged.checkin.no_checkin=Cancel
 staff.cat.util.mark_item_damaged.checkin.forgiving_checkin=Forgiving Checkin
 staff.cat.util.mark_item_damaged.checkin.confirm_action=Check here to confirm this action
 staff.cat.util.mark_item_damaged.item_circulating_to_patron=Item %1$s is checked out to patron, %2$s, and is due on %3$s. 
-staff.cat.util.mark_item_damaged.charge_patron_prompt.message=Item %1$s will be marked damaged.  Was returned on %3$s by %2$s.  Charge this patron $%4$s for the damage?
+staff.cat.util.mark_item_damaged.charge_patron_prompt.message=Item %1$s will be marked damaged.  Was returned on %3$s for %2$s.  Charge this patron $%4$s for the damage?
 staff.cat.util.mark_item_damaged.charge_patron_prompt.title=Charge Patron For Damaged Item?
 staff.cat.util.mark_item_damaged.charge_patron_prompt.ok_label=OK
 staff.cat.util.mark_item_damaged.charge_patron_prompt.cancel_label=Cancel