[Vtigercrm-commits] [vtiger-commits] r9972 - in /vtigercrm/branches/5.0.3: ./ modules/Accounts/ modules/Calendar/ modules/Contacts/ modules/HelpDesk/ modules/Leads/ modules/Settings/language/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu Dec 14 05:23:29 EST 2006
Author: richie
Date: Thu Dec 14 03:23:15 2006
New Revision: 9972
Log:
mailmerge template option will be hidden if no template is present
Modified:
vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php
vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
vtigercrm/branches/5.0.3/modules/Leads/ListView.php
vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
vtigercrm/branches/5.0.3/vtigerversion.php
Modified: vtigercrm/branches/5.0.3/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/ListView.php Thu Dec 14 03:23:15 2006
@@ -226,7 +226,6 @@
}
if(isPermitted("Accounts","Merge") == 'yes')
{
- $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Accounts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
$wordTemplateResult = fetchWordTemplateList("Accounts");
$tempCount = $adb->num_rows($wordTemplateResult);
$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -235,8 +234,22 @@
$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
$tempVal = $adb->fetch_array($wordTemplateResult);
}
- $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
-}
+ if($tempCount > 0)
+ {
+ $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+ $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Accounts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+ }
+ else
+ {
+ require("user_privileges/user_privileges_1.php");
+ if($is_admin == true)
+ {
+ $smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+ }
+ }
+}
+
//mass merge for word templates
$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
@@ -268,7 +281,7 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
-$check_button = Button_Check($module);
+$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
Modified: vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/OpenListView.php Thu Dec 14 03:23:15 2006
@@ -75,7 +75,7 @@
{
//for upcoming avtivities
$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid LEFT JOIN vtiger_activitygrouprelation ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$upcoming_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
- if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)
+ if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
{
$sec_parameter=getListViewSecurityParameter('Calendar');
$list_query .= $sec_parameter;
@@ -87,7 +87,7 @@
{
//for pending activities
$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid LEFT JOIN vtiger_activitygrouprelation ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid LEFT JOIN vtiger_groups ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Not Held' ) ".$pending_condition." AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
- if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[9] == 3)
+ if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[16] == 3)
{
$sec_parameter=getListViewSecurityParameter('Calendar');
$list_query .= $sec_parameter;
Modified: vtigercrm/branches/5.0.3/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/ListView.php Thu Dec 14 03:23:15 2006
@@ -234,7 +234,6 @@
}
if(isPermitted("Contacts","Merge") == 'yes')
{
- $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Contacts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
$wordTemplateResult = fetchWordTemplateList("Contacts");
$tempCount = $adb->num_rows($wordTemplateResult);
$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -243,7 +242,20 @@
$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
$tempVal = $adb->fetch_array($wordTemplateResult);
}
- $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+ if($tempCount > 0)
+ {
+ $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+ $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Contacts')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+ }
+ else
+ {
+ require("user_privileges/user_privileges_1.php");
+ if($is_admin == true)
+ {
+ $smarty->assign("MERGEBUTTON","<td><a href=index.php?module=Settings&action=upload&tempModule=".$currentModule.">". $app_strings['LBL_CREATE_MERGE_TEMPLATE']."</td>");
+ }
+ }
}
//mass merge for word templates
Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Thu Dec 14 03:23:15 2006
@@ -204,7 +204,6 @@
}
if(isPermitted("HelpDesk","Merge") == 'yes')
{
- $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('HelpDesk')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
$wordTemplateResult = fetchWordTemplateList("HelpDesk");
$tempCount = $adb->num_rows($wordTemplateResult);
$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -213,7 +212,21 @@
$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
$tempVal = $adb->fetch_array($wordTemplateResult);
}
- $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+ if($tempCount > 0)
+ {
+ $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+ $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('HelpDesk')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+ }
+ else
+ {
+ require("user_privileges/user_privileges_1.php");
+ if($is_admin == true)
+ {
+ $smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+ }
+ }
+
}
//mass merge for word templates
Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/ListView.php Thu Dec 14 03:23:15 2006
@@ -221,7 +221,6 @@
}
if(isPermitted("Leads","Merge") == 'yes')
{
- $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Leads')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
$wordTemplateResult = fetchWordTemplateList("Leads");
$tempCount = $adb->num_rows($wordTemplateResult);
$tempVal = $adb->fetch_array($wordTemplateResult);
@@ -230,7 +229,22 @@
$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
$tempVal = $adb->fetch_array($wordTemplateResult);
}
- $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+ if($tempCount > 0)
+ {
+ $smarty->assign("WORDTEMPLATEOPTIONS","<td>".$mod_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']."</td><td style=\"padding-left:5px;padding-right:5px\"><select class=\"small\" name=\"mergefile\">".$optionString."</select></td>");
+
+ $smarty->assign("MERGEBUTTON","<td><input title=\"$app_strings[LBL_MERGE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_MERGE_BUTTON_KEY]\" class=\"crmbutton small create\" onclick=\"return massMerge('Leads')\" type=\"submit\" name=\"Merge\" value=\" $app_strings[LBL_MERGE_BUTTON_LABEL]\"></td>");
+ }
+ else
+ {
+ require("user_privileges/user_privileges_1.php");
+ if($is_admin == true)
+ {
+ $smarty->assign("MERGEBUTTON",'<td><a href=index.php?module=Settings&action=upload&tempModule='.$currentModule.'>'. $app_strings["LBL_CREATE_MERGE_TEMPLATE"].'</td>');
+ }
+ }
+
+
}
//mass merge for word templates
Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Thu Dec 14 03:23:15 2006
@@ -827,8 +827,13 @@
'LBL_MEMBER_SELECTED'=>'Selected Members',
'LBL_ENTITY'=>'Entity',
'LBL_OF'=>'of',
-
-//Sharing
+'LBL_CREATE_NEW_GROUP'=>'Create New Group',
+'LBL_ADD_GROUP_BUTTON'=>'Add Group',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
+//Sharing Privileges
'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Organization-level Sharing Rules',
'LBL_RECALCULATE_BUTTON'=>'Recalculate',
'LBL_CHANGE'=>'Change',
@@ -868,6 +873,12 @@
//Added for User Login History While moving from User to Settings
'LBL_LOGIN_HISTORY'=>'Login History',
+//Sharing Access module moved to Setting
+'Read/Write'=>'Read/Write',
+'Read Only '=>'Read Only ',
+'LBL_GROUP'=>'Group',
+'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
+'LBL_ADD_RULE'=>'Add Rule',
);
Modified: vtigercrm/branches/5.0.3/vtigerversion.php
==============================================================================
--- vtigercrm/branches/5.0.3/vtigerversion.php (original)
+++ vtigercrm/branches/5.0.3/vtigerversion.php Thu Dec 14 03:23:15 2006
@@ -10,5 +10,5 @@
********************************************************************************/
$patch_version = '';
$modified_database = '';
-$vtiger_current_version = '5.0.2';
+$vtiger_current_version = '5.0.3';
?>
More information about the vtigercrm-commits
mailing list