[Vtigercrm-commits] [vtiger-commits] r6003 - in /vtigercrm/branches/5.0_postgresql_integration: Smarty/templates/ include/js/ include/language/ include/utils/ modules/Accounts/ modules/Activities/ modules/Calendar/language/ modules/Campaigns/ modules/Contacts/ modules/Dashboard/ modules/Dashboard/language/ modules/Emails/ modules/Emails/language/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/Reports/ modules/Reports/language/ modules/SalesOrder/ modules/Users/ modules/Users/language/ modules/Vendors/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon May 15 12:08:08 EDT 2006
Author: jeffk
Date: Mon May 15 10:07:36 2006
New Revision: 6003
Log:
refs #752. merge trunk changesets [5963] through [6002]. Conflicting line in include/FormValidationUtil.php, kept branch version per [5889]
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DisplayFields.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js
vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Activities/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Activities/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/index.php
vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php
vtigercrm/branches/5.0_postgresql_integration/modules/Faq/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Faq/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ConvertLead.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Notes/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Notes/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Products/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Products/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Reports/SaveAndRun.php
vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/massdelete.php
vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php
vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/DetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/EditView.php
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Buttons_List.tpl Mon May 15 10:07:36 2006
@@ -24,7 +24,7 @@
<tr>
{if $CHECK.EditView eq 'yes'}
{if $MODULE eq 'Activities'}
- <td style="padding-right:0px"><a href="#" id="showSubMenu" onMouseOver="moveMe('subMenu');searchshowhide('subMenu');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+ <td style="padding-right:0px"><a href="#" id="showSubMenu" onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
{else}
<td style="padding-right:0px"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
{/if}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ComposeEmail.tpl Mon May 15 10:07:36 2006
@@ -38,6 +38,7 @@
<input type="hidden" name="return_action" value="{$RETURN_ACTION}">
<input type="hidden" name="return_viewname" value="{$RETURN_VIEWNAME}">
<input type="hidden" name="popupaction" value="create">
+<input type="hidden" name="hidden_toid">
<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
<tbody>
<tr>
@@ -58,6 +59,7 @@
<td class="lvtCol" style="padding: 5px;" align="right"><b>{$MOD.LBL_TO}</b></td>
<td class="dvtCellLabel" style="padding: 5px;">
<input name="{$elements.2.0}" type="hidden" value="{$IDLISTS}">
+ <input type="hidden" name="saved_toid" value="{$TO_MAIL}">
<textarea id="parent_name" cols="70">{$TO_MAIL}</textarea>
</td>
<td class="dvtCellLabel" style="padding: 5px;" align="left">
@@ -69,7 +71,7 @@
<span class="lvtCol" style="padding: 3px;">
<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=set_return_emails","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>
- </span><span class="lvtCol" style="padding: 3px;"><input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+ </span><span class="lvtCol" style="padding: 3px;"><input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.hidden_toid.value='';this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
</span>
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DisplayFields.tpl Mon May 15 10:07:36 2006
@@ -459,6 +459,8 @@
{section name=reminder start=$start max=$end loop=$end step=1 }
{if $smarty.section.reminder.index eq $sel_val}
{assign var=sel_value value="SELECTED"}
+ {else}
+ {assign var=sel_value value=""}
{/if}
<OPTION VALUE="{$smarty.section.reminder.index}" "{$sel_value}">{$smarty.section.reminder.index}</OPTION>
{/section}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailContents.tpl Mon May 15 10:07:36 2006
@@ -13,18 +13,18 @@
<table class="rssTable" cellspacing="0" cellpadding="0">
<tr>
<th width="5%"><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id")></th>
- {foreach item=element from=$LISTHEADER}
- <th>{$element}</th>
- {/foreach}
+ <th width="65%">{$LISTHEADER.0}</th>
+ <th width="15%">{$LISTHEADER.1}</th>
+ <th width="15%">{$LISTHEADER.2}</th>
</tr>
{foreach key=id item=row from=$LISTENTITY}
<tr onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
<td>
<span><input type="checkbox" name="selected_id" value= '{$id}' onClick=toggleSelectAll(this.name,"selectall")>
</span></td>
- {foreach item=row_values from=$row}
- <td><b>{$row_values}</b></td>
- {/foreach}
+ <td><b>{$row.0}</b></td>
+ <td><b>{$row.1}</b></td>
+ <td><b>{$row.2}</b></td>
</tr>
{/foreach}
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EmailDetails.tpl Mon May 15 10:07:36 2006
@@ -14,19 +14,17 @@
<td class="forwardBg">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- {if $BLOCKS neq ''}
+ {if $BLOCKS neq ''}
<td width="75%">
- <input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" onClick=OpenCompose('{$ID}','forward')>
- <input type="button" name="Send" value=" {$MOD.LBL_SEND} " class="classWebBtn" onClick=OpenCompose('{$ID}','edit')>
- {foreach item=row from=$BLOCKS}
- {foreach item=elements key=title from=$row}
- {if $title eq 'Attachment'}
- {if $elements.value ne ''}
- <input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay')"/>
- {/if}
- {/if}
- {/foreach}
- {/foreach}
+ <input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" onClick=OpenCompose('{$ID}','forward')>
+ <input type="button" name="Send" value=" {$MOD.LBL_SEND} " class="classWebBtn" onClick=OpenCompose('{$ID}','edit')>
+ {foreach item=row from=$BLOCKS}
+ {foreach item=elements key=title from=$row}
+ {if $title eq 'Attachment' && $elements.value != ''}
+ <input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay')"/>
+ {/if}
+ {/foreach}
+ {/foreach}
</td>
<td width="25%" align="right"><input type="button" name="Button" value=" {$APP.LBL_DELETE_BUTTON} " class="classWebBtn" onClick="DeleteEmail('{$ID}')"/></td>
{else}
@@ -42,10 +40,10 @@
{foreach item=elements key=title from=$row}
{if $title eq 'Subject'}
<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td width="20%" align="right"><b>{$MOD.LBL_TO}</b></td><td width="2%"> </td><td>{$TO_MAIL} </td></tr>
- <tr><td align="right">{$MOD.LBL_CC}</td><td> </td><td> {$CC_MAIL}</td></tr>
- <tr><td align="right">{$MOD.LBL_BCC}</td><td> </td><td> {$BCC_MAIL}</td></tr>
- <tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td> </td><td>{$elements.value}</td></tr>
+ <tr><td width="20%" align="right" valign="top"><b>{$MOD.LBL_TO}</b></td><td width="2%"> </td><td>{$TO_MAIL} </td></tr>
+ <tr><td align="right" valign="top">{$MOD.LBL_CC}</td><td> </td><td>{$CC_MAIL} </td></tr>
+ <tr><td align="right" valign="top">{$MOD.LBL_BCC}</td><td> </td><td>{$BCC_MAIL} </td></tr>
+ <tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td> </td><td>{$elements.value} </td></tr>
<tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3"> </td></tr>
</table>
{elseif $title eq 'Description'}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Emails.tpl Mon May 15 10:07:36 2006
@@ -33,20 +33,7 @@
ajaxObj.process("index.php?",urlstring);
{rdelim}
{literal}
-function DeleteEmail(id)
-{
- if(confirm("Are you sure you want to delete ?"))
- {
- show("status");
- var ajaxObj = new Ajax(ajaxDelResponse);
- var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+id;
- ajaxObj.process("index.php?",urlstring);
- }
- else
- {
- return false;
- }
-}
+
function ajaxDelResponse(response)
{
hide("status");
@@ -59,6 +46,8 @@
function ShowFolders(folderid)
{ldelim}
var ajaxObj = new Ajax(ajaxSaveResponse);
+ gFolderid = folderid;
+ getObj('search_text').value = '';
switch(folderid)
{ldelim}
case 1:
@@ -168,9 +157,12 @@
<td width="25%"><input type="button" name="Button2" value=" {$APP.LBL_DELETE_BUTTON}" class="classWebBtn" onClick="return massDelete();"/>
</td>
<td width="75%" align="right">
- <font color="#000000">{$APP.LBL_SEARCH}</font> <input type="text" name="srch" class="importBox" />
- <select name="optionSel" class="importBox"><option selected>in Subject</option></select>
- <input type="button" name="find" value=" {$APP.LBL_FIND_BUTTON} " class="classWebBtn" />
+ <font color="#000000">{$APP.LBL_SEARCH}</font> <input type="text" name="search_text" id="search_text" class="importBox" onkeyUp="Searchfn();">
+ <select name="search_field" id="search_field" onChange="Searchfn();" class="importBox">
+ <option value='subject'>{$MOD.LBL_IN_SUBJECT}</option>
+ <option value='user_name'>{$MOD.LBL_IN_SENDER}</option>
+ <option value='join'>{$MOD.LBL_IN_SUBJECT_OR_SENDER}</option>
+ </select>
</td>
</tr>
</table>
@@ -232,6 +224,6 @@
url = 'index.php?module=Emails&action=EmailsAjax&file=EditView&record='+id+'&forward=true';
break;
{rdelim}
- openPopUp('xComposeEmail',this,url,'createemailWin',775,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
+ openPopUp('xComposeEmail',this,url,'createemailWin',797,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
{rdelim}
</script>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl Mon May 15 10:07:36 2006
@@ -13,7 +13,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
- <title>{$CURRENT_USER} - {$CATEGORY} - {$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
+ <title>{$CURRENT_USER} - {$APP.$CATEGORY} - {$APP.$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
<link rel="stylesheet" type="text/css" href="style.css">
<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">
<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
@@ -324,7 +324,7 @@
<td valign="top">
{assign var="parentno" value=0}
{foreach name=parenttablist key=parenttab item=details from=$QUICKACCESS}
- <span class="allMnuHdr">{$parenttab}</span>
+ <span class="allMnuHdr">{$APP[$parenttab]}</span>
{foreach name=modulelist item=modules from=$details}
{math assign="num" equation="x + y" x=$parentno y=1}
{math assign="loopvalue" equation="x % y" x=$num y=14}
@@ -332,7 +332,7 @@
{if $loopvalue eq '0'}
</td><td valign="top">
{/if}
- <a href="index.php?module={$modules.0}&action=index&parenttab={$parenttab}" class="allMnu">{$modules.1}</a>
+ <a href="index.php?module={$modules.0}&action=index&parenttab={$parenttab}" class="allMnu">{$APP[$modules.1]}</a>
{/foreach}
{/foreach}
</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListView.tpl Mon May 15 10:07:36 2006
@@ -91,31 +91,25 @@
</script>
{include file='Buttons_List.tpl'}
-
-<div id="subMenuBg" style="position:absolute;display:none;filter:Alpha(Opacity=90);-moz-opacit
-y:0.90;z-index:50"></div>
-<div id="subMenu" style="z-index:1;display:none;position:absolute;">
-<table border=0 cellspacing=0 cellpadding=0 width="100px" align=center class="moduleSearch">
- <tr>
- <td class=small>
- <table cellspacing="2" cellpadding="2" border="0">
- <tr>
- <td width=90% ><a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}">{$NEW_EVENT}</a></td>
- </tr>
- <tr>
- <td width=90% ><a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}">{$NEW_TASK}</a></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
+<!-- Activity createlink layer start -->
+<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+ <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td>
+ <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
+ <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
+ </td>
+ </tr>
+ </table>
+
</div>
+<!-- Activity createlink layer end -->
<!-- SIMPLE SEARCH -->
<div id="searchAcc" style="z-index:1;display:none;position:relative;">
<form name="basicSearch" action="index.php">
<table width="80%" cellpadding="5" cellspacing="0" style="border:1px dashed #CCCCCC;" class="small" align="center">
<tr>
- <td width="15%" class="dvtCellLabel" nowrap align="right"><img src="{$IMAGE_PATH}basicSearchLens.gif" align="absmiddle" alt="{$APP.LNK_BASIC_SEARCH}" title="{$APP.LNK_BASIC_SEARCH}" border=0> <b>Search for</b></td>
+ <td width="15%" class="dvtCellLabel" nowrap align="right"><img src="{$IMAGE_PATH}basicSearchLens.gif" align="absmiddle" alt="{$APP.LNK_BASIC_SEARCH}" title="{$APP.LNK_BASIC_SEARCH}" border=0> <b>{$APP.LBL_SEARH_FOR}</b></td>
<td width="25%" class="dvtCellLabel"><input type="text" class="txtBox" name="search_text"></td>
<td width="25%" class="dvtCellLabel"><b>In</b>
<select name ="search_field" class="txtBox">
@@ -129,8 +123,8 @@
<input type="hidden" name="search_cnt">
</td>
<td width="35%" class="dvtCellLabel">
- <input name="submit" type="button" class="classBtn" onClick="callSearch('Basic');" value=" Search Now ">
- <span class="hiliteBtn4Search"><a href="#" onClick="hide('searchAcc');show('advSearch');document.basicSearch.searchtype.value='advance';">Go to {$APP.LNK_ADVANCED_SEARCH}</a></span>
+ <input name="submit" type="button" class="classBtn" onClick="callSearch('Basic');" value=" {$APP.LBL_SEARCH_NOW_BUTTON} ">
+ <span class="hiliteBtn4Search"><a href="#" onClick="hide('searchAcc');show('advSearch');document.basicSearch.searchtype.value='advance';">{$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH}</a></span>
</td>
</tr>
<tr>
@@ -149,9 +143,9 @@
<table cellspacing=0 cellpadding=5 width=80% style="border-top:1px dashed #CCCCCC;border-left:1px dashed #CCCCCC;border-right:1px dashed #CCCCCC;" class="small" align="center">
<tr>
<td width="15%" class="dvtCellLabel" align="right"><img src="{$IMAGE_PATH}advancedSearchLens.gif" alt="{$APP.LNK_ADVANCED_SEARCH}" title="{$APP.LNK_ADVANCED_SEARCH}" border=0></td>
- <td nowrap width="30%" class="dvtCellLabel"><b><input name="matchtype" type="radio" value="all"> Match All of the Following</b></td>
- <td nowrap class="dvtCellLabel" width="30%"><b><input name="matchtype" type="radio" value="any" checked> Match Any of the Following</b></td>
- <td width="35%" class="dvtCellLabel"><span class="hiliteBtn4Search"><a href="#" onClick="show('searchAcc');hide('advSearch')">Go to {$APP.LNK_BASIC_SEARCH}</a></span></td>
+ <td nowrap width="30%" class="dvtCellLabel"><b><input name="matchtype" type="radio" value="all"> {$APP.LBL_ADV_SEARCH_MSG_ALL}</b></td>
+ <td nowrap class="dvtCellLabel" width="30%"><b><input name="matchtype" type="radio" value="any" checked> {$APP.LBL_ADV_SEARCH_MSG_ANY}</b></td>
+ <td width="35%" class="dvtCellLabel"><span class="hiliteBtn4Search"><a href="#" onClick="show('searchAcc');hide('advSearch')">{$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH}</a></span></td>
</tr>
</table>
<table style="border-left:1px dashed #CCCCCC;border-right:1px dashed #CCCCCC;" cellpadding="2" cellspacing="0" width="80%" align="center" class="small">
@@ -175,15 +169,15 @@
</td>
</tr>
<tr>
- <td class="dvtCellLabel"><input type="button" name="more" value=" More " onClick="fnAddSrch('{$FIELDNAMES}','{$CRITERIA}')" class="classBtn">
- <input name="button" type="button" value=" Fewer " onclick="delRow()" class="classBtn"></td>
+ <td class="dvtCellLabel"><input type="button" name="more" value=" {$APP.LBL_MORE} " onClick="fnAddSrch('{$FIELDNAMES}','{$CRITERIA}')" class="classBtn">
+ <input name="button" type="button" value=" {$APP.LBL_FEWER_BUTTON} " onclick="delRow()" class="classBtn"></td>
<td class="dvtCellLabel"> </td>
<td class="dvtCellLabel"> </td>
</tr>
</table>
<table border=0 cellspacing=0 cellpadding=5 width=80% style="border-bottom:1px dashed #CCCCCC;border-left:1px dashed #CCCCCC;border-right:1px dashed #CCCCCC;" align="center">
<tr>
- <td align=center class="dvtCellLabel"><input type="button" class="classBtn" value=" Search Now " onClick="totalnoofrows();callSearch('Basic');">
+ <td align=center class="dvtCellLabel"><input type="button" class="classBtn" value=" {$APP.LBL_SEARCH_NOW_BUTTON} " onClick="totalnoofrows();callSearch('Basic');">
</td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefDetailView.tpl Mon May 15 10:07:36 2006
@@ -93,13 +93,13 @@
<tr>
<td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME}</td>
<td width="30%" class="dvtCellInfo" nowrap>{$FIRST_NAME}</td>
- <td width="25%" align="right" class="dvtCellLabel">My {$UMOD.LBL_GROUP_NAME} </td>
+ <td width="25%" align="right" class="dvtCellLabel">{$UMOD.LBL_MY} {$UMOD.LBL_GROUP_NAME} </td>
<td width="25%" class="dvtCellInfo">{$GROUPASSIGNED}</td>
</tr>
<tr>
<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
<td class="dvtCellInfo">{$LAST_NAME}</td>
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_USER_ROLE}</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_MY} {$UMOD.LBL_USER_ROLE}</td>
<td class="dvtCellInfo">{$ROLEASSIGNED}</td>
</tr>
@@ -107,12 +107,12 @@
<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
<td class="dvtCellInfo"><a href="mailto:{$EMAIL1}" target="_blank">{$EMAIL1}</a></td>
{* <td width="30%" align=left class="dvtCellInfo"><input name="pass" type="button" class="classBtn" id="pass" value=" Change Now... " onclick="fnvshobj(this,'roleLay');"/></td>*}
- <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_STATUS}</td>
+ <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_MY} {$UMOD.LBL_STATUS}</td>
<td class="dvtCellInfo">{$STATUS}</td>
</tr>
<tr><td colspan="4"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Defaults</b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_MY_DEFAULTS}</b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ACTIVITY_VIEW}</td>
@@ -128,7 +128,7 @@
</tr>
<tr><td colspan="4"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Designation & Contact Details </b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_MY_DESG}</b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_TITLE}</td>
@@ -177,7 +177,7 @@
<tr><td colspan="4"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Postal Address </b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_MY_ADDR} </b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ADDRESS}</td>
@@ -209,10 +209,10 @@
<td width="25%" valign="top" style="padding:10px; ">
<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
<tr><td height="35"> </td></tr>
- <tr><td class="detailedViewHeader"><b>My Photo</b></td></tr>
+ <tr><td class="detailedViewHeader"><b>{$UMOD.LBL_MY_PHOTO}</b></td></tr>
<tr><td align="center"><img src="images/myPreferences.gif" /></td>
</tr>
- <tr><td align="center"><input type="button" value=" Change Photo... " class="classBtn" onclick="fnvshNrm('chPhoto')"/></td></tr>
+ <tr><td align="center"><input type="button" value=" {$UMOD.LBL_CHANGE_PHOTO} " class="classBtn" onclick="fnvshNrm('chPhoto')"/></td></tr>
<tr>
<td align="center">
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/MyPrefEditView.tpl Mon May 15 10:07:36 2006
@@ -103,7 +103,7 @@
</tr>
<tr>
<td class="dvtCellLabel" align="right">
- <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_USER_ROLE}</td>
+ <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_MY} {$UMOD.LBL_USER_ROLE}</td>
<td class="dvtCellInfo">{$USER_ROLE}</td>
<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
<td class="dvtCellInfo"><input type="text" name="email1" value='{$EMAIL1}' class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
@@ -112,12 +112,12 @@
<tr>
{* <td width="30%" align=left class="dvtCellInfo"><input name="pass" type="button" class="classBtn" id="pass" value=" Change Now... " onclick="fnvshobj(this,'roleLay');"/></td>*}
<td class="dvtCellLabel" align="right">
- <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>My {$UMOD.LBL_STATUS}</td>
+ <span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_MY} {$UMOD.LBL_STATUS}</td>
{$USER_STATUS_OPTIONS}
</tr>
<tr><td colspan="4"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Defaults</b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_MY_DEFAULTS}</b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ACTIVITY_VIEW}</td>
@@ -133,7 +133,7 @@
</tr>
<tr><td colspan="4"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Designation & Contact Details </b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_MY_DESG}</b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_TITLE}</td>
@@ -194,7 +194,7 @@
<tr><td colspan="4"> </td></tr>
<tr>
- <td colspan="4" class="detailedViewHeader"><b>My Postal Address </b> </td>
+ <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_MY_ADDR}</b> </td>
</tr>
<tr>
<td class="dvtCellLabel" align="right" width="25%">{$UMOD.LBL_ADDRESS}</td>
@@ -234,10 +234,10 @@
<td width="25%" valign="top" style="padding:10px; ">
<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
<tr><td height="35"> </td></tr>
- <tr><td class="detailedViewHeader"><b>My Photo</b></td></tr>
+ <tr><td class="detailedViewHeader"><b>{$UMOD.LBL_MY_PHOTO}</b></td></tr>
<tr><td align="center"><img src="images/myPreferences.gif" /></td>
</tr>
- <tr><td align="center"><input type="button" value=" Change Photo... " class="classBtn" onclick="fnvshNrm('chPhoto')"/></td></tr>
+ <tr><td align="center"><input type="button" value=" {$UMOD.LBL_CHANGE_PHOTO} " class="classBtn" onclick="fnvshNrm('chPhoto')"/></td></tr>
<tr>
<td align="center">
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportContents.tpl Mon May 15 10:07:36 2006
@@ -27,9 +27,9 @@
<tbody>
<tr>
<td class="lvtCol" width="5%">#</td>
- <td class="lvtCol" width="35%">Report Name</td>
- <td class="lvtCol" width="50%">Description</td>
- <td class="lvtCol" width="10%">Tools</td>
+ <td class="lvtCol" width="35%">{$MOD.LBL_REPORT_NAME}</td>
+ <td class="lvtCol" width="50%">{$MOD.LBL_DESCRIPTION}</td>
+ <td class="lvtCol" width="10%">{$MOD.LBL_TOOLS}</td>
</tr>
{foreach name=reportdtls item=reportdetails from=$reportfolder.details}
<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportFilters.tpl Mon May 15 10:07:36 2006
@@ -11,7 +11,7 @@
-->*}
<link rel="stylesheet" type="text/css" media="all" href="jscalendar/calendar-win2k-cold-1.css">
<script type="text/javascript" src="jscalendar/calendar.js"></script>
-<script type="text/javascript" src="jscalendar/lang/calendar-en.js"></script>
+<script type="text/javascript" src="jscalendar/lang/calendar-{$APP.LBL_JSCALENDAR_LANG}.js"></script>
<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
<script language="JavaScript" type="text/javascript" src="include/calculator/calc.js"></script>
{$BLOCKJS_STD}
@@ -51,10 +51,10 @@
</select>
</td>
<td class="dvtCellInfo"><input name="startdate" id="jscal_field_date_start" style="border: 1px solid rgb(186, 186, 186);" size="10" maxlength="10" value="{$STARTDATE_STD}" type="text">
- <img src="{$IMAGE_PATH}calendar.gif" id="jscal_trigger_date_start"><br><font size="1"><em old="(yyyy-mm-dd)">(yyyy-mm-dd)</em></font>
+ <img src="{$IMAGE_PATH}calendar.gif" id="jscal_trigger_date_start"><br><font size="1"><em old="{$APP.NTC_DATE_FORMAT}">{$APP.NTC_DATE_FORMAT}</em></font>
</td>
<td class="dvtCellInfo"><input name="enddate" id="jscal_field_date_end" style="border: 1px solid rgb(186, 186, 186);" size="10" maxlength="10" value="{$ENDDATE_STD}" type="text">
- <img src="{$IMAGE_PATH}calendar.gif" id="jscal_trigger_date_end"><br><font size="1"><em old="(yyyy-mm-dd)">(yyyy-mm-dd)</em></font>
+ <img src="{$IMAGE_PATH}calendar.gif" id="jscal_trigger_date_end"><br><font size="1"><em old="{$APP.NTC_DATE_FORMAT}">{$APP.NTC_DATE_FORMAT}</em></font>
</td>
</tr>
<tr>
@@ -90,7 +90,7 @@
</select>
</td>
<td class="dvtCellLabel"><input name="fval1" id="fval1" class="txtBox" type="text" value="{$VALUE1}"></td>
- <td class="dvtCellLabel">and</td>
+ <td class="dvtCellLabel">{$MOD.LBL_AND}</td>
</tr>
<tr>
<td class="dvtCellInfo">
@@ -106,7 +106,7 @@
</select>
</td>
<td class="dvtCellInfo"><input name="fval2" id="fval2" class="txtBox" type="text" value="{$VALUE2}"></td>
- <td class="dvtCellInfo">And</td>
+ <td class="dvtCellInfo">{$MOD.LBL_AND}</td>
</tr>
<tr>
<td class="dvtCellLabel">
@@ -122,7 +122,7 @@
</select>
</td>
<td class="dvtCellLabel"><input name="fval3" id="fval3" class="txtBox" type="text" value="{$VALUE3}"></td>
- <td class="dvtCellLabel">and</td>
+ <td class="dvtCellLabel">{$MOD.LBL_AND}</td>
</tr>
<tr>
<td class="dvtCellInfo">
@@ -138,7 +138,7 @@
</select>
</td>
<td class="dvtCellInfo"><input name="fval4" id="fval4" class="txtBox" type="text" value="{$VALUE4}"></td>
- <td class="dvtCellInfo">and</td>
+ <td class="dvtCellInfo">{$MOD.LBL_AND}</td>
</tr>
<tr>
<td class="dvtCellLabel">
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Rss.tpl Mon May 15 10:07:36 2006
@@ -75,7 +75,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
<tr>
<td class="showPanelBg" valign="top" width="95%" style="padding-left:20px; "><br />
- <span class="lvtHeaderText">{$CATEGORY} > {$MODULE} </span>
+ <span class="lvtHeaderText">{$APP.$CATEGORY} > {$APP.$MODULE} </span>
<hr noshade="noshade" size="1" />
</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl Mon May 15 10:07:36 2006
@@ -579,6 +579,8 @@
{section name=reminder start=$start max=$end loop=$end step=1 }
{if $smarty.section.reminder.index eq $sel_val}
{assign var=sel_value value="SELECTED"}
+ {else}
+ {assign var=sel_value value=""}
{/if}
<OPTION VALUE="{$smarty.section.reminder.index}" "{$sel_value}">{$smarty.section.reminder.index}</OPTION>
{/section}
Modified: vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/Mail.js Mon May 15 10:07:36 2006
@@ -103,6 +103,7 @@
{
window.opener.document.EditView.parent_id.value = window.opener.document.EditView.parent_id.value+entity_id+'@'+email_id+'|';
window.opener.document.EditView.parent_name.value = window.opener.document.EditView.parent_name.value+parentname+'<'+emailadd+'>; ';
+ window.opener.document.EditView.hidden_toid.value = emailadd+','+window.opener.document.EditView.hidden_toid.value;
window.close();
}else
{
Modified: vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php Mon May 15 10:07:36 2006
@@ -444,6 +444,14 @@
'LBL_SEARCH_ALT'=>'Search in ',
'LBL_SEARCH_STRING'=>'Search...',
+
+'LBL_SEARCH_FOR'=>'Search for',
+'LBL_SEARCH_NOW_BUTTON'=>'Search Now',
+'LBL_GO_TO'=>'Go to',
+'LBL_FEWER_BUTTON'=>'Fewer',
+
+'LBL_ADV_SEARCH_MSG_ANY'=>'Match Any of the Following',
+'LBL_ADV_SEARCH_MSG_ALL'=>'Match All of the Following',
'COMBO_ALL'=>'All',
@@ -728,6 +736,36 @@
'Inventory'=>'Inventory',
'Tools'=>'Tools',
'Settings'=>'Settings',
+
+'LBL_INFORMATION'=>'Information',
+'LBL_MORE'=>'More',
+'LBL_BASIC'=>'Basic',
+'LBL_CREATING'=>'Creating',
+'LBL_EDITING'=>'Editing',
+'LBL_NEW'=>'New',
+
+//Added for Detail/Edit/Related List of all modules
+
+'Lead'=>'Lead',
+'Account'=>'Account',
+'Contact'=>'Contact',
+'Potential'=>'Potential',
+'Product'=>'Product',
+'Email'=>'Email',
+'Activity'=>'Activity',
+'Event'=>'Event',
+'Quote'=>'Quote',
+'PriceBook'=>'PriceBook',
+'PurchaseOrder'=>'Purchase Order',
+'Ticket'=>'Ticket',
+'SalesOrder'=> 'Sales Order',
+'Campaign'=>'Campaign',
+'Note'=>'Note',
+'Dashboard'=>'Dashboard',
+'Report'=>'Report',
+'Vendor'=>'Vendor',
+'Webmail'=>'Webmail',
+
'LBL_SELECT_TEMPLATE_TO_MAIL_MERGE'=>'Select template to Mail Merge:',
'LBL_TITLE_OR_DESCRIPTION'=>'Title / Description',
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php Mon May 15 10:07:36 2006
@@ -258,8 +258,10 @@
//This is added to strip the crmid and _ from the file name and show the original filename
$org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_');
- $custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$org_filename.'</a>';
-
+ if($org_filename != '')
+ $custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$org_filename.'</a>';
+ else
+ $custfldval = '';
$label_fld[] =$mod_strings[$fieldlabel];
$label_fld[] =$custfldval;
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -48,7 +48,7 @@
$smarty->assign("ID",$RECORD );
$smarty->assign("id",$focus->id);
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","Account");
+$smarty->assign("SINGLE_MOD",$app_strings['Account']);
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
$smarty->assign("THEME", $theme);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/DetailView.php Mon May 15 10:07:36 2006
@@ -65,7 +65,7 @@
$smarty->assign("CUSTOMFIELD", $cust_fld);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD","Account");
+$smarty->assign("SINGLE_MOD",$app_strings['Account']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Accounts/EditView.php Mon May 15 10:07:36 2006
@@ -96,7 +96,7 @@
$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
$smarty->assign("ID", $focus->id);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Account");
+$smarty->assign("SINGLE_MOD",$app_strings['Account']);
$smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
$smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -46,7 +46,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("RELATEDLISTS", $related_array);
$smarty->assign("ID", $RECORD);
-$smarty->assign("SINGLE_MOD", "Activity");
+$smarty->assign("SINGLE_MOD", $app_strings['Activity']);
$smarty->assign("ACTIVITY_MODE",'Events');
$smarty->assign("MODULE", $MODULE);
$smarty->assign("THEME", $theme);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/DetailView.php Mon May 15 10:07:36 2006
@@ -124,7 +124,7 @@
$smarty->assign("CUSTOMFIELD", $cust_fld);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD", "Activity");
+$smarty->assign("SINGLE_MOD", $app_strings['Activity']);
//get Description Information
@@ -137,7 +137,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-$smarty->assign("MODULE","Activities");
+$smarty->assign("MODULE",$app_strings['Activities']);
$smarty->display("DetailView.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Activities/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Activities/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Activities/EditView.php Mon May 15 10:07:36 2006
@@ -71,7 +71,7 @@
$smarty->assign("ACTIVITY_MODE",$activity_mode);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD",'Activity');
+$smarty->assign("SINGLE_MOD",$app_strings['Activity']);
$smarty->assign("NEW_EVENT",$app_strings['LNK_NEW_EVENT']);
$smarty->assign("NEW_TASK",$app_strings['LNK_NEW_TASK']);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php Mon May 15 10:07:36 2006
@@ -167,6 +167,23 @@
"Dec",
),
+'LBL_ADD_EVENT'=>'Add Event',
+'LBL_INVITE'=>'Invite',
+'LBL_REMINDER'=>'Reminder',
+'LBL_REPEAT'=>'Repeat',
+'LBL_EVENTTYPE'=>'Event Type',
+'LBL_EVENTNAME'=>'Event Name',
+'LBL_EVENTSTAT'=>'Event starts at',
+'LBL_EVENTEDAT'=>'Event ends on',
+'LBL_HRVIEW'=>'Hour View',
+'LBL_LISTVIEW'=>'List View',
+'LBL_TOTALEVENTS'=>'Total Events :',
+'LBL_TOTALTODOS'=>'Total Todos :',
+'LBL_EVTDTL'=>'Event Details',
+'LBL_ACTION'=>'Actions',
+'LBL_CURSTATUS'=>'Current Status',
+'LBL_PENDING'=>'Pending',
+
//DON'T CONVERT THESE THEY ARE MAPPINGS
'db_last_name' => 'LBL_LIST_LAST_NAME',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -31,6 +31,7 @@
global $mod_strings;
global $app_strings;
global $theme;
+global $currentModule;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
@@ -42,7 +43,7 @@
}
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("Campaigns",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -50,7 +51,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD",$currentmodule);
+$smarty->assign("SINGLE_MOD",$app_strings['Campaign']);
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
$smarty->assign("THEME", $theme);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/DetailView.php Mon May 15 10:07:36 2006
@@ -26,7 +26,7 @@
{
$focus->id = "";
}
-global $app_strings,$mod_strings,$theme;
+global $app_strings,$mod_strings,$theme,$currentModule;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -38,10 +38,10 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("Campaigns","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD","Campaign");
+$smarty->assign("SINGLE_MOD",$app_strings['Campaign']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -58,7 +58,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-$smarty->assign("MODULE","Campaigns");
+$smarty->assign("MODULE",$app_strings['Campaigns']);
$smarty->display("DetailView.tpl");
$focus->id = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Campaigns/EditView.php Mon May 15 10:07:36 2006
@@ -38,16 +38,16 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Campaigns",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Campaigns",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Campaign");
+$smarty->assign("SINGLE_MOD",$app_strings['Campaign']);
$category = getParentTab();
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -40,6 +40,7 @@
global $mod_strings;
global $app_strings;
global $theme;
+global $currentModule;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
@@ -59,10 +60,10 @@
$smarty->assign("id",$focus->id);
$smarty->assign("NAME",$focus->name);
-$related_array = getrelatedlists("Contacts",$focus);
+$related_array = getrelatedlists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","Contact");
+$smarty->assign("SINGLE_MOD",$app_strings['Contact']);
$smarty->assign("ID",$record );
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/DetailView.php Mon May 15 10:07:36 2006
@@ -31,6 +31,7 @@
global $log;
global $mod_strings;
global $app_strings;
+global $currentModule;
$focus = new Contact();
@@ -65,9 +66,9 @@
$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname);
$log->info("Detail Block Informations successfully retrieved.");
-$smarty->assign("BLOCKS", getBlocks("Contacts","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD","Contact");
+$smarty->assign("SINGLE_MOD",$app_strings['Contact']);
$smarty->assign("REDIR_MOD","contacts");
$smarty->assign("ID", $_REQUEST['record']);
@@ -107,7 +108,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-$smarty->assign("MODULE","Contacts");
+$smarty->assign("MODULE",$app_strings['Contacts']);
$smarty->display("DetailView.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Contacts/EditView.php Mon May 15 10:07:36 2006
@@ -29,7 +29,7 @@
require_once('include/utils/utils.php');
require_once('include/FormValidationUtil.php');
-global $log,$mod_strings,$app_strings,$theme;
+global $log,$mod_strings,$app_strings,$theme,$currentModule;
//added for contact image
$encode_val=$_REQUEST['encode_val'];
@@ -96,11 +96,11 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Contacts",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Contacts",$disp_view,$mode,$focus->column_fields,'BAS'));
- $smarty->assign("ADVBLOCKS",getBlocks("Contacts",$disp_view,$mode,$focus->column_fields,'ADV'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV'));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -136,7 +136,7 @@
}
$smarty->assign("ID", $focus->id);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Contact");
+$smarty->assign("SINGLE_MOD",$app_strings['Contact']);
if($focus->mode == 'edit')
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/index.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/index.php Mon May 15 10:07:36 2006
@@ -32,22 +32,22 @@
require_once('include/logging.php');
$graph_array = Array(
- "leadsource" => "Leads By Source",
- "leadstatus" => "Leads By Status",
- "leadindustry" => "Leads By Industry",
- "salesbyleadsource" => "Sales by LeadSource",
- "salesbyaccount" => "Sales by Accounts",
- "accountindustry" => "Account By Industry",
- "productcategory" => "Products by Category",
- "sobyaccounts" => "Sales Order by Accounts",
- "sobystatus" => "Sales Order by Status",
- "pobystatus" => "Purchase Order by Status",
- "quotesbyaccounts" => "Quotes by Accounts",
- "quotesbystage" => "Quotes by Stage",
- "invoicebyacnts" => "Invoices by Accounts",
- "invoicebystatus" => "Invoices by status",
- "ticketsbystatus" => "Tickets by status",
- "ticketsbypriority" => "Tickets by Priority",
+ "leadsource" => $mod_strings['leadsource'],
+ "leadstatus" => $mod_strings['leadstatus'],
+ "leadindustry" => $mod_strings['leadindustry'],
+ "salesbyleadsource" => $mod_strings['salesbyleadsource'],
+ "salesbyaccount" => $mod_strings['salesbyaccount'],
+ "accountindustry" => $mod_strings['accountindustry'],
+ "productcategory" => $mod_strings['productcategory'],
+ "sobyaccounts" => $mod_strings['sobyaccounts'],
+ "sobystatus" => $mod_strings['sobystatus'],
+ "pobystatus" => $mod_strings['pobystatus'],
+ "quotesbyaccounts" => $mod_strings['quotesbyaccounts'],
+ "quotesbystage" => $mod_strings['quotesbystage'],
+ "invoicebyacnts" => $mod_strings['invoicebyacnts'],
+ "invoicebystatus" => $mod_strings['invoicebystatus'],
+ "ticketsbystatus" => $mod_strings['ticketsbystatus'],
+ "ticketsbypriority" => $mod_strings['ticketsbypriority'],
);
$log = LoggerManager::getLogger('dashboard');
@@ -59,7 +59,7 @@
</tr>
<tr>
- <td style="padding-left: 10px; padding-right: 10px;" class="moduleName" nowrap="nowrap">Analytics > Dashboard </td>
+ <td style="padding-left: 10px; padding-right: 10px;" class="moduleName" nowrap="nowrap"><? echo $app_strings['Analytics'];?> > <? echo $app_strings['Dashboard'] ?></td>
<td style="width: 1px;"></td>
<td class="small" height="30"> </td>
</tr>
@@ -79,7 +79,7 @@
<td width="20%" nowrap valign="top">
<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#DFDFDF">
<tr><td class="dashMnuSel">
- <a href="index.php?module=Dashboard&action=index&type=dashboardhome">Dashboard Home</a>
+ <a href="index.php?module=Dashboard&action=index&type=dashboardhome"><? echo $mod_strings['LBL_DASHBRD_HOME'];?></a>
</td></tr>
<?php
$mnuHTML = "";
@@ -115,7 +115,7 @@
<td nowrap><span class="genHeaderSmall"><?echo $mod_strings['LBL_SALES_STAGE_FORM_TITLE']; ?></span></td>
</tr>
<tr>
- <td><span class="big">Horizontal Bar Chart</span> </td>
+ <td><span class="big"><? echo $mod_strings['LBL_HORZ_BAR_CHART'];?></span> </td>
</tr>
</table>
@@ -138,7 +138,7 @@
</tr>
<tr>
- <td><span class="big">Vertical Bar Chart</span> </td>
+ <td><span class="big"><? echo $mod_strings['LBL_VERT_BAR_CHART'];?></span> </td>
</tr>
</table>
</td>
@@ -161,7 +161,7 @@
</tr>
<tr>
- <td><span class="big">Horizontal Bar Chart</span> </td>
+ <td><span class="big"><? echo $mod_strings['LBL_HORZ_BAR_CHART'];?></span> </td>
</tr>
</table>
</td>
@@ -184,7 +184,7 @@
</tr>
<tr>
- <td><span class="big">Pie Chart</span> </td>
+ <td><span class="big"><? echo $mod_strings['LBL_PIE_CHART'];?></span> </td>
</tr>
</table>
</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Dashboard/language/en_us.lang.php Mon May 15 10:07:36 2006
@@ -53,6 +53,28 @@
//Added for 5.0
'LBL_NO_PERMISSION'=>'Your profile doesn\'t allow you view the Graph for this module',
'LBL_NO_PERMISSION_FIELD'=>'Your profile doesn\'t allow you view the Graph for this module or for the Field',
+
+"leadsource" => "Leads By Source",
+"leadstatus" => "Leads By Status",
+"leadindustry" => "Leads By Industry",
+"salesbyleadsource" => "Sales by LeadSource",
+"salesbyaccount" => "Sales by Accounts",
+"accountindustry" => "Account By Industry",
+"productcategory" => "Products by Category",
+"sobyaccounts" => "Sales Order by Accounts",
+"sobystatus" => "Sales Order by Status",
+"pobystatus" => "Purchase Order by Status",
+"quotesbyaccounts" => "Quotes by Accounts",
+"quotesbystage" => "Quotes by Stage",
+"invoicebyacnts" => "Invoices by Accounts",
+"invoicebystatus" => "Invoices by Status",
+"ticketsbystatus" => "Tickets by Status",
+"ticketsbypriority" => "Tickets by Priority",
+
+'LBL_DASHBRD_HOME'=>'Dashboard Home',
+'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',
+'LBL_VERT_BAR_CHART'=>'Vertical Bar Chart',
+'LBL_PIE_CHART'=>'Pie Chart',
);
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -30,6 +30,7 @@
global $mod_strings;
global $app_strings;
+global $currentModule;
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -38,7 +39,7 @@
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("Emails",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -46,7 +47,7 @@
$smarty->assign("RELATEDLISTS", $related_array);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","Email");
+$smarty->assign("SINGLE_MOD",$app_strings['Email']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.php Mon May 15 10:07:36 2006
@@ -31,6 +31,7 @@
global $log;
global $app_strings;
global $mod_strings;
+global $currentModule;
$focus = new Email();
@@ -44,10 +45,10 @@
$query = 'select from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
$result = $adb->query($query);
$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));
- $to_email = ereg_replace('###',',',$adb->query_result($result,0,'to_email'));
+ $to_email = ereg_replace('###',', ',$adb->query_result($result,0,'to_email'));
$smarty->assign('TO_MAIL',$to_email);
- $smarty->assign('CC_MAIL',ereg_replace('###',',',$adb->query_result($result,0,'cc_email')));
- $smarty->assign('BCC_MAIL',ereg_replace('###',',',$adb->query_result($result,0,'bcc_email')));
+ $smarty->assign('CC_MAIL',ereg_replace('###',', ',$adb->query_result($result,0,'cc_email')));
+ $smarty->assign('BCC_MAIL',ereg_replace('###',', ',$adb->query_result($result,0,'bcc_email')));
if($focus->column_fields['name'] != '')
$focus->name = $focus->column_fields['name'];
else
@@ -129,7 +130,7 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$entries = getBlocks("Emails","detail_view",'',$focus->column_fields);
+$entries = getBlocks($currentModule,"detail_view",'',$focus->column_fields);
if($_REQUEST['mode'] != 'ajax')
$smarty->assign("BLOCKS" , $entries);
else
@@ -138,7 +139,7 @@
$smarty->assign("BLOCKS" , from_html($entries['Email Information']));
}
-$smarty->assign("SINGLE_MOD","Email");
+$smarty->assign("SINGLE_MOD",$app_strings['Email']);
$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
@@ -154,7 +155,7 @@
$smarty->assign("CHECK", $check_button);
//Constructing the Related Lists from here
-$smarty->assign("MODULE","Emails");
+$smarty->assign("MODULE",$app_strings['Emails']);
$smarty->assign("SENDER",$email_id);
if($_REQUEST['mode'] != 'ajax')
$smarty->display("DetailView.tpl");
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/EditView.php Mon May 15 10:07:36 2006
@@ -33,6 +33,7 @@
global $app_list_strings;
global $mod_strings;
global $current_user;
+global $currentModule;
$focus = new Email();
$smarty = new vtigerCRM_Smarty();
@@ -85,11 +86,11 @@
$disp_view = getView($focus->mode);
-$details = getBlocks("Emails",$disp_view,$mode,$focus->column_fields);
+$details = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields);
$smarty->assign("BLOCKS",$details['Email Information']);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Email");
+$smarty->assign("SINGLE_MOD",$app_strings['Email']);
//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php
$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.js Mon May 15 10:07:36 2006
@@ -8,18 +8,9 @@
* All Rights Reserved.
********************************************************************************/
-
-function showDefaultCustomView(selectView)
-{
- show("status");
- var ajaxObj = new Ajax(ajaxSaveResponse);
- var viewName = selectView.options[selectView.options.selectedIndex].value;
- var urlstring ="module=Emails&action=EmailsAjax&file=ListView&ajax=true&viewname="+viewName;
- ajaxObj.process("index.php?",urlstring);
-}
+var gFolderid = 1;
function massDelete()
{
-
x = document.massdelete.selected_id.length;
idstring = "";
if ( x == undefined)
@@ -27,7 +18,7 @@
if (document.massdelete.selected_id.checked)
{
- idstring = document.massdelete.selected_id.value+':';
+ idstring = document.massdelete.selected_id.value;
xx = 1;
}
else
@@ -59,9 +50,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
+ getObj('search_text').value = '';
show("status");
var ajaxObj = new Ajax(ajaxSaveResponse);
- var urlstring ="module=Users&action=massdelete&return_module=Emails&idlist="+idstring;
+ var urlstring ="module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring;
ajaxObj.process("index.php?",urlstring);
}
else
@@ -69,4 +61,27 @@
return false;
}
}
-
+function DeleteEmail(id)
+{
+ if(confirm("Are you sure you want to delete ?"))
+ {
+ getObj('search_text').value = '';
+ show("status");
+ var ajaxObj = new Ajax(ajaxDelResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id;
+ ajaxObj.process("index.php?",urlstring);
+ }
+ else
+ {
+ return false;
+ }
+}
+function Searchfn()
+{
+ var osearch_field = document.getElementById('search_field');
+ var search_field = osearch_field.options[osearch_field.options.selectedIndex].value;
+ var search_text = document.getElementById('search_text').value;
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text;
+ ajaxObj.process("index.php?",urlstring);
+}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Email.php Mon May 15 10:07:36 2006
@@ -71,7 +71,7 @@
var $column_fields = Array();
- var $sortby_fields = Array('subject');
+ var $sortby_fields = Array();
//Added these variables which are used as default order by and sortorder in ListView
var $default_order_by = 'subject';
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/ListView.php Mon May 15 10:07:36 2006
@@ -129,21 +129,19 @@
$smarty->assign("ALL", 'All');
}
-if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
-{
- $where=Search($currentModule);
- // we have a query
- $url_string .="&query=true";
- if (isset($_REQUEST['subject'])) $name = $_REQUEST['subject'];
- if (isset($_REQUEST['contactname'])) $contactname = $_REQUEST['contactname'];
- if(isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only'];
-
- $log->info("Here is the where clause for the list view: $where");
-}
-
global $email_title;
$display_title = $mod_strings['LBL_LIST_FORM_TITLE'];
if($email_title)$display_title = $email_title;
+
+//to get the search field if exists
+if(isset($_REQUEST['search']) && $_REQUEST['search'] != '' && $_REQUEST['search_text'] != '')
+{
+ if($_REQUEST['search_field'] != 'join')
+ $where = $_REQUEST['search_field'].' like "%'.$_REQUEST['search_text'].'%"';
+ else
+ $where = '(subject like "%'.$_REQUEST['search_text'].'%" OR users.user_name like "%'.$_REQUEST['search_text'].'%")';
+}
+
//Retreive the list from Database
//<<<<<<<<<customview>>>>>>>>>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/Save.php Mon May 15 10:07:36 2006
@@ -156,10 +156,20 @@
$email_id = $return_id;
$query = 'select emailid from emaildetails where emailid ='.$email_id;
$result = $adb->query($query);
+if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
+ $all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
+if(isset($_REQUEST["saved_toid"]) && $_REQUEST["saved_toid"]!='')
+ $all_to_ids .= ereg_replace(",","###",$_REQUEST["saved_toid"]);
+
+$all_cc_ids = ereg_replace(",","###",$_REQUEST["ccmail"]);
+$all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
if($adb->num_rows($result) > 0)
- $query = 'update emaildetails set idlists='.$_REQUEST["parent_id"].' where emailid = '.$email_id;
-else
- $query = 'insert into emaildetails values ('.$email_id.',"","","","","","'.$_REQUEST["parent_id"].'","SAVED")';
+{
+ $query = 'update emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'" where emailid = '.$email_id;
+}else
+{
+ $query = 'insert into emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
+}
$adb->query($query);
$focus->retrieve_entity_info($return_id,"Emails");
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/language/en_us.lang.php Mon May 15 10:07:36 2006
@@ -137,6 +137,9 @@
'LBL_ALLMAILS'=>'All Mails',
'LBL_TO_USERS'=>'To Users',
'LBL_TO'=>'To:',
+'LBL_IN_SUBJECT'=>'in Subject',
+'LBL_IN_SENDER'=>'in Sender',
+'LBL_IN_SUBJECT_OR_SENDER'=>'in Subject or Sender',
);
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Emails/mailsend.php Mon May 15 10:07:36 2006
@@ -73,7 +73,8 @@
{
$mail_status = send_mail('Emails',$to_email,$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$cc,$bcc,'all',$focus->id);
- $query = 'update emaildetails set cc_email="'.ereg_replace(',','###',$cc).'",bcc_email="'.ereg_replace(',','###',$bcc).'",assigned_user_email="'.$to_email.'",email_flag="SENT" where emailid='.$focus->id;
+ $query = 'update emaildetails set email_flag ="SENT" where emailid='.$focus->id;
+ $adb->query($query);
//set the errorheader1 to 1 if the mail has not been sent to the assigned to user
if($mail_status != 1)//when mail send fails
{
@@ -88,7 +89,6 @@
}
else
{
- $adb->query($query);
$mail_status_str = $to_email."=".$mail_status."&&&";
}
}
@@ -179,9 +179,6 @@
$date_var = date('Ymd');
$query = 'update activity set date_start ='.$date_var.' where activityid = '.$returnid;
$adb->query($query);
- $toemails = implode('###',$all_to_emailids);
- $query = 'update emaildetails set email_flag="SENT",to_email="'.$toemails.'" where emailid='.$focus->id;
- $adb->query($query);
}
//The following function call is used to parse and form a encoded error message and then pass to result page
$mail_error_str = getMailErrorString($mail_status_str);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Faq/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Faq/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Faq/DetailView.php Mon May 15 10:07:36 2006
@@ -28,6 +28,7 @@
global $mod_strings;
global $app_strings;
+global $currentModule;
$focus = new Faq();
@@ -68,9 +69,9 @@
$smarty->assign("THEME", $theme);
$smarty->assign("IMAGE_PATH", $image_path);
$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("BLOCKS", getBlocks("Faq","detail_view",'',$focus->column_fields));
-$smarty->assign("SINGLE_MOD","Faq");
-$smarty->assign("MODULE","Faq");
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
+$smarty->assign("SINGLE_MOD",$currentModule);
+$smarty->assign("MODULE",$currentModule);
$smarty->assign("ID", $_REQUEST['record']);
if(isPermitted("Faq","EditView",$_REQUEST['record']) == 'yes')
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Faq/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Faq/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Faq/EditView.php Mon May 15 10:07:36 2006
@@ -30,6 +30,7 @@
global $app_strings;
global $mod_strings;
global $current_user;
+global $currentModule;
$focus = new Faq();
$smarty = new vtigerCRM_Smarty();
@@ -54,16 +55,16 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Faq",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Faq",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
-$smarty->assign("MODULE","Faq");
-$smarty->assign("SINGLE_MOD","Faq");
+$smarty->assign("MODULE",$currentModule);
+$smarty->assign("SINGLE_MOD",$currentModule);
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -30,6 +30,7 @@
global $mod_strings;
global $app_strings;
+global $currentModule;
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -42,7 +43,7 @@
}
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("HelpDesk",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -50,7 +51,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD",$currentmodule);
+$smarty->assign("SINGLE_MOD",$app_strings['Ticket']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/DetailView.php Mon May 15 10:07:36 2006
@@ -37,6 +37,7 @@
global $app_strings;
global $mod_strings;
+global $currentModule;
global $theme;
$theme_path="themes/".$theme."/";
@@ -49,11 +50,11 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("HelpDesk","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("TICKETID", $_REQUEST['record']);
$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD","HelpDesk");
+$smarty->assign("SINGLE_MOD",$app_strings['Ticket']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
$smarty->assign("UPDATEINFO",updateInfo($_REQUEST['record']));
@@ -90,7 +91,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-$smarty->assign("MODULE","HelpDesk");
+$smarty->assign("MODULE",$currentModule);
$smarty->display("DetailView.tpl");
$focus->id = $_REQUEST['record'];
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/HelpDesk/EditView.php Mon May 15 10:07:36 2006
@@ -15,7 +15,7 @@
require_once('modules/HelpDesk/Forms.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$theme;
+global $app_strings,$mod_strings,$theme,$currentModule;
$focus = new HelpDesk();
$smarty = new vtigerCRM_Smarty();
@@ -39,16 +39,16 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("HelpDesk",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("HelpDesk",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Ticket");
+$smarty->assign("SINGLE_MOD",$app_strings['Ticket']);
$category = getParentTab();
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -27,6 +27,7 @@
global $mod_strings;
global $app_strings;
+global $currentModule;
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -35,7 +36,7 @@
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("Invoice",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -43,7 +44,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD",$currentmodule);
+$smarty->assign("SINGLE_MOD",$app_strings['Invoice']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/DetailView.php Mon May 15 10:07:36 2006
@@ -59,11 +59,11 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("Invoice","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("CUSTOMFIELD", $cust_fld);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD", "Invoice");
+$smarty->assign("SINGLE_MOD", $app_strings['Invoice']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php Mon May 15 10:07:36 2006
@@ -32,7 +32,7 @@
require_once('include/utils/utils.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$log;
+global $app_strings,$mod_strings,$currentModule,$log;
$focus = new Invoice();
$smarty = new vtigerCRM_Smarty();
@@ -179,16 +179,16 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Invoice",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Invoice",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Invoice");
+$smarty->assign("SINGLE_MOD",$app_strings['Invoice']);
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -29,6 +29,8 @@
global $mod_strings;
global $app_strings;
global $theme;
+global $currentModule;
+
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
@@ -51,9 +53,9 @@
$smarty->assign("id",$focus->id);
$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname);
-$related_array = getRelatedLists("Leads",$focus);
+$related_array = getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
-$smarty->assign("SINGLE_MOD","Lead");
+$smarty->assign("SINGLE_MOD",$app_strings['Lead']);
$smarty->assign("REDIR_MOD","leads");
$smarty->assign("MODULE", $currentmodule);
$smarty->assign("ID",$RECORD );
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ConvertLead.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ConvertLead.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ConvertLead.php Mon May 15 10:07:36 2006
@@ -80,7 +80,7 @@
<input type="hidden" name="action">
<input type="hidden" name="current_user_id" value="'.$modified_user_id.'">
- <div id="orgLay">
+ <div id="orgLay" style="display: block;">
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<td class="genHeaderSmall" align="left"><IMG src="'.$image_path.'Leads.gif">'.$mod_strings['LBL_CONVERT_LEAD'].' '.$firstname.' '.$lastname.'</td>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/DetailView.php Mon May 15 10:07:36 2006
@@ -23,7 +23,7 @@
global $mod_strings;
global $app_strings;
-
+global $currentModule;
global $log;
$focus = new Lead();
@@ -56,13 +56,13 @@
$smarty->assign("THEME", $theme);
$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
$smarty->assign("ID", $focus->id);
-$smarty->assign("SINGLE_MOD","Lead");
+$smarty->assign("SINGLE_MOD",$app_strings['Lead']);
$smarty->assign("REDIR_MOD","leads");
$smarty->assign("NAME",$focus->lastname.' '.$focus->firstname);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
-$smarty->assign("BLOCKS", getBlocks("Leads","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("CUSTOMFIELD", $cust_fld);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/EditView.php Mon May 15 10:07:36 2006
@@ -22,7 +22,7 @@
require_once('include/utils/utils.php');
require_once('include/FormValidationUtil.php');
-global $mod_strings,$app_strings,$theme;
+global $mod_strings,$app_strings,$theme,$currentModule;
$focus = new Lead();
$smarty = new vtigerCRM_Smarty;
@@ -41,11 +41,11 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Leads",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Leads",$disp_view,$mode,$focus->column_fields,'BAS'));
- $smarty->assign("ADVBLOCKS",getBlocks("Leads",$disp_view,$mode,$focus->column_fields,'ADV'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV'));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -91,7 +91,7 @@
$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
$smarty->assign("ID", $focus->id);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Lead");
+$smarty->assign("SINGLE_MOD",$app_strings['Lead']);
$smarty->assign("HEADER", get_module_title("Leads", "{MOD.LBL_LEAD} ".$focus->firstname." ".$focus->lastname, true));
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Notes/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Notes/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Notes/DetailView.php Mon May 15 10:07:36 2006
@@ -28,6 +28,7 @@
require_once('include/utils/utils.php');
global $app_strings;
global $mod_strings;
+global $currentModule;
$focus = new Note();
@@ -70,7 +71,7 @@
$smarty = new vtigerCRM_Smarty;
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
-$smarty->assign("BLOCKS", getBlocks("Notes","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
@@ -94,7 +95,7 @@
$smarty->assign("FILELINK", $fileurl);
}
-$smarty->assign("SINGLE_MOD","Note");
+$smarty->assign("SINGLE_MOD",$app_strings['Note']);
if(isPermitted("Notes","EditView",$_REQUEST['record']) == 'yes')
$smarty->assign("EDIT_DUPLICATE","permitted");
@@ -105,7 +106,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-$smarty->assign("MODULE", $module);
+$smarty->assign("MODULE",$currentModule);
$smarty->display("DetailView.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Notes/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Notes/EditView.php Mon May 15 10:07:36 2006
@@ -26,7 +26,7 @@
require_once('modules/Notes/Forms.php');
require_once('include/utils/utils.php');
-global $app_strings,$app_list_strings,$mod_strings,$theme;
+global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule;
$focus = new Note();
$smarty = new vtigerCRM_Smarty();
@@ -96,10 +96,10 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Notes",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Notes",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$category = getParentTab();
@@ -111,7 +111,7 @@
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Note");
+$smarty->assign("SINGLE_MOD",$app_strings['Note']);
//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php
$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -26,6 +26,7 @@
global $mod_strings;
global $app_strings;
+global $currentModule;
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -37,15 +38,15 @@
$focus->id = "";
}
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array = getRelatedLists("Potentials",$focus);
+$related_array = getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
-$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","Potential");
+$smarty->assign("MODULE",$currentModule);
+$smarty->assign("SINGLE_MOD",$app_strings['Potential']);
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
$smarty->assign("THEME", $theme);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/DetailView.php Mon May 15 10:07:36 2006
@@ -29,6 +29,7 @@
global $mod_strings;
global $app_strings;
+global $currentModule;
$focus = new Potential();
$smarty = new vtigerCRM_Smarty;
@@ -62,10 +63,10 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("Potentials","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD","Potential");
+$smarty->assign("SINGLE_MOD",$app_strings['Potential']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Potentials/EditView.php Mon May 15 10:07:36 2006
@@ -30,7 +30,7 @@
require_once('include/FormValidationUtil.php');
global $app_strings;
global $mod_strings;
-
+global $currentModule;
$focus = new Potential();
$smarty = new vtigerCRM_Smarty();
@@ -52,10 +52,10 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Potentials",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Potentials",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$category = getParentTab();
@@ -121,7 +121,7 @@
$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
$smarty->assign("ID", $focus->id);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Potential");
+$smarty->assign("SINGLE_MOD",$app_strings['Potential']);
$potential_tables = Array('potential','crmentity','potentialscf');
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -11,6 +11,8 @@
require_once('Smarty_setup.php');
require_once('modules/PriceBooks/PriceBook.php');
+
+global $currentModule;
$focus = new PriceBook();
@@ -30,7 +32,7 @@
$focus->id = "";
}
-$related_array=getRelatedLists("PriceBooks",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
global $mod_strings;
global $app_strings;
@@ -50,7 +52,7 @@
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("RELATEDLISTS", $related_array);
-$smarty->assign("SINGLE_MOD","PriceBook");
+$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/DetailView.php Mon May 15 10:07:36 2006
@@ -27,7 +27,7 @@
$focus->id = "";
}
-global $app_strings,$mod_strings,$theme;
+global $app_strings,$mod_strings,$theme,$currentModule;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -37,7 +37,7 @@
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
-$smarty->assign("BLOCKS", getBlocks("PriceBooks","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$category = getParentTab();
@@ -60,7 +60,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
-$smarty->assign("MODULE", $module);
-$smarty->assign("SINGLE_MOD","PriceBook");
+$smarty->assign("MODULE", $currentModule);
+$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']);
$smarty->display("DetailView.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/EditView.php Mon May 15 10:07:36 2006
@@ -14,7 +14,7 @@
require_once('modules/PriceBooks/PriceBook.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$theme;
+global $app_strings,$mod_strings,$theme,$currentModule;
$focus = new PriceBook();
$smarty = new vtigerCRM_Smarty();
@@ -38,15 +38,15 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("PriceBooks",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("PriceBooks",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Product");
+$smarty->assign("SINGLE_MOD",$app_strings['PriceBook']);
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Products/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -25,7 +25,7 @@
}
global $mod_strings;
-global $app_strings;
+global $app_strings,$currentModule;
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -39,7 +39,7 @@
}
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("Products",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -48,7 +48,7 @@
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
-$smarty->assign("SINGLE_MOD","Product");
+$smarty->assign("SINGLE_MOD",$app_strings['Product']);
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
$smarty->assign("THEME", $theme);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Products/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Products/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Products/DetailView.php Mon May 15 10:07:36 2006
@@ -26,7 +26,7 @@
$focus->id = "";
}
-global $app_strings;
+global $app_strings,$currentModule;
global $mod_strings;
global $theme;
@@ -41,14 +41,14 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("Products","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD","Product");
+$smarty->assign("SINGLE_MOD",$app_strings['Product']);
if(isPermitted("Products","EditView",$_REQUEST['record']) == 'yes')
$smarty->assign("EDIT_DUPLICATE","permitted");
@@ -63,7 +63,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
//Security check for related list
-$smarty->assign("MODULE", $module);
+$smarty->assign("MODULE", $currentModule);
$smarty->display("DetailView.tpl");
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Products/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Products/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Products/EditView.php Mon May 15 10:07:36 2006
@@ -16,7 +16,7 @@
global $app_strings;
global $mod_strings;
-
+global $currentModule;
$encode_val=$_REQUEST['encode_val'];
$decode_val=base64_decode($encode_val);
@@ -78,16 +78,16 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Products",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Products",$disp_view,$mode,$focus->column_fields,'BAS'));
- $smarty->assign("ADVBLOCKS",getBlocks("Products",$disp_view,$mode,$focus->column_fields,'ADV'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Product");
+$smarty->assign("SINGLE_MOD",$app_strings['Product']);
$smarty->assign("MOD", $mod_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -23,7 +23,7 @@
$log->debug("name is ".$focus->name);
}
-global $mod_strings;
+global $mod_strings,$currentmodule;
global $app_strings;
global $theme;
$theme_path="themes/".$theme."/";
@@ -33,7 +33,7 @@
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("PurchaseOrder",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -41,7 +41,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD",$currentmodule);
+$smarty->assign("SINGLE_MOD",$app_strings['PurchaseOrder']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/DetailView.php Mon May 15 10:07:36 2006
@@ -26,7 +26,7 @@
require_once('include/CustomFieldUtil.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-global $mod_strings,$app_strings,$theme;
+global $mod_strings,$app_strings,$theme,$currentModule;
$focus = new Order();
@@ -53,17 +53,17 @@
$smarty->assign("THEME", $theme);
$smarty->assign("IMAGE_PATH", $image_path);
-$smarty->assign("MODULE","PurchaseOrder");
+$smarty->assign("MODULE",$currentModule);
$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("PurchaseOrder","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("CUSTOMFIELD", $cust_fld);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD","PurchaseOrder");
+$smarty->assign("SINGLE_MOD",$app_strings['PurchaseOrder']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/EditView.php Mon May 15 10:07:36 2006
@@ -28,7 +28,7 @@
require_once('include/utils/utils.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$log,$theme;
+global $app_strings,$mod_strings,$log,$theme,$currentModule;
$focus = new Order();
@@ -81,15 +81,15 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("PurchaseOrder",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("PurchaseOrder",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","PurchaseOrder");
+$smarty->assign("SINGLE_MOD",$app_strings['PurchaseOrder']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -23,7 +23,7 @@
$log->debug("name is ".$focus->name);
}
-global $mod_strings;
+global $mod_strings,$currentModule;
global $app_strings;
global $theme;
$theme_path="themes/".$theme."/";
@@ -33,7 +33,7 @@
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("Quotes",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -41,7 +41,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","Quote");
+$smarty->assign("SINGLE_MOD",$app_strings['Quote']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/DetailView.php Mon May 15 10:07:36 2006
@@ -57,12 +57,12 @@
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("Quotes","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("CUSTOMFIELD", $cust_fld);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD","Quotes");
+$smarty->assign("SINGLE_MOD",$app_strings['Quote']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php Mon May 15 10:07:36 2006
@@ -28,7 +28,7 @@
require_once('include/utils/utils.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$log,$theme;
+global $app_strings,$mod_strings,$log,$theme,$currentModule;
$log->debug("Inside Quote EditView");
@@ -94,15 +94,15 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Quotes",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Quotes",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Quote");
+$smarty->assign("SINGLE_MOD",$app_strings['Quote']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Reports/SaveAndRun.php Mon May 15 10:07:36 2006
@@ -48,7 +48,7 @@
$list_report_form = new vtigerCRM_Smarty;
$ogReport->getSelectedStandardCriteria($reportid);
- require_once('modules/DashBoard/ReportsCharts.php');
+ require_once('modules/Dashboard/ReportsCharts.php');
$image = get_graph_by_type('Report','Report',$primarymodule,'',$sshtml[2]);
$list_report_form->assign("GRAPH", $image);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php Mon May 15 10:07:36 2006
@@ -104,6 +104,8 @@
'LBL_DESCRIPTION_FOR_REPORT'=>'Description for the report',
'LBL_REPORT_NAME'=>'Report Name',
'LBL_DESCRIPTION'=>'Description',
+'LBL_TOOLS'=>'Tools',
+'LBL_AND'=>'and',
'LBL_REPORT_MODULE'=>'Report Module',
'LBL_SELECT_RELATIVE_MODULE_FOR_REPORT'=>'Select Relative Module for Report',
'LBL_SELECT_REPORT_TYPE_BELOW'=>'Select Report type Below',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -23,7 +23,7 @@
}
global $mod_strings;
-global $app_strings;
+global $app_strings,$currentModule;
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -32,7 +32,7 @@
$smarty = new vtigerCRM_Smarty;
if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-$related_array=getRelatedLists("SalesOrder",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
$smarty->assign("RELATEDLISTS", $related_array);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -40,7 +40,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","SalesOrder");
+$smarty->assign("SINGLE_MOD",$app_strings['SalesOrder']);
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
$smarty->assign("THEME", $theme);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/DetailView.php Mon May 15 10:07:36 2006
@@ -26,7 +26,7 @@
require_once('include/CustomFieldUtil.php');
require_once('include/database/PearDatabase.php');
require_once('include/utils/utils.php');
-global $mod_strings,$app_strings,$theme;
+global $mod_strings,$app_strings,$theme,$currentModule;
$focus = new SalesOrder();
@@ -59,12 +59,12 @@
$smarty->assign("NAME", $focus->name);
else
$smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks("SalesOrder","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$smarty->assign("CUSTOMFIELD", $cust_fld);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD", "SalesOrder");
+$smarty->assign("SINGLE_MOD",$app_strings['SalesOrder']);
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
@@ -80,7 +80,7 @@
if(isPermitted("SalesOrder","Delete",$_REQUEST['record']) == 'yes')
$smarty->assign("DELETE","permitted");
-$smarty->assign("MODULE", $module);
+$smarty->assign("MODULE", $currentModule);
$smarty->assign("CONVERTMODE",'sotoinvoice');
//Get the associated Products and then display above Terms and Conditions
$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('SalesOrder',$focus));
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php Mon May 15 10:07:36 2006
@@ -29,7 +29,7 @@
require_once('include/utils/utils.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$log,$theme;
+global $app_strings,$mod_strings,$log,$theme,$currentModule;
$log->debug("Inside Sales Order EditView");
@@ -165,15 +165,15 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("SalesOrder",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("SalesOrder",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","SalesOrder");
+$smarty->assign("SINGLE_MOD",$app_strings['SalesOrder']);
$smarty->assign("MOD", $mod_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php Mon May 15 10:07:36 2006
@@ -424,6 +424,15 @@
'LBL_USER_IMAGE'=>'User Image',
'LBL_USR'=>'Users',
+'LBL_MY'=>'My',
+'LBL_MY_DEFAULTS'=>'My Defaults',
+'LBL_MY_DESG'=>'My Designation & Contact Details',
+'LBL_MY_ADDR'=>'My Postal Address',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_MY_PHOTO'=>'My Photo',
+'LBL_CHANGE_PHOTO'=>'Change Photo...',
+
+
//Added for Access Privileges
'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/massdelete.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/massdelete.php Mon May 15 10:07:36 2006
@@ -21,7 +21,6 @@
$returnmodule=$_REQUEST['return_module'];
//split the string and store in an array
$storearray = explode(";",$idlist);
-
$ids_list = array();
foreach($storearray as $id)
{
@@ -48,11 +47,24 @@
{
$smod = "&smodule=".$_REQUEST['smodule'];
}
-if($returnmodule!='Faq')
+if($returnmodule == 'Emails')
+{
+ if(isset($_REQUEST['folderid']) && $_REQUEST['folderid'] != '')
+ {
+ $folderid = $_REQUEST['folderid'];
+ }else
+ {
+ $folderid = 1;
+ }
+ header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&folderid=".$folderid."&ajax=delete&file=ListView");
+}
+elseif($returnmodule!='Faq')
{
header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&viewname=".$viewid);
}
else
+{
header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView");
+}
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/CallRelatedList.php Mon May 15 10:07:36 2006
@@ -12,6 +12,7 @@
require_once('Smarty_setup.php');
require_once('modules/Vendors/Vendor.php');
+global $currentModule;
$focus = new Vendor();
$currentmodule = $_REQUEST['module'];
@@ -30,7 +31,7 @@
$focus->id = "";
}
-$related_array=getRelatedLists("Vendors",$focus);
+$related_array=getRelatedLists($currentModule,$focus);
global $mod_strings;
global $app_strings;
@@ -50,7 +51,7 @@
$smarty->assign("id",$focus->id);
$smarty->assign("ID",$RECORD );
$smarty->assign("MODULE",$currentmodule);
-$smarty->assign("SINGLE_MOD","Vendor");
+$smarty->assign("SINGLE_MOD",$app_strings['Vendor']);
$smarty->assign("RELATEDLISTS", $related_array);
$smarty->assign("MOD",$mod_strings);
$smarty->assign("APP",$app_strings);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/DetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/DetailView.php Mon May 15 10:07:36 2006
@@ -27,7 +27,7 @@
$focus->id = "";
}
-global $app_strings,$mod_strings,$theme;
+global $app_strings,$mod_strings,$theme,$currentModule;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -39,7 +39,7 @@
if(isset($focus->name))
$smarty->assign("NAME", $focus->name);
-$smarty->assign("BLOCKS", getBlocks("Vendors","detail_view",'',$focus->column_fields));
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
$smarty->assign("CUSTOMFIELD", $cust_fld);
@@ -56,8 +56,8 @@
$smarty->assign("IMAGE_PATH", $image_path);
$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
$smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("MODULE", $module);
-$smarty->assign("SINGLE_MOD","Vendor");
+$smarty->assign("MODULE", $currentModule);
+$smarty->assign("SINGLE_MOD",$app_strings['Vendor']);
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/EditView.php Mon May 15 10:07:36 2006
@@ -14,7 +14,7 @@
require_once('modules/Vendors/Vendor.php');
require_once('include/FormValidationUtil.php');
-global $app_strings,$mod_strings,$theme;
+global $app_strings,$mod_strings,$theme,$currentModule;
$focus = new Vendor();
$smarty = new vtigerCRM_Smarty();
@@ -38,15 +38,15 @@
$disp_view = getView($focus->mode);
if($disp_view == 'edit_view')
- $smarty->assign("BLOCKS",getBlocks("Vendors",$disp_view,$mode,$focus->column_fields));
+ $smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks("Vendors",$disp_view,$mode,$focus->column_fields,'BAS'));
+ $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
}
$smarty->assign("OP_MODE",$disp_view);
$smarty->assign("MODULE",$currentModule);
-$smarty->assign("SINGLE_MOD","Vendors");
+$smarty->assign("SINGLE_MOD",$app_strings['Vendor']);
$smarty->assign("MOD", $mod_strings);
$smarty->assign("APP", $app_strings);
More information about the vtigercrm-commits
mailing list