From 0d16f521feb16628cbbb12d6f0ea65f6ecac3151 Mon Sep 17 00:00:00 2001 From: monishdeb Date: Thu, 3 Jul 2014 21:43:05 +0530 Subject: [PATCH] CRM-14913 fix - merging contacts does not change contact_id in financial_item table. https://issues.civicrm.org/jira/browse/CRM-14913 --- CRM/Dedupe/Merger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 3faa547bd4..8504ef34f0 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -202,6 +202,7 @@ class CRM_Dedupe_Merger { 'civicrm_contribution_page' => array('created_id'), 'civicrm_contribution_recur' => array('contact_id'), 'civicrm_contribution_soft' => array('contact_id'), + 'civicrm_financial_item' => array('contact_id'), 'civicrm_custom_group' => array('created_id'), 'civicrm_entity_tag' => array('entity_id'), 'civicrm_event' => array('created_id'), @@ -1535,7 +1536,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m */ static function getContactFields() { $contactFields = CRM_Contact_DAO_Contact::fields(); - $invalidFields = array('api_key', 'contact_is_deleted', 'created_date', 'display_name', 'hash', 'id', 'modified_date', + $invalidFields = array('api_key', 'contact_is_deleted', 'created_date', 'display_name', 'hash', 'id', 'modified_date', 'primary_contact_id', 'sort_name', 'user_unique_id'); foreach ($contactFields as $field => $value) { if (in_array($field, $invalidFields)) { @@ -1578,4 +1579,3 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m } } } - -- 2.25.1