From 4ae33ee60b3a90482398bb66978d3f1aa3a5e9f4 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Mon, 2 Dec 2013 16:45:19 +0530 Subject: [PATCH] -- CRM-13847, removed ts tag since we never translate civicrm_financial_account.name field. ---------------------------------------- * CRM-13847: Upgrade 4.2.14 -> 4.4.2 fails when Language set to German http://issues.civicrm.org/jira/browse/CRM-13847 --- CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl | 2 +- CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl index 20464bc508..626b50290e 100644 --- a/CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl @@ -30,7 +30,7 @@ WHERE cog.name IN ('grant_program_status', 'allocation_algorithm'); -- CRM-12470 UPDATE civicrm_financial_account SET is_default = 1 -WHERE name IN ('{ts escape="sql"}Premiums{/ts}', '{ts escape="sql"}Banking Fees{/ts}', '{ts escape="sql"}Accounts Payable{/ts}', '{ts escape="sql"}Donation{/ts}'); +WHERE name IN ('Premiums', 'Banking Fees', 'Accounts Payable', 'Donation'); SELECT @option_group_id_arel := max(id) from civicrm_option_group where name = 'account_relationship'; SELECT @option_group_id_fat := max(id) from civicrm_option_group where name = 'financial_account_type'; diff --git a/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl index fbec9a837e..a547a77f08 100644 --- a/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl @@ -543,14 +543,14 @@ ALTER TABLE civicrm_financial_type DROP accounting_code; INSERT INTO `civicrm_financial_account` (`name`, `contact_id`, `financial_account_type_id`, `description`, `accounting_code`, `account_type_code`, `is_reserved`, `is_active`, `is_deductible`, `is_default`) VALUES - ('{ts escape="sql"}Banking Fees{/ts}' , @domainContactId, @opexp, 'Payment processor fees and manually recorded banking fees', '5200', 'EXP', 0, 1, 0, 0), - ('{ts escape="sql"}Deposit Bank Account{/ts}' , @domainContactId, @opAsset, 'All manually recorded cash and cheques go to this account', '1100', 'BANK', 0, 1, 0, 1), - ('{ts escape="sql"}Accounts Receivable{/ts}' , @domainContactId, @opAsset, 'Amounts to be received later (eg pay later event revenues)', '1200', 'AR', 0, 1, 0, 0), - ('{ts escape="sql"}Accounts Payable{/ts}' , @domainContactId, @opLiability, 'Amounts to be paid out such as grants and refunds', '2200', 'AP', 0, 1, 0, 0), - ('{ts escape="sql"}Premiums{/ts}' , @domainContactId, @opCost, 'Account to record cost of premiums provided to payors', '5100', 'COGS', 0, 1, 0, 0), - ('{ts escape="sql"}Premiums Inventory{/ts}' , @domainContactId, @opAsset, 'Account representing value of premiums inventory', '1375', 'OCASSET', 0, 1, 0, 0), - ('{ts escape="sql"}Discounts{/ts}' , @domainContactId, @opval, 'Contra-revenue account for amounts discounted from sales', '4900', 'INC', 0, 1, 0, 0), - ('{ts escape="sql"}Payment Processor Account{/ts}', @domainContactId, @opAsset, 'Account to record payments into a payment processor merchant account', '1150', 'BANK', 0, 1, 0, 0); + ('Banking Fees' , @domainContactId, @opexp, 'Payment processor fees and manually recorded banking fees', '5200', 'EXP', 0, 1, 0, 0), + ('Deposit Bank Account' , @domainContactId, @opAsset, 'All manually recorded cash and cheques go to this account', '1100', 'BANK', 0, 1, 0, 1), + ('Accounts Receivable' , @domainContactId, @opAsset, 'Amounts to be received later (eg pay later event revenues)', '1200', 'AR', 0, 1, 0, 0), + ('Accounts Payable' , @domainContactId, @opLiability, 'Amounts to be paid out such as grants and refunds', '2200', 'AP', 0, 1, 0, 0), + ('Premiums' , @domainContactId, @opCost, 'Account to record cost of premiums provided to payors', '5100', 'COGS', 0, 1, 0, 0), + ('Premiums Inventory' , @domainContactId, @opAsset, 'Account representing value of premiums inventory', '1375', 'OCASSET', 0, 1, 0, 0), + ('Discounts' , @domainContactId, @opval, 'Contra-revenue account for amounts discounted from sales', '4900', 'INC', 0, 1, 0, 0), + ('Payment Processor Account', @domainContactId, @opAsset, 'Account to record payments into a payment processor merchant account', '1150', 'BANK', 0, 1, 0, 0); -- CRM-10926 SELECT @option_value_rel_id_exp := value FROM `civicrm_option_value` WHERE `option_group_id` = @option_group_id_arel AND `name` = 'Expense Account is'; -- 2.25.1