moving fund down to the detail

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8804 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 6d8362c..3436b12 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2688,20 +2688,18 @@
                        <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
                        <field reporter:label="PO Line Item ID" name="id" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id" />
                        <field reporter:label="Purchase Order" name="purchase_order" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="link" />
-                       <field reporter:label="Fund" name="fund" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="link" />
-                       <field reporter:label="Creation Time" name="create_time" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="timestamp" />
-                       <field reporter:label="Edit Time" name="edit_time" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="timestamp" />
-                       <field reporter:label="MARC" name="marc" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="text" />
-                       <field reporter:label="Evergreen Bib ID" name="eg_bib_id" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="link" />
-                       <field reporter:label="List Price" name="list_price" oils_obj:array_position="10" oils_persist:virtual="false" reporter:datatype="money" />
-                       <field reporter:label="Item Count" name="item_count" oils_obj:array_position="11" oils_persist:virtual="false" reporter:datatype="int" />
-                       <field reporter:label="Expected Receive Date" name="expected_recv_time" oils_obj:array_position="12" oils_persist:virtual="false" reporter:datatype="timestamp" />
-                       <field reporter:label="Descriptive Attributes" name="attributes" oils_obj:array_position="13" oils_persist:virtual="true" reporter:datatype="link" />
-                       <field reporter:label="Line Item Details" name="lineitem_details" oils_obj:array_position="14" oils_persist:virtual="true" reporter:datatype="link" />
+                       <field reporter:label="Creation Time" name="create_time" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="timestamp" />
+                       <field reporter:label="Edit Time" name="edit_time" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="timestamp" />
+                       <field reporter:label="MARC" name="marc" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="text" />
+                       <field reporter:label="Evergreen Bib ID" name="eg_bib_id" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="link" />
+                       <field reporter:label="List Price" name="list_price" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="money" />
+                       <field reporter:label="Item Count" name="item_count" oils_obj:array_position="10" oils_persist:virtual="false" reporter:datatype="int" />
+                       <field reporter:label="Expected Receive Date" name="expected_recv_time" oils_obj:array_position="11" oils_persist:virtual="false" reporter:datatype="timestamp" />
+                       <field reporter:label="Descriptive Attributes" name="attributes" oils_obj:array_position="12" oils_persist:virtual="true" reporter:datatype="link" />
+                       <field reporter:label="Line Item Details" name="lineitem_details" oils_obj:array_position="13" oils_persist:virtual="true" reporter:datatype="link" />
                </fields>
                <links>
                        <link field="purchase_order" reltype="has_a" key="id" map="" class="acqpo"/>
-                       <link field="fund" reltype="has_a" key="id" map="" class="acqf"/>
                        <link field="eg_bib_id" reltype="has_a" key="id" map="" class="bre"/>
                        <link field="attributes" reltype="has_many" key="po_lineitem" map="" class="acqpolia"/>
                        <link field="lineitem_details" reltype="has_many" key="po_lineitem" map="" class="acqpolid"/>
@@ -2771,12 +2769,14 @@
                        <field reporter:label="Barcode" name="barcode" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="text" />
                        <field reporter:label="Call Number Label" name="cn_label" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="text" />
                        <field reporter:label="Actual Receive Date" name="recv_time" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="timestamp" />
-                       <field reporter:label="Fund Debit" name="fund_debit" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="link" />
+                       <field reporter:label="Fund" name="fund" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="link" />
+                       <field reporter:label="Fund Debit" name="fund_debit" oils_obj:array_position="10" oils_persist:virtual="false" reporter:datatype="link" />
                </fields>
                <links>
                        <link field="po_lineitem" reltype="has_a" key="id" map="" class="acqpoli"/>
                        <link field="eg_copy_id" reltype="has_a" key="id" map="" class="acp"/>
-            <link field="fund_debit" reltype="has_a" key="id" map="" class="acqfdeb"/>
+                       <link field="fund" reltype="has_a" key="id" map="" class="acqf"/>
+                       <link field="fund_debit" reltype="has_a" key="id" map="" class="acqfdeb"/>
                </links>
        </class>
 

diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 7b3067c..bafba8a 100644 (file)
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -132,7 +132,6 @@ CREATE TABLE acq.picklist_entry (
 CREATE TABLE acq.po_lineitem (
        id                      BIGSERIAL                       PRIMARY KEY,
        purchase_order          INT                             NOT NULL REFERENCES acq.purchase_order (id),
-       fund                    INT                             REFERENCES acq.fund (id),
        expected_recv_time      TIMESTAMP WITH TIME ZONE,
        create_time             TIMESTAMP WITH TIME ZONE        NOT NULL DEFAULT NOW(),
        edit_time               TIMESTAMP WITH TIME ZONE        NOT NULL DEFAULT NOW(),
@@ -157,6 +156,7 @@ CREATE INDEX po_li_note_li_idx ON acq.po_li_note (po_lineitem);
 CREATE TABLE acq.po_li_detail (
        id              BIGSERIAL                       PRIMARY KEY,
        po_lineitem     INT                             NOT NULL REFERENCES acq.po_lineitem (id),
+       fund            INT                             REFERENCES acq.fund (id),
        fund_debit      INT                             REFERENCES acq.fund_debit (id),
        eg_copy_id      BIGINT                          REFERENCES asset.copy (id),
        barcode         TEXT,