SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-05 10:18:33 +08:00
Code Issues Projects Packages Activity Actions

Merge commit '114b895b6d' into merge_develop

Browse source 
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/include/CleanCSV.php
#	public/legacy/suitecrm_version.php
#	public/legacy/tests/unit/phpunit/includes/CleanCSVTest.php
This commit is contained in:
Dillon-Brown 2021-08-30 10:18:23 +01:00
commit 33fc2ee307
182 changed files with 1220 additions and 3898 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/legacy/modules/Contacts/ShowDuplicates.php
View file

@ -85,7 +85,7 @@ $contactForm = new ContactFormBase();
$GLOBALS['check_notify'] = false;
$query = 'select id, first_name, last_name, title from contacts where deleted=0 ';
$query = 'select contacts.id, first_name, last_name, title, accounts.name, primary_address_city from contacts LEFT JOIN accounts_contacts ON contacts.id=accounts_contacts.contact_id and accounts_contacts.deleted = 0 LEFT JOIN accounts ON accounts_contacts.account_id=accounts.id AND accounts_contacts.deleted=0 AND accounts.deleted=0 where contacts.deleted=0 ';
$duplicates = $_POST['duplicate'];
$count = count($duplicates);
$db = DBManagerFactory::getInstance();
@ -98,7 +98,7 @@ if ($count > 0) {
}
$first = false;
$duplicateIdQuoted = $db->quote($duplicate_id);
$query .= "id='$duplicateIdQuoted' ";
$query .= "contacts.id='$duplicateIdQuoted' ";
}
$query .= ')';
}