diff --git a/modules/Accounts/AccountHierarchy.php b/modules/Accounts/AccountHierarchy.php
new file mode 100644
index 0000000..b36a408
--- /dev/null
+++ b/modules/Accounts/AccountHierarchy.php
@@ -0,0 +1,43 @@
+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/modules/Accounts/Accounts.js b/modules/Accounts/Accounts.js
new file mode 100644
index 0000000..5db2c21
--- /dev/null
+++ b/modules/Accounts/Accounts.js
@@ -0,0 +1,404 @@
+/*********************************************************************************
+
+** 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("
+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);
+$userNameSql = getSqlForNameInDisplayFormat(array('first_name'=>
+ 'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
+$contactUserNameSql = getSqlForNameInDisplayFormat(array('first_name'=>'usersContacts.first_name', 'last_name' =>
+ 'usersContacts.last_name'), 'Users');
+
+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 $userNameSql else vtiger_groups.groupname end as userjoinname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.secondaryemail,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 $contactUserNameSql 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_SECONDARYEMAIL,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);
+?>
+
+
+