adding note and circ_modifier to acq.lineitem_detail; moving some IDL definitions...

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 77eebb4..ef1a608 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4805,6 +4805,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Fund Debit" name="fund_debit" oils_obj:array_position="10" oils_persist:virtual="false" reporter:datatype="link" />
                        <field reporter:label="Owning Library" name="owning_lib" oils_obj:array_position="11" oils_persist:virtual="false" reporter:datatype="org_unit" />
                        <field reporter:label="Shelving Location" name="location" oils_obj:array_position="12" oils_persist:virtual="false" reporter:datatype="link" />
+                       <field reporter:label="Circ Modifier" name="circ_modifier" oils_obj:array_position="13" oils_persist:virtual="false" reporter:datatype="link" />
+                       <field reporter:label="Note" name="note" oils_obj:array_position="14" oils_persist:virtual="false" reporter:datatype="text" />
                </fields>
                <links>
                        <link field="lineitem" reltype="has_a" key="id" map="" class="jub"/>
@@ -4813,6 +4815,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <link field="fund_debit" reltype="has_a" key="id" map="" class="acqfdeb"/>
                        <link field="owning_lib" reltype="has_a" key="id" map="" class="aou"/>
                        <link field="location" reltype="has_a" key="id" map="" class="acpl"/>
+                       <link field="circ_modifier" reltype="has_a" key="code" map="" class="ccm"/>
                </links>
        </class>
 
@@ -5238,6 +5241,67 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
         </links>
     </class>
 
+       <class id="acqdf" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::distribution_formula" oils_persist:tablename="acq.distribution_formula">
+        <fields oils_persist:primary="id" oils_persist:sequence="acq.distribution_formula_id_seq">
+            <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
+            <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
+            <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
+            <field reporter:label="Formula ID" name="id" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id"/>
+            <field reporter:label="Formula Owner" name="owner" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="org_unit"/>
+            <field reporter:label="Formula Name" name="name" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="text"/>
+            <field reporter:label="Skip Count" name="skip_count" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="int"/>
+            <field reporter:label="Entries" name="entries" oils_obj:array_position="7" oils_persist:virtual="true" reporter:datatype="link"/>
+               </fields>
+        <links>
+            <link field="owner" reltype="has_a" key="id" map="" class="aou"/>
+            <link field="entries" reltype="has_many" key="formula" map="" class="acqdfe"/>
+        </links>
+               <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+               <actions>
+                       <create permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
+                       <retrieve permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
+                       <update permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
+                       <delete permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
+               </actions>
+               </permacrud>
+       </class>
+
+       <class id="acqdfe" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::distribution_formula_entry" oils_persist:tablename="acq.distribution_formula_entry">
+        <fields oils_persist:primary="id" oils_persist:sequence="acq.distribution_formula_entry_id_seq">
+            <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
+            <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
+            <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
+            <field reporter:label="Entry ID" name="id" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id"/>
+            <field reporter:label="Formula ID" name="formula" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="link"/>
+            <field reporter:label="Position" name="position" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="int"/>
+            <field reporter:label="Item Count" name="item_count" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="int"/>
+            <field reporter:label="Owning Library" name="owning_lib" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="org_unit"/>
+            <field reporter:label="Location" name="location" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="link"/>
+               </fields>
+        <links>
+            <link field="formula" reltype="has_a" key="id" map="" class="acqdf"/>
+            <link field="owning_lib" reltype="has_a" key="id" map="" class="aou"/>
+            <link field="location" reltype="has_a" key="id" map="" class="acpl"/>
+        </links>
+               <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+               <actions>
+                       <create permission="ADMIN_ACQ_DISTRIB_FORMULA">
+                       <context link="formula" field="owner"/>
+                       </create>
+                       <retrieve permission="ADMIN_ACQ_DISTRIB_FORMULA">
+                       <context link="formula" field="owner"/>
+                       </retrieve>
+                       <update permission="ADMIN_ACQ_DISTRIB_FORMULA">
+                       <context link="formula" field="owner"/>
+                       </update>
+                       <delete permission="ADMIN_ACQ_DISTRIB_FORMULA">
+                       <context link="formula" field="owner"/>
+                       </delete>
+               </actions>
+               </permacrud>
+       </class>
+
+
        <!-- ********************************************************************************************************************* -->
        <!-- What follows is a set of example extensions that are useful for PINES.  Comment out or remove if you don't want them. -->
        <!-- ********************************************************************************************************************* -->
@@ -5604,65 +5668,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
             <link field="home_ou" reltype="has_a" key="id" map="" class="aou"/>
         </links>
     </class>
-       <class id="acqdf" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::distribution_formula" oils_persist:tablename="acq.distribution_formula">
-        <fields oils_persist:primary="id" oils_persist:sequence="acq.distribution_formula_id_seq">
-            <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
-            <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
-            <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
-            <field reporter:label="Formula ID" name="id" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id"/>
-            <field reporter:label="Formula Owner" name="owner" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="org_unit"/>
-            <field reporter:label="Formula Name" name="name" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="text"/>
-            <field reporter:label="Skip Count" name="skip_count" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="int"/>
-            <field reporter:label="Entries" name="entries" oils_obj:array_position="7" oils_persist:virtual="true" reporter:datatype="link"/>
-               </fields>
-        <links>
-            <link field="owner" reltype="has_a" key="id" map="" class="aou"/>
-            <link field="entries" reltype="has_many" key="formula" map="" class="acqdfe"/>
-        </links>
-               <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
-               <actions>
-                       <create permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
-                       <retrieve permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
-                       <update permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
-                       <delete permission="ADMIN_ACQ_DISTRIB_FORMULA" context_field="owner"/>
-               </actions>
-               </permacrud>
-       </class>
-       <class id="acqdfe" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::distribution_formula_entry" oils_persist:tablename="acq.distribution_formula_entry">
-        <fields oils_persist:primary="id" oils_persist:sequence="acq.distribution_formula_entry_id_seq">
-            <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
-            <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
-            <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
-            <field reporter:label="Entry ID" name="id" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id"/>
-            <field reporter:label="Formula ID" name="formula" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="link"/>
-            <field reporter:label="Position" name="position" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="int"/>
-            <field reporter:label="Item Count" name="item_count" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="int"/>
-            <field reporter:label="Owning Library" name="owning_lib" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="org_unit"/>
-            <field reporter:label="Location" name="location" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="link"/>
-               </fields>
-        <links>
-            <link field="formula" reltype="has_a" key="id" map="" class="acqdf"/>
-            <link field="owning_lib" reltype="has_a" key="id" map="" class="aou"/>
-            <link field="location" reltype="has_a" key="id" map="" class="acpl"/>
-        </links>
-               <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
-               <actions>
-                       <create permission="ADMIN_ACQ_DISTRIB_FORMULA">
-                       <context link="formula" field="owner"/>
-                       </create>
-                       <retrieve permission="ADMIN_ACQ_DISTRIB_FORMULA">
-                       <context link="formula" field="owner"/>
-                       </retrieve>
-                       <update permission="ADMIN_ACQ_DISTRIB_FORMULA">
-                       <context link="formula" field="owner"/>
-                       </update>
-                       <delete permission="ADMIN_ACQ_DISTRIB_FORMULA">
-                       <context link="formula" field="owner"/>
-                       </delete>
-               </actions>
-               </permacrud>
-       </class>
-
 
        <!-- ********************************************************************************************************************* -->
 

diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 09d5532..0b6b0e7 100644 (file)
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -212,6 +212,8 @@ CREATE TABLE acq.lineitem_detail (
     eg_copy_id  BIGINT      REFERENCES asset.copy (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
     barcode     TEXT,
     cn_label    TEXT,
+    note        TEXT,
+    circ_modifier   TEXT    REFERENCES config.circ_modifier (code) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
     owning_lib  INT         REFERENCES actor.org_unit (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
     location    INT         REFERENCES asset.copy_location (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
     recv_time   TIMESTAMP WITH TIME ZONE