From: Kurund Jalmi <kurund@civicrm.org>
Date: Tue, 21 May 2013 03:42:27 +0000 (-0400)
Subject: Merge branch 'CRM-12470' of git://github.com/pradpnayak/civicrm-core into pradpnayak... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=80f293e8a567748b9cdb4aefdce4272b3d93e896;p=civicrm-core.git

Merge branch 'CRM-12470' of git://github.com/pradpnayak/civicrm-core into pradpnayak-CRM-12470

Conflicts:
	CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
---

80f293e8a567748b9cdb4aefdce4272b3d93e896
diff --cc CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
index 4f1ee85ff3,fbb8167b4c..0b5acef3b7
--- a/CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
@@@ -1,24 -1,6 +1,28 @@@
 -{* placeholder file for upgrade*}
 +{* file to handle db changes in 4.3.4 during upgrade*}
 +
 +-- CRM-12466
 +INSERT INTO
 +civicrm_option_group (name, {localize field='title'}title{/localize}, is_reserved, is_active)
 +VALUES
 +('contact_smart_group_display', {localize}'{ts escape="sql"}Contact Smart Group View Options{/ts}'{/localize}, 1, 1);
 +
 +SELECT @option_group_id_csgOpt := max(id) FROM civicrm_option_group WHERE name = 'contact_smart_group_display';
 +
 +INSERT INTO
 +civicrm_option_value (option_group_id, {localize field='label'}label{/localize}, value, name, grouping, filter,
 +is_default, weight)
 +VALUES
 +(@option_group_id_csgOpt, {localize}'Show Smart Groups on Demand'{/localize}, 1, 'showondemand', NULL, 0, 0, 1),
 +(@option_group_id_csgOpt, {localize}'Always Show Smart Groups'{/localize}, 2, 'alwaysshow', NULL, 0, 0, 2),
 +(@option_group_id_csgOpt, {localize}'Hide Smart Groups'{/localize}, 3, 'hide' , NULL, 0, 0, 3);
 +
 +
 +INSERT INTO civicrm_setting
 +(domain_id, contact_id, is_domain, group_name, name, value)
 +VALUES
 +({$domainID}, NULL, 1, 'CiviCRM Preferences', 'contact_smart_group_display', '{serialize}1{/serialize}');
  
+ -- 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}');