LP#1391282 - Updated A/T email template From: lines.

Signed-off-by: Josh Stompro <stomproj@larl.org>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 6f08288..4c4d57b 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -7092,7 +7092,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Overdue Notification
 Auto-Submitted: auto-generated
 
@@ -7137,7 +7137,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Overdue Items Marked Lost
 Auto-Submitted: auto-generated
 
@@ -7322,7 +7322,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Hold Available Notification
 Auto-Submitted: auto-generated
 
@@ -7388,7 +7388,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Hold Available Notification
 Auto-Submitted: auto-generated
 
@@ -7466,7 +7466,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Long Wait Hold Notification
 Auto-Submitted: auto-generated
 
@@ -7605,7 +7605,7 @@ $$
 [%- SET pubdate = helpers.get_li_attr("pubdate", "", li.attributes) -%]
 
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Acquisition Request Notification
 Auto-Submitted: auto-generated
 
@@ -7640,7 +7640,7 @@ $$
 [%- SET pubdate = helpers.get_li_attr("pubdate", "", li.attributes) -%]
 
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Acquisition Request Notification
 Auto-Submitted: auto-generated
 
@@ -7675,7 +7675,7 @@ $$
 [%- SET pubdate = helpers.get_li_attr("pubdate", "", li.attributes) -%]
 
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Acquisition Request Notification
 Auto-Submitted: auto-generated
 
@@ -7708,7 +7708,7 @@ $$
 [%- SET pubdate = target.pubdate -%]
 
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Acquisition Request Notification
 Auto-Submitted: auto-generated
 
@@ -7741,7 +7741,7 @@ $$
 [%- SET cancel_reason = target.cancel_reason.description -%]
 
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Acquisition Request Notification
 Auto-Submitted: auto-generated
 
@@ -8278,7 +8278,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Courtesy Notice
 Auto-Submitted: auto-generated
 
@@ -9108,7 +9108,7 @@ $$
 [%- USE date -%]
 [%- SET user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Circulation History
 Auto-Submitted: auto-generated
 
@@ -9167,7 +9167,7 @@ $$
 [%- USE date -%]
 [%- SET user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Hold Request History
 Auto-Submitted: auto-generated
 
@@ -9277,7 +9277,7 @@ $$
 [%- USE date -%]
 [%- SET user = target.0.xact.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Payment Receipt
 Auto-Submitted: auto-generated
 
@@ -9513,7 +9513,7 @@ INSERT INTO action_trigger.event_definition (
 $$
 [%- SET user = target.0.owner -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Bibliographic Records
 Auto-Submitted: auto-generated
 
@@ -10301,7 +10301,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Item Recall Notification
 Auto-Submitted: auto-generated 
 
@@ -10368,7 +10368,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Hold Request Cancelled
 Auto-Submitted: auto-generated
 
@@ -10620,7 +10620,7 @@ $$
 [%- USE date -%]
 [%- SET user = target.0.queue.owner -%]
 To: [%- params.recipient_email || user.email || 'root@localhost' %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Bibs from Import Queue
 Auto-Submitted: auto-generated
 
@@ -10763,7 +10763,7 @@ $$
 [%- USE date -%]
 [%- SET user = target.0.queue.owner -%]
 To: [%- params.recipient_email || user.email || 'root@localhost' %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Authorities from Import Queue
 Auto-Submitted: auto-generated
 
@@ -10920,7 +10920,7 @@ $$
 [%- USE date -%]
 [%- SET user = target.0.record.queue.owner -%]
 To: [%- params.recipient_email || user.email || 'root@localhost' %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Import Items from Import Queue
 Auto-Submitted: auto-generated
 
@@ -12541,7 +12541,7 @@ INSERT INTO action_trigger.event_definition (
     'sms_notify',
     '[%- USE date -%]
 [%- user = target.0.usr -%]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 To: [%- params.recipient_email || helpers.get_sms_gateway_email(target.0.sms_carrier,target.0.sms_notify) %]
 Subject: [% target.size %] hold(s) ready
 Auto-Submitted: auto-generated
@@ -12608,7 +12608,7 @@ INSERT INTO action_trigger.event_definition (
     'NOOP_True',
     'SendSMS',
     '[%- USE date -%]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 To: [%- params.recipient_email || helpers.get_sms_gateway_email(user_data.sms_carrier,user_data.sms_notify) %]
 Subject: Call Number
 Auto-Submitted: auto-generated
@@ -13816,7 +13816,7 @@ $$
 [%- USE date -%]
 [%- user = target.0.usr -%]
 To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
+From: [%- helpers.get_org_setting(target.home_ou.id, 'org.bounced_emails') || lib.email || params.sender_email || default_sender %]
 Subject: Overdue Items Marked Long Overdue
 Auto-Submitted: auto-generated