From 3edbc8dc640605d3cf64e73652a13b0277e0f36f Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 2 Nov 2016 14:50:22 -0400
Subject: [PATCH] LP#1513872 EDIWriter NAD+BY+<ou_san>+31B support

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm
index 3036f34ab7..b4828599fa 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/EDIWriter.pm
@@ -382,6 +382,12 @@ UNB+UNOB:3+$c{org_unit_san}:31B+$c{vendor_san}:31B+$datetime+1'
 UNH+1+ORDERS:D:96A:UN'
 BGM+220+$c{po_id}+9'
 DTM+137:$date:102'
+EDI
+
+    $edi .= "NAD+BY+$c{org_unit_san}::31B\n"
+        unless $self->{compiled}->{edi_attrs}->{BUYER_ID_INCLUDE_VENDCODE};
+
+    $edi .= <<EDI;
 NAD+BY+$c{buyer_code}::91'
 NAD+SU+$c{vendor_san}::31B'
 NAD+SU+$c{provider_id}::92'
-- 
2.11.0