From be4d57936b559181826e360ddd710efe107673e9 Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Mon, 28 Sep 2015 15:07:37 +0530 Subject: [PATCH] CRM-17169 -- Fix upgrade conflict --- CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl | 5 ----- CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl index 9665ca99c3..991a0e96de 100644 --- a/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl @@ -7,11 +7,6 @@ INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VA -- CRM-17039 - Add credit note for cancelled payments {include file='../CRM/Upgrade/4.6.9.msg_template/civicrm_msg_template.tpl'} --- Modify Instance for Soft Credit Reports - CRM-17169 -UPDATE civicrm_report_instance -SET form_values = '{literal}a:23:{s:6:"fields";a:5:{s:21:"display_name_creditor";s:1:"1";s:24:"display_name_constituent";s:1:"1";s:14:"email_creditor";s:1:"1";s:14:"phone_creditor";s:1:"1";s:6:"amount";s:1:"1";}s:5:"id_op";s:2:"in";s:8:"id_value";a:0:{}s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:10:"amount_min";s:0:"";s:10:"amount_max";s:0:"";s:9:"amount_op";s:3:"lte";s:12:"amount_value";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:20:"Soft Credit details.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}{/literal}' -WHERE report_id = 'contribute/softcredit'; - -- CRM-17258 - Add created id, owner_id to report instances. ALTER TABLE civicrm_report_instance ADD COLUMN `created_id` int(10) unsigned DEFAULT NULL COMMENT 'FK to contact table.', diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl index 840e0b6e27..e0dd79d5de 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl @@ -1,4 +1,9 @@ {* file to handle db changes in 4.7.alpha2 during upgrade *} -- CRM-17221 -UPDATE civicrm_state_province SET name = 'Phuket' WHERE name = 'Phaket'; \ No newline at end of file +UPDATE civicrm_state_province SET name = 'Phuket' WHERE name = 'Phaket'; + +-- Modify Instance for Soft Credit Reports - CRM-17169 +UPDATE civicrm_report_instance +SET form_values = '{literal}a:23:{s:6:"fields";a:5:{s:21:"display_name_creditor";s:1:"1";s:24:"display_name_constituent";s:1:"1";s:14:"email_creditor";s:1:"1";s:14:"phone_creditor";s:1:"1";s:6:"amount";s:1:"1";}s:5:"id_op";s:2:"in";s:8:"id_value";a:0:{}s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:10:"amount_min";s:0:"";s:10:"amount_max";s:0:"";s:9:"amount_op";s:3:"lte";s:12:"amount_value";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:20:"Soft Credit details.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}{/literal}' +WHERE report_id = 'contribute/softcredit'; -- 2.25.1