LP1930753 ACQ provider buyer san override option

Adds a new field acq.provider.buyer_san that acts as an override to the
san value found on the mailing address of the ordering agency (org unit)
when a value is present.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 242c357..ae94ec0 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -9123,6 +9123,7 @@ SELECT  usr,
                        <field reporter:label="Holdings Subfields" name="holdings_subfields" oils_persist:virtual="true" reporter:datatype="link" />
                        <field reporter:label="Attribute Definitions" name="attributes" oils_persist:virtual="true" reporter:datatype="link" />
                        <field reporter:label="EDI Accounts" name="edi_accounts" oils_persist:virtual="true" reporter:datatype="link" />
+                       <field reporter:label="Buyer SAN" name="buyer_san" reporter:datatype="text" />
                </fields>
                <links>
                        <link field="currency_type" reltype="has_a" key="code" map="" class="acqct"/>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm
index b0349ee..3a68174 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm
@@ -153,7 +153,8 @@ sub compile_po {
         po_name => $self->escape_edi($po->name),
         provider_id => $po->provider->id,
         vendor_san => $po->provider->san || '',
-        org_unit_san => $po->ordering_agency->mailing_address->san || '',
+        org_unit_san => $po->provider->buyer_san ||
+            $po->ordering_agency->mailing_address->san || '',
         currency_type => $po->provider->currency_type,
         edi_attrs => {},
         lineitems => []

diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 2ddf74e..6a75a2e 100644 (file)
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -74,6 +74,7 @@ CREATE TABLE acq.provider (
     code                TEXT    NOT NULL,
     holding_tag         TEXT,
     san                 TEXT,
+    buyer_san           TEXT,
     edi_default         INT,          -- REFERENCES acq.edi_account (id) DEFERRABLE INITIALLY DEFERRED
        active              BOOL    NOT NULL DEFAULT TRUE,
        prepayment_required BOOL    NOT NULL DEFAULT FALSE,

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-buyer-san.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-buyer-san.sql
new file mode 100644 (file)
index 0000000..d37d587
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-buyer-san.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
+
+ALTER TABLE acq.provider ADD COLUMN buyer_san TEXT;
+
+COMMIT;
+