diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl index b836f5440ba..f1ee2a2a8cc 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl @@ -8,99 +8,99 @@ - +


- +
- {if $contribution_status_id == $refundedStatusId} - - {else} - - {/if} + + + - {if $contribution_status_id == $refundedStatusId} - - {else} - - {/if} - + + + + {if $organization_name} - + {else} - + {/if} - + - {if $contribution_status_id == $refundedStatusId} - - {else} - {/if} + - + - + - + + + + + +
CREDIT NOTETAX INVOICETAX INVOICEDate:Invoice Date:{$organization_name}Invoice Date:{$organization_name}
{$display_name} ({$organization_name}){$display_name} ({$organization_name}){$display_name}{$display_name} {$invoice_date}
{$street_address} {$supplemental_address_1}{$street_address} {$supplemental_address_1} Credit Note Number:Incoice Number:
{$supplemental_address_2} {$stateProvinceAbbreviation}{$supplemental_address_2} {$stateProvinceAbbreviation} {$invoice_id}
{$city} {$postal_code}{$city} {$postal_code} Reference: {$title}Reference:
{$title}
- +
{* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - + + + + + - {foreach from=$lineItem item=value key=priceset} - + {foreach from=$lineItem item=value key=priceset name=taxpricevalue} + {if $smarty.foreach.taxpricevalue.index eq 0} + + {else} + + {/if} - - - - {if $value.tax_rate} - - {elseif $value.tax_amount != ''} - + + + {if $value.tax_amount != ''} + {else} - + {/if} - + {/foreach} - - + + {foreach from = $dataArray item = value key = priceset} {if $priceset} - - + + {elseif $priceset == 0} - - + + {/if} {/foreach} @@ -111,19 +111,23 @@ - - + + {if $is_pay_later == 0} - {if $contribution_status_id == $refundedStatusId} - - {else} - - {/if} - + + + + @@ -131,14 +135,11 @@ - {if $contribution_status_id == $refundedStatusId} - - - {else} - - - {/if} - + + + + + {/if}


@@ -146,11 +147,9 @@ - {if $contribution_status_id == $refundedStatusId} - - {else} + - {/if} +
Description
Quantity
Unit Price
VAT
Amount {$defaultCurrency}
DescriptionQuantityUnit Price{$taxTerm} Amount {$defaultCurrency}
+ {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} 		{$value.qty} {$value.unit_price|crmMoney:$currency}
{$value.tax_rate}%
VAT (exempt)
 {$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%
No VAT
No {$taxTerm}{$value.subTotal|crmMoney:$currency}{$value.subTotal|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}Sub Total {$subTotal|crmMoney:$currency}
TOTAL VAT {$priceset}%{$value|crmMoney:$currency} TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency} TOTAL NO VAT{$value|crmMoney:$currency} TOTAL NO {$taxTerm}{$value|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
LESS Credit to invoice(s)LESS Amount Paid{$amount|crmMoney:$currency} + {if $contribution_status_id == $refundedStatusId} + LESS Amount Credited + {else} + LESS Amount Paid + {/if} + {$amount|crmMoney:$currency}
REMAINING CREDIT{$amountDue|crmMoney:$currency}AMOUNT DUE: {$amountDue|crmMoney:$currency}AMOUNT DUE: {$amountDue|crmMoney:$currency}
DUE DATE: {$dueDate}
@@ -163,68 +162,40 @@
- - {if $contribution_status_id == $refundedStatusId} - - - - - -
CREDIT ADVICE

{$notes}		 - - - - - - - - - - - - - - - - - -
Customer: {$display_name}
Credit Note#: {$invoice_id}
Credit Amount:{$amount|crmMoney:$currency}
-
- {else} - +
-
PAYMENT ADVICE

To: - {$organization_name}

{$notes} + 		PAYMENT ADVICE

To: + {$organization_name}

{$notes} 		- +
- - + + - + {if $is_pay_later == 1} - - + + {else} - - + + {/if} - + @@ -234,7 +205,191 @@
Customer: {$display_name}Customer: {$display_name}
Invoice Number: Invoice Number: {$invoice_id}
Amount Due:{$amount|crmMoney:$currency}Amount Due:{$amount|crmMoney:$currency}
Amount Due: {$amountDue|crmMoney:$currency}Amount Due: {$amountDue|crmMoney:$currency}
Due Date: Due Date: {$dueDate}
- {/if} + + + {if $contribution_status_id == $refundedStatusId} + + + + +
+
+

+ + + + + + + + + + + + + + {if $organization_name} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + +
CREDIT NOTEDate:{$organization_name}
{$display_name} ({$organization_name}){$display_name}{$invoice_date}
{$street_address} {$supplemental_address_1}Credit Note Number:
{$supplemental_address_2} {$stateProvinceAbbreviation}{$creditnote_id}
{$city} {$postal_code}Reference:
{$title}
+ + + + + +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + + + + {foreach from=$lineItem item=value key=priceset name=pricevalue} + {if $smarty.foreach.pricevalue.index eq 0} + + {else} + + {/if} + + + + + {if $value.tax_amount != ''} + + {else} + + {/if} + + + {/foreach} + + + + + + + {foreach from = $dataArray item = value key = priceset} + + + {if $priceset} + + + {elseif $priceset == 0} + + + + {/if} + {/foreach} + + + + + + + + + + + + {if $is_pay_later == 0} + + + + + + + + + + + + + + + + + + + + {/if} +


+ + + + + + + + + +
DescriptionQuantityUnit Price{$taxTerm} Amount {$defaultCurrency}
+ {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} + 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%No {$taxTerm}{$value.subTotal|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}
TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency} TOTAL NO {$taxTerm}{$value|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
LESS Credit to invoice(s){$amount|crmMoney:$currency}
REMAINING CREDIT{$amountDue|crmMoney:$currency}
+
+ + + + + +
+ + + + + + + +
CREDIT ADVICE

Please do not pay on this advice. Deduct the amount of this Credit Note +from your next payment to us

{$notes}		 + + + + + + + + + + + + + + + + + +
Customer: {$display_name}
Credit Note#: {$creditnote_id}
Credit Amount:{$amount|crmMoney:$currency}
+
+ {/if}
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl index 76c4843dfd9..f1ee2a2a8cc 100644 --- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl @@ -12,95 +12,95 @@


- +
- {if $contribution_status_id == $refundedStatusId} - - {else} - - {/if} + + + - {if $contribution_status_id == $refundedStatusId} - - {else} - - {/if} - + + + + {if $organization_name} - + {else} - + {/if} - + - {if $contribution_status_id == $refundedStatusId} - - {else} - {/if} + - + - + - + + + + + +
CREDIT NOTETAX INVOICETAX INVOICEDate:Invoice Date:{$organization_name}Invoice Date:{$organization_name}
{$display_name} ({$organization_name}){$display_name} ({$organization_name}){$display_name}{$display_name} {$invoice_date}
{$street_address} {$supplemental_address_1}{$street_address} {$supplemental_address_1} Credit Note Number:Incoice Number:
{$supplemental_address_2} {$stateProvinceAbbreviation}{$supplemental_address_2} {$stateProvinceAbbreviation} {$invoice_id}
{$city} {$postal_code}{$city} {$postal_code} Reference: {$title}Reference:
{$title}
- +
{* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - + + + + + - {foreach from=$lineItem item=value key=priceset} - + {foreach from=$lineItem item=value key=priceset name=taxpricevalue} + {if $smarty.foreach.taxpricevalue.index eq 0} + + {else} + + {/if} - - - - {if $value.tax_rate} - - {elseif $value.tax_amount != ''} - + + + {if $value.tax_amount != ''} + {else} - + {/if} - + {/foreach} - - + + {foreach from = $dataArray item = value key = priceset} {if $priceset} - - + + {elseif $priceset == 0} - - + + {/if} {/foreach} @@ -111,19 +111,23 @@ - - + + {if $is_pay_later == 0} - {if $contribution_status_id == $refundedStatusId} - - {else} - - {/if} - + + + + @@ -131,14 +135,11 @@ - {if $contribution_status_id == $refundedStatusId} - - - {else} - - - {/if} - + + + + + {/if}


@@ -146,11 +147,9 @@ - {if $contribution_status_id == $refundedStatusId} - - {else} + - {/if} +
Description
Quantity
Unit Price
VAT
Amount {$defaultCurrency}
DescriptionQuantityUnit Price{$taxTerm} Amount {$defaultCurrency}
+ {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} 		{$value.qty} {$value.unit_price|crmMoney:$currency}
{$value.tax_rate}%
VAT (exempt)
 {$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%
No VAT
No {$taxTerm}{$value.subTotal|crmMoney:$currency}{$value.subTotal|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}Sub Total {$subTotal|crmMoney:$currency}
TOTAL VAT {$priceset}%{$value|crmMoney:$currency} TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency} TOTAL NO VAT{$value|crmMoney:$currency} TOTAL NO {$taxTerm}{$value|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
LESS Credit to invoice(s)LESS Amount Paid{$amount|crmMoney:$currency} + {if $contribution_status_id == $refundedStatusId} + LESS Amount Credited + {else} + LESS Amount Paid + {/if} + {$amount|crmMoney:$currency}
REMAINING CREDIT{$amountDue|crmMoney:$currency}AMOUNT DUE: {$amountDue|crmMoney:$currency}AMOUNT DUE: {$amountDue|crmMoney:$currency}
DUE DATE: {$dueDate}
@@ -163,68 +162,40 @@
- - {if $contribution_status_id == $refundedStatusId} - - - - - -
CREDIT ADVICE

{$notes}		 - - - - - - - - - - - - - - - - - -
Customer: {$display_name}
Credit Note#: {$invoice_id}
Credit Amount:{$amount|crmMoney:$currency}
-
- {else} - +
-
PAYMENT ADVICE

To: - {$organization_name}

{$notes} + 		PAYMENT ADVICE

To: + {$organization_name}

{$notes} 		- +
- - + + - + {if $is_pay_later == 1} - - + + {else} - - + + {/if} - + @@ -234,7 +205,191 @@
Customer: {$display_name}Customer: {$display_name}
Invoice Number: Invoice Number: {$invoice_id}
Amount Due:{$amount|crmMoney:$currency}Amount Due:{$amount|crmMoney:$currency}
Amount Due: {$amountDue|crmMoney:$currency}Amount Due: {$amountDue|crmMoney:$currency}
Due Date: Due Date: {$dueDate}
- {/if} + + + {if $contribution_status_id == $refundedStatusId} + + + + +
+
+

+ + + + + + + + + + + + + + {if $organization_name} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + +
CREDIT NOTEDate:{$organization_name}
{$display_name} ({$organization_name}){$display_name}{$invoice_date}
{$street_address} {$supplemental_address_1}Credit Note Number:
{$supplemental_address_2} {$stateProvinceAbbreviation}{$creditnote_id}
{$city} {$postal_code}Reference:
{$title}
+ + + + + +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + + + + {foreach from=$lineItem item=value key=priceset name=pricevalue} + {if $smarty.foreach.pricevalue.index eq 0} + + {else} + + {/if} + + + + + {if $value.tax_amount != ''} + + {else} + + {/if} + + + {/foreach} + + + + + + + {foreach from = $dataArray item = value key = priceset} + + + {if $priceset} + + + {elseif $priceset == 0} + + + + {/if} + {/foreach} + + + + + + + + + + + + {if $is_pay_later == 0} + + + + + + + + + + + + + + + + + + + + {/if} +


+ + + + + + + + + +
DescriptionQuantityUnit Price{$taxTerm} Amount {$defaultCurrency}
+ {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} + 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%No {$taxTerm}{$value.subTotal|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}
TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency} TOTAL NO {$taxTerm}{$value|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
LESS Credit to invoice(s){$amount|crmMoney:$currency}
REMAINING CREDIT{$amountDue|crmMoney:$currency}
+
+ + + + + +
+ + + + + + + +
CREDIT ADVICE

Please do not pay on this advice. Deduct the amount of this Credit Note +from your next payment to us

{$notes}		 + + + + + + + + + + + + + + + + + +
Customer: {$display_name}
Credit Note#: {$creditnote_id}
Credit Amount:{$amount|crmMoney:$currency}
+
+ {/if}