Additional fix for CRM-17815 and alignment fixes

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 9bc685129e74e1f0d7597e74c92e71b875c69dab..617033da661ccc1514e265babd5c26ae6be66602 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4046,7 +4046,7 @@ WHERE con.id = {$contributionId}
       empty($params['skipLineItem']) && !$isLineItem
     ) {
       $taxRateParams = $taxRates[$params['financial_type_id']];
-      $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($params['total_amount'], $taxRateParams);
+      $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount(CRM_Utils_Array::value('total_amount', $params), $taxRateParams);
       $params['tax_amount'] = round($taxAmount['tax_amount'], 2);
 
       // Get Line Item on update of contribution
@@ -4061,7 +4061,7 @@ WHERE con.id = {$contributionId}
           $params['line_item'][$setID][$priceFieldID]['tax_amount'] = $params['tax_amount'];
         }
       }
-      $params['total_amount'] = $params['total_amount'] + $params['tax_amount'];
+      $params['total_amount'] = CRM_Utils_Array::value('total_amount', $params) + $params['tax_amount'];
     }
     elseif (isset($params['api.line_item.create'])) {
       // Update total amount of contribution using lineItem

diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index 16064ca53ce1dbb49b6c59fa15216469f018020c..66c222b70e1e171d0f3c7e79d58419827b116f09 100644 (file)
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -12,70 +12,70 @@
     </table>
     <center>
       <table style = "padding-right:19px;font-family: Arial, Verdana, sans-serif;" width = "500" height = "100" border = "0" cellpadding = "2" cellspacing = "1">
-  <tr>
-    <td style = "padding-left:15px;" ><b><font size = "4" align = "center">{ts}INVOICE{/ts}</font></b></td>
+        <tr>
+          <td style = "padding-left:15px;" ><b><font size = "4" align = "center">{ts}INVOICE{/ts}</font></b></td>
           <td colspan = "1"></td>
           <td style = "padding-left:70px;"><b><font size = "1" align = "center" >{ts}Invoice Date:{/ts}</font></b></td>
           <td><font size = "1" align = "right">{$domain_organization}</font></td>
-  </tr>
+        </tr>
         <tr>
-         {if $organization_name}
-           <td style = "padding-left:17px;"><font size = "1" align = "center" >{$display_name}  ({$organization_name})</font></td>
-         {else}
-           <td style = "padding-left:15px;"><font size = "1" align = "center" >{$display_name}</font></td>
-         {/if}
-         <td colspan = "1"></td>
-         <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
-   <td><font size = "1" align = "right">
-  {if $domain_street_address }
-    {$domain_street_address}
-  {/if}
-  {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}</font></td>
-  </tr>
+          {if $organization_name}
+            <td style = "padding-left:17px;"><font size = "1" align = "center" >{$display_name}  ({$organization_name})</font></td>
+          {else}
+            <td style = "padding-left:15px;"><font size = "1" align = "center" >{$display_name}</font></td>
+          {/if}
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_street_address }{$domain_street_address}{/if}
+              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
+            </font>
+          </td>
+        </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$street_address}   {$supplemental_address_1}</font></td>
           <td colspan = "1"></td>
           <td style = "padding-left:70px;"><b><font size = "1" align = "right">{ts}Invoice Number:{/ts}</font></b></td>
-    <td ><font size = "1" align = "right">{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}
-    {if $domain_state }{$domain_state}{/if}</font></td>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}
+              {if $domain_state }{$domain_state}{/if}
+            </font>
+          </td>
         </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
           <td colspan="1"></td>
           <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_id}</font></td>
-    <td><font size = "1" align = "right">{if $domain_city}
-    {$domain_city}
-        {/if}
-        {if $domain_postal_code }
-    {$domain_postal_code}
-        {/if}
-    </font></td>
-  </tr>
-  <tr>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_city}{$domain_city}{/if}
+              {if $domain_postal_code }{$domain_postal_code}{/if}
+            </font>
+          </td>
+        </tr>
+        <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>
           <td colspan="1"></td>
-    <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">{ts}Reference:{/ts}</font></b></td>
-    <td><font size = "1" align = "right"> {if $domain_country}
-    {$domain_country}
-        {/if}</font></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td></td>
-    <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
-    <td><font size = "1" align = "right"> {if $domain_phone}{$domain_phone}{/if}</font> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td><font size = "1" align = "right"> {if $domain_email}
-    {$domain_email}
-         {/if}</font> </td>
-  </tr>
+          <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">{ts}Reference:{/ts}</font></b></td>
+          <td><font size = "1" align = "right"> {if $domain_country}{$domain_country}{/if}</font></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
+          <td><font size = "1" align = "right"> {if $domain_phone}{$domain_phone}{/if}</font> </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td><font size = "1" align = "right"> {if $domain_email}{$domain_email}{/if}</font> </td>
+        </tr>
       </table>
       <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">
-  <tr>
+        <tr>
           <td colspan = "2" {$valueStyle}>
             <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
               <tr>
@@ -86,232 +86,246 @@
                 <th style = "padding-left:34px;text-align:right;font-weight:bold;"><font size = "1">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>
               </tr>
               {foreach from=$lineItem item=value key=priceset name=taxpricevalue}
-    {if $smarty.foreach.taxpricevalue.index eq 0}
-            <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
-    {else}
-      <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-    {/if}
+                {if $smarty.foreach.taxpricevalue.index eq 0}
+                  <tr>
+                    <td colspan = "5" ><hr size="3" style = "color:#000;"></hr></td>
+                  </tr>
+                {else}
+                  <tr>
+                    <td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td>
+                  </tr>
+                {/if}
                 <tr>
                   <td style="text-align:left;" ><font size = "1">
-      {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
-      </font></td>
-      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
-      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
-        {if $value.tax_amount != ''}
-          <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1"> {$value.tax_rate}%</font></td>
+                    {if $value.html_type eq 'Text'}
+                      {$value.label}
                     {else}
-          <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1">{ts 1=$taxTerm}No %1{/ts}</font></td>
-              {/if}
-        <td style = "padding-left:34px;text-align:right;"><font size = "1">{$value.subTotal|crmMoney:$currency}</font></td>
-    </tr>
+                      {$value.field_title} - {$value.label}
+                    {/if} 
+                    {if $value.description}
+                      <div>{$value.description|truncate:30:"..."}</div>
+                    {/if}
+                    </font>
+                  </td>
+                  <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
+                  <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
+                  {if $value.tax_amount != ''}
+                    <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1"> {$value.tax_rate}%</font></td>
+                  {else}
+                    <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1">{ts 1=$taxTerm}No %1{/ts}</font></td>
+                  {/if}
+                  <td style = "padding-left:34px;text-align:right;"><font size = "1">{$value.subTotal|crmMoney:$currency}</font></td>
+                </tr>
               {/foreach}
-          <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-          <tr>
-      <td colspan = "3"></td>
-      <td style = "padding-left:20px;text-align:right;"><font size = "1">{ts}Sub Total{/ts}</font></td>
-      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
-    </tr>
-    {foreach from = $dataArray item = value key = priceset}
-            <tr>
-        <td colspan = "3"></td>
-        {if $priceset}
-          <td style = "padding-left:20px;text-align:right;"><font size = "1"> {ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>
-          <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+              <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+              <tr>
+                <td colspan = "3"></td>
+                <td style = "padding-left:20px;text-align:right;"><font size = "1">{ts}Sub Total{/ts}</font></td>
+                <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
+              </tr>
+              {foreach from = $dataArray item = value key = priceset}
+                <tr>
+                  <td colspan = "3"></td>
+                    {if $priceset}
+                      <td style = "padding-left:20px;text-align:right;"><font size = "1"> {ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>
+                      <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
                     {elseif $priceset == 0}
                       <td style = "padding-left:20px;text-align:right;"><font size = "1">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>
                       <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
-                  </tr>
-        {/if}
-    {/foreach}
-          <tr>
-      <td colspan = "3"></td>
-      <td colspan = "2"><hr></hr></td>
-    </tr>
-
-          <tr>
-      <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>
-    </tr>
-
-    {if $is_pay_later == 0}
-            <tr>
-        <td colspan = "3"></td>
-        <td style = "padding-left:20px;text-align:right;"><font size = "1">
-           {if $contribution_status_id == $refundedStatusId}
-          {ts}LESS Amount Credited{/ts}
-           {else}
-          {ts}LESS Amount Paid{/ts}
-           {/if}
-        </font></td>
-        <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-      </tr>
-            <tr>
-        <td colspan = "3"></td>
-        <td colspan = "2" ><hr></hr></td>
-      </tr>
-            <tr>
-        <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>
-      </tr>
-    {/if}
-    <br/><br/><br/>
-          <tr>
-      <td colspan = "3"></td>
-    </tr>
-    {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
-      <tr>
-        <td><b><font size = "1" align = "center">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>
-        <td colspan = "3"></td>
-      </tr>
-    {/if}
+                </tr>
+              {/if}
+              {/foreach}
+              <tr>
+                <td colspan = "3"></td>
+                <td colspan = "2"><hr></hr></td>
+              </tr>
+              <tr>
+                <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>
+              </tr>
+              {if $is_pay_later == 0}
+                <tr>
+                  <td colspan = "3"></td>
+                  <td style = "padding-left:20px;text-align:right;"><font size = "1">
+                    {if $contribution_status_id == $refundedStatusId}
+                      {ts}LESS Amount Credited{/ts}
+                    {else}
+                      {ts}LESS Amount Paid{/ts}
+                    {/if}
+                    </font>
+                  </td>
+                  <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+                </tr>
+                <tr>
+                  <td colspan = "3"></td>
+                  <td colspan = "2" ><hr></hr></td>
+                </tr>
+                <tr>
+                  <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>
+                </tr>
+              {/if}
+              <br/><br/><br/>
+              <tr>
+                <td colspan = "3"></td>
+              </tr>
+              {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
+                <tr>
+                  <td><b><font size = "1" align = "center">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>
+                  <td colspan = "3"></td>
+                </tr>
+              {/if}
             </table>
           </td>
         </tr>
       </table>
-      <table style = "margin-top:5px;padding-right:45px;">
-        <tr>
-          <td><img src = "{$resourceBase}/i/contribute/cut_line.png" height = "15" width = "630"></td>
-        </tr>
-      </table>
-  <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "480" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
-    <tr>
-      <td width="60%"><b><font size = "4" align = "right">{ts}PAYMENT ADVICE{/ts}</font></b> <br/><br/> <font size = "1" align = "right"><b>{ts}To: {/ts}</b>      <div style="width:17em;word-wrap:break-word;">
-    {$domain_organization} <br />
-    {$domain_street_address} {$domain_supplemental_address_1} <br />
-    {$domain_supplemental_address_2} {$domain_state} <br />
-    {$domain_city} {$domain_postal_code} <br />
-    {$domain_country} <br />
-    {$domain_phone} <br />
-    {$domain_email}</div>
-    </font><br/><br/><font size="1" align="right">{$notes}</font>
+      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
+        <table style = "margin-top:5px;padding-right:45px;">
+          <tr>
+            <td><img src = "{$resourceBase}/i/contribute/cut_line.png" height = "15" width = "630"></td>
+          </tr>
+        </table>
+        <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "480" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
+          <tr>
+            <td width="60%"><b><font size = "4" align = "right">{ts}PAYMENT ADVICE{/ts}</font></b> <br/><br/> <font size = "1" align = "right"><b>{ts}To: {/ts}</b><div style="width:17em;word-wrap:break-word;">
+              {$domain_organization} <br />
+              {$domain_street_address} {$domain_supplemental_address_1} <br />
+              {$domain_supplemental_address_2} {$domain_state} <br />
+              {$domain_city} {$domain_postal_code} <br />
+              {$domain_country} <br />
+              {$domain_phone} <br />
+              {$domain_email}</div>
+              </font><br/><br/><font size="1" align="right">{$notes}</font>
             </td>
             <td width="40%">
-        <table  cellpadding = "-10" cellspacing = "22"  align="right" >
-    <tr>
-            <td  colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Customer: {/ts}</font></td>
-      <td ><font size = "1" align = "right">{$display_name}</font></td>
-    </tr>
-    <tr>
-      <td colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Invoice Number: {/ts}</font></td>
-      <td><font size = "1" align = "right">{$invoice_id}</font></td>
-    </tr>
-    <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
-    {if $is_pay_later == 1}
-    <tr>
+              <table  cellpadding = "-10" cellspacing = "22"  align="right" >
+                <tr>
                   <td colspan = "2"></td>
-                  <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
-    </tr>
-    {else}
-    <tr>
-      <td colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Amount Due: {/ts}</font></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
-    </tr>
-    {/if}
-    <tr>
-      <td colspan = "2"></td>
-      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
-        <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Due Date:  {/ts}</font></td>
-        <td><font size = "1" align = "right">{$dueDate}</font></td>
-      {/if}
-    </tr>
-    <tr>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Customer: {/ts}</font></td>
+                  <td ><font size = "1" align = "right">{$display_name}</font></td>
+                </tr>
+                <tr>
+                  <td colspan = "2"></td>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Invoice Number: {/ts}</font></td>
+                  <td><font size = "1" align = "right">{$invoice_id}</font></td>
+                </tr>
+                <tr><td colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
+                {if $is_pay_later == 1}
+                  <tr>
+                    <td colspan = "2"></td>
+                    <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
+                    <td><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+                  </tr>
+                {else}
+                  <tr>
+                    <td colspan = "2"></td>
+                    <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Amount Due: {/ts}</font></td>
+                    <td><font size = "1" align = "right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
+                  </tr>
+                {/if}
+                <tr>
+                  <td colspan = "2"></td>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Due Date:  {/ts}</font></td>
+                  <td><font size = "1" align = "right">{$dueDate}</font></td>
+                </tr>
+                <tr>
                   <td colspan = "5" style = "color:#F5F5F5;"><hr></hr></td>
                 </tr>
-        </table>
+              </table>
             </td>
-    </tr>
-  </table>
-
+          </tr>
+        </table>
+      {/if}
 
       {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>
-      </tr>
-    </table>
+        <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>
+          </tr>
+        </table>
     <center>
 
       <table style = "padding-right:19px;font-family: Arial, Verdana, sans-serif" width = "500" height = "100" border = "0" cellpadding = "2" cellspacing = "1">
-  <tr>
+        <tr>
           <td style = "padding-left:15px;" ><b><font size = "4" align = "center">{ts}CREDIT NOTE{/ts}</font></b></td>
           <td colspan = "1"></td>
           <td style = "padding-left:70px;"><b><font size = "1" align = "right">{ts}Date:{/ts}</font></b></td>
           <td><font size = "1" align = "right">{$domain_organization}</font></td>
-  </tr>
+        </tr>
         <tr>
-         {if $organization_name}
-           <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}  ({$organization_name})</font></td>
-           {else}
-           <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}</font></td>
-         {/if}
-         <td colspan = "1"></td>
-         <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
-   <td ><font size = "1" align = "right">
-  {if $domain_street_address }
-    {$domain_street_address}
-  {/if}
-  {if $domain_supplemental_address_1 }
-    {$domain_supplemental_address_1}
-  {/if}</font></td>
-  </tr>
+          {if $organization_name}
+            <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}  ({$organization_name})</font></td>
+          {else}
+            <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}</font></td>
+          {/if}
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_street_address }{$domain_street_address}{/if}
+              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
+            </font>
+          </td>
+        </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$street_address}   {$supplemental_address_1}</font></td>
           <td colspan = "1"></td>
           <td style = "padding-left:70px;"><b><font size = "1" align = "right">{ts}Credit Note Number:{/ts}</font></b></td>
-          <td><font size = "1" align = "right">{if $domain_supplemental_address_2 }
-    {$domain_supplemental_address_2}
-        {/if}
-        {if $domain_state }
-    {$domain_state}
-        {/if}
-    </font></td>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}
+              {if $domain_state }{$domain_state}{/if}
+            </font>
+          </td>
         </tr>
         <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
           <td colspan="1"></td>
           <td style = "padding-left:70px;"><font size = "1" align = "right">{$creditnote_id}</font></td>
-    <td ><font size = "1" align = "right">{if $domain_city}
-     {$domain_city}
-         {/if}
-         {if $domain_postal_code }
-     {$domain_postal_code}
-         {/if}
-    </font></td>
-  </tr>
-  <tr>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_city}{$domain_city}{/if}
+              {if $domain_postal_code }{$domain_postal_code}{/if}
+            </font>
+          </td>
+        </tr>
+        <tr>
           <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>
           <td colspan="1"></td>
           <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">{ts}Reference:{/ts}</font></b></td>
-    <td><font size = "1" align = "right"> {if $domain_country}
-    {$domain_country}
-        {/if}</font></td>
-  </tr>
-  <tr>
+          <td>
+            <font size = "1" align = "right">
+              {if $domain_country}{$domain_country}{/if}
+            </font>
+          </td>
+        </tr>
+        <tr>
           <td></td>
           <td></td>
           <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
-    <td><font size = "1" align = "right"> {if $domain_phone}
-    {$domain_phone}
-         {/if}</font> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td><font size = "1" align = "right"> {if $domain_email}
-    {$domain_email}
-        {/if}</font> </td>
-  </tr>
+          <td>
+            <font size = "1" align = "right"> 
+              {if $domain_phone}{$domain_phone}{/if}
+            </font>
+          </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>
+            <font size = "1" align = "right"> 
+              {if $domain_email}{$domain_email}{/if}
+            </font> 
+          </td>
+        </tr>
       </table>
 
       <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">
-  <tr>
+        <tr>
           <td colspan = "2" {$valueStyle}>
             <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
               <tr>
@@ -322,116 +336,122 @@
                 <th style = "padding-left:28px;text-align:right;font-weight:bold;"><font size = "1">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>
               </tr>
               {foreach from=$lineItem item=value key=priceset name=pricevalue}
-    {if $smarty.foreach.pricevalue.index eq 0}
-          <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
-    {else}
-    <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-    {/if}
+                {if $smarty.foreach.pricevalue.index eq 0}
+                  <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
+                {else}
+                  <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+                {/if}
                 <tr>
-                  <td style ="text-align:left;"  ><font size = "1">
-      {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
-      </font></td>
-      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
-      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
-        {if $value.tax_amount != ''}
-          <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.tax_rate}%</font></td>
-                    {else}
-          <td style = "padding-left:28px;text-align:right"><font size = "1" >{ts 1=$taxTerm}No %1{/ts}</font></td>
+                  <td style ="text-align:left;"  >
+                    <font size = "1">
+                      {if $value.html_type eq 'Text'}
+                        {$value.label}
+                      {else}
+                        {$value.field_title} - {$value.label}
+                      {/if} 
+                      {if $value.description}
+                        <div>{$value.description|truncate:30:"..."}</div>
+                      {/if}
+                    </font>
+                  </td>
+                  <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
+                  <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
+                  {if $value.tax_amount != ''}
+                    <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.tax_rate}%</font></td>
+                  {else}
+                    <td style = "padding-left:28px;text-align:right"><font size = "1" >{ts 1=$taxTerm}No %1{/ts}</font></td>
+                  {/if}
+                  <td style = "padding-left:28px;text-align:right;"><font size = "1" >{$value.subTotal|crmMoney:$currency}</font></td>
+                </tr>
+              {/foreach}
+              <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+              <tr>
+                <td colspan = "3"></td>
+                <td style = "padding-left:28px;text-align:right;"><font size = "1">{ts}Sub Total{/ts}</font></td>
+                <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
+              </tr>
+              {foreach from = $dataArray item = value key = priceset}
+                <tr>
+                  <td colspan = "3"></td>
+                  {if $priceset}
+                    <td style = "padding-left:28px;text-align:right;"><font size = "1"> {ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>
+                    <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+                  {elseif $priceset == 0}
+                    <td style = "padding-left:28px;text-align:right;"><font size = "1">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>
+                    <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+                </tr>
+                {/if}
+              {/foreach}
+              <tr>
+                <td colspan = "3"></td>
+                <td colspan = "2"><hr></hr></td>
+              </tr>
+              <tr>
+                <td colspan = "3"></td>
+                <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
+                <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+              </tr>
+              {if $is_pay_later == 0}
+                <tr>
+                  <td colspan = "3"></td>
+                  <td style = "padding-left:28px;text-align:right;"><font size = "1" >{ts}LESS Credit to invoice(s){/ts}</font></td>
+                  <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+                </tr>
+                <tr>
+                  <td colspan = "3"></td>
+                  <td colspan = "2" ><hr></hr></td>
+                </tr>
+                <tr>
+                  <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>
+                </tr>
               {/if}
-       <td style = "padding-left:28px;text-align:right;"><font size = "1" >{$value.subTotal|crmMoney:$currency}</font></td>
-    </tr>
-                {/foreach}
-          <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
-          <tr>
-      <td colspan = "3"></td>
-      <td style = "padding-left:28px;text-align:right;"><font size = "1">{ts}Sub Total{/ts}</font></td>
-      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
-    </tr>
-    {foreach from = $dataArray item = value key = priceset}
-            <tr>
-        <td colspan = "3"></td>
-        {if $priceset}
-          <td style = "padding-left:28px;text-align:right;"><font size = "1"> {ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>
-          <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
-                    {elseif $priceset == 0}
-                      <td style = "padding-left:28px;text-align:right;"><font size = "1">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>
-                      <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
-                  </tr>
-        {/if}
-    {/foreach}
-          <tr>
-      <td colspan = "3"></td>
-      <td colspan = "2"><hr></hr></td>
-    </tr>
-
-          <tr>
-      <td colspan = "3"></td>
-      <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
-      <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-    </tr>
-
-    {if $is_pay_later == 0}
-            <tr>
-        <td colspan = "3"></td>
-        <td style = "padding-left:28px;text-align:right;"><font size = "1" >{ts}LESS Credit to invoice(s){/ts}</font></td>
-        <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
-      </tr>
-            <tr>
-        <td colspan = "3"></td>
-        <td colspan = "2" ><hr></hr></td>
-      </tr>
-            <tr>
-        <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>
-      </tr>
-    {/if}
-    <br/><br/><br/>
-          <tr>
-      <td colspan = "3"></td>
-    </tr>
-          <tr>
-      <td></td>
-      <td colspan = "3"></td>
-    </tr>
+              <br/><br/><br/>
+              <tr>
+                <td colspan = "3"></td>
+              </tr>
+              <tr>
+                <td></td>
+                <td colspan = "3"></td>
+              </tr>
             </table>
           </td>
         </tr>
       </table>
-
       <table style = "margin-top:5px;padding-right:45px;">
         <tr>
           <td><img src = "{$resourceBase}/i/contribute/cut_line.png" height = "15" width = "630"></td>
         </tr>
       </table>
 
-  <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "507" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
-    <tr>
-      <td width="60%"><font size = "4" align = "right"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div  style="font-size:10px;max-width:300px;">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>
-      <td width="40%">
-              <table    align="right" >
-    <tr>
-            <td colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Customer:{/ts} </font></td>
-      <td><font size = "1" align = "right" >{$display_name}</font></td>
-    </tr>
-    <tr>
-      <td colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Credit Note#:{/ts} </font></td>
-      <td><font size = "1" align = "right">{$creditnote_id}</font></td>
-    </tr>
-    <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
-    <tr>
-                  <td colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Credit Amount:{/ts}</font></td>
-      <td width='50px'><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
-    </tr>
-              </table>
-            </td>
-    </tr>
-  </table>
- {/if}
+      <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "507" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
+        <tr>
+          <td width="60%"><font size = "4" align = "right"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div  style="font-size:10px;max-width:300px;">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>
+          <td width="40%">
+            <table    align="right" >
+              <tr>
+                <td colspan = "2"></td>
+                <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Customer:{/ts} </font></td>
+                <td><font size = "1" align = "right" >{$display_name}</font></td>
+              </tr>
+              <tr>
+                <td colspan = "2"></td>
+                <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Credit Note#:{/ts} </font></td>
+                <td><font size = "1" align = "right">{$creditnote_id}</font></td>
+              </tr>
+              <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
+              <tr>
+                <td colspan = "2"></td>
+                <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Credit Amount:{/ts}</font></td>
+                <td width='50px'><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    {/if}
     </center>
   </body>
 </html>