1. Add estimated_unit_price column to acq.lineitem.

2. Bring acq.acq_lineitem_history and acq.acq_purchase_order_history
into sync with their respective source tables.

M    Open-ILS/src/sql/Pg/200.schema.acq.sql
M    Open-ILS/src/sql/Pg/002.schema.config.sql
A    Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql
M    Open-ILS/examples/fm_IDL.xml

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15767 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 63fdc9a..e0ad0d6 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -5166,6 +5166,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="State" name="state" reporter:datatype="text"/>
                        <field reporter:label="Order Date" name="order_date" reporter:datatype="timestamp"/>
                        <field reporter:label="Name" name="name" reporter:datatype="text"/>
+                       <field reporter:label="Cancel Reason" name="cancel_reason" reporter:datatype="link"/>
                </fields>
                <links>
                        <link field="id" reltype="has_a" key="id" map="" class="acqpo"/>
@@ -5174,6 +5175,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <link field="editor" reltype="has_a" key="id" map="" class="au"/>
                        <link field="ordering_agency" reltype="has_a" key="id" map="" class="aou"/>
                        <link field="provider" reltype="has_a" key="id" map="" class="acqpro"/>
+                       <link field="cancel_reason" reltype="has_a" key="id" map="" class="acqcr"/>
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <retrieve permission="CREATE_PURCHASE_ORDER VIEW_PURCHASE_ORDER" context_field="ordering_agency"/>
@@ -5229,6 +5231,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Editor" name="editor" reporter:datatype="link" />
                        <field reporter:label="Claim Interval" name="claim_interval" reporter:datatype="interval" />
                        <field reporter:label="Cancel Reason" name="cancel_reason" reporter:datatype="link" />
+                       <field reporter:label="Estimated Unit Price" name="estimated_unit_price" reporter:datatype="money" />
                        <field reporter:label="Item Count" name="item_count" oils_persist:virtual="true" reporter:datatype="int" />
                        <field reporter:label="Descriptive Attributes" name="attributes" oils_persist:virtual="true" reporter:datatype="link" />
                        <field reporter:label="Line Item Details" name="lineitem_details" oils_persist:virtual="true" reporter:datatype="link" />
@@ -5245,7 +5248,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <link field="attributes" reltype="has_many" key="lineitem" map="" class="acqlia"/>
                        <link field="lineitem_details" reltype="has_many" key="lineitem" map="" class="acqlid"/>
                        <link field="lineitem_notes" reltype="has_many" key="lineitem" map="" class="acqlin"/>
-                       <link field="cancel_reason" reltype="might_have" key="id" map="" class="acqcr"/>
+                       <link field="cancel_reason" reltype="has_a" key="id" map="" class="acqcr"/>
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <retrieve permission="CREATE_PURCHASE_ORDER VIEW_PURCHASE_ORDER CREATE_PICKLIST VIEW_PICKLIST">
@@ -5275,6 +5278,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Source Label" name="source_label" reporter:datatype="text"/>
                        <field reporter:label="Item Count" name="item_count" reporter:datatype="int"/>
                        <field reporter:label="State" name="state" reporter:datatype="text"/>
+                       <field reporter:label="Claim Interval" name="claim_interval" reporter:datatype="interval"/>
+                       <field reporter:label="Cancel Reason" name="cancel_reason" reporter:datatype="link"/>
+                       <field reporter:label="Estimated Unit Price" name="estimated_unit_price" reporter:datatype="money" />
                </fields>
                <links>
                        <link field="id" reltype="has_a" key="id" map="" class="jub"/>
@@ -5285,6 +5291,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <link field="purchase_order" reltype="has_a" key="id" map="" class="acqpo"/>
                        <link field="picklist" reltype="has_a" key="id" map="" class="acqpl"/>
                        <link field="eg_bib_id" reltype="has_a" key="id" map="" class="bre"/>
+                       <link field="cancel_reason" reltype="has_a" key="id" map="" class="acqcr"/>
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <retrieve permission="CREATE_PURCHASE_ORDER VIEW_PURCHASE_ORDER">

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 24abc8b..ba73b9b 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0182'); -- dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0183'); -- Scott McKellar
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 35abc2d..047a0a4 100644 (file)
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -454,6 +454,7 @@ CREATE TABLE acq.lineitem (
        claim_interval      INTERVAL,
        cancel_reason       INT                         REFERENCES acq.cancel_reason( id )
                                                     DEFERRABLE INITIALLY DEFERRED,
+       estimated_unit_price NUMERIC,
     CONSTRAINT picklist_or_po CHECK (picklist IS NOT NULL OR purchase_order IS NOT NULL)
 );
 CREATE INDEX li_po_idx ON acq.lineitem (purchase_order);

diff --git a/Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql b/Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql
new file mode 100644 (file)
index 0000000..7e3e2d8
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql
@@ -0,0 +1,20 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0183'); -- Scott McKellar
+
+ALTER TABLE acq.lineitem
+       ADD COLUMN estimated_unit_price NUMERIC;
+
+ALTER TABLE acq.acq_lineitem_history
+       ADD COLUMN claim_interval INTERVAL;
+
+ALTER TABLE acq.acq_lineitem_history
+       ADD COLUMN cancel_reason INTEGER;
+
+ALTER TABLE acq.acq_lineitem_history
+       ADD COLUMN estimated_unit_price NUMERIC;
+
+ALTER TABLE acq.acq_purchase_order_history
+       ADD COLUMN cancel_reason INTEGER;
+
+COMMIT;