From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 24 Apr 2017 02:26:28 +0000 (+1000)
Subject: CRM-20450 Update post upgrade message with correct list of modified templates and... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7dffc2a7146bacba0251484ffa88939d3f52837a;p=civicrm-core.git

CRM-20450 Update post upgrade message with correct list of modified templates and fix closing tag which should be font
---

diff --git a/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl
index a938ca349d..0b5633f53b 100644
--- a/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl
+++ b/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl
@@ -143,7 +143,7 @@
                 <td colspan = "3"></td>
                 <td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
                 <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-                <td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
+                <td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
               </tr>
               {if $is_pay_later == 0}
                 <tr>
@@ -166,7 +166,7 @@
                   <td colspan = "3"></td>
                   <td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts}AMOUNT DUE:{/ts} </font></b></td>
                   <td style = "padding-left:34px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
-                  <td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
+                  <td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
                 </tr>
               {/if}
               <br/><br/><br/>
@@ -406,7 +406,7 @@
                   <td colspan = "3"></td>
                   <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts}REMAINING CREDIT{/ts}</font></b></td>
                   <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
-                  <td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
+                  <td style = "padding-left:28px;"><font size = "1" align = "right"></font></td>
                 </tr>
               {/if}
               <br/><br/><br/>
diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index cf7209ab25..894afe1ba6 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -115,7 +115,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
         . '</p>';
     }
     if ($rev == '4.7.19') {
-      $postUpgradeMessage .= '<br /><br />' . ts('Default version of the following System Workflow Message Templates have been modified: <ul><li>Additional Payment Receipt or Refund Notification</li></ul> If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).');
+      $postUpgradeMessage .= '<br /><br />' . ts('Default version of the following System Workflow Message Templates have been modified: <ul><li>Additional Payment Receipt or Refund Notification</li><li>Contribution Invoice</li></ul> If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).');
       $check = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_domain");
       $smsCheck = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_sms_provider");
       if ($check > 1 && (bool) $smsCheck) {
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index a938ca349d..0b5633f53b 100644
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -143,7 +143,7 @@
                 <td colspan = "3"></td>
                 <td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
                 <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-                <td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
+                <td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
               </tr>
               {if $is_pay_later == 0}
                 <tr>
@@ -166,7 +166,7 @@
                   <td colspan = "3"></td>
                   <td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts}AMOUNT DUE:{/ts} </font></b></td>
                   <td style = "padding-left:34px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
-                  <td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
+                  <td style = "padding-left:34px;"><font size = "1" align = "right"></font></td>
                 </tr>
               {/if}
               <br/><br/><br/>
@@ -406,7 +406,7 @@
                   <td colspan = "3"></td>
                   <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts}REMAINING CREDIT{/ts}</font></b></td>
                   <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
-                  <td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
+                  <td style = "padding-left:28px;"><font size = "1" align = "right"></font></td>
                 </tr>
               {/if}
               <br/><br/><br/>