diff --git a/templates/CRM/Financial/ExportFormat/IIF.tpl b/templates/CRM/Financial/ExportFormat/IIF.tpl
index 1ca972a0af6411d907650f73a868daf0d1945f3d..9c28635e293867cf41544105360eea5385ee3a91 100644
--- a/templates/CRM/Financial/ExportFormat/IIF.tpl
+++ b/templates/CRM/Financial/ExportFormat/IIF.tpl
@@ -39,7 +39,7 @@ character. And watch out for editors that add spaces/tabs at the end of lines.
{assign var='tabchar' value=9|chr}
{if !empty($accounts)}
!ACCNT{$tabchar}NAME{$tabchar}REFNUM{$tabchar}TIMESTAMP{$tabchar}ACCNTTYPE{$tabchar}OBAMOUNT{$tabchar}DESC{$tabchar}ACCNUM
-{* I don't think we need these fields - SCD BANKNUM EXTRA HIDDEN DELCOUNT USEID WKPAPERREF
+{* I don't think we need these fields - SCD BANKNUM EXTRA HIDDEN DELCOUNT USEID WKPAPERREF
*}
{foreach from=$accounts key=account_id item=acct}
diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index c9638ddd628e8404642af42641eb579d91257af8..8be7dd060f129e5919ab0a728bae7536ab145e07 100644
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -96,10 +96,10 @@
<th class="crm-contact-type"></th>
<th class="crm-contact-name">{ts}Name{/ts}</th>
<th class="crm-amount">{ts}Amount{/ts}</th>
- <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
+ <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
<th class="crm-received">{ts}Received{/ts}</th>
<th class="crm-payment-method">{ts}Pay Method{/ts}</th>
- <th class="crm-status">{ts}Status{/ts}</th>
+ <th class="crm-status">{ts}Status{/ts}</th>
<th class="crm-type">{ts}Financial Type{/ts}</th>
<th class="crm-transaction-links"></th>
</tr>
@@ -364,7 +364,7 @@ function bulkAssignRemove( action ) {
}
else {
CRM.alert(data.status);
- }
+ }
}, 'json');
}
</script>
diff --git a/templates/CRM/Financial/Form/FinancialBatch.tpl b/templates/CRM/Financial/Form/FinancialBatch.tpl
index 6c254c352a0ad8f7d467f1bf345acf10c2a65c6c..db78d80b32d31a94cbe8b7cc18c2842e8da35ed7 100644
--- a/templates/CRM/Financial/Form/FinancialBatch.tpl
+++ b/templates/CRM/Financial/Form/FinancialBatch.tpl
@@ -52,9 +52,9 @@
</tr>
{if $action eq 2}
<tr class="crm-contribution-form-block-contact">
- <td class="label">{ts}Created By{/ts}</td>
- <td class="html-adjust">{$contactName}</td>
- </tr>
+ <td class="label">{ts}Created By{/ts}</td>
+ <td class="html-adjust">{$contactName}</td>
+ </tr>
<tr class="crm-contribution-form-block-open_date">
<td class="label">{ts}Opened Date{/ts}</td>
<td class="html-adjust">{$created_date|crmDate}</td>
diff --git a/templates/CRM/Financial/Form/FinancialType.tpl b/templates/CRM/Financial/Form/FinancialType.tpl
index 5e3cfba567f41583fc5454c2d2e21ff4c58b3649..e85e5f6596b11c80fa68415af91688b76d3723ba 100644
--- a/templates/CRM/Financial/Form/FinancialType.tpl
+++ b/templates/CRM/Financial/Form/FinancialType.tpl
@@ -28,43 +28,43 @@
<div class="crm-block crm-form-block crm-financial_type-form-block">
{if $action eq 8}
<div class="messages status">
- <div class="icon inform-icon"></div>
+ <div class="icon inform-icon"></div>
{ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout">
<tr class="crm-contribution-form-block-name">
- <td class="label">{$form.name.label}</td>
- <td class="html-adjust">{$form.name.html}</td>
+ <td class="label">{$form.name.label}</td>
+ <td class="html-adjust">{$form.name.html}</td>
</tr>
- <tr class="crm-contribution-form-block-description">
- <td class="label">{$form.description.label}</td>
- <td class="html-adjust">{$form.description.html}</td>
+ <tr class="crm-contribution-form-block-description">
+ <td class="label">{$form.description.label}</td>
+ <td class="html-adjust">{$form.description.html}</td>
</tr>
-
+
<tr class="crm-contribution-form-block-is_deductible">
- <td class="label">{$form.is_deductible.label}</td>
- <td class="html-adjust">{$form.is_deductible.html}<br />
- <span class="description">{ts}Are contributions of this type tax-deductible?{/ts}</span>
- </td>
+ <td class="label">{$form.is_deductible.label}</td>
+ <td class="html-adjust">{$form.is_deductible.html}<br />
+ <span class="description">{ts}Are contributions of this type tax-deductible?{/ts}</span>
+ </td>
</tr>
- <tr class="crm-contribution-form-block-is_active">
- <td class="label">{$form.is_active.label}</td>
- <td class="html-adjust">{$form.is_active.html}</td>
+ <tr class="crm-contribution-form-block-is_active">
+ <td class="label">{$form.is_active.label}</td>
+ <td class="html-adjust">{$form.is_active.html}</td>
</tr>
- <tr class="crm-contribution-form-block-is_reserved">
- <td class="label">{$form.is_reserved.label}</td>
- <td class="html-adjust">{$form.is_reserved.html}</td>
+ <tr class="crm-contribution-form-block-is_reserved">
+ <td class="label">{$form.is_reserved.label}</td>
+ <td class="html-adjust">{$form.is_reserved.html}</td>
</tr>
-
- </table>
+
+ </table>
{/if}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
{if $action eq 2 or $action eq 4 } {* Update or View*}
<div class="crm-submit-buttons">
- <a href="{crmURL p='civicrm/admin/financial/financialType/accounts' q="action=browse&reset=1&aid=$aid"}" class="button"><span>{ts}View or Edit Financial Accounts{/ts}</a></span>
+ <a href="{crmURL p='civicrm/admin/financial/financialType/accounts' q="action=browse&reset=1&aid=$aid"}" class="button"><span>{ts}View or Edit Financial Accounts{/ts}</a></span>
</div>
- {/if}
+ {/if}
</div>
diff --git a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
index ec2faa118c77d97155dc7d952118d6d7ec933bb1..363d5c0fb067bb4c8de304c4cdbc0057b85be783 100644
--- a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
+++ b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl
@@ -28,24 +28,24 @@
<div class="crm-block crm-form-block crm-financial_type-form-block">
{if $action eq 8}
<div class="messages status">
- <div class="icon inform-icon"></div>
+ <div class="icon inform-icon"></div>
{ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
+
<table class="form-layout">
-
- <tr class="crm-contribution-form-block-account_relationship">
- <td class="label">{$form.account_relationship.label}</td>
- <td class="html-adjust">{$form.account_relationship.html}</td>
+
+ <tr class="crm-contribution-form-block-account_relationship">
+ <td class="label">{$form.account_relationship.label}</td>
+ <td class="html-adjust">{$form.account_relationship.html}</td>
</tr>
- <tr class="crm-contribution-form-block-financial_account_id">
- <td class="label">{$form.financial_account_id.label}</td>
- <td class="html-adjust">{$form.financial_account_id.html}</td>
+ <tr class="crm-contribution-form-block-financial_account_id">
+ <td class="label">{$form.financial_account_id.label}</td>
+ <td class="html-adjust">{$form.financial_account_id.html}</td>
</tr>
-
- </table>
+
+ </table>
{/if}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
</div>
@@ -56,112 +56,112 @@ cj("#financial_account_id").change(function()
{
{/literal}
relationID = "#account_relationship"
- financialAccountID = "#financial_account_id"
+ financialAccountID = "#financial_account_id"
callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}"
{literal}
var financialId = cj("#financial_account_id").val();
- var check = cj(relationID).val();
+ var check = cj(relationID).val();
if( check == 'select' || financialId == 'select' ){
- callbackURL = callbackURL+"&_value="+financialId;
+ callbackURL = callbackURL+"&_value="+financialId;
cj.ajax({
url: callbackURL,
context: document.body,
success: function( data, textStatus ){
- cj(relationID).html("");//clear old options
- data = eval(data);//get json array
+ cj(relationID).html("");//clear old options
+ data = eval(data);//get json array
if ( data != null ) {
- for (i = 0; i < data.length; i++) {
- if( data[i].selected == 'Selected')
- var idf = data[i].value;
- cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
- }
- }
- if( idf != null)
- cj(relationID).val(idf);
- //cj("option:first", relationID).attr( "selected", "selected" );//select first option
-
- }
- });
- if( financialId == 'select' ){
+ for (i = 0; i < data.length; i++) {
+ if( data[i].selected == 'Selected')
+ var idf = data[i].value;
+ cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
+ }
+ }
+ if( idf != null)
+ cj(relationID).val(idf);
+ //cj("option:first", relationID).attr( "selected", "selected" );//select first option
+
+ }
+ });
+ if( financialId == 'select' ){
{/literal}
-
- callbackURLs = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancial'}"
+
+ callbackURLs = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancial'}"
{literal}
- callbackURLs = callbackURLs+"&_value=select";
- cj.ajax({
+ callbackURLs = callbackURLs+"&_value=select";
+ cj.ajax({
url: callbackURLs,
context: document.body,
success: function( data, textStatus ){
- cj(financialAccountID).html("");//clear old options
- data = eval(data);//get json array
+ cj(financialAccountID).html("");//clear old options
+ data = eval(data);//get json array
if ( data != null ) {
- for (i = 0; i < data.length; i++) {
- cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
- }
- }
-
- }
- });
- }
- }
+ for (i = 0; i < data.length; i++) {
+ cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
+ }
+ }
+
+ }
+ });
+ }
+ }
});
{/literal}
{literal}
-
+
cj("#account_relationship").change(function()
{
{/literal}
- relationID = "#account_relationship"
- financialAccountID = "#financial_account_id"
+ relationID = "#account_relationship"
+ financialAccountID = "#financial_account_id"
callbackURLs = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancial'}"
{literal}
- var financialId = cj("#account_relationship").val();
- var check = cj(financialAccountID).val();
+ var financialId = cj("#account_relationship").val();
+ var check = cj(financialAccountID).val();
if( check == 'select' || financialId == 'select' ){
- callbackURLs = callbackURLs+"&_value="+financialId;
+ callbackURLs = callbackURLs+"&_value="+financialId;
cj.ajax({
url: callbackURLs,
context: document.body,
success: function( data, textStatus ){
- cj(financialAccountID).html("");//clear old options
- data = eval(data);//get json array
+ cj(financialAccountID).html("");//clear old options
+ data = eval(data);//get json array
if ( data != null ) {
- for (i = 0; i < data.length; i++) {
- cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
- }
- }
-
- }
- });
-
- if( financialId == 'select' ){
+ for (i = 0; i < data.length; i++) {
+ cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
+ }
+ }
+
+ }
+ });
+
+ if( financialId == 'select' ){
{/literal}
- callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}"
-{literal}
- callbackURL = callbackURL+"&_value=select";
- cj.ajax({
+ callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}"
+{literal}
+ callbackURL = callbackURL+"&_value=select";
+ cj.ajax({
url: callbackURL,
context: document.body,
success: function( data, textStatus ){
- cj(relationID).html("");//clear old options
- data = eval(data);//get json array
+ cj(relationID).html("");//clear old options
+ data = eval(data);//get json array
if ( data != null ) {
- for (i = 0; i < data.length; i++) {
- if( data[i].selected == 'Selected')
- var idf = data[i].value;
- cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
- }
- }
- if( idf != null)
- cj(relationID).val(idf);
- //cj("option:first", relationID).attr( "selected", "selected" );//select first option
-
- }
- });
- }
-
- }
+ for (i = 0; i < data.length; i++) {
+ if( data[i].selected == 'Selected')
+ var idf = data[i].value;
+ cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);
+ }
+ }
+ if( idf != null)
+ cj(relationID).val(idf);
+ //cj("option:first", relationID).attr( "selected", "selected" );//select first option
+
+ }
+ });
+ }
+
+ }
});
{/literal}
</script>
\ No newline at end of file
diff --git a/templates/CRM/Financial/Page/BatchTransaction.tpl b/templates/CRM/Financial/Page/BatchTransaction.tpl
index 4812c6aaa3f330acfd19fd947cd4320c997f1e78..118ad9c1d6dacff4fbd0d71f8c4af0da451d4121 100644
--- a/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -59,10 +59,10 @@
<th class="crm-contact-type"></th>
<th class="crm-contact-name">{ts}Name{/ts}</th>
<th class="crm-amount">{ts}Amount{/ts}</th>
- <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
+ <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
<th class="crm-received">{ts}Received{/ts}</th>
<th class="crm-payment-method">{ts}Pay Method{/ts}</th>
- <th class="crm-status">{ts}Status{/ts}</th>
+ <th class="crm-status">{ts}Status{/ts}</th>
<th class="crm-type">{ts}Type{/ts}</th>
<th class="crm-transaction-links"></th>
</tr>