[open-ils-commits] r11397 - trunk/Open-ILS/src/sql/Pg

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-12-03 17:21:40 -0500 (Wed, 03 Dec 2008)
New Revision: 11397

Modified:
   trunk/Open-ILS/src/sql/Pg/070.schema.container.sql
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
i18n-ize the new container types
Create billing_types after their owning org_units have been created


Modified: trunk/Open-ILS/src/sql/Pg/070.schema.container.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/070.schema.container.sql	2008-12-03 21:42:17 UTC (rev 11396)
+++ trunk/Open-ILS/src/sql/Pg/070.schema.container.sql	2008-12-03 22:21:40 UTC (rev 11397)
@@ -24,8 +24,6 @@
 	code	TEXT	PRIMARY KEY,
 	label	TEXT	NOT NULL UNIQUE
 );
-INSERT INTO container.copy_bucket_type (code,label) VALUES ('misc','Miscellaneous');
-INSERT INTO container.copy_bucket_type (code,label) VALUES ('staff_client','General Staff Client container');
 
 CREATE TABLE container.copy_bucket (
 	id		SERIAL				PRIMARY KEY,
@@ -66,7 +64,6 @@
 	code	TEXT	PRIMARY KEY,
 	label	TEXT	NOT NULL UNIQUE
 );
-INSERT INTO container.call_number_bucket_type (code,label) VALUES ('misc','Miscellaneous');
 
 CREATE TABLE container.call_number_bucket (
 	id	SERIAL	PRIMARY KEY,
@@ -106,9 +103,6 @@
 	code	TEXT	PRIMARY KEY,
 	label	TEXT	NOT NULL UNIQUE
 );
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('misc','Miscellaneous');
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('staff_client','General Staff Client container');
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('bookbag','Book Bag');
 
 
 CREATE TABLE container.biblio_record_entry_bucket (
@@ -149,10 +143,6 @@
 	code	TEXT	PRIMARY KEY,
 	label	TEXT	NOT NULL UNIQUE
 );
-INSERT INTO container.user_bucket_type (code,label) VALUES ('misc','Miscellaneous');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks','Friends');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.view','List Published Book Bags');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.add','Add to Published Book Bags');
 
 CREATE TABLE container.user_bucket (
 	id	SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2008-12-03 21:42:17 UTC (rev 11396)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2008-12-03 22:21:40 UTC (rev 11397)
@@ -805,21 +805,6 @@
 	oils_i18n_gettext(5, 'Your Bookmobile', 'aout', 'opac_label'), 3, 3 );
 SELECT SETVAL('actor.org_unit_type_id_seq'::TEXT, 100);
 
-INSERT INTO config.billing_type (id, name, owner) VALUES
-	( 1, oils_i18n_gettext(1, 'Overdue Materials', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
-	( 2, oils_i18n_gettext(2, 'Long Overdue Collection Fee', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
-	( 3, oils_i18n_gettext(3, 'Lost Materials', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
-	( 4, oils_i18n_gettext(4, 'Lost Materials Processing Fee', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
-	( 5, oils_i18n_gettext(5, 'System: Deposit', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
-	( 6, oils_i18n_gettext(6, 'System: Rental', 'cbt', 'name'), 1);
-
-SELECT SETVAL('config.billing_type_id_seq'::TEXT, 100);
-
 INSERT INTO actor.org_unit (id, parent_ou, ou_type, shortname, name) VALUES 
     (1, NULL, 1, 'CONS', oils_i18n_gettext(1, 'Example Consortium', 'aou', 'name'));
 INSERT INTO actor.org_unit (id, parent_ou, ou_type, shortname, name) VALUES 
@@ -844,6 +829,22 @@
 
 UPDATE actor.org_unit SET holds_address = 1, ill_address = 1, billing_address = 1, mailing_address = 1;
 
+INSERT INTO config.billing_type (id, name, owner) VALUES
+	( 1, oils_i18n_gettext(1, 'Overdue Materials', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+	( 2, oils_i18n_gettext(2, 'Long Overdue Collection Fee', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+	( 3, oils_i18n_gettext(3, 'Lost Materials', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+	( 4, oils_i18n_gettext(4, 'Lost Materials Processing Fee', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+	( 5, oils_i18n_gettext(5, 'System: Deposit', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+	( 6, oils_i18n_gettext(6, 'System: Rental', 'cbt', 'name'), 1);
+
+SELECT SETVAL('config.billing_type_id_seq'::TEXT, 100);
+
+
 --006.data.permissions.sql:
 INSERT INTO permission.perm_list VALUES 
     (-1, 'EVERYTHING', NULL);
@@ -1566,3 +1567,14 @@
 SELECT SETVAL('vandelay.authority_attr_definition_id_seq'::TEXT, 100);
 
 
+INSERT INTO container.copy_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'ccpbt', 'label'));
+INSERT INTO container.copy_bucket_type (code,label) VALUES ('staff_client', oils_i18n_gettext('staff_client', 'General Staff Client container', 'ccpbt', 'label'));
+INSERT INTO container.call_number_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'ccnbt', 'label'));
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'cbrebt', 'label'));
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('staff_client', oils_i18n_gettext('staff_client', 'General Staff Client container', 'cbrebt', 'label'));
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('bookbag', oils_i18n_gettext('bookbag', 'Book Bag', 'cbrebt', 'label'));
+
+INSERT INTO container.user_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'cubt', 'label'));
+INSERT INTO container.user_bucket_type (code,label) VALUES ('folks', oils_i18n_gettext('folks', 'Friends', 'cubt', 'label'));
+INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.view', oils_i18n_gettext('folks:pub_book_bags.view', 'List Published Book Bags', 'cubt', 'label'));
+INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.add', oils_i18n_gettext('folks:pub_book_bags.add', 'Add to Published Book Bags', 'cubt', 'label'));