Merge branch 'Emails_records_from_activity' into 'master'

Fixes #976 Emails records deletion during migration is addressed

Deletion of emails records during migration has been addressed.

See merge request !547

modules/Migration/schema/660_to_700.php

@@ -2215,7 +2215,10 @@ if(defined('VTIGER_UPGRADE')) {
 					}
 				}
 			}
-			$db->pquery("DELETE FROM $baseTableName WHERE $baseTableIndex NOT IN (SELECT crmid FROM vtiger_crmentity WHERE setype=?)", array($moduleName));
+            if($baseTableName == 'vtiger_activity'){
+                array_push($moduleName, "Emails");
+            }
+			$db->pquery("DELETE FROM $baseTableName WHERE $baseTableIndex NOT IN (SELECT crmid FROM vtiger_crmentity WHERE setype in ". generateQuestionMarks($moduleName).")", array($moduleName));
 		}
 	}