From: Guanhuan Chen <oooomic@gmail.com>
Date: Mon, 7 Sep 2015 11:48:34 +0000 (+0100)
Subject: Apply modifications to invoice templates
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=470395b093302321aef2320ca62ed00a8644670e;p=civicrm-core.git

Apply modifications to invoice templates
---

diff --git a/CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl
index e51ffe6bcb..0274f093e9 100644
--- a/CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl
@@ -225,7 +225,7 @@
   </table>
 
 
-      {if $contribution_status_id == $refundedStatusId}
+      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}
     <table style = "margin-top:2px;padding-left:7px;page-break-before: always;">
       <tr>
         <td><img src = "{$resourceBase}/i/civi99.png" height = "34px" width = "99px"></td>
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index e88f1bd39b..6794485467 100644
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -225,7 +225,7 @@
   </table>
 
 
-      {if $contribution_status_id == $refundedStatusId}
+      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}
     <table style = "margin-top:2px;padding-left:7px;page-break-before: always;">
       <tr>
         <td><img src = "{$resourceBase}/i/civi99.png" height = "34px" width = "99px"></td>