From: monishdeb Date: Thu, 3 Jul 2014 16:13:05 +0000 (+0530) Subject: CRM-14913 fix - merging contacts does not change contact_id in financial_item table. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d16f521feb16628cbbb12d6f0ea65f6ecac3151;p=civicrm-core.git CRM-14913 fix - merging contacts does not change contact_id in financial_item table. https://issues.civicrm.org/jira/browse/CRM-14913 --- 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 } } } -