Merge remote-tracking branch 'working/user/tsbere/floating_groups' into 201303013

Conflicts:
	Open-ILS/src/sql/Pg/950.data.seed-values.sql
	Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge

diff --cc Open-ILS/src/sql/Pg/800.fkeys.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 010f7fe,96af370..14cc025
--- 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
@@@ -1583,15 -1583,10 +1583,17 @@@ INSERT INTO permission.perm_list ( id, 
      'Allows a user to configure URL verification org unit settings', 'ppl', 'description')),
   ( 545, 'SAVED_FILTER_DIALOG_FILTERS', oils_i18n_gettext( 545,
      'Allows users to save and load sets of filters for filter dialogs, available in certain staff interfaces', 'ppl', 'description')),
 - ( 546, 'ADMIN_FLOAT_GROUPS', oils_i18n_gettext( 546,
++
 + ( 546, 'ADMIN_HOLD_CAPTURE_SORT', oils_i18n_gettext( 546,
 +        'Allows a user to make changes to best-hold selection sort order', 'ppl', 'description')),
 + ( 547, 'ACQ_ADD_LINEITEM_IDENTIFIER', oils_i18n_gettext(547,
 +        'When granted, newly added lineitem identifiers will propagate to linked bib records', 'ppl', 'description')),
 + ( 548, 'ACQ_SET_LINEITEM_IDENTIFIER', oils_i18n_gettext(549,
 +        'Allows staff to change the lineitem identifier', 'ppl', 'description'))
++ ( 549, 'ADMIN_FLOAT_GROUPS', oils_i18n_gettext( 546,
+     'Allows administration of floating groups', 'ppl', 'description' ))
  ;
  
- 
  SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
  
  INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm) VALUES
@@@ -12489,103 -12397,5 +12491,105 @@@ INSERT INTO config.metabib_class_ts_map
      ('subject','english_nostop','C',true),
      ('identifier','simple','A',true);
  
 +INSERT INTO config.org_unit_setting_type (
 +    name, label, description, datatype, fm_class, update_perm, grp
 +) VALUES (
 +    'circ.hold_capture_order',
 +    oils_i18n_gettext(
 +        'circ.hold_capture_order',
 +        'Best-hold selection sort order',
 +        'coust',
 +        'label'
 +    ),
 +    oils_i18n_gettext(
 +        'circ.hold_capture_order',
 +        'Defines the sort order of holds when selecting a hold to fill using a given copy at capture time',
 +        'coust',
 +        'description'
 +    ),
 +    'link',
 +    'cbho',
 +    543,
 +    'holds'
 +);
 +
 +INSERT INTO config.org_unit_setting_type (
 +    name, label, description, datatype, update_perm, grp
 +) VALUES (
 +    'circ.hold_go_home_interval',
 +    oils_i18n_gettext(
 +        'circ.hold_go_home_interval',
 +        'Max foreign-circulation time',
 +        'coust',
 +        'label'
 +    ),
 +    oils_i18n_gettext(
 +        'circ.hold_go_home_interval',
 +        'Time a copy can spend circulating away from its circ lib before returning there to fill a hold (if one exists there)',
 +        'coust',
 +        'description'
 +    ),
 +    'interval',
 +    543,
 +    'holds'
 +);
 +
 +
 +INSERT INTO config.best_hold_order (
 +    name,
 +    pprox, aprox, priority, cut, depth, rtime, htime, hprox
 +) VALUES (
 +    'Traditional',
 +    1, 2, 3, 4, 5, 6, 7, 8
 +);
 +
 +INSERT INTO config.best_hold_order (
 +    name,
 +    hprox, pprox, aprox, priority, cut, depth, rtime, htime
 +) VALUES (
 +    'Traditional with Holds-always-go-home',
 +    1, 2, 3, 4, 5, 6, 7, 8
 +);
 +
 +INSERT INTO config.best_hold_order (
 +    name,
 +    htime, hprox, pprox, aprox, priority, cut, depth, rtime
 +) VALUES (
 +    'Traditional with Holds-go-home',
 +    1, 2, 3, 4, 5, 6, 7, 8
 +);
 +
 +INSERT INTO config.best_hold_order (
 +    name,
 +    priority, cut, rtime, depth, pprox, hprox, aprox, htime
 +) VALUES (
 +    'FIFO',
 +    1, 2, 3, 4, 5, 6, 7, 8
 +);
 +
 +INSERT INTO config.best_hold_order (
 +    name,
 +    hprox, priority, cut, rtime, depth, pprox, aprox, htime
 +) VALUES (
 +    'FIFO with Holds-always-go-home',
 +    1, 2, 3, 4, 5, 6, 7, 8
 +);
 +
 +INSERT INTO config.best_hold_order (
 +    name,
 +    htime, priority, cut, rtime, depth, pprox, aprox, hprox
 +) VALUES (
 +    'FIFO with Holds-go-home',
 +    1, 2, 3, 4, 5, 6, 7, 8
 +);
 +
 +INSERT INTO actor.org_unit_setting (
 +    org_unit, name, value
 +) VALUES (
 +    (SELECT id FROM actor.org_unit WHERE parent_ou IS NULL),
 +    'circ.hold_go_home_interval',
 +    '"6 months"'
 +);
 +
+ INSERT INTO config.floating_group(name) VALUES ('Everywhere');
+ INSERT INTO config.floating_group_member(floating_group, org_unit) VALUES (1, 1);

diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
index d545284,f896494..6b77b8b
--- 1/Open-ILS/web/opac/locale/en-US/lang.dtd
--- 2/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@@ -785,9 -783,9 +785,10 @@@
  <!ENTITY staff.main.menu.admin.server_admin.conify.config_asset_sip_fields "Asset Stat Cat Sip Fields">
  <!ENTITY staff.main.menu.admin.server_admin.conify.config_usr_activity_type "User Activity Types">
  <!ENTITY staff.main.menu.admin.server_admin.conify.actor.org_unit_custom_tree "Custom Org Unit Trees">
 +<!ENTITY staff.main.menu.admin.server_admin.conify.config.remote_account "Remote Accounts">
  <!ENTITY staff.main.menu.admin.server_admin.conify.global_flag.label "Global Flags">
  <!ENTITY staff.main.menu.admin.server_admin.conify.circulation_limit_group.label "Circulation Limit Groups">
+ <!ENTITY staff.main.menu.admin.server_admin.conify.floating_groups.label "Floating Groups">
  
  <!ENTITY staff.main.menu.admin.server_admin.acq.label "Acquisitions">
  <!ENTITY staff.main.menu.admin.server_admin.acq.accesskey "A">

diff --cc Open-ILS/xul/staff_client/chrome/content/main/menu.js
Simple merge

diff --cc Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index 0081bec,3a741b6..81cd01b
--- 1/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
--- 2/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@@ -322,11 -321,8 +322,13 @@@
      <command id="cmd_server_admin_actor_org_unit_custom_tree"
               perm="ADMIN_ORG_UNIT_CUSTOM_TREE VIEW_ORG_UNIT_CUSTOM_TREE"
               />
 +    <command id="cmd_server_admin_config_best_hold_order"
 +             perm="ADMIN_HOLD_CAPTURE_SORT"
 +             />
 +    <command id="cmd_server_admin_conify_remote_account"
 +             perm="ADMIN_CONFIG_REMOTE_ACCOUNT VIEW_CONFIG_REMOTE_ACCOUNT"
+     <command id="cmd_server_admin_floating_groups"
+              perm="ADMIN_FLOAT_GROUPS"
               />
  
      <command id="cmd_hotkeys_toggle" />

diff --cc Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
Simple merge

diff --cc Open-ILS/xul/staff_client/server/circ/util.js
Simple merge