From e6caf38a5d94287ffd9448e77179968b02806cde Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Thu, 15 Sep 2016 15:27:14 +0530
Subject: [PATCH] Merged migration changes

---
 modules/Migration/schema/650_to_660.php |  4 ++++
 run-migration-script.php                | 14 --------------
 2 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 run-migration-script.php

diff --git a/modules/Migration/schema/650_to_660.php b/modules/Migration/schema/650_to_660.php
index 67c73f52a..5102dc71c 100644
--- a/modules/Migration/schema/650_to_660.php
+++ b/modules/Migration/schema/650_to_660.php
@@ -11,5 +11,9 @@
 if(defined('VTIGER_UPGRADE')) {
 global $adb;
 
+// Migration for - #117 - Convert lead field mapping NULL values and redundant rows
+$phoneFieldId = getFieldid(getTabid('Leads'), 'phone');
+$db->pquery('UPDATE vtiger_convertleadmapping SET editable=? WHERE leadfid=?', array(1, $phoneFieldId));
+
 }
 
diff --git a/run-migration-script.php b/run-migration-script.php
deleted file mode 100644
index 607cb506e..000000000
--- a/run-migration-script.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*+***********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- *************************************************************************************/
-
-//migration script started
-$db = PearDatabase::getInstance();
-$phoneFieldId = getFieldid(getTabid('Leads'), 'phone');
-$db->pquery('UPDATE vtiger_convertleadmapping SET editable=? WHERE leadfid=?', array(1, $phoneFieldId));
\ No newline at end of file
-- 
GitLab