[open-ils-commits] r8804 - in branches/acq-experiment/Open-ILS: examples src/sql/Pg

svn at svn.open-ils.org svn at svn.open-ils.org
Wed Feb 20 16:38:57 EST 2008 

Author: miker
Date: 2008-02-20 16:08:30 -0500 (Wed, 20 Feb 2008)
New Revision: 8804

Modified:
   branches/acq-experiment/Open-ILS/examples/fm_IDL.xml
   branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql
Log:
moving fund down to the detail

Modified: branches/acq-experiment/Open-ILS/examples/fm_IDL.xml
===================================================================
--- branches/acq-experiment/Open-ILS/examples/fm_IDL.xml	2008-02-20 20:30:33 UTC (rev 8803)
+++ branches/acq-experiment/Open-ILS/examples/fm_IDL.xml	2008-02-20 21:08:30 UTC (rev 8804)
@@ -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>
 

Modified: branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql
===================================================================
--- branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql	2008-02-20 20:30:33 UTC (rev 8803)
+++ branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql	2008-02-20 21:08:30 UTC (rev 8804)
@@ -132,7 +132,6 @@
 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 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,

More information about the open-ils-commits mailing list