repaired seed data merge conflict

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 88c24cb,e07160a..25424f8
--- 1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
--- 2/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@@ -8708,43 -8711,20 +8711,59 @@@ INSERT INTO config.usr_setting_typ
    'bool'
  );
  
 -
 +INSERT INTO config.org_unit_setting_type 
 +( name, label, description, datatype ) VALUES 
 +( 'cat.volume.delete_on_empty',
 +  oils_i18n_gettext('cat.volume.delete_on_empty', 'Cat: Delete volume with last copy', 'coust', 'label'),
 +  oils_i18n_gettext('cat.volume.delete_on_empty', 'Automatically delete a volume when the last linked copy is deleted', 'coust', 'description'),
 +  'bool'
 +);
 +
 +-- Event def for email notice for hold cancelled due to lack of target -----
 +
 +INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, delay, delay_field, group_field, template)
 +    VALUES (38, FALSE, 1, 
 +        'Hold Cancelled (No Target) Email Notification', 
 +        'hold_request.cancel.expire_no_target', 
 +        'HoldIsCancelled', 'SendEmail', '30 minutes', 'cancel_time', 'usr',
 +$$
 +[%- USE date -%]
 +[%- user = target.0.usr -%]
 +To: [%- params.recipient_email || user.email %]
 +From: [%- params.sender_email || default_sender %]
 +Subject: Hold Request Cancelled
 +
 +Dear [% user.family_name %], [% user.first_given_name %]
 +The following holds were cancelled because no items were found to fullfil the hold.
 +
 +[% FOR hold IN target %]
 +    Title: [% hold.bib_rec.bib_record.simple_record.title %]
 +    Author: [% hold.bib_rec.bib_record.simple_record.author %]
 +    Library: [% hold.pickup_lib.name %]
 +    Request Date: [% date.format(helpers.format_date(hold.rrequest_time), '%Y-%m-%d') %]
 +[% END %]
 +
 +$$);
 +
 +INSERT INTO action_trigger.environment (event_def, path) VALUES
 +    (38, 'usr'),
 +    (38, 'pickup_lib'),
 +    (38, 'bib_rec.bib_record.simple_record');
 +
 +
+ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+     'circ.transit.min_checkin_interval',
+     oils_i18n_gettext( 
+         'circ.transit.min_checkin_interval', 
+         'Circ:  Minimum Transit Checkin Interval',
+         'coust',
+         'label'
+     ),
+     oils_i18n_gettext( 
+         'circ.transit.min_checkin_interval', 
+         'In-Transit items checked in this close to the transit start time will be prevented from checking in',
+         'coust',
+         'label'
+     ),
+     'interval'
+ );

diff --cc Open-ILS/xul/staff_client/server/cat/copy_browser.js
Simple merge

diff --cc Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Simple merge