Removing ordering agency address links

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 96fd40d..70a0094 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -10871,8 +10871,6 @@ SELECT  usr,
                        <field reporter:label="Ordering Agency Link" name="ordering_agency_id" reporter:datatype="link"/>
                        <field reporter:label="Ordering Agency Name" name="ordering_agency_name" reporter:datatype="text"/>
                        <field reporter:label="Ordering Agency Short (Policy) Name" name="ordering_agency_shortname" reporter:datatype="text"/> 
-                       <field reporter:label="Ordering Agency Mailing Address Link" name="ordering_agency_mailing_address_id" reporter:datatype="link"/>
-                       <field reporter:label="Ordering Agency Billing Address Link" name="ordering_agency_billing_address_id" reporter:datatype="link"/>
                        <field reporter:label="Lineitem ID" name="lineitem_id" reporter:datatype="id"/>
                        <field reporter:label="Lineitem Identifier" name="lineitem_identifier" reporter:datatype="text"/>
                        <field reporter:label="Lineitem Title" name="lineitem_title" reporter:datatype="text"/>
@@ -10899,8 +10897,6 @@ SELECT  usr,
                        <link field="provider_id" reltype="has_a" key="id" map="" class="acqpro"/>
                        <link field="provider_address_id" reltype="has_a" key="id" map="" class="acqpa"/>
                        <link field="ordering_agency_id" reltype="has_a" key="id" map="" class="aou"/>
-                       <link field="ordering_agency_mailing_address" reltype="might_have" key="id" map="" class="aoa"/>
-                       <link field="ordering_agency_billing_address" reltype="might_have" key="id" map="" class="aoa"/>
                        <link field="lineitem_id" reltype="might_have" key="id" map="" class="jub"/>
                        <link field="fund_id" reltype="has_a" key="id" map="" class="acqf"/>
                        <link field="po_item_id" reltype="might_have" key="id" map="" class="acqpoi"/>

diff --git a/Open-ILS/src/sql/Pg/example.reporter-extension.sql b/Open-ILS/src/sql/Pg/example.reporter-extension.sql
index 903e7d0..53359e2 100644 (file)
--- a/Open-ILS/src/sql/Pg/example.reporter-extension.sql
+++ b/Open-ILS/src/sql/Pg/example.reporter-extension.sql
@@ -329,8 +329,6 @@ CREATE VIEW reporter.acq_purchase_order_view AS
         ord_agency.id AS ordering_agency_id,
         ord_agency.name AS ordering_agency_name,
         ord_agency.shortname AS ordering_agency_shortname,
-        oa_mailing_address.id AS ordering_agency_mailing_address_id,
-        oa_billing_address.id AS orderind_agency_billing_address_id,
         li.id AS lineitem_id,
         li_identifier.attr_value AS lineitem_identifier,
         li_title.attr_value AS lineitem_title,
@@ -362,8 +360,6 @@ FROM    acq.purchase_order po
         inner join acq.provider provider ON (po.provider = provider.id)
         left outer join acq.provider_address provider_address ON (provider_address.provider = provider.id)
         inner join actor.org_unit ord_agency ON (po.ordering_agency = ord_agency.id)
-        left outer join actor.org_address oa_mailing_address ON (ord_agency.mailing_address = oa_mailing_address.id)
-        left outer join actor.org_address oa_billing_address ON (ord_agency.billing_address = oa_billing_address.id)
         left outer join acq.lineitem li ON (li.purchase_order = po.id)
         left outer join acq.lineitem_attr li_identifier ON (li_identifier.lineitem = li.id AND li_identifier.attr_name = 'identifier')
         left outer join acq.lineitem_attr li_title ON (li_title.lineitem = li.id AND li_title.attr_name = 'title')