Repaired seed data T-pac merge conflict

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

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 366b457,e4e7607..67fdaab
--- 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
@@@ -2751,13 -2762,25 +2762,31 @@@ INSERT into config.org_unit_setting_typ
  ( 'org.patron_opt_default',
      oils_i18n_gettext( 'org.patron_opt_default', 'Circ: Patron Opt-In Default', 'coust', 'label'),
      oils_i18n_gettext( 'org.patron_opt_default', 'This is the default depth at which a patron is opted in; it is calculated as an org unit relative to the current workstation.', 'coust', 'label'),
 -    'integer')
 -,( 
 +    'integer'),
 +
 +( 'opac.payment_history_age_limit',
 +    oils_i18n_gettext( 'opac.payment_history_age_limit', 'OPAC: Payment History Age Limit', 'coust', 'label'),
 +    oils_i18n_gettext( 'opac.payment_history_age_limit', 'The OPAC should not display payments by patrons that are older than any interval defined here.', 'coust', 'label'),
-     'interval')
++    'interval'),
 +
++( 
+         'ui.circ.billing.uncheck_bills_and_unfocus_payment_box',
+         oils_i18n_gettext(
+             'ui.circ.billing.uncheck_bills_and_unfocus_payment_box',
+             'GUI: Uncheck bills by default in the patron billing interface',
+             'coust',
+             'label'
+         ),
+         oils_i18n_gettext(
+             'ui.circ.billing.uncheck_bills_and_unfocus_payment_box',
+             'Uncheck bills by default in the patron billing interface,'
+             || ' and focus on the Uncheck All button instead of the'
+             || ' Payment Received field.',
+             'coust',
+             'description'
+         ),
+         'bool'
+     )
  ;
  
  UPDATE config.org_unit_setting_type

diff --cc Open-ILS/xul/staff_client/server/patron/holds.js
Simple merge