diff --git a/layouts/v7/modules/PurchaseOrder/PopupContents.tpl b/layouts/v7/modules/PurchaseOrder/PopupContents.tpl
deleted file mode 100644
index 3bf4eb1bfee0c6bdbe21451689fc9e99fcbfab19..0000000000000000000000000000000000000000
--- a/layouts/v7/modules/PurchaseOrder/PopupContents.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.1
- * ("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.
- ************************************************************************************}
-{* modules/PurchaseOrder/views/ProductsPopupAjax.php *}
-
-{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
-<DIV>TEMPLATE: layout/modules/PurchaseOrder/PopupContents.tpl</DIV>
diff --git a/modules/Migration/schema/540_to_600RC.php b/modules/Migration/schema/540_to_600RC.php
index 8151c9fcbd0412f10c19c7f195ec9be6090b2983..96054ff69daa1364d34ebfaecd88810c2b92b899 100644
--- a/modules/Migration/schema/540_to_600RC.php
+++ b/modules/Migration/schema/540_to_600RC.php
@@ -1603,8 +1603,10 @@ foreach($entityModules as $moduleModel) {
 	$crmInstance = CRMEntity::getInstance($moduleModel->getName());
 	$tabId = $moduleModel->getId();
 	$defaultRelatedFields = $crmInstance->list_fields_name;
-	$updateQuery = 'UPDATE vtiger_field SET summaryfield=1  where tabid=? and fieldname IN ('.generateQuestionMarks($defaultRelatedFields).')';
-	Migration_Index_View::ExecuteQuery($updateQuery,  array_merge(array($tabId), array_values($defaultRelatedFields)));
+        if($defaultRelatedFields) {
+            $updateQuery = 'UPDATE vtiger_field SET summaryfield=1  where tabid=? and fieldname IN ('.generateQuestionMarks($defaultRelatedFields).')';
+            Migration_Index_View::ExecuteQuery($updateQuery,  array_merge(array($tabId), array_values($defaultRelatedFields)));
+        }
 }
 
 Migration_Index_View::ExecuteQuery('UPDATE vtiger_currencies SET currency_name = ? where currency_name = ? and currency_code = ?',