From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 30 Mar 2011 13:35:57 +0000 (-0400)
Subject: Merging affix/parts/unified-item-editor from upstream
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b612189513679937dabd19cd64a08605e1635b76;p=evergreen%2Fequinox.git

Merging affix/parts/unified-item-editor from upstream
---

b612189513679937dabd19cd64a08605e1635b76
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 1cd6677614,549d03474e..732d6f665d
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@@ -7941,11 -7943,15 +7943,23 @@@ INSERT INTO action_trigger.environment 
      (37, 'circ_lib.billing_address')
  ;
  
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'general.unknown', oils_i18n_gettext('general.unknown', 'Import or Overlay failed', 'vie', 'description') );
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.item.duplicate.barcode', oils_i18n_gettext('import.item.duplicate.barcode', 'Import failed due to barcode collision', 'vie', 'description') );
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.duplicate.sysid', oils_i18n_gettext('import.duplicate.sysid', 'Import failed due to system id collision', 'vie', 'description') );
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'overlay.missing.sysid', oils_i18n_gettext('overlay.missing.sysid', 'Overlay failed due to missing system id', 'vie', 'description') );
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.auth.duplicate.acn', oils_i18n_gettext('import.auth.duplicate.acn', 'Import failed due to Accession Number collision', 'vie', 'description') );
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.xml.malformed', oils_i18n_gettext('import.xml.malformed', 'Malformed record cause Import failure', 'vie', 'description') );
 +INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'overlay.xml.malformed', oils_i18n_gettext('overlay.xml.malformed', 'Malformed record cause Overlay failure', 'vie', 'description') );
 +
+ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+     'ui.cat.volume_copy_editor.horizontal',
+     oils_i18n_gettext(
+         'ui.cat.volume_copy_editor.horizontal',
+         'GUI: Horizontal layout for Volume/Copy Creator/Editor.',
+         'coust', 'label'),
+     oils_i18n_gettext(
+         'ui.cat.volume_copy_editor.horizontal',
+         'The main entry point for this interface is in Holdings Maintenance, Actions for Selected Rows, Edit Item Attributes / Call Numbers / Replace Barcodes.  This setting changes the top and bottom panes for that interface into left and right panes.',
+         'coust', 'description'),
+     'bool'
+ );