[Vtigercrm-commits] [vtiger-commits] r7178 - in /vtigercrm/trunk/modules/Accounts: Account.php ListViewTop.php Merge.php Popup_picker.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: don
Date: Fri Jun 16 03:48:00 2006
New Revision: 7178

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Accounts/ListViewTop.php
    vtigercrm/trunk/modules/Accounts/Merge.php
    vtigercrm/trunk/modules/Accounts/Popup_picker.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Fri Jun 16 03:48:00 2006
@@ -38,7 +38,7 @@
 	var $log;
 	var $db;
 
-	var $table_name = "account";
+	var $table_name = "vtiger_account";
 	var $tab_name = Array('vtiger_crmentity','vtiger_account','vtiger_accountbillads','vtiger_accountshipads','vtiger_accountscf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_account'=>'accountid','vtiger_accountbillads'=>'accountaddressid','vtiger_accountshipads'=>'accountaddressid','vtiger_accountscf'=>'accountid');
 
@@ -258,8 +258,8 @@
 				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
 			WHERE vtiger_seactivityrel.crmid = ".$id."
 			AND (activitytype='Task'
-				OR vtiger_activitytype='Call'
-				OR vtiger_activitytype='Meeting')
+				OR activitytype='Call'
+				OR activitytype='Meeting')
 			AND vtiger_crmentity.deleted = 0
 			AND ((vtiger_activity.status IS NOT NULL
 					AND vtiger_activity.status != 'Completed')
@@ -669,7 +669,7 @@
 	{
 		global $log;
                 $log->debug("Entering getColumnNames_Acnt() method ...");
-		$sql1 = "SELECT vtiger_fieldlabel FROM vtiger_field WHERE vtiger_tabid = 6";
+		$sql1 = "SELECT fieldlabel FROM vtiger_field WHERE tabid = 6";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Fri Jun 16 03:48:00 2006
@@ -21,7 +21,7 @@
  ********************************************************************************/
 function getTopAccounts()
 {
-	$log = LoggerManager::getLogger('top vtiger_accounts_list');
+	$log = LoggerManager::getLogger('top accounts_list');
 	$log->debug("Entering getTopAccounts() method ...");
 	require_once("data/Tracker.php");
 	require_once('modules/Potentials/Opportunity.php');

Modified: vtigercrm/trunk/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Merge.php (original)
+++ vtigercrm/trunk/modules/Accounts/Merge.php Fri Jun 16 03:48:00 2006
@@ -87,7 +87,7 @@
 if(count($deleted_id) > 0)
 {
 	$deleted_id = implode(",",$deleted_id);
-	$update_query = "update vtiger_contactdetails set vtiger_accountid = 0 where contactid in (".$deleted_id.")";
+	$update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")";
 	$result = $adb->query($update_query);
 }
 //End setting vtiger_accountid=0 for the contacts which are deleted
@@ -209,7 +209,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Accounts/Popup_picker.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Popup_picker.php (original)
+++ vtigercrm/trunk/modules/Accounts/Popup_picker.php Fri Jun 16 03:48:00 2006
@@ -99,9 +99,9 @@
 if($_REQUEST['form'] == 'TasksEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -113,9 +113,9 @@
 elseif($_REQUEST['form'] == 'HelpDeskEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -127,8 +127,8 @@
 elseif(isset($_REQUEST['form_submit']) && $_REQUEST['form'] == 'AccountDetailView' && $_REQUEST['form_submit'] == 'true')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.DetailView.member_id.value = vtiger_account_id; \n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.DetailView.member_id.value = account_id; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_module.value = window.opener.document.DetailView.module.value; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_id.value = window.opener.document.DetailView.record.value; \n";
@@ -144,9 +144,9 @@
 elseif ($_REQUEST['form'] == 'EditView') 
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.account_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.account_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.account_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.account_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";