LP#1373690 template continued

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

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-edi.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-edi.sql
index adab421..478379e 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-edi.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-edi.sql
@@ -204,9 +204,10 @@ END; # for lineitem
 -%]
 [%- BLOCK big_block -%]
 UNA:+.? '
-UNB+UNOB:3+[% ORG_UNIT_SAN %]:31B+[% VENDOR_SAN %]:31B+140924:1351+1'
+UNB+UNOB:3+[% ORG_UNIT_SAN %]:31B+[% VENDOR_SAN %]:31B+[%-
+date.format(date.now, "%y%m%d") %]:[% date.format(date.now, "%H%M") %]+1'
 UNH+1+ORDERS:D:96A:UN'
-BGM+220+98+9'
+BGM+220+[% target.id %]+9'
 DTM+137:[% date.format(date.now, '%Y%m%d') %]:102'
 NAD+BY+[% BUYER_CODE %]::91'
 NAD+SU+[% VENDOR_SAN %]::31B'
@@ -249,19 +250,22 @@ when we exceed 5, add a new GIR segement.
 -%]
 [%- IF FIELD_COUNT == 5; 
     FIELD_COUNT = 0; SEGMENT_COUNT = SEGMENT_COUNT + 1 -%]
-GIR+[% GIR_INDEX.format('%03d') -%][% END -%]
+'[%# finalize the GIR segment with a "'" %]
+GIR+[% GIR_INDEX | format('%03d') -%][% END -%]
 [%- IF INC_LOCATION AND (VENDOR_BT OR copy.location); 
     FIELD_COUNT = FIELD_COUNT + 1 ; SEGMENT_COUNT = SEGMENT_COUNT + 1-%]
 +[% copy.location %]:LFH[%- END -%]
 [%- IF FIELD_COUNT == 5; 
     FIELD_COUNT = 0; SEGMENT_COUNT = SEGMENT_COUNT + 1 -%]
-GIR+[% GIR_INDEX.format('%03d') -%][% END -%]
+'[%# finalize the GIR segment with a "'" %]
+GIR+[% GIR_INDEX | format('%03d') -%][% END -%]
 [%- IF INC_QUANTITY AND (VENDOR_BT OR copy.quantity); 
     FIELD_COUNT = FIELD_COUNT + 1; SEGMENT_COUNT = SEGMENT_COUNT + 1 -%]
 +[% copy.quantity %]:LQT[%- END -%]
 [%- IF FIELD_COUNT == 5; 
     FIELD_COUNT = 0; SEGMENT_COUNT = SEGMENT_COUNT + 1 -%]
-GIR+[% GIR_INDEX.format('%03d') -%][% END -%]
+'[%# finalize the GIR segment with a "'" %]
+GIR+[% GIR_INDEX | format('%03d') -%][% END -%]
 [%- IF INC_COPY_ID AND (VENDOR_BT OR copy.copy_id); 
     FIELD_COUNT = FIELD_COUNT + 1 -%]
 +[% copy.copy_id %]:LCO[%- END -%]