added new on-lost-return event org unit settings

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

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 2db2a68..db24f5a 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1578,15 +1578,30 @@
 <!ENTITY staff.server.admin.org_settings.cat.bib.alert_on_empty.desc "Alert staff when the last copy for a record is being deleted">
 <!ENTITY staff.server.admin.org_settings.patron.password.use_phone "Patron: password from phone #">
 <!ENTITY staff.server.admin.org_settings.patron.password.use_phone.desc "Use the last 4 digits of the patrons phone number as the default password when creating new users">
-<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return "Void lost item fine when returned">
-<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return.desc "Void lost item fine when returned">
-<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return_before_interval "Void lost item fine when returned before interval">
-<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return_before_interval.desc "Void lost item fine when returned before interval">
 <!ENTITY staff.server.admin.org_settings.circ.charge_on_damaged "Charge item price when marked damaged">
 <!ENTITY staff.server.admin.org_settings.circ.charge_on_damaged.desc "Charge item price when marked damaged">
 <!ENTITY staff.server.admin.org_settings.circ.damaged_item_processing_fee "Charge processing fee for damaged items">
 <!ENTITY staff.server.admin.org_settings.circ.damaged_item_processing_fee.desc "Charge processing fee for damaged items">
 
+
+
+<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return "Void lost item fine when returned">
+<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return.desc "Void lost item fine when returned">
+<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return_before_interval "Void lost item fine when returned before interval">
+<!ENTITY staff.server.admin.org_settings.circ.void_item_billing_on_lost_return_before_interval.desc "Void lost item fine when returned before interval">
+
+<!ENTITY staff.server.admin.org_settings.circ.void_lost_on_checkin "Circ: Void lost item billing when returned">
+<!ENTITY staff.server.admin.org_settings.circ.void_lost_on_checkin.desc "Void lost item billing when returned">
+<!ENTITY staff.server.admin.org_settings.circ.max_accept_return_of_lost "Circ: Void lost max interval">
+<!ENTITY staff.server.admin.org_settings.circ.max_accept_return_of_lost.desc "Items that have been lost this long will not result in voided billings when returned.  E.g. \'6 months\'">
+<!ENTITY staff.server.admin.org_settings.circ.void_lost_proc_fee_on_checkin "Circ: Void processing fee on lost item return">
+<!ENTITY staff.server.admin.org_settings.circ.void_lost_proc_fee_on_checkin.desc "Void processing fee when lost item returned">
+<!ENTITY staff.server.admin.org_settings.circ.restore_overdue_on_lost_return "Circ: Restore overdues on lost item return">
+<!ENTITY staff.server.admin.org_settings.circ.restore_overdue_on_lost_return.desc "Restore overdue fines on lost item return">
+<!ENTITY staff.server.admin.org_settings.circ.lost_immediately_available "Circ: Lost items usable on checkin">
+<!ENTITY staff.server.admin.org_settings.circ.lost_immediately_available.desc "Lost items are usable on checkin instead of going \'home\' first">
+
+
 <!ENTITY staff.server.admin.stat_cat.title "Evergreen: Statistical Category Editor">
 <!ENTITY staff.server.admin.stat_cat.greeting "Welcome ">
 <!ENTITY staff.server.admin.stat_cat.heading " Statistical Category Editor">

diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index 5e54ae2..33d8d7b 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -146,15 +146,6 @@
                     desc : '&ui.general.button_bar.desc;',
                     type : 'bool'
                 },
-                'circ.void_item_billing_on_lost_return' : {
-                    label : '&staff.server.admin.org_settings.circ.void_item_billing_on_lost_return;',
-                    desc : '&staff.server.admin.org_settings.circ.void_item_billing_on_lost_return.desc;',
-                    type : 'bool'
-                },
-                'circ.void_item_billing_on_lost_return_before_interval' : {
-                    label : '&staff.server.admin.org_settings.circ.void_item_billing_on_lost_return_before_interval;',
-                    desc : '&staff.server.admin.org_settings.circ.void_item_billing_on_lost_return_before_interval.desc;',
-                },
                 'circ.charge_on_damaged' : {
                     label : '&staff.server.admin.org_settings.circ.charge_on_damaged;',
                     desc : '&staff.server.admin.org_settings.circ.charge_on_damaged.desc;',
@@ -163,6 +154,31 @@
                 'circ.damaged_item_processing_fee' : {
                     label : '&staff.server.admin.org_settings.circ.damaged_item_processing_fee;',
                     desc : '&staff.server.admin.org_settings.circ.damaged_item_processing_fee.desc;',
+                },
+
+                'circ.void_lost_on_checkin' : {
+                    label : '&staff.server.admin.org_settings.circ.void_lost_on_checkin;',
+                    desc : '&staff.server.admin.org_settings.circ.void_lost_on_checkin.desc;',
+                    type : 'bool'
+                },
+                'circ.max_accept_return_of_lost' : {
+                    label : '&staff.server.admin.org_settings.circ.max_accept_return_of_lost;',
+                    desc : '&staff.server.admin.org_settings.circ.max_accept_return_of_lost.desc;',
+                },
+                'circ.void_lost_proc_fee_on_checkin' : {
+                    label : '&staff.server.admin.org_settings.circ.void_lost_proc_fee_on_checkin;',
+                    desc : '&staff.server.admin.org_settings.circ.void_lost_proc_fee_on_checkin.desc;',
+                    type : 'bool'
+                },
+                'circ.restore_overdue_on_lost_return' : {
+                    label : '&staff.server.admin.org_settings.circ.restore_overdue_on_lost_return;',
+                    desc : '&staff.server.admin.org_settings.circ.restore_overdue_on_lost_return.desc;',
+                    type : 'bool'
+                },
+                'circ.lost_immediately_available' : {
+                    label : '&staff.server.admin.org_settings.circ.lost_immediately_available;',
+                    desc : '&staff.server.admin.org_settings.circ.lost_immediately_available.desc;',
+                    type : 'bool'
                 }
             };
         </script>