diff --git a/oss/vtiger/trunk/modules/Accounts/AccountHierarchy.php b/oss/vtiger/trunk/modules/Accounts/AccountHierarchy.php
deleted file mode 100644
index b36a408f..00000000
--- a/oss/vtiger/trunk/modules/Accounts/AccountHierarchy.php
+++ /dev/null
@@ -1,43 +0,0 @@
-assign("CATEGORY",$parent_tab);
-
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-
-$smarty->assign("MOD", $mod_strings);
-$smarty->assign("APP", $app_strings);
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH",$image_path);
-$smarty->assign("MODULE",$currentModule);
-
-$check_button = Button_Check($currentModule);
-$check_button['Import'] = 'no';
-$check_button['Export'] = 'no';
-$check_button['moduleSettings'] = 'no';
-$smarty->assign("CHECK", $check_button);
-
-$focus = CRMEntity::getInstance($currentModule);
-$accountid = vtlib_purify($_REQUEST['accountid']);
-if (!empty($accountid)) {
- $hierarchy = $focus->getAccountHierarchy($accountid);
-}
-$smarty->assign("ACCOUNT_HIERARCHY",$hierarchy);
-$smarty->display("AccountHierarchy.tpl");
-
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/Accounts.js b/oss/vtiger/trunk/modules/Accounts/Accounts.js
deleted file mode 100644
index f2a3d1b8..00000000
--- a/oss/vtiger/trunk/modules/Accounts/Accounts.js
+++ /dev/null
@@ -1,414 +0,0 @@
-/*********************************************************************************
-
-** 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.
- ********************************************************************************/
-
-
-document.write("";
-// mailer_export
-if (isset($other_text['mailer_exp']))
-{
- $view_script .= "";
-}
-// end of mailer export
-if(isset($order_by) && $order_by != '')
-{
- if($order_by == 'smownerid')
- {
- if( $adb->dbType == "pgsql")
- $query .= ' GROUP BY user_name';
- $query .= ' ORDER BY user_name '.$sorder;
- }
- else
- {
- $tablename = getTableNameForField('Accounts',$order_by);
- $tablename = (($tablename != '')?($tablename."."):'');
- if( $adb->dbType == "pgsql")
- $query .= ' GROUP BY '.$tablename.$order_by;
-
- $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
- }
-}
-
-
-
-//Postgres 8 fixes
-if( $adb->dbType == "pgsql")
- $query = fixPostgresQuery( $query, $log, 0);
-
-if(PerformancePrefs::getBoolean('LISTVIEW_COMPUTE_PAGE_COUNT', false) === true){
- $count_result = $adb->query( mkCountQuery( $query));
- $noofrows = $adb->query_result($count_result,0,"count");
-}else{
- $noofrows = null;
-}
-
-$queryMode = (isset($_REQUEST['query']) && $_REQUEST['query'] == 'true');
-$start = ListViewSession::getRequestCurrentPage($currentModule, $query, $viewid, $queryMode);
-
-$navigation_array = VT_getSimpleNavigationValues($start,$list_max_entries_per_page,$noofrows);
-
-$limit_start_rec = ($start-1) * $list_max_entries_per_page;
-
-if( $adb->dbType == "pgsql")
- $list_result = $adb->pquery($query. " OFFSET $limit_start_rec LIMIT $list_max_entries_per_page", array());
-else
- $list_result = $adb->pquery($query. " LIMIT $limit_start_rec, $list_max_entries_per_page", array());
-
-$recordListRangeMsg = getRecordRangeMessage($list_result, $limit_start_rec,$noofrows);
-$smarty->assign('recordListRange',$recordListRangeMsg);
-
-//mass merge for word templates -- *Raj*17/11
-while($row = $adb->fetch_array($list_result))
-{
- $ids[] = $row[$focus->table_index];
-}
-if(isset($ids))
-{
- $smarty->assign("ALLIDS", implode($ids,";"));
-}
-if(isPermitted("Accounts","Merge") == 'yes')
-{
- $wordTemplateResult = fetchWordTemplateList("Accounts");
- $tempCount = $adb->num_rows($wordTemplateResult);
- $tempVal = $adb->fetch_array($wordTemplateResult);
- for($templateCount=0;$templateCount<$tempCount;$templateCount++)
- {
- $optionString .="";
- $tempVal = $adb->fetch_array($wordTemplateResult);
- }
- if($tempCount > 0)
- {
- $smarty->assign("WORDTEMPLATEOPTIONS","
".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']." | | ");
-
- $smarty->assign("MERGEBUTTON"," | ");
- }
- else
- {
- global $current_user;
- require("user_privileges/user_privileges_".$current_user->id.".php");
- if($is_admin == true)
- {
- $smarty->assign("MERGEBUTTON",''. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].' | ');
- }
- }
-}
-
-//mass merge for word templates
-
-//Retreive the List View Table Header
-if($viewid !='')
-$url_string .= "&viewname=".$viewid;
-
-$controller = new ListViewController($adb, $current_user, $queryGenerator);
-$listview_header = $controller->getListViewHeader($focus,$currentModule,$url_string,$sorder,
- $order_by);
-$smarty->assign("LISTHEADER", $listview_header);
-
-$listview_header_search = $controller->getBasicSearchFieldInfoList();
-$smarty->assign("SEARCHLISTHEADER", $listview_header_search);
-
-$listview_entries = $controller->getListViewEntries($focus,$currentModule,$list_result,
- $navigation_array);
-
-$smarty->assign("LISTENTITY", $listview_entries);
-$smarty->assign("SELECT_SCRIPT", $view_script);
-$smarty->assign("CATEGORY",$category);
-
-$smarty->assign("AVALABLE_FIELDS", getMergeFields($currentModule,"available_fields"));
-$smarty->assign("FIELDS_TO_MERGE", getMergeFields($currentModule,"fileds_to_merge"));
-
-//Added to select Multiple records in multiple pages
-$smarty->assign("SELECTEDIDS", vtlib_purify($_REQUEST['selobjs']));
-$smarty->assign("ALLSELECTEDIDS", vtlib_purify($_REQUEST['allselobjs']));
-$smarty->assign("CURRENT_PAGE_BOXES", implode(array_keys($listview_entries),";"));
-
-$navigationOutput = getTableHeaderSimpleNavigation($navigation_array, $url_string,"Accounts","index",$viewid);
-$alphabetical = AlphabeticalSearch($currentModule,'index','accountname','true','basic',"","","","",$viewid);
-$fieldnames = $controller->getAdvancedSearchOptionString();
-$criteria = getcriteria_options();
-$smarty->assign("CRITERIA", $criteria);
-$smarty->assign("FIELDNAMES", $fieldnames);
-$smarty->assign("ALPHABETICAL", $alphabetical);
-$smarty->assign("NAVIGATION", $navigationOutput);
-
-$check_button = Button_Check($currentModule);
-$smarty->assign("CHECK", $check_button);
-
-$_SESSION[$currentModule.'_listquery'] = $query;
-
-// Gather the custom link information to display
-include_once('vtlib/Vtiger/Link.php');
-$customlink_params = Array('MODULE'=>$currentModule, 'ACTION'=>vtlib_purify($_REQUEST['action']), 'CATEGORY'=> $category);
-$smarty->assign('CUSTOM_LINKS', Vtiger_Link::getAllByType(getTabid($currentModule), Array('LISTVIEWBASIC','LISTVIEW'), $customlink_params));
-// END
-
-if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
- $smarty->display("ListViewEntries.tpl");
-else
- $smarty->display("ListView.tpl");
-
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/ListViewPagging.php b/oss/vtiger/trunk/modules/Accounts/ListViewPagging.php
deleted file mode 100644
index 333f1768..00000000
--- a/oss/vtiger/trunk/modules/Accounts/ListViewPagging.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/ListViewTop.php b/oss/vtiger/trunk/modules/Accounts/ListViewTop.php
deleted file mode 100644
index ea0932df..00000000
--- a/oss/vtiger/trunk/modules/Accounts/ListViewTop.php
+++ /dev/null
@@ -1,110 +0,0 @@
-$title,'Header'=>$listview_header,'Entries'=>$listview_entries) where as listview_header and listview_entries are arrays of header and entity values which are returned from function getListViewHeader and getListViewEntries
-*/
-function getTopAccounts($maxval,$calCnt)
-{
- $log = LoggerManager::getLogger('top accounts_list');
- $log->debug("Entering getTopAccounts() method ...");
- require_once("data/Tracker.php");
- require_once('modules/Potentials/Potentials.php');
- require_once('include/logging.php');
- require_once('include/ListView/ListView.php');
- global $app_strings;
- global $adb;
- global $current_language;
- global $current_user;
- $current_module_strings = return_module_language($current_language, "Accounts");
-
- require('user_privileges/user_privileges_'.$current_user->id.'.php');
- require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
-
- $list_query = "select vtiger_potential.potentialname,vtiger_account.accountid, vtiger_account.accountname, ".
- "vtiger_account.tickersymbol, sum(vtiger_potential.amount) as amount from vtiger_potential ".
- "inner join vtiger_crmentity on (vtiger_potential.potentialid=vtiger_crmentity.crmid) ".
- "left join vtiger_account on (vtiger_potential.related_to=vtiger_account.accountid) ";
- $list_query .= " WHERE vtiger_crmentity.deleted = 0 ".$where.
- " AND vtiger_potential.potentialid>0";
- $list_query .= " AND vtiger_crmentity.smownerid='".$current_user->id."' ".
- "and vtiger_potential.sales_stage not in ('Closed Won', 'Closed Lost','".
- $app_strings['LBL_CLOSE_WON']."','".$app_strings['LBL_CLOSE_LOST']."')";
- $list_query .= " group by vtiger_account.accountid, vtiger_account.tickersymbol order by amount desc";
-
- $list_query .= " LIMIT 0," . $adb->sql_escape_string($maxval);
-
- if($calCnt == 'calculateCnt') {
- $list_result_rows = $adb->query(mkCountQuery($list_query));
- return $adb->query_result($list_result_rows, 0, 'count');
- }
-
- $list_result=$adb->query($list_query);
- $open_accounts_list = array();
- $noofrows = $adb->num_rows($list_result);
-
- if ($noofrows) {
- for($i=0;$i<$noofrows;$i++)
- {
- $open_accounts_list[] = Array('accountid' => $adb->query_result($list_result,$i,'accountid'),
- 'accountname' => $adb->query_result($list_result,$i,'accountname'),
- 'amount' => $adb->query_result($list_result,$i,'amount'),
- 'tickersymbol' => $adb->query_result($list_result,$i,'tickersymbol'),
- );
- }
- }
-
- $title=array();
- $title[]='myTopAccounts.gif';
- $title[]=$current_module_strings['LBL_TOP_ACCOUNTS'];
- $title[]='home_myaccount';
-
- $header=array();
- $header[]=$current_module_strings['LBL_LIST_ACCOUNT_NAME'];
- $currencyid=fetchCurrency($current_user->id);
- $rate_symbol = getCurrencySymbolandCRate($currencyid);
- $rate = $rate_symbol['rate'];
- $curr_symbol = $rate_symbol['symbol'];
- $header[]=$current_module_strings['LBL_LIST_AMOUNT'].'('.$curr_symbol.')';
- $header[] = $current_module_strings['LBL_POTENTIAL_TITLE'];
-
- $entries=array();
- foreach($open_accounts_list as $account)
- {
- $value=array();
- $account_fields = array(
- 'ACCOUNT_ID' => $account['accountid'],
- 'ACCOUNT_NAME' => $account['accountname'],
- 'AMOUNT' => ($account['amount']),
- );
-
- $Top_Accounts = (strlen($account['accountname']) > 20) ? (substr($account['accountname'],0,20).'...') : $account['accountname'];
- $value[]=''.$Top_Accounts.'';
- $value[]=convertFromDollar($account['amount'],$rate);
- $entries[$account['accountid']]=$value;
- }
- $values=Array('ModuleName'=>'Accounts','Title'=>$title,'Header'=>$header,'Entries'=>$entries);
- $log->debug("Exiting getTopAccounts method ...");
- if (($display_empty_home_blocks && count($entries) == 0 ) || (count($entries)>0))
- return $values;
-}
-?>
diff --git a/oss/vtiger/trunk/modules/Accounts/MailerExport.php b/oss/vtiger/trunk/modules/Accounts/MailerExport.php
deleted file mode 100644
index c44c1e8e..00000000
--- a/oss/vtiger/trunk/modules/Accounts/MailerExport.php
+++ /dev/null
@@ -1,325 +0,0 @@
-query ($query,true,"Error: "."
$query");
- for ($tmp=0; $tmp < $adb->num_rows($result); $tmp++)
- {
- $myData = $adb->fetchByAssoc ($result);
- $queryFields[] = Array('columnname'=>$myData['columnname']
- ,'uitype'=>'56','fieldlabel'=>$mod_strings[$myData['fieldlabel']]
- ,'value'=> $valueArray);
- }
-}
-
-if ($step == "ask")
-{
- require_once('config.php');
- require_once('include/database/PearDatabase.php');
- require_once('Smarty_setup.php');
- $smarty = new vtigerCRM_Smarty;
- $valueArray = Array('' => $mod_strings['LBL_MAILER_EXPORT_IGNORE'],
- '0' => $mod_strings['LBL_MAILER_EXPORT_NOTCHECKED'],
- '1' => $mod_strings['LBL_MAILER_EXPORT_CHECKED']);
-
- $smarty->assign("MOD", return_module_language($current_language,'Accounts'));
- $smarty->assign("CMOD", $mod_strings);
- $smarty->assign("APP", $app_strings);
- $smarty->assign("IMAGE_PATH",$image_path);
- $smarty->assign("MODULE",$currentModule);
- $smarty->assign("EXPORTWHERE",$exportWhere);
- $queryFields = Array();
- // get the Contacts CF fields
- $cfquery = "SELECT columnname,fieldlabel,uitype FROM vtiger_field WHERE tablename='vtiger_contactscf' and vtiger_field.presence in (0,2)";
- $result = $adb->query ($cfquery,true,"Error: "."
$cfquery");
- for ($tmp=0; $tmp < $adb->num_rows($result); $tmp++)
- {
- $cfTmp = $adb->fetchByAssoc ($result);
- $cfColName=$cfTmp['columnname'];
- if ($cfTmp['uitype'] == 1)
- $queryFields[$tmp] = $cfTmp;
- elseif ($cfTmp['uitype'] == 15)
- {
- $queryFields[$tmp] = $cfTmp;
- $queryFields[$tmp]['value'][''] = $mod_strings['LBL_MAILER_EXPORT_IGNORE'];
- $cfValues = "SELECT ".$cfColName.",".$cfColName."id FROM vtiger_".$cfColName;
- $resVal = $adb->query ($cfValues,true,"Error: "."
$cfValues");
- for ($tmp1=0; $tmp1 < $adb->num_rows($resVal); $tmp1++)
- {
- $cfTmp=$adb->fetchByAssoc ($resVal);
- $queryFields[$tmp]['value'][$cfTmp[$cfColName]] = $cfTmp[$cfColName];
- }
- }
- elseif ($cfTmp['uitype'] == 56)
- {
- $queryFields[$tmp] = $cfTmp;
- $queryFields[$tmp]['value'] = $valueArray;
- }
- }
- // now add the standard fields
- getStdContactFlds(&$queryFields, $adb, $valueArray);
- // get the list of fields
- $fieldList="";
- foreach ($queryFields as $myField)
- {
- if (strlen($fieldList) > 0)
- $fieldList .= ',';
- $fieldList .= $myField['columnname'];
- }
- $smarty->assign("FIELDLIST",$fieldList);
- // and their types
- $typeList ="";
- foreach ($queryFields as $myField)
- {
- if (strlen($typeList) > 0)
- $typeList .= ',';
- $typeList .= $myField['uitype'];
- }
-
- $smarty->assign("TYPELIST",$typeList);
- $smarty->assign("QUERYFIELDS",$queryFields);
- $smarty->assign("CATEGORY",$category);
- $smarty->display('MailerExport.tpl');
-
-
-}
-else
-{
- require_once('../../config.php');
- chdir ($root_directory);
- require_once("include/utils/CommonUtils.php");
- require_once('include/database/PearDatabase.php');
- require_once('include/logging.php');
- $exquery = Array();
- $fields = explode(",",$_POST['fieldlist']);
- $types = explode(",",$_POST['typelist']);
- $escapxportWhere = $adb->sql_escape_string($exportWhere);
- if (($export_type == "email") || ($export_type == "emailplus") )
- {
-
- $where = "";
-
- if(count($fields) > 0)
- $where .= getExpWhereClause($fields,$types);
- $exquery[0] = "SELECT crmentity.crmid, contactdetails.contactid,
- contactdetails.salutation, contactdetails.firstname,
- contactdetails.lastname, contactdetails.email FROM vtiger_account
- INNER JOIN vtiger_crmentity crmentity on crmentity.crmid=vtiger_account.accountid
- INNER JOIN vtiger_accountbillads ON vtiger_account.accountid=vtiger_accountbillads.accountaddressid
- INNER JOIN vtiger_accountshipads ON vtiger_account.accountid=vtiger_accountshipads.accountaddressid
- INNER JOIN vtiger_accountscf ON vtiger_account.accountid = vtiger_accountscf.accountid
- INNER JOIN vtiger_contactdetails contactdetails ON vtiger_account.accountid = contactdetails.accountid
- INNER JOIN vtiger_contactscf contactscf ON contactscf.contactid = contactdetails.contactid
- WHERE crmentity.deleted=0 AND contactdetails.email != '' ".$where;
-
- if (strlen ($exportWhere))
- $exquery[0] .= " AND ".$exportWhere;
-
- if ($export_type == "emailplus")
- {
- $exquery[1] = "SELECT crmentity.crmid, contactdetails.contactid,
- contactdetails.salutation, contactdetails.firstname,
- contactdetails.lastname, vtiger_account.email1 FROM vtiger_account
- INNER JOIN vtiger_crmentity crmentity ON crmentity.crmid=vtiger_account.accountid
- INNER JOIN vtiger_accountbillads ON vtiger_account.accountid=vtiger_accountbillads.accountaddressid
- INNER JOIN vtiger_accountshipads ON vtiger_account.accountid=vtiger_accountshipads.accountaddressid
- INNER JOIN vtiger_accountscf ON vtiger_account.accountid = vtiger_accountscf.accountid
- INNER JOIN vtiger_contactdetails contactdetails ON vtiger_account.accountid = contactdetails.accountid
- INNER JOIN vtiger_contactscf contactscf ON contactscf.contactid = contactdetails.contactid
- WHERE crmentity.deleted=0
- AND contactdetails.email = '' AND vtiger_account.email1 != '' ".$where;
-
- if (strlen ($exportWhere))
- $exquery[1] .= " AND ".$exportWhere;
- }
- }
- else if ($export_type == "full")
- {
- $where = '';
- if(count($fields) > 0)
- $where .= getExpWhereClause($fields,$types);
- $exquery[0] = "select crmentity.crmid, contactdetails.contactid,
- contactdetails.salutation, contactdetails.firstname,
- contactdetails.lastname, contactdetails.email, vtiger_account.accountname,"
- ." vtiger_account.phone, vtiger_account.website, vtiger_accountshipads.ship_street,"
- ." vtiger_accountshipads.ship_code,"
- ." vtiger_accountshipads.ship_city, vtiger_accountshipads.ship_state,"
- ." vtiger_accountshipads.ship_country,"
- ." vtiger_accountbillads.bill_street, vtiger_accountbillads.bill_code,"
- ." vtiger_accountbillads.bill_city, vtiger_accountbillads.bill_state,"
- ." vtiger_accountbillads.bill_country"
- ." FROM vtiger_account INNER JOIN vtiger_crmentity crmentity ON crmentity.crmid=vtiger_account.accountid"
- ." LEFT JOIN vtiger_accountbillads ON vtiger_account.accountid=vtiger_accountbillads.accountaddressid"
- ." LEFT JOIN vtiger_accountshipads ON vtiger_account.accountid=vtiger_accountshipads.accountaddressid"
- ." INNER JOIN vtiger_accountscf ON vtiger_account.accountid = vtiger_accountscf.accountid"
- ." INNER JOIN vtiger_contactdetails contactdetails ON vtiger_account.accountid = contactdetails.accountid"
- ." INNER JOIN vtiger_contactscf contactscf ON contactscf.contactid = contactdetails.contactid"
- ." WHERE crmentity.deleted=0 ".$where;
-
- if (strlen ($exportWhere))
- $exquery[0] .= " AND ".$exportWhere;
- }
- // Added for getting field labels of the fields selected in the above export queries. If any new fields added in the select clause then the below array need to be updated with the corresponding lablels
- $fld_label_arr = Array("salutation"=>getTranslatedString('Salutation','Contacts'),
- "lastname"=>getTranslatedString('Last Name','Contacts'),
- "firstname"=>getTranslatedString('First Name','Contacts'),
- "email"=>getTranslatedString('Email','Contacts'),
- "accountname"=>getTranslatedString('Account Name','Accounts'),
- "phone"=>getTranslatedString('Phone','Accounts'),
- "website"=>getTranslatedString('Website','Accounts'),
- "ship_street"=>getTranslatedString('Shipping Address','Accounts'),
- "ship_code"=>getTranslatedString('Shipping Code','Accounts'),
- "ship_city"=>getTranslatedString('Shipping City','Accounts'),
- "ship_state"=>getTranslatedString('Shipping State','Accounts'),
- "ship_country"=>getTranslatedString('Shipping Country','Accounts'),
- "bill_street"=>getTranslatedString('Billing Address','Accounts'),
- "bill_code"=>getTranslatedString('Billing Code','Accounts'),
- "bill_city"=>getTranslatedString('Billing City','Accounts'),
- "bill_state"=>getTranslatedString('Billing State','Accounts'),
- "bill_country"=>getTranslatedString('Billing Country','Accounts')
- );
-
- for ($temp = 0; $temp < count($exquery); $temp++)
- {
- $result = $adb->query ($exquery[$temp],true,"Error exporting: "."
$query");
- if ($temp == 0) // We only need the headers for first query
- {
- $fields_array = $adb->getFieldsArray($result);
- // Now walk through the array and replace any cf_* with the content of the
- // name array, the index is the cf_ var name
- for ($arraywalk = 0; $arraywalk < count($fields_array); $arraywalk++)
- {
- // echo "Checking: ".$fields_array[$arraywalk];
- if (strstr ($fields_array[$arraywalk], "vtiger_cf_"))
- {
- $fields_array[$arraywalk] = $name[$fields_array[$arraywalk]];
- // echo "Changing to: ".$fields_array[$arraywalk];
- }
- else
- $fields_array[$arraywalk] = ($fld_label_arr[$fields_array[$arraywalk]]!='')?$fld_label_arr[$fields_array[$arraywalk]]:$fields_array[$arraywalk];
- }
-
-
- $header = implode("\",\"",array_values($fields_array));
- $header = "\"" .$header;
- $header .= "\"\r\n";
- $content .= $header;
-
- $column_list = implode(",",array_values($fields_array));
- }
-
- while($val = $adb->fetchByAssoc($result, -1, false))
- {
- $new_arr = array();
-
- // foreach (array_values($val) as $value)
- foreach ($val as $key => $value)
- {
- $value=br2nl_int($value);
- array_push($new_arr, preg_replace("/\"/","\"\"",$value));
- }
-
- $line = implode("\",\"",$new_arr);
- $line = "\"" .$line;
- $line .= "\"\r\n";
-
- $content .= $line;
- }
- }
-
- // echo "
Rows: ".$adb->num_rows($result);
- header( "Content-Disposition: inline; filename=MailerExport.csv");
- header( "Content-Type: text/csv; charset=".$app_strings['LBL_CHARSET']);
- header( "Expires: Mon, 26 Jul 2007 05:00:00 GMT" );
- header( "Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT" );
- header( "Cache-Control: post-check=0, pre-check=0", false );
- header( "Content-Length: ".strlen($content));
- print $content;
- exit ();
-
-}
-
-function getExpWhereClause($fields,$types)
-{
- global $adb;
- $where_cond = "";
-
- foreach ($fields as $myField)
- {
- $myType = each($types);
- if (strlen($_POST[$myField]) > 0)
- {
- // type 1 should use a LIKE search
- if ($myType['value'] == 1)
- {
- $equals = " LIKE '";
- $postfix = "%'";
- }
- else
- {
- $equals = " = '";
- $postfix = "'";
- }
- // is customer field
- if (substr($myField,0,3) == 'cf_')
- $where_cond .= " AND contactscf.".$myField.$equals.$adb->sql_escape_string($_POST[$myField]).$postfix;
- else
- $where_cond .= " AND contactdetails.".$myField.$equals.$adb->sql_escape_string($_POST[$myField]).$postfix;
- }
- }
- return $where_cond;
-
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/MassEdit.php b/oss/vtiger/trunk/modules/Accounts/MassEdit.php
deleted file mode 100644
index 348dab37..00000000
--- a/oss/vtiger/trunk/modules/Accounts/MassEdit.php
+++ /dev/null
@@ -1,45 +0,0 @@
-mode = '';
-$mode = 'mass_edit';
-$disp_view = getView($focus->mode);
-
-$smarty = new vtigerCRM_Smarty;
-$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
-$smarty->assign("IDS",$_REQUEST['idstring']);
-$smarty->assign("MASS_EDIT","1");
-$smarty->assign("MODULE",$currentModule);
-$smarty->assign("APP",$app_strings);
-$smarty->assign("CATEGORY",getParentTab());
-
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH", $image_path);
-
-// Field Validation Information
-$tabid = getTabid($currentModule);
-$validationData = getDBValidationData($focus->tab_name,$tabid);
-$validationArray = split_validationdataArray($validationData);
-
-$smarty->assign("VALIDATION_DATA_FIELDNAME",$validationArray['fieldname']);
-$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$validationArray['datatype']);
-$smarty->assign("VALIDATION_DATA_FIELDLABEL",$validationArray['fieldlabel']);
-
-$smarty->display('MassEditForm.tpl');
-
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/MassEditSave.php b/oss/vtiger/trunk/modules/Accounts/MassEditSave.php
deleted file mode 100644
index 0e1f2a6f..00000000
--- a/oss/vtiger/trunk/modules/Accounts/MassEditSave.php
+++ /dev/null
@@ -1,67 +0,0 @@
-retrieve_entity_info($recordid, $currentModule);
- $focus->mode = 'edit';
- $focus->id = $recordid;
- foreach($focus->column_fields as $fieldname => $val)
- {
- if(isset($_REQUEST[$fieldname."_mass_edit_check"]))
- {
- if($fieldname == 'assigned_user_id'){
- if($_REQUEST['assigntype'] == 'U') {
- $value = $_REQUEST['assigned_user_id'];
- } elseif($_REQUEST['assigntype'] == 'T') {
- $value = $_REQUEST['assigned_group_id'];
- }
- } else {
- if(is_array($_REQUEST[$fieldname]))
- $value = $_REQUEST[$fieldname];
- else
- $value = trim($_REQUEST[$fieldname]);
- }
- $focus->column_fields[$fieldname] = $value;
- }
- else{
- $focus->column_fields[$fieldname] = decode_html($focus->column_fields[$fieldname]);
- }
- }
- $focus->save($currentModule);
- }
- }
-}
-
-$parenttab = getParentTab();
-header("Location: index.php?module=$return_module&action=$return_action&parenttab=$parenttab$rstart");
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/Merge.php b/oss/vtiger/trunk/modules/Accounts/Merge.php
deleted file mode 100644
index 78dcf050..00000000
--- a/oss/vtiger/trunk/modules/Accounts/Merge.php
+++ /dev/null
@@ -1,298 +0,0 @@
-
-
-
-
-pquery($sql, array($templateid));
-$temparray = $adb->fetch_array($result);
-
-$fileContent = $temparray['data'];
-$filename=html_entity_decode($temparray['filename'], ENT_QUOTES, $default_charset);
-// Fix For: http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/2107
-$filename= $randomfilename . "_word.doc";
-
-$filesize=$temparray['filesize'];
-$wordtemplatedownloadpath =$root_directory ."/test/wordtemplatedownload/";
-
-$handle = fopen($wordtemplatedownloadpath.$filename,"wb");
-fwrite($handle,base64_decode($fileContent),$filesize);
-fclose($handle);
-
-//<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>
-$mass_merge = $_REQUEST['allselectedboxes'];
-$single_record = $_REQUEST['record'];
-
-if($mass_merge != "")
-{
- $mass_merge = explode(";",$mass_merge);
- $temp_mass_merge = $mass_merge;
- if(array_pop($temp_mass_merge)=="")
- array_pop($mass_merge);
- //$mass_merge = implode(",",$mass_merge);
-}else if($single_record != "")
-{
- $mass_merge = $single_record;
-}else
-{
- die("Record Id is not found, cannot merge the document");
-}
-
-//echo $mass_merge;
-//die;
-//for setting vtiger_accountid=0 for the contacts which are deleted
-$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1";
-$result = $adb->pquery($ct_query, array());
-
-while($row = $adb->fetch_array($result))
-{
- $deleted_id[] = $row['crmid'];
-}
-
-if(count($deleted_id) > 0)
-{
- $update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (". generateQuestionMarks($deleted_id) .")";
- $result = $adb->pquery($update_query, array($deleted_id));
-}
-//End setting vtiger_accountid=0 for the contacts which are deleted
-
-//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>
-global $current_user;
-require('user_privileges/user_privileges_'.$current_user->id.'.php');
-if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users" || $module == "Emails")
-{
- $query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 75 and vtiger_field.presence in (0,2) order by vtiger_field.tablename";
- $params1 = array();
-}
-else
-{
- $profileList = getCurrentUserProfileList();
- $query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid=vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 75 AND vtiger_profile2field.visible=0 AND vtiger_def_org_field.visible=0 AND vtiger_profile2field.profileid IN (". generateQuestionMarks($profileList) .") and vtiger_field.presence in (0,2) GROUP BY vtiger_field.fieldid order by vtiger_field.tablename";
- $params1 = array($profileList);
- //Postgres 8 fixes
- if( $adb->dbType == "pgsql")
- $query1 = fixPostgresQuery( $query1, $log, 0);
-}
-
-$result = $adb->pquery($query1, $params1);
-$y=$adb->num_rows($result);
-
-for ($x=0; $x<$y; $x++)
-{
- $tablename = $adb->query_result($result,$x,"tablename");
- $columnname = $adb->query_result($result,$x,"columnname");
- $modulename = $adb->query_result($result,$x,"name");
-
- if($tablename == "crmentity")
- {
- if($modulename == "Contacts")
- {
- $tablename = "vtiger_crmentityContacts";
- }
- }
- $querycolumns[$x] = $tablename.".".$columnname;
- if($columnname == "smownerid")
- {
- if($modulename == "Accounts")
- {
- $querycolumns[$x] = "case when (vtiger_users.user_name not like '') then concat(vtiger_users.last_name,' ',vtiger_users.first_name) else vtiger_groups.groupname end as userjoinname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
- }
- if($modulename == "Contacts")
- {
- $querycolumns[$x] = "case when (usersContacts.user_name not like '') then concat(usersContacts.last_name,' ',usersContacts.first_name) else groupsContacts.groupname end as userjoincname";
- }
- }
- if($columnname == "parentid")
- {
- $querycolumns[$x] = "vtiger_accountAccount.accountname";
- }
- if($columnname == "accountid")
- {
- $querycolumns[$x] = "vtiger_accountContacts.accountname";
- }
- if($columnname == "reportsto")
- {
- $querycolumns[$x] = "vtiger_contactdetailsContacts.lastname";
- }
-
- if($modulename == "Accounts")
- {
- $field_label[$x] = "ACCOUNT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel")));
- if($columnname == "smownerid")
- {
- $field_label[$x] = $field_label[$x].",USER_FIRSTNAME,USER_LASTNAME,USER_USERNAME,USER_YAHOOID,USER_TITLE,USER_OFFICEPHONE,USER_DEPARTMENT,USER_MOBILE,USER_OTHERPHONE,USER_FAX,USER_EMAIL,USER_HOMEPHONE,USER_OTHEREMAIL,USER_PRIMARYADDRESS,USER_CITY,USER_STATE,USER_POSTALCODE,USER_COUNTRY";
- }
- }
-
- if($modulename == "Contacts")
- {
- $field_label[$x] = "CONTACT_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel")));
- }
-
-}
-
-$csvheader = implode(",",$field_label);
-//<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>
-
-if(count($querycolumns) > 0)
-{
- $selectcolumns = implode($querycolumns,",");
-
- $query = "select $selectcolumns from vtiger_account
- inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid
- inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
- inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
- inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
- left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid
- left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
- LEFT JOIN vtiger_groups
- ON vtiger_groups.groupid = vtiger_crmentity.smownerid
- left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid
- left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
- left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
- left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
- left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
- left join vtiger_customerdetails on vtiger_contactdetails.contactid = vtiger_customerdetails.customerid
- left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
- left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
- left join vtiger_users as usersContacts on usersContacts.id = vtiger_crmentityContacts.smownerid
- LEFT JOIN vtiger_groups as groupsContacts
- ON groupsContacts.groupid = vtiger_crmentity.smownerid
- where vtiger_crmentity.deleted=0 and (vtiger_crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(". generateQuestionMarks($mass_merge) .")";
- //echo $query;
- //die;
- $result = $adb->pquery($query, array($mass_merge));
-$avail_pick_arr = getAccessPickListValues('Accounts');
-while($columnValues = $adb->fetch_array($result))
-{
- $y=$adb->num_fields($result);
- for($x=0; $x<$y; $x++)
- {
- $value = $columnValues[$x];
- foreach($columnValues as $key=>$val)
- {
- if($val == $value && $value != '')
- {
- if(array_key_exists($key,$avail_pick_arr))
- {
- if(!in_array($val,$avail_pick_arr[$key]))
- {
- $value = "Not Accessible";
- }
- }
- }
- }
- //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>
- if(trim($value) == "--None--" || trim($value) == "--none--")
- {
- $value = "";
- }
- //<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>
- $actual_values[$x] = $value;
- $actual_values[$x] = str_replace('"'," ",$actual_values[$x]);
- //if value contains any line feed or carriage return replace the value with ".value."
- if (preg_match ("/(\r?\n)/", $actual_values[$x]))
- {
- $actual_values[$x] = '"'.$actual_values[$x].'"';
- }
- $actual_values[$x] = decode_html(str_replace(","," ",$actual_values[$x]));
- }
- $mergevalue[] = implode($actual_values,",");
-}
-$csvdata = implode($mergevalue,"###");
-}else
-{
- die("No fields to do Merge");
-}
-
-// Fix for: http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/2107
-$datafilename = $randomfilename . "_data.csv";
-
-$handle = fopen($wordtemplatedownloadpath.$datafilename,"wb");
-fwrite($handle,$csvheader."\r\n");
-fwrite($handle,str_replace("###","\r\n",$csvdata));
-fclose($handle);
-?>
-
-
-
diff --git a/oss/vtiger/trunk/modules/Accounts/Popup.php b/oss/vtiger/trunk/modules/Accounts/Popup.php
deleted file mode 100644
index eb0e6e50..00000000
--- a/oss/vtiger/trunk/modules/Accounts/Popup.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/oss/vtiger/trunk/modules/Accounts/ProcessDuplicates.php b/oss/vtiger/trunk/modules/Accounts/ProcessDuplicates.php
deleted file mode 100644
index bb5047fa..00000000
--- a/oss/vtiger/trunk/modules/Accounts/ProcessDuplicates.php
+++ /dev/null
@@ -1,134 +0,0 @@
-pquery("SELECT count(*) AS count FROM vtiger_crmentity WHERE crmid=? and deleted=0", array($merge_id));
- $count = $adb->query_result($result,0,'count');
-
- if($count > 0)
- {
- // First, save the primary record
- $focus->mode="edit";
- setObjectValuesFromRequest($focus);
- $focus->save($module);
- $rec_values=$focus->column_fields;
-
- // Remove the id of primary record from the list of records to be deleted.
- $del_value=explode(",",$recordids,-1);
- $offset = array_search($merge_id,$del_value);
- unset($del_value[$offset]);
-
- // Transfer the related lists of the records to be deleted, to the primary record's related list
- if(method_exists($focus, 'transferRelatedRecords')){
- $focus->transferRelatedRecords($module,$del_value,$merge_id);
- } else {
- transferRelatedRecords($module,$del_value,$merge_id);
- }
-
- // Delete the records by id specified in the list
- foreach($del_value as $value)
- {
- DeleteEntity($_REQUEST['module'],$_REQUEST['return_module'],$focus,$value,"");
- }
- }
-
- ?>
-
-assign("EDIT_DUPLICATE","");
- if($record_count == 2) {
- if(isPermitted($currentModule,"EditView",$exploded_id[0]) == 'yes' && isPermitted($currentModule,"EditView",$exploded_id[1]) == 'yes'
- && isPermitted($currentModule,"Delete",$exploded_id[0]) == 'yes' && isPermitted($currentModule,"Delete",$exploded_id[1]) == 'yes')
- $smarty->assign("EDIT_DUPLICATE","permitted");
- }
- else {
- if(isPermitted($currentModule,"EditView",$exploded_id[0]) == 'yes' && isPermitted($currentModule,"EditView",$exploded_id[1]) == 'yes' && isPermitted($currentModule,"EditView",$exploded_id[2]) == 'yes'
- && isPermitted($currentModule,"Delete",$exploded_id[0]) == 'yes' && isPermitted($currentModule,"Delete",$exploded_id[1]) == 'yes' && isPermitted($currentModule,"Delete",$exploded_id[2]) == 'yes')
- $smarty->assign("EDIT_DUPLICATE","permitted");
- }
-
- $all_values_array=getRecordValues($exploded_id,$module);
- $all_values=$all_values_array[0];
- $js_arr_val=$all_values_array[1];
- $fld_array=$all_values_array[2];
- $js_arr=implode(",",$js_arr_val);
-
- $imported_records = Array();
- $sql="select bean_id from vtiger_users_last_import where bean_type=? and deleted=0";
- $result = $adb->pquery($sql, array($module));
- $num_rows=$adb->num_rows($result);
- $count=0;
- for($i=0; $i<$num_rows;$i++)
- {
- foreach($exploded_id as $value)
- if($value == $adb->query_result($result,$i,"bean_id"))
- $count++;
- array_push($imported_records,$adb->query_result($result,$i,"bean_id"));
- }
-
- if ($record_count == $count)
- $no_existing=1;
- else
- $no_existing=0;
-
- $smarty->assign("MOD", $mod_strings);
- $smarty->assign("APP", $app_strings);
- $smarty->assign("RECORD_COUNT",$record_count);
- $smarty->assign("THEME", $theme);
- $smarty->assign("IMAGE_PATH", $image_path);
- $smarty->assign("MODULENAME", $module);
- $smarty->assign("PARENT_TAB", $parent_tab);
- $smarty->assign("JS_ARRAY", $js_arr);
- $smarty->assign("ID_ARRAY", $exploded_id);
- $smarty->assign("IDSTRING",$idstring);
- $smarty->assign("ALLVALUES", $all_values);
- $smarty->assign("FIELD_ARRAY", $fld_array);
- $smarty->assign("IMPORTED_RECORDS", $imported_records);
- $smarty->assign("NO_EXISTING", $no_existing);
- $smarty->display("MergeFields.tpl");
-}
-
-?>
diff --git a/oss/vtiger/trunk/modules/Accounts/QuickCreate.php b/oss/vtiger/trunk/modules/Accounts/QuickCreate.php
deleted file mode 100644
index 8d5998b8..00000000
--- a/oss/vtiger/trunk/modules/Accounts/QuickCreate.php
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/oss/vtiger/trunk/modules/Accounts/Save.php b/oss/vtiger/trunk/modules/Accounts/Save.php
deleted file mode 100644
index 9a0109f8..00000000
--- a/oss/vtiger/trunk/modules/Accounts/Save.php
+++ /dev/null
@@ -1,231 +0,0 @@
-pquery($query, $params);
- if($adb->num_rows($result) > 0)
- {
- echo $mod_strings['LBL_ACCOUNT_EXIST'];
- }
- else
- {
- echo 'SUCCESS';
- }
- die;
-}
-//Ended
-
-$local_log =& LoggerManager::getLogger('index');
-global $log;
-$focus = new Accounts();
-global $current_user;
-$currencyid=fetchCurrency($current_user->id);
-$rate_symbol = getCurrencySymbolandCRate($currencyid);
-$rate = $rate_symbol['rate'];
-$curr_symbol = $rate_symbol['symbol'];
-if(isset($_REQUEST['record']))
-{
- $focus->id = $_REQUEST['record'];
-$log->info("id is ".$focus->id);
-}
-if(isset($_REQUEST['mode']))
-{
- $focus->mode = $_REQUEST['mode'];
-}
-
-foreach($focus->column_fields as $fieldname => $val)
-{
- if(isset($_REQUEST[$fieldname]))
- {
- if(is_array($_REQUEST[$fieldname]))
- $value = $_REQUEST[$fieldname];
- else
- $value = trim($_REQUEST[$fieldname]);
- $log->DEBUG($fieldname."=Field Name &first& Value =".$value);
- $focus->column_fields[$fieldname] = $value;
- }
-}
-
-if(isset($_REQUEST['annual_revenue']))
-{
- $value = convertToDollar($_REQUEST['annual_revenue'],$rate);
- $focus->column_fields['annual_revenue'] = $value;
-}
-
-if($_REQUEST['assigntype'] == 'U') {
- $focus->column_fields['assigned_user_id'] = $_REQUEST['assigned_user_id'];
-} elseif($_REQUEST['assigntype'] == 'T') {
- $focus->column_fields['assigned_user_id'] = $_REQUEST['assigned_group_id'];
-}
-
-//When changing the Account Address Information it should also change the related contact address - dina
-if($focus->mode == 'edit' && $_REQUEST['address_change'] == 'yes')
-{
- $query = "update vtiger_contactaddress set mailingcity=?,mailingstreet=?,mailingcountry=?,mailingzip=?,mailingpobox=?,mailingstate=?,othercountry=?,othercity=?,otherstate=?,otherzip=?,otherstreet=?,otherpobox=? where contactaddressid in (select contactid from vtiger_contactdetails where accountid=?)" ;
- $params = array($focus->column_fields['bill_city'], $focus->column_fields['bill_street'], $focus->column_fields['bill_country'],
- $focus->column_fields['bill_code'], $focus->column_fields['bill_pobox'], $focus->column_fields['bill_state'], $focus->column_fields['ship_country'],
- $focus->column_fields['ship_city'], $focus->column_fields['ship_state'], $focus->column_fields['ship_code'], $focus->column_fields['ship_street'],
- $focus->column_fields['ship_pobox'], $focus->id);
- $adb->pquery($query, $params);
-}
-//Changing account address - Ends
-
-$focus->save("Accounts");
-if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Campaigns")
-{
- if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
- {
- $campAccStatusResult = $adb->pquery("select campaignrelstatusid from vtiger_campaignaccountrel where campaignid=? AND accountid=?",array($_REQUEST['return_id'], $focus->id));
- $accountStatus = $adb->query_result($campAccStatusResult,0,'campaignrelstatusid');
- $sql = "delete from vtiger_campaignaccountrel where accountid = ?";
- $adb->pquery($sql, array($focus->id));
- if(isset($accountStatus) && $accountStatus!=''){
- $sql = "insert into vtiger_campaignaccountrel values (?,?,?)";
- $adb->pquery($sql, array($_REQUEST['return_id'], $focus->id,$accountStatus));
- }
- else{
- $sql = "insert into vtiger_campaignaccountrel values (?,?,1)";
- $adb->pquery($sql, array($_REQUEST['return_id'], $focus->id));
- }
- }
-}
-$return_id = $focus->id;
-
-$parenttab = getParentTab();
-if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = vtlib_purify($_REQUEST['return_module']);
-else $return_module = "Accounts";
-if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = vtlib_purify($_REQUEST['return_action']);
-else $return_action = "DetailView";
-if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = vtlib_purify($_REQUEST['return_id']);
-
-$local_log->debug("Saved record with id of ".$return_id);
-
-//code added for returning back to the current view after edit from list view
-if($_REQUEST['return_viewname'] == '') $return_viewname='0';
-if($_REQUEST['return_viewname'] != '')$return_viewname=vtlib_purify($_REQUEST['return_viewname']);
-
-header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname&start=".vtlib_purify($_REQUEST['pagenumber']).$search);
-/** Function to save Accounts custom field info into database
-* @param integer $entity_id - accountid
-*/
-function save_customfields($entity_id)
-{
- global $log;
- $log->debug("Entering save_customfields(".$entity_id.") method ...");
- $log->info("save customfields invoked");
- global $adb;
- $dbquery = "SELECT * FROM customfields WHERE module = 'Accounts'";
- $result = $adb->pquery($dbquery, array());
-
- $custquery = "SELECT * FROM vtiger_accountcf WHERE vtiger_accountid = ?";
- $cust_result = $adb->pquery($custquery, array($entity_id));
- if($adb->num_rows($result) != 0)
- {
-
- $columns='';
- $values='';
- $ins_params = array();
- $update='';
- $upd_params = array();
-
- $noofrows = $adb->num_rows($result);
- for($i=0; $i<$noofrows; $i++)
- {
- $fldName=$adb->query_result($result,$i,"fieldlabel");
- $colName=$adb->query_result($result,$i,"column_name");
- if(isset($_REQUEST[$colName]))
- {
- $fldvalue=$_REQUEST[$colName];
- if(get_magic_quotes_gpc() == 1)
- {
- $fldvalue = stripslashes($fldvalue);
- }
- }
- else
- {
- $fldvalue = '';
- }
-
- if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $adb->num_rows($cust_result) !=0)
- {
- //Update Block
- if($i == 0)
- {
- $update = $colName."=?";
- array_push($upd_params, $fldvalue);
- }
- else
- {
- $update .= ', '.$colName."=?";
- array_push($upd_params, $fldvalue);
- }
- }
- else
- {
- //Insert Block
- if($i == 0)
- {
- $columns='accountid, '.$colName;
- array_push($ins_params, $entity_id, $fldvalue);
- }
- else
- {
- $columns .= ', '.$colName;
- array_push($ins_params, $fldvalue);
- }
- }
- }
- if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $adb->num_rows($cust_result) !=0)
- {
- //Update Block
- $query = "UPDATE vtiger_accountcf SET $update WHERE vtiger_accountid=?";
- array_push($upd_params, $entity_id);
- $adb->pquery($query, $upd_params);
- }
- else
- {
- //Insert Block
- $query = "INSERT INTO vtiger_accountcf ($columns) VALUES(" . generateQuestionMarks($ins_params) .")";
- $adb->pquery($query, $ins_params);
- }
-
- }
- $log->debug("Exiting save_customfields method ...");
-}
-?>
diff --git a/oss/vtiger/trunk/modules/Accounts/Settings.php b/oss/vtiger/trunk/modules/Accounts/Settings.php
deleted file mode 100644
index 48a80c0b..00000000
--- a/oss/vtiger/trunk/modules/Accounts/Settings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/TagCloud.php b/oss/vtiger/trunk/modules/Accounts/TagCloud.php
deleted file mode 100644
index 859b11ff..00000000
--- a/oss/vtiger/trunk/modules/Accounts/TagCloud.php
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/oss/vtiger/trunk/modules/Accounts/Tickerdetail.php b/oss/vtiger/trunk/modules/Accounts/Tickerdetail.php
deleted file mode 100644
index 2577bdd6..00000000
--- a/oss/vtiger/trunk/modules/Accounts/Tickerdetail.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- ';
- $output .='';
- foreach($first_array as $arr => $val)
- {
- $output .= '';
- for($j=0;$j
- | '.$val[$j+1].' | ';
- }
- $output .= ' ';
- }
- $output .=' | ';
- $output .='';
- array_shift($second_array[0]);
- array_shift($second_array[0]);
- foreach($second_array as $arr => $val)
- {
- $output .= '';
- for($j=0;$j
- | '.$val[$j+1].' | ';
- }
- $output .= ' ';
- }
- $output .=' | ![[Chart]](http://ichart.finance.yahoo.com/t?s='.trim($variable).') |
| ';
- $output .= '
- | |
- ';
- $output .= '
-
- |
';
-echo $output;
-}
-else
-{
- $output = '';
- $output .= "";
- $output .= "".$data."";
- $output .= "
";
- echo $output;
-}
-?>
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/UnifiedSearch.php b/oss/vtiger/trunk/modules/Accounts/UnifiedSearch.php
deleted file mode 100644
index 9a37320c..00000000
--- a/oss/vtiger/trunk/modules/Accounts/UnifiedSearch.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/oss/vtiger/trunk/modules/Accounts/index.php b/oss/vtiger/trunk/modules/Accounts/index.php
deleted file mode 100644
index 87ea1151..00000000
--- a/oss/vtiger/trunk/modules/Accounts/index.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
diff --git a/oss/vtiger/trunk/modules/Accounts/language/en_us.lang.php b/oss/vtiger/trunk/modules/Accounts/language/en_us.lang.php
deleted file mode 100644
index 1468183c..00000000
--- a/oss/vtiger/trunk/modules/Accounts/language/en_us.lang.php
+++ /dev/null
@@ -1,242 +0,0 @@
-'Accounts',
-'LBL_MODULE_TITLE'=>'Accounts: Home',
-'LBL_SEARCH_FORM_TITLE'=>'Account Search',
-'LBL_LIST_FORM_TITLE'=>'Account List',
-'LBL_NEW_FORM_TITLE'=>'New Account',
-'LBL_MEMBER_ORG_FORM_TITLE'=>'Member Organizations',
-// Label for Top Accounts in Home Page, added for 4.2 GA
-'LBL_TOP_ACCOUNTS'=>'My Top Accounts',
-'LBL_TOP_AMOUNT'=>'Amount',
-'LBL_LIST_ACCOUNT_NAME'=>'Account Name',
-'LBL_LIST_CITY'=>'City',
-'LBL_LIST_WEBSITE'=>'Website',
-'LBL_LIST_STATE'=>'State',
-'LBL_LIST_PHONE'=>'Phone',
-'LBL_LIST_EMAIL_ADDRESS'=>'Email Address',
-'LBL_LIST_CONTACT_NAME'=>'Contact Name',
-'LBL_LIST_AMOUNT' => 'Total Amount',
-
-//DON'T CONVERT THESE THEY ARE MAPPINGS
-'db_name' => 'LBL_LIST_ACCOUNT_NAME',
-'db_website' => 'LBL_LIST_WEBSITE',
-'db_billing_address_city' => 'LBL_LIST_CITY',
-
-//END DON'T CONVERT
-
-'LBL_ACCOUNT'=>'Account:',
-'LBL_ACCOUNT_NAME'=>'Account Name:',
-'LBL_PHONE'=>'Phone:',
-'LBL_WEBSITE'=>'Website:',
-'LBL_FAX'=>'Fax:',
-'LBL_TICKER_SYMBOL'=>'Ticker Symbol:',
-'LBL_OTHER_PHONE'=>'Other Phone:',
-'LBL_ANY_PHONE'=>'Any Phone:',
-'LBL_MEMBER_OF'=>'Member of:',
-'LBL_EMAIL'=>'Email:',
-'LBL_EMPLOYEES'=>'Employees:',
-'LBL_OTHER_EMAIL_ADDRESS'=>'Other Email:',
-'LBL_ANY_EMAIL'=>'Any Email:',
-'LBL_OWNERSHIP'=>'Ownership:',
-'LBL_RATING'=>'Rating:',
-'LBL_INDUSTRY'=>'Industry:',
-'LBL_SIC_CODE'=>'SIC Code:',
-'LBL_TYPE'=>'Type:',
-'LBL_ANNUAL_REVENUE'=>'Annual Revenue:',
-'LBL_ADDRESS_INFORMATION'=>'Address Information',
-'LBL_ACCOUNT_INFORMATION'=>'Account Information',
-'LBL_CUSTOM_INFORMATION'=>'Custom Information',
-'LBL_BILLING_ADDRESS'=>'Billing Address:',
-'LBL_SHIPPING_ADDRESS'=>'Shipping Address:',
-'LBL_ANY_ADDRESS'=>'Any Address:',
-'LBL_CITY'=>'City:',
-'LBL_STATE'=>'State:',
-'LBL_POSTAL_CODE'=>'Postal Code:',
-'LBL_COUNTRY'=>'Country:',
-'LBL_DESCRIPTION_INFORMATION'=>'Description Information',
-'LBL_DESCRIPTION'=>'Description:',
-'NTC_COPY_BILLING_ADDRESS'=>'Copy billing address to shipping address',
-'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
-'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
-'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
-
-'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
-
-'LBL_SELECT_ACCOUNT'=>'Select Account',
-'LBL_GENERAL_INFORMATION'=>'General Information',
-
-//for v4 release added
-'LBL_NEW_POTENTIAL'=>'New Potential',
-'LBL_POTENTIAL_TITLE'=>'Potentials',
-
-'LBL_NEW_TASK'=>'New Task',
-'LBL_TASK_TITLE'=>'Tasks',
-'LBL_NEW_CALL'=>'New Call',
-'LBL_CALL_TITLE'=>'Calls',
-'LBL_NEW_MEETING'=>'New Meeting',
-'LBL_MEETING_TITLE'=>'Meetings',
-'LBL_NEW_EMAIL'=>'New Email',
-'LBL_EMAIL_TITLE'=>'Emails',
-'LBL_NEW_CONTACT'=>'New Contact',
-'LBL_CONTACT_TITLE'=>'Contacts',
-
-//Added vtiger_fields after RC1 - Release
-'LBL_ALL'=>'All',
-'LBL_PROSPECT'=>'Prospect',
-'LBL_INVESTOR'=>'Investor',
-'LBL_RESELLER'=>'Reseller',
-'LBL_PARTNER'=>'Partner',
-
-// Added for 4GA
-'LBL_TOOL_FORM_TITLE'=>'Account Tools',
-//Added for 4GA
-'Account Name'=>'Account Name',
-'Phone'=>'Phone',
-'Website'=>'Website',
-'Fax'=>'Fax',
-'Ticker Symbol'=>'Ticker Symbol',
-'Other Phone'=>'Other Phone',
-'Member Of'=>'Member Of',
-'Email'=>'Email',
-'Employees'=>'Employees',
-'Other Email'=>'Other Email',
-'Ownership'=>'Ownership',
-'Rating'=>'Rating',
-'industry'=>'Industry',
-'SIC Code'=>'SIC Code',
-'Type'=>'Type',
-'Annual Revenue'=>'Annual Revenue',
-'Assigned To'=>'Assigned To',
-'Billing Address'=>'Billing Address',
-'Shipping Address'=>'Shipping Address',
-'Billing City'=>'Billing City',
-'Shipping City'=>'Shipping City',
-'Billing State'=>'Billing State',
-'Shipping State'=>'Shipping State',
-'Billing Code'=>'Billing Postal Code',
-'Shipping Code'=>'Shipping Postal Code',
-'Billing Country'=>'Billing Country',
-'Shipping Country'=>'Shipping Country',
-'Created Time'=>'Created Time',
-'Modified Time'=>'Modified Time',
-'Description'=>'Description',
-'Shipping Po Box'=>'Shipping PO Box',
-'Billing Po Box'=>'Billing PO Box',
-
-//Added after 4.2 patch 2
-'Email Opt Out'=>'Email Opt Out',
-'LBL_EMAIL_OPT_OUT'=>'Email Opt Out:',
-
-//Added after 5Alpha5
-'Notify Owner'=>'Notify Owner',
-
-//Added for existing picklist entries
-
-'--None--'=>'--None--',
-
-'Acquired'=>'Acquired',
-'Active'=>'Active',
-'Market Failed'=>'Market Failed',
-'Project Cancelled'=>'Project Cancelled',
-'Shutdown'=>'Shutdown',
-
-'Apparel'=>'Apparel',
-'Banking'=>'Banking',
-'Biotechnology'=>'Biotechnology',
-'Chemicals'=>'Chemicals',
-'Communications'=>'Communications',
-'Construction'=>'Construction',
-'Consulting'=>'Consulting',
-'Education'=>'Education',
-'Electronics'=>'Electronics',
-'Energy'=>'Energy',
-'Engineering'=>'Engineering',
-'Entertainment'=>'Entertainment',
-'Environmental'=>'Environmental',
-'Finance'=>'Finance',
-'Food & Beverage'=>'Food & Beverage',
-'Government'=>'Government',
-'Healthcare'=>'Healthcare',
-'Hospitality'=>'Hospitality',
-'Insurance'=>'Insurance',
-'Machinery'=>'Machinery',
-'Manufacturing'=>'Manufacturing',
-'Media'=>'Media',
-'Not For Profit'=>'Not For Profit',
-'Recreation'=>'Recreation',
-'Retail'=>'Retail',
-'Shipping'=>'Shipping',
-'Technology'=>'Technology',
-'Telecommunications'=>'Telecommunications',
-'Transportation'=>'Transportation',
-'Utilities'=>'Utilities',
-'Other'=>'Other',
-
-'Analyst'=>'Analyst',
-'Competitor'=>'Competitor',
-'Customer'=>'Customer',
-'Integrator'=>'Integrator',
-'Investor'=>'Investor',
-'Partner'=>'Partner',
-'Press'=>'Press',
-'Prospect'=>'Prospect',
-'Reseller'=>'Reseller',
-'LBL_START_DATE' => 'Start Date',
-'LBL_END_DATE' => 'End Date',
-
-// Added/Updated for vtiger CRM 5.0.4
-
-//added to fix the issue #4081
-'LBL_ACCOUNT_EXIST' => 'Account Name Already Exists!',
-
-// mailer export
-'LBL_MAILER_EXPORT' => 'Mailer Export',
-'LBL_MAILER_EXPORT_CONTACTS_TYPE'=>'Select Contacts:',
-'LBL_MAILER_EXPORT_CONTACTS_DESCR'=>'Contacts can also be selected via "Custom Fields" and some standard fields.',
-'LBL_MAILER_EXPORT_RESULTS_TYPE'=>'Select export type:',
-'LBL_MAILER_EXPORT_RESULTS_DESCR'=>'The data will gathered from the Accounts and their Contacts, that were returned
- from the previous search.',
-'LBL_EXPORT_RESULTS_EMAIL' => 'Export E-Mailer data',
-'LBL_EXPORT_RESULTS_EMAIL_CORP'=>'Export E-Mail data, using "Company Email" from the Account if the Contacts "Email" is empty',
-'LBL_EXPORT_RESULTS_FULL'=>'Export data with the Contacts, E-Mail, Account name, Address, Telephone, etc.',
-'LBL_EXPORT_RESULTS_GO'=>'Export',
-'LBL_MAILER_EXPORT_IGNORE' => '--ignore--',
-'LBL_MAILER_EXPORT_CHECKED' =>'Checked',
-'LBL_MAILER_EXPORT_NOTCHECKED' => 'Not Checked',
-
-// Added after 5.0.4 GA
-
-//Module Sequence Numbering
-'Account No'=>'Account No',
-// END
-
-// Account Hierarchy
-'LBL_SHOW_ACCOUNT_HIERARCHY' => 'Show Account Hierarchy',
-
-);
-
-?>
diff --git a/oss/vtiger/trunk/modules/Accounts/language/zh_cn.lang.php b/oss/vtiger/trunk/modules/Accounts/language/zh_cn.lang.php
deleted file mode 100644
index 9870d06e..00000000
--- a/oss/vtiger/trunk/modules/Accounts/language/zh_cn.lang.php
+++ /dev/null
@@ -1,242 +0,0 @@
-'客户',
-'LBL_MODULE_TITLE'=>'客户:首页',
-'LBL_SEARCH_FORM_TITLE'=>'搜寻客户',
-'LBL_LIST_FORM_TITLE'=>'客户列表',
-'LBL_NEW_FORM_TITLE'=>'新增客户',
-'LBL_MEMBER_ORG_FORM_TITLE'=>'成员组织性质',
-//LabelforTopAccountsinHomePage,addedfor4.2GA
-'LBL_TOP_ACCOUNTS'=>'我的重要客户',
-'LBL_TOP_AMOUNT'=>'金额',
-'LBL_LIST_ACCOUNT_NAME'=>'客户名称',
-'LBL_LIST_CITY'=>'乡镇市区',
-'LBL_LIST_WEBSITE'=>'网站',
-'LBL_LIST_STATE'=>'县市',
-'LBL_LIST_PHONE'=>'电话',
-'LBL_LIST_EMAIL_ADDRESS'=>'电子邮件地址',
-'LBL_LIST_CONTACT_NAME'=>'联系人姓名',
-'LBL_LIST_AMOUNT'=>'机会总计',
-
-//DON'TCONVERTTHESETHEYAREMAPPINGS
-'db_name'=>'LBL_LIST_ACCOUNT_NAME',
-'db_website'=>'LBL_LIST_WEBSITE',
-'db_billing_address_city'=>'LBL_LIST_CITY',
-
-//ENDDON'TCONVERT
-
-'LBL_ACCOUNT'=>'客户:',
-'LBL_ACCOUNT_NAME'=>'客户名称:',
-'LBL_PHONE'=>'电话:',
-'LBL_WEBSITE'=>'网站:',
-'LBL_FAX'=>'传真:',
-'LBL_TICKER_SYMBOL'=>'传票符号:',
-'LBL_OTHER_PHONE'=>'其它电话:',
-'LBL_ANY_PHONE'=>'其它电话:',
-'LBL_MEMBER_OF'=>'成员:',
-'LBL_EMAIL'=>'电子邮件:',
-'LBL_EMPLOYEES'=>'员工:',
-'LBL_OTHER_EMAIL_ADDRESS'=>'其它电子邮件:',
-'LBL_ANY_EMAIL'=>'其它电子邮件:',
-'LBL_OWNERSHIP'=>'所有者:',
-'LBL_RATING'=>'评价:',
-'LBL_INDUSTRY'=>'行业别:',
-'LBL_SIC_CODE'=>'统一编号:',
-'LBL_TYPE'=>'类型:',
-'LBL_ANNUAL_REVENUE'=>'年营业额:',
-'LBL_ADDRESS_INFORMATION'=>'地址信息',
-'LBL_ACCOUNT_INFORMATION'=>'账号信息',
-'LBL_CUSTOM_INFORMATION'=>'客户信息',
-'LBL_BILLING_ADDRESS'=>'账单地址:',
-'LBL_SHIPPING_ADDRESS'=>'送货地址:',
-'LBL_ANY_ADDRESS'=>'其它地址:',
-'LBL_CITY'=>'乡镇市区:',
-'LBL_STATE'=>'县市:',
-'LBL_POSTAL_CODE'=>'邮政编码:',
-'LBL_COUNTRY'=>'国家:',
-'LBL_DESCRIPTION_INFORMATION'=>'描述信息',
-'LBL_DESCRIPTION'=>'描述:',
-'NTC_COPY_BILLING_ADDRESS'=>'复制账单地址内容到送货地址',
-'NTC_COPY_SHIPPING_ADDRESS'=>'复制送货地址内容到账单地址',
-'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'您确定要删除这笔成员/组织的记录吗?',
-'LBL_DUPLICATE'=>'复制潜在案件客户',
-'MSG_DUPLICATE'=>'由潜在案件客户中复制建立新客户,您可以点选客户列表中的客户以复制建立新的客户,并且继承它的相关数据。',
-
-'LBL_INVITEE'=>'联系人',
-'ERR_DELETE_RECORD'=>'要删除账号您必须指定一笔记录编号.',
-
-'LBL_SELECT_ACCOUNT'=>'选择客户',
-'LBL_GENERAL_INFORMATION'=>'主要信息',
-
-//forv4releaseadded
-'LBL_NEW_POTENTIAL'=>'新增潜在案件',
-'LBL_POTENTIAL_TITLE'=>'潜在案件',
-
-'LBL_NEW_TASK'=>'新增任务',
-'LBL_TASK_TITLE'=>'任务',
-'LBL_NEW_CALL'=>'新增电话记录',
-'LBL_CALL_TITLE'=>'电话记录',
-'LBL_NEW_MEETING'=>'新增会议记录',
-'LBL_MEETING_TITLE'=>'会议',
-'LBL_NEW_EMAIL'=>'新增电子邮件',
-'LBL_EMAIL_TITLE'=>'邮件',
-'LBL_NEW_CONTACT'=>'新增联系人',
-'LBL_CONTACT_TITLE'=>'联系人',
-
-//Addedvtiger_fieldsafterRC1-Release
-'LBL_ALL'=>'全部',
-'LBL_PROSPECT'=>'期望',
-'LBL_INVESTOR'=>'投资者',
-'LBL_RESELLER'=>'转售人',
-'LBL_PARTNER'=>'伙伴',
-
-//Addedfor4GA
-'LBL_TOOL_FORM_TITLE'=>'客户工具',
-//Addedfor4GA
-'AccountName'=>'客户名称',
-'Phone'=>'电话',
-'Website'=>'网址',
-'Fax'=>'传真',
-'TickerSymbol'=>'传票符号',
-'OtherPhone'=>'其它电话',
-'MemberOf'=>'成员',
-'Email'=>'电子邮件',
-'Employees'=>'员工',
-'OtherEmail'=>'其它电子邮件',
-'Ownership'=>'拥有者',
-'Rating'=>'评价',
-'industry'=>'行业别',
-'SICCode'=>'统一编号',
-'Type'=>'类型',
-'AnnualRevenue'=>'年营业额',
-'AssignedTo'=>'负责人',
-'BillingAddress'=>'账单地址',
-'ShippingAddress'=>'送货地址',
-'BillingCity'=>'乡镇市区',
-'ShippingCity'=>'乡镇市区',
-'BillingState'=>'县市',
-'ShippingState'=>'县市',
-'BillingCode'=>'邮政编码',
-'ShippingCode'=>'邮政编码',
-'BillingCountry'=>'国家',
-'ShippingCountry'=>'国家',
-'CreatedTime'=>'建立时间',
-'ModifiedTime'=>'修改时间',
-'Description'=>'描述',
-'ShippingPoBox'=>'付款地址采购订单信箱',
-'BillingPoBox'=>'付款地址采购订单信箱',
-
-//Addedafter4.2patch2
-'EmailOptOut'=>'拒绝电子邮件打扰',
-'LBL_EMAIL_OPT_OUT'=>'拒绝电子邮件打扰:',
-
-//Addedafter5Alpha5
-'NotifyOwner'=>'提醒负责人',
-
-//Addedforexistingpicklistentries
-
-'--None--'=>'--无--',
-
-'Acquired'=>'取得',
-'Active'=>'启用',
-'MarketFailed'=>'市场失利',
-'ProjectCancelled'=>'项目取消',
-'Shutdown'=>'关闭',
-
-'Apparel'=>'存在',
-'Banking'=>'银行',
-'Biotechnology'=>'生物科技',
-'Chemicals'=>'化学',
-'Communications'=>'交通',
-'Construction'=>'建筑',
-'Consulting'=>'顾问',
-'Education'=>'教育',
-'Electronics'=>'电子',
-'Energy'=>'能源',
-'Engineering'=>'工程',
-'Entertainment'=>'娱乐',
-'Environmental'=>'环境',
-'Finance'=>'财务',
-'Food&Beverage'=>'饮食',
-'Government'=>'政府',
-'Healthcare'=>'健康照护',
-'Hospitality'=>'医院',
-'Insurance'=>'保险',
-'Machinery'=>'机械',
-'Manufacturing'=>'工厂',
-'Media'=>'媒体',
-'NotForProfit'=>'非营利',
-'Recreation'=>'娱乐中心',
-'Retail'=>'零售',
-'Shipping'=>'运输',
-'Technology'=>'科技',
-'Telecommunications'=>'通讯',
-'Transportation'=>'传输',
-'Utilities'=>'工具',
-'Other'=>'其它',
-
-'Analyst'=>'分析师',
-'Competitor'=>'竞争者',
-'Customer'=>'客户',
-'Integrator'=>'整合者',
-'Investor'=>'投资者',
-'Partner'=>'伙伴',
-'Press'=>'新闻',
-'Prospect'=>'潜在客户',
-'Reseller'=>'盘商',
-'LBL_START_DATE'=>'开始日期',
-'LBL_END_DATE'=>'结束日期',
-
-//Added/UpdatedforvtigerCRM5.0.4
-
-//addedtofixtheissue#4081
-'LBL_ACCOUNT_EXIST'=>'帐户名称已存在!',
-
-//mailerexport
-'LBL_MAILER_EXPORT'=>'邮寄导出',
-'LBL_MAILER_EXPORT_CONTACTS_TYPE'=>'选择通讯录:',
-'LBL_MAILER_EXPORT_CONTACTS_DESCR'=>'联络可能被选择通过"自定义字段"和一些标准字段。.',
-'LBL_MAILER_EXPORT_RESULTS_TYPE'=>'选择导出类型:',
-'LBL_MAILER_EXPORT_RESULTS_DESCR'=>'聚集从账户及其联系人的数据,还给前次搜索.',
-'LBL_EXPORT_RESULTS_EMAIL'=>'导出邮件联系人数据',
-'LBL_EXPORT_RESULTS_EMAIL_CORP'=>'导出邮件数据,如果联系人"电邮"为空则用"公司电邮"',
-'LBL_EXPORT_RESULTS_FULL'=>'导出联系人数据,电子邮件帐户名称,地址,电话等.',
-
-'LBL_EXPORT_RESULTS_GO'=>'导出',
-'LBL_MAILER_EXPORT_IGNORE'=>'--忽略--',
-'LBL_MAILER_EXPORT_CHECKED'=>'检查',
-'LBL_MAILER_EXPORT_NOTCHECKED'=>'不进行检查',
-
-//Addedafter5.0.4GA
-
-//ModuleSequenceNumbering
-'AccountNo'=>'帐号',
-//END
-
-//AccountHierarchy
-'LBL_SHOW_ACCOUNT_HIERARCHY'=>'查看账号级别',
-
-);
-
-?>
diff --git a/oss/vtiger/trunk/modules/Accounts/updateRelations.php b/oss/vtiger/trunk/modules/Accounts/updateRelations.php
deleted file mode 100644
index 30bb11c6..00000000
--- a/oss/vtiger/trunk/modules/Accounts/updateRelations.php
+++ /dev/null
@@ -1,52 +0,0 @@
-pquery("insert into vtiger_senotesrel values (?,?)", array($forCRMRecord,$id));
- elseif($dest_mod == 'Products')
- $adb->pquery("insert into vtiger_seproductsrel values(?,?,?)", array($forCRMRecord, $id, $currentModule));
- elseif($dest_mod == 'Campaigns')
- $adb->pquery("insert into vtiger_campaignaccountrel values(?,?,1)", array($id, $forCRMRecord));
- else {
- $focus->save_related_module($currentModule, $forCRMRecord, $dest_mod, $id);
- }
- }
-}
-
-header("Location: index.php?action=$action&module=$currentModule&record=".$forCRMRecord."&parenttab=".$parenttab);
-
-?>