[open-ils-commits] [GIT] Evergreen ILS branch master updated. 11639547a6d21bb92009a237473ff7b660d3d59c

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  11639547a6d21bb92009a237473ff7b660d3d59c (commit)
       via  64e473dbbf8d45447256a860801a2a9a6868468a (commit)
      from  3e7cbfa71cef994682bdf73b281298aa448bb388 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11639547a6d21bb92009a237473ff7b660d3d59c
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Jul 12 17:20:07 2013 -0400

    Move exchange_rate seed data to 950 file
    
    Since currency_type is a foreign key of acq.exchange_rate, if we move
    currency_type to the seed data file, exchange rate must follow.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 75185a0..35be244 100644
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -36,9 +36,6 @@ CREATE TABLE acq.exchange_rate (
     CONSTRAINT exchange_rate_from_to_once UNIQUE (from_currency,to_currency)
 );
 
-INSERT INTO acq.exchange_rate (from_currency,to_currency,ratio) VALUES ('USD','CAN',1.2);
-INSERT INTO acq.exchange_rate (from_currency,to_currency,ratio) VALUES ('USD','EUR',0.5);
-
 CREATE TABLE acq.claim_policy (
 	id              SERIAL       PRIMARY KEY,
 	org_unit        INT          NOT NULL REFERENCES actor.org_unit
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index fadeb20..fe3c2b3 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -9046,6 +9046,9 @@ INSERT INTO acq.currency_type (code, label) VALUES ('USD', oils_i18n_gettext('US
 INSERT INTO acq.currency_type (code, label) VALUES ('CAN', oils_i18n_gettext('CAN', 'Canadian Dollars', 'acqct', 'label'));
 INSERT INTO acq.currency_type (code, label) VALUES ('EUR', oils_i18n_gettext('EUR', 'Euros', 'acqct', 'label'));
 
+INSERT INTO acq.exchange_rate (from_currency,to_currency,ratio) VALUES ('USD','CAN',1.2);
+INSERT INTO acq.exchange_rate (from_currency,to_currency,ratio) VALUES ('USD','EUR',0.5);
+
 INSERT INTO acq.invoice_item_type (code,name) VALUES ('TAX',oils_i18n_gettext('TAX', 'Tax', 'aiit', 'name'));
 INSERT INTO acq.invoice_item_type (code,name) VALUES ('PRO',oils_i18n_gettext('PRO', 'Processing Fee', 'aiit', 'name'));
 INSERT INTO acq.invoice_item_type (code,name) VALUES ('SHP',oils_i18n_gettext('SHP', 'Shipping Charge', 'aiit', 'name'));

commit 64e473dbbf8d45447256a860801a2a9a6868468a
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Tue Jun 11 11:53:42 2013 +0300

    Move acq.currency_code entries and wrap for i18n
    
    Fix LP#1107834 by moving the acq.currency_code entries into
    950.data.seed-values.sql and wrapping the texts with oils_i18n_gettext.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index c059f66..75185a0 100644
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -28,11 +28,6 @@ CREATE TABLE acq.currency_type (
 	label	TEXT
 );
 
--- Use the ISO 4217 abbreviations for currency codes
-INSERT INTO acq.currency_type (code, label) VALUES ('USD','US Dollars');
-INSERT INTO acq.currency_type (code, label) VALUES ('CAN','Canadian Dollars');
-INSERT INTO acq.currency_type (code, label) VALUES ('EUR','Euros');
-
 CREATE TABLE acq.exchange_rate (
     id              SERIAL  PRIMARY KEY,
     from_currency   TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index c45a574..fadeb20 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -9041,6 +9041,11 @@ INSERT INTO action_trigger.environment (
         ,( 32, 'items' )
 ;
 
+-- Use the ISO 4217 abbreviations for currency codes
+INSERT INTO acq.currency_type (code, label) VALUES ('USD', oils_i18n_gettext('USD', 'US Dollars', 'acqct', 'label'));
+INSERT INTO acq.currency_type (code, label) VALUES ('CAN', oils_i18n_gettext('CAN', 'Canadian Dollars', 'acqct', 'label'));
+INSERT INTO acq.currency_type (code, label) VALUES ('EUR', oils_i18n_gettext('EUR', 'Euros', 'acqct', 'label'));
+
 INSERT INTO acq.invoice_item_type (code,name) VALUES ('TAX',oils_i18n_gettext('TAX', 'Tax', 'aiit', 'name'));
 INSERT INTO acq.invoice_item_type (code,name) VALUES ('PRO',oils_i18n_gettext('PRO', 'Processing Fee', 'aiit', 'name'));
 INSERT INTO acq.invoice_item_type (code,name) VALUES ('SHP',oils_i18n_gettext('SHP', 'Shipping Charge', 'aiit', 'name'));

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/200.schema.acq.sql       |    8 --------
 Open-ILS/src/sql/Pg/950.data.seed-values.sql |    8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS