[Vtigercrm-commits] [vtiger-commits] r6054 - in /vtigercrm/branches/5.0_postgresql_integration: ./ Smarty/templates/ Smarty/templates/Settings/ data/ include/ListView/ include/install/ include/install/images/ include/js/ include/language/ include/utils/ install/ log4php/appenders/ modules/Calendar/ modules/Calendar/language/ modules/CustomView/ modules/Emails/ modules/Invoice/ modules/Leads/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/Reports/language/ modules/SalesOrder/ modules/Settings/ modules/Settings/language/ modules/Users/ modules/Users/language/ modules/Vendors/ modules/Webmails/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue May 16 09:09:02 EDT 2006
Author: jeffk
Date: Tue May 16 07:08:32 2006
New Revision: 6054
Log:
refs #752. merge trunk changesets [6012] through [6053]. Conflicting changes in install/3confirmConfig.php, dropped
Added:
vtigercrm/branches/5.0_postgresql_integration/include/ListView/ListViewSession.php
- copied unchanged from r6053, vtigercrm/trunk/include/ListView/ListViewSession.php
vtigercrm/branches/5.0_postgresql_integration/include/install/
- copied from r6053, vtigercrm/trunk/include/install/
vtigercrm/branches/5.0_postgresql_integration/include/install/images/
- copied from r6053, vtigercrm/trunk/include/install/images/
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwBtnChange.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwBtnChange.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwBtnFinish.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwBtnFinish.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwBtnNext.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwBtnNext.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwBtnStart.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwBtnStart.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwHdrCnfSysConf.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwHdrCnfSysConf.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwHdrCrConfFile.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwHdrCrConfFile.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwHdrCrDbTables.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwHdrCrDbTables.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwHdrSysCheck.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwHdrSysCheck.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwHdrSysConf.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwHdrSysConf.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwHdrVtConfWiz.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwHdrVtConfWiz.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwIcoConfFile.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwIcoConfFile.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwIcoDB.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwIcoDB.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwIcoSystem.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwIcoSystem.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwRegVCRM.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwRegVCRM.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwShadeBg.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwShadeBg.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwShadeLeft.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwShadeLeft.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwShadeRight.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwShadeRight.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwStep1of5.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwStep1of5.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwStep2of5.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwStep2of5.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwStep3of5.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwStep3of5.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwStep4of5.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwStep4of5.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwStep5of5.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwStep5of5.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwTitle.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwTitle.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwTopBg.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwTopBg.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwTopLeft.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwTopLeft.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwTopRight.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwTopRight.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/images/cwURL.gif
- copied unchanged from r6053, vtigercrm/trunk/include/install/images/cwURL.gif
vtigercrm/branches/5.0_postgresql_integration/include/install/install.css
- copied unchanged from r6053, vtigercrm/trunk/include/install/install.css
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CurrencyEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldMapping.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/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/OrgSharingDetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/QuickCreate.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailConfig.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailNotificationContents.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl
vtigercrm/branches/5.0_postgresql_integration/config.inc.php
vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php
vtigercrm/branches/5.0_postgresql_integration/include/ListView/ListView.php
vtigercrm/branches/5.0_postgresql_integration/include/js/Inventory.js
vtigercrm/branches/5.0_postgresql_integration/include/js/ListView.js
vtigercrm/branches/5.0_postgresql_integration/include/js/general.js
vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/install/1checkSystem.php
vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php
vtigercrm/branches/5.0_postgresql_integration/install/4createConfigFile.php
vtigercrm/branches/5.0_postgresql_integration/install/5createTables.php
vtigercrm/branches/5.0_postgresql_integration/log4php/appenders/LoggerAppenderRollingFile.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Emails/DetailView.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/Invoice/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ConvertLead.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PriceBooks/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Products/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/PurchaseOrder/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Reports/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php
vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingEditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Vendors/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/Save.php
vtigercrm/branches/5.0_postgresql_integration/parent_tabdata.php
vtigercrm/branches/5.0_postgresql_integration/tabdata.php
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CurrencyEditView.tpl Tue May 16 07:08:32 2006
@@ -21,7 +21,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"> {$MOD.LBL_MODULE_NAME} >{$MOD.LBL_CONFIGURATION} > {$MOD.LBL_CURRENCY_INFO} </span>
+ <span class="lvtHeaderText"> {$MOD.LBL_MODULE_NAME} > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_CURRENCY_INFO} </span>
<hr noshade="noshade" size="1" />
</td>
<td width="5%" class="showPanelBg"> </td>
@@ -47,7 +47,7 @@
</tr>
</table>
</td>
- <td colspan="2" class="genHeaderBig" width="70%">Currency<br />
+ <td colspan="2" class="genHeaderBig" width="70%">{$MOD.LBL_CURRENCY_TITLE}<br />
<hr /> </td>
</tr>
<tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldEntries.tpl Tue May 16 07:08:32 2006
@@ -47,7 +47,7 @@
<td style="padding:5px;" width="5%" >
<img src="{$IMAGE_PATH}mapping.gif" align="absmiddle" /> </td>
<td><span class="genHeaderSmall">{$MOD.LBL_FIELD_MAPPING}</span><br />
- {$MOD.LBL_FIELD_MAPPING} allows you to ....
+ {$MOD.LBL_FIELD_MAPPING} {$MOD.LBL_CUSTM_MSG}
</td>
</tr>
<tr><td colspan="2" align="right"><input input title="{$MOD.CUSTOMFIELDMAPPING}" class="classBtn" onclick="CustomFieldMapping();" type="button" name="ListLeadCustomFieldMapping" value="{$MOD.CUSTOMFIELDMAPPING}"></td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/CustomFieldMapping.tpl Tue May 16 07:08:32 2006
@@ -30,24 +30,24 @@
<img src="{$IMAGE_PATH}mapping.gif" align="middle" height="48" width="48">
</td>
<td style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">
- <span class="genHeaderGrayBig">Mapping Lead Custom Fields</span><br>
- <span>Map each of your organizations lead custom fields to each of your custom account ,contact, or potential fields. These mappings will be used when you convert leads</span>
+ <span class="genHeaderGrayBig">{$MOD.LBL_LEAD_MAP_CUSTOM_FIELD}</span><br>
+ <span>{$MOD.leadCustomFieldDescription}</span>
</td>
</tr>
<tr><td colspan="2"> </td></tr>
<tr>
<td align="right"> </td>
- <td><b class="lvtHeaderText">Mapping Information </b></td>
+ <td><b class="lvtHeaderText">{$MOD.LBL_MAPPING_INFO}</b></td>
</tr>
<tr>
<td> </td>
<td>
<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="95%">
<tr>
- <td class="lvtCol" width="25%">Leads Custom Field </td>
- <td class="lvtCol" width="25%">Accounts Custom Field</td>
- <td class="lvtCol" width="25%">Contacts Custom Field</td>
- <td class="lvtCol" width="25%">Potential Custom Field</td>
+ <td class="lvtCol" width="25%">{$MOD.LBL_LEAD_FIELD}</td>
+ <td class="lvtCol" width="25%">{$MOD.LBL_ACCOUNT_FIELD}</td>
+ <td class="lvtCol" width="25%">{$MOD.LBL_CONTACT_FIELD}</td>
+ <td class="lvtCol" width="25%">{$MOD.LBL_POTENTIAL_FIELD}</td>
<tr>
{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
<tr class="lvtColData" bgcolor="white">
@@ -55,7 +55,7 @@
{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
<td>
<select name='{$fldnameacc}'>
- <option value='None'>-None-</option>
+ <option value='None'>{$APP.LBL_NONE}</option>
{foreach item=element from=$acc_cf}
<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
{/foreach}
@@ -65,7 +65,7 @@
{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
<td>
<select name='{$fldnamecon}'>
- <option value='None'>-None-</option>
+ <option value='None'>{$APP.LBL_NONE}</option>
{foreach item=element from=$con_cf}
<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
{/foreach}
@@ -74,7 +74,7 @@
{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
<td>
<select name='{$fldnamepot}'>
- <option value='None'>-None-</option>
+ <option value='None'>{$APP.LBL_NONE}</option>
{foreach item=element from=$pot_cf}
<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
{/foreach}
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 Tue May 16 07:08:32 2006
@@ -17,7 +17,11 @@
{if $BLOCKS neq ''}
<td width="75%">
<input type="button" name="forward" value=" {$MOD.LBL_FORWARD_BUTTON} " class="classWebBtn" onClick=OpenCompose('{$ID}','forward')>
+ {if $EMAIL_FLAG neq 'WEBMAIL'}
<input type="button" name="Send" value=" {$MOD.LBL_SEND} " class="classWebBtn" onClick=OpenCompose('{$ID}','edit')>
+ {else}
+ <input type="button" name="Send" value=" {$MOD.LBL_REPLY_BUTTON} " class="classWebBtn" onClick=OpenCompose('{$ID}','edit')>
+ {/if}
{foreach item=row from=$BLOCKS}
{foreach item=elements key=title from=$row}
{if $title eq 'Attachment' && $elements.value != ''}
@@ -40,9 +44,13 @@
{foreach item=elements key=title from=$row}
{if $title eq 'Subject'}
<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ {if $EMAIL_FLAG neq 'WEBMAIL'}
<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>
+ {else}
+ <tr><td width="20%" align="right" valign="top"><b>{$MOD.LBL_FROM}</b></td><td width="2%"> </td><td>{$TO_MAIL} </td></tr>
+ {/if}
<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>
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 Tue May 16 07:08:32 2006
@@ -65,6 +65,8 @@
case 5:
getObj('mail_fldrname').innerHTML = '{$MOD.LBL_TO_USERS}';
break;
+ case 6:
+ getObj('mail_fldrname').innerHTML = '{$MOD.LBL_QUAL_CONTACT}';
{rdelim}
var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid="+folderid;
ajaxObj.process("index.php?",urlstring);
@@ -94,7 +96,7 @@
<form name="massdelete" method="POST">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td colspan="3" style="padding:10px;vertical-align:middle;">
+ <td colspan="3" style="vertical-align:middle;">
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td width="10%" >
@@ -124,7 +126,7 @@
<img src="{$IMAGE_PATH}webmail_root.gif" align="absmiddle" /> <b class="txtGreen">{$MOD.LBL_INBOX}</b>
<ul style="list-style-type:none;">
<li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />
- <a href="index.php?module=Webmails&action=index" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a> <b></b>
+ <a href="javascript:;" onClick="ShowFolders(6)" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a> <b></b>
</li>
<li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />
<a href="index.php?module=Webmails&action=index" class="webMnu">{$MOD.LBL_MY_MAILS}</a> <b></b>
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 Tue May 16 07:08:32 2006
@@ -111,7 +111,7 @@
<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>{$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>
+ <td width="25%" class="dvtCellLabel"><b>{$APP.LBL_IN}</b>
<select name ="search_field" class="txtBox">
{html_options options=$SEARCHLISTHEADER }
</select>
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 Tue May 16 07:08:32 2006
@@ -220,9 +220,9 @@
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<td width="50%" align="left" style="border-bottom:1px dotted #666666;">
- <b>Change Photo</b></td>
+ <b>{$UMOD.LBL_CHANGE_PHOTO}</b></td>
<td width="50%" align="right" style="border-bottom:1px dotted #666666;">
- <a href="javascript:fninvsh('chPhoto');"><img src="../themes/blue/images/close.gif" border="0" align="absmiddle" /></a></td>
+ <a href="javascript:fninvsh('chPhoto');"><img src="{$IMAGE_PATH}close.gif" border="0" align="absmiddle" /></a></td>
</tr>
<tr>
<td align="center" colspan="2"><input type="file" name="newPhoto" size="15" /></td>
@@ -231,7 +231,7 @@
<td align="center" colspan="2">
<input type="button" name="cSave" value=" OK " class="classBtn" onclick="fninvsh('chPhoto');" />
- <input type="button" name="cCancel" value=" Cancel " class="classBtn" onclick="fninvsh('chPhoto');" />
+ <input type="button" name="cCancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="classBtn" onclick="fninvsh('chPhoto');" />
</td>
</tr>
</table>
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 Tue May 16 07:08:32 2006
@@ -245,9 +245,9 @@
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<td width="50%" align="left" style="border-bottom:1px dotted #666666;">
- <b>Change Photo</b></td>
+ <b>{$UMOD.LBL_CHANGE_PHOTO}</b></td>
<td width="50%" align="right" style="border-bottom:1px dotted #666666;">
- <a href="javascript:fninvsh('chPhoto');"><img src="../themes/blue/images/close.gif" border="0" align="absmiddle" /></a></td>
+ <a href="javascript:fninvsh('chPhoto');"><img src="{$IMAGE_PATH}close.gif" border="0" align="absmiddle" /></a></td>
</tr>
<tr>
<td align="center" colspan="2"><input type="file" name="newPhoto" size="15" /></td>
@@ -256,7 +256,7 @@
<td align="center" colspan="2">
<input type="button" name="cSave" value=" OK " class="classBtn" onclick="fninvsh('chPhoto');" />
- <input type="button" name="cCancel" value=" Cancel " class="classBtn" onclick="fninvsh('chPhoto');" />
+ <input type="button" name="cCancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="classBtn" onclick="fninvsh('chPhoto');" />
</td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingDetailView.tpl Tue May 16 07:08:32 2006
@@ -70,7 +70,7 @@
<input type="hidden" name="action" value="OrgSharingEditView">
<input type="hidden" name="parenttab" value="Settings">
<tr>
- <td class="genHeaderSmall" height="25" valign="middle">Global Access Privileges</td>
+ <td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</td>
<td align="right"><input class=small title="{$CMOD.LBL_RECALCULATE_BUTTON}" type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">
<input class=small type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
@@ -83,14 +83,14 @@
<tbody>
{foreach item=module from=$DEFAULT_SHARING}
<tr class="prvPrfHoverOff" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
- <th width="20%">{$module.0}</th>
+ <th width="20%">{$APP[$module.0]}</th>
<td width="30%">
{if $module.1 neq 'Private' && $module.1 neq 'Hide Details'}
<img src="{$IMAGE_PATH}public.gif" align="absmiddle">
{else}
<img src="{$IMAGE_PATH}private.gif" align="absmiddle">
{/if}
- {$module.1}</td>
+ {$CMOD[$module.1]}</td>
<td width="50%">{$module.2}</td>
</tr>
{/foreach}
@@ -140,23 +140,23 @@
<!-- Start of Module Display -->
{foreach key=modulename item=details from=$MODSHARING}
- <div align="right"><a href="#">Go to Top</a></div>
+ <div align="right"><a href="#">{$CMOD.LBL_GO_TO_TOP}</a></div>
{if $details.0 neq ''}
<table class="orgTab" cellpadding="0" cellspacing="0">
<tbody>
<tr bgcolor="#cccccc">
<td colspan=3 style="border: 1px solid rgb(204, 204, 204); padding-left: 5px;">
<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">
- <b>{$modulename}</b>
+ <b>{$APP.$modulename}</b>
</td>
<td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','')"></td>
</tr>
<tr>
- <th class="lvtCol" nowrap width="9%">Rule No.</th>
- <th class="lvtCol" width="20%">{$modulename} of </th>
- <th class="lvtCol" width="25%">can be accessed by </th>
- <th class="lvtCol" width="40%">privileges</th>
- <th class="lvtCol" width="6%">Delete</th>
+ <th class="lvtCol" nowrap width="9%">{$CMOD.LBL_RULE_NO}</th>
+ <th class="lvtCol" width="20%">{$APP.$modulename} {$CMOD.LBL_OF} </th>
+ <th class="lvtCol" width="25%">{$CMOD.LBL_CAN_BE_ACCESSED}</th>
+ <th class="lvtCol" width="40%">{$CMOD.LBL_PRIVILEGES}</th>
+ <th class="lvtCol" width="6%">{$APP.Tools}</th>
</tr>
{foreach key=sno item=elements from=$details}
<tr class="prvPrfHoverOut" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOut'">
@@ -164,7 +164,7 @@
<td>{$elements.1}</td>
<td>{$elements.2}</td>
<td>{$elements.3}</td>
- <td align="center"><a href="javascript:onClick=callEditDiv('{$modulename}','edit','{$elements.0}')"><img src="{$IMAGE_PATH}editfield.gif" align="absmiddle" height="15" width="16" border=0></a>|<a href="index.php?module=Users&action=DeleteSharingRule&shareid={$elements.0}"><img src="{$IMAGE_PATH}delete.gif" align="absmiddle" height="15" width="16" border=0></a></td>
+ <td align="center"><a href="javascript:onClick=callEditDiv('{$modulename}','edit','{$elements.0}')"><img src="{$IMAGE_PATH}editfield.gif" title='edit' align="absmiddle" height="15" width="16" border=0></a>|<a href="index.php?module=Users&action=DeleteSharingRule&shareid={$elements.0}"><img src="{$IMAGE_PATH}delete.gif" title='del' align="absmiddle" height="15" width="16" border=0></a></td>
</tr>
{/foreach}
</tbody></table>
@@ -177,14 +177,14 @@
<tr bgcolor="#cccccc">
<td style="border: 1px solid rgb(204, 204, 204); padding-left: 5px;">
<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">
- <b>{$modulename}</b>
+ <b>{$APP.$modulename}</b>
</td>
<td align="right"><input title="New" class="small" type="button" name="Create" value="Add Privileges" onClick="callEditDiv('{$modulename}','create','')"></td>
</tr>
<tr>
<td colspan="2" style="padding: 20px;" bgcolor="#ffffff" align="center">
{$CMOD.LBL_CUSTOM_ACCESS_MESG}
- <a href="javascript:onClick=callEditDiv('{$modulename}','create','')">Click here</a>
+ <a href="javascript:onClick=callEditDiv('{$modulename}','create','')">{$CMOD.LNK_CLICK_HERE}</a>
{$CMOD.LBL_CREATE_RULE_MESG}
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/OrgSharingEditView.tpl Tue May 16 07:08:32 2006
@@ -45,7 +45,7 @@
<tbody>
{foreach item=elements from=$ORGINFO}
<tr>
- <th width="30%">{$elements.0}</th>
+ <th width="30%">{$APP[$elements.0]}</th>
<td width="70%">{$elements.2}</td>
<tr>
{/foreach}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/QuickCreate.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/QuickCreate.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/QuickCreate.tpl Tue May 16 07:08:32 2006
@@ -22,7 +22,7 @@
<tr>
<td>
<table border=0 cellspacing=0 cellpadding=0 width="100%" class=small>
- <tr> <td class="qcHeader" background="{$IMAGE_PATH}qcBg.gif"><b >Create {$MODULE}</b></td><td class="qcHeader" align=right><img src="{$IMAGE_PATH}qcName.gif"></td></tr>
+ <tr> <td class="qcHeader" background="{$IMAGE_PATH}qcBg.gif"><b >{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.$MODULE}</b></td><td class="qcHeader" align=right><img src="{$IMAGE_PATH}qcName.gif"></td></tr>
</table>
<table border=0 cellspacing=0 cellpadding=5 width="100%" class=small>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Reports.tpl Tue May 16 07:08:32 2006
@@ -18,7 +18,7 @@
<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
<tr><td style="height:2px"></td></tr>
<tr>
- <td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > {$MODULE}</td>
+ <td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$APP.$CATEGORY} > {$APP.$MODULE}</td>
<td class="sep1" style="width:1px"></td>
<td class=small width="60%">
<table border=0 cellspacing=0 cellpadding=0>
@@ -62,7 +62,7 @@
<!-- POPUP LAYER FOR CREATE NEW REPORT -->
<div style="display: none; left: 193px; top: 106px;" id="reportLay" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
<table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody><tr><td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;"><b>Create New :</b></td></tr>
+ <tbody><tr><td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;"><b>{$MOD.LBL_CREATE_NEW} :</b></td></tr>
<tr>
<td>
{foreach item=modules from=$REPT_MODULES}
@@ -80,7 +80,7 @@
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody>
<tr>
- <td class="genHeaderSmall" align="left" width="40%">Add New Group</td>
+ <td class="genHeaderSmall" align="left" width="40%">{$MOD.LBL_ADD_NEW_GROUP}</td>
<td align="right" width="60%"><a href="javascript:fninvsh('orgLay');"><img src="{$IMAGE_PATH}close.gif" align="absmiddle" border="0"></a></td>
</tr>
<tr><td colspan="2"><hr></td></tr>
@@ -97,8 +97,8 @@
<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2"> </td></tr>
<tr>
<td colspan="2" align="center">
- <input name="save" value=" Save " class="classBtn" onClick="AddFolder();" type="button">
- <input name="cancel" value=" Cancel " class="classBtn" onclick="fninvsh('orgLay');" type="button">
+ <input name="save" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " class="classBtn" onClick="AddFolder();" type="button">
+ <input name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="classBtn" onclick="fninvsh('orgLay');" type="button">
</td>
</tr>
<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ReportsCustomize.tpl Tue May 16 07:08:32 2006
@@ -31,9 +31,9 @@
<tbody>
<tr>
<td class="lvtCol" width="5%"><input type="checkbox" name="selectall" onclick='toggleSelect(this.checked,"selected_id{$reportfolder.id}")' value="checkbox" /></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/Settings/EmailConfig.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailConfig.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailConfig.tpl Tue May 16 07:08:32 2006
@@ -55,7 +55,7 @@
</tr>
</table>
</td>
- <td colspan="2" class="genHeaderBig" width="70%">Mail Server (SMTP) - Settings{$ERROR_MSG}<br><hr> </td>
+ <td colspan="2" class="genHeaderBig" width="70%">{$MOD.LBL_MAIL_SERVER_SMTP} - {$MOD.LBL_SETTINGS}<br>{$ERROR_MSG}<br><hr> </td>
</tr>
{if $EMAILCONFIG_MODE neq 'edit'}
<tr><td colspan="2" style="padding-top: 0px;" align="right" width="75%">
@@ -81,9 +81,9 @@
<td align="right"><b>{$MOD.LBL_REQUIRE_SMTP_AUTHENTICATION} :</b></td>
<td>
{if $SMTP_AUTH eq 'checked'}
- yes
+ {$MOD.LBL_YES}
{else}
- no
+ {$MOD.LBL_NO}
{/if}
</td>
</tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailNotificationContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailNotificationContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/EmailNotificationContents.tpl Tue May 16 07:08:32 2006
@@ -13,10 +13,10 @@
<tbody>
<tr>
<td class="lvtCol" width="5%">#</td>
- <td class="lvtCol" width="35%">Notification</td>
- <td class="lvtCol" width="50%">Description</td>
- <td class="lvtCol" width="10%">Active</td>
- <td class="lvtCol" width="10%">Tool</td>
+ <td class="lvtCol" width="35%">{$MOD.LBL_NOTIFICATION}</td>
+ <td class="lvtCol" width="50%">{$MOD.LBL_DESCRIPTION}</td>
+ <td class="lvtCol" width="10%">{$MOD.LBL_ACTIVE}</td>
+ <td class="lvtCol" width="10%">{$MOD.LBL_TOOL}</td>
</tr>
{foreach name=notifyfor item=elements from=$NOTIFICATION}
<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
@@ -24,7 +24,7 @@
<td>{$elements.label}</td>
<td>{$elements.schedulename}</td>
<td>{$elements.active}</td>
- <td onClick="fetchEditNotify('{$smarty.foreach.notifyfor.iteration}');"><img src="{$IMAGE_PATH}editfield.gif"></td>
+ <td onClick="fetchEditNotify('{$smarty.foreach.notifyfor.iteration}');"><img src="{$IMAGE_PATH}editfield.gif" title="edit"></td>
</tr>
{/foreach}
</tbody>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Settings/ModuleOwnersContents.tpl Tue May 16 07:08:32 2006
@@ -39,7 +39,7 @@
{foreach name=modulelists item=modules from=$USER_LIST}
<tr class="prvPrfHoverOff" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
<td>{$smarty.foreach.modulelists.iteration}</td>
- <td>{$modules.0}</td>
+ <td>{$APP[$modules.0]}</td>
<td><a href="index.php?module=Users&action=DetailView&record={$modules.1}">{$modules.2}</a></td>
</tr>
{/foreach}
@@ -47,7 +47,7 @@
{foreach name=modulelists item=modules from=$USER_LIST}
<tr class="prvPrfHoverOff">
<td>{$smarty.foreach.modulelists.iteration}</td>
- <td>{$modules.0}</td>
+ <td>{$APP[$modules.0]}</td>
<td>{$modules.1}</td>
</tr>
{/foreach}
Modified: vtigercrm/branches/5.0_postgresql_integration/config.inc.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/config.inc.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/config.inc.php Tue May 16 07:08:32 2006
@@ -1,0 +1,194 @@
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is: SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+********************************************************************************/
+
+include('vtigerversion.php');
+
+// more than 8MB memory needed for graphics
+// memory limit default value = 16M
+ini_set('memory_limit','16M');
+
+// show or hide world clock, calculator and FCKEditor
+// world_clock_display default value = true
+// calculator_display default value = true
+// fckeditor_display default value = true
+$WORLD_CLOCK_DISPLAY = 'true';
+$CALCULATOR_DISPLAY = 'true';
+$FCKEDITOR_DISPLAY = 'true';
+
+// url for customer portal (Example: http://vtiger.com/portal)
+$PORTAL_URL = 'http://your-domain.com/customerportal';
+
+// helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support')
+$HELPDESK_SUPPORT_EMAIL_ID = 'support at your-domain.com';
+$HELPDESK_SUPPORT_NAME = 'your-domain name';
+
+/* database configuration
+ db_server
+ db_port
+ db_hostname
+ db_username
+ db_password
+ db_name
+*/
+
+$dbconfig['db_server'] = 'laptop';
+$dbconfig['db_port'] = ':5432';
+$dbconfig['db_username'] = 'vtigercrm';
+$dbconfig['db_password'] = 'vtigercrm';
+$dbconfig['db_name'] = 'vtigercrm5_beta';
+$dbconfig['db_type'] = 'pgsql';
+$dbconfig['db_status'] = 'true';
+
+// TODO: test if port is empty
+// TODO: set db_hostname dependending on db_type
+$dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port'];
+
+// log_sql default value = false
+$dbconfig['log_sql'] = false;
+
+// persistent default value = true
+$dbconfigoption['persistent'] = true;
+
+// autofree default value = false
+$dbconfigoption['autofree'] = false;
+
+// debug default value = 0
+$dbconfigoption['debug'] = 0;
+
+// seqname_format default value = '%s_seq'
+$dbconfigoption['seqname_format'] = '%s_seq';
+
+// portability default value = 0
+$dbconfigoption['portability'] = 0;
+
+// ssl default value = false
+$dbconfigoption['ssl'] = false;
+
+$host_name = $dbconfig['db_hostname'];
+
+$site_URL = 'http://laptop/vtigercrm5';
+
+// root directory path
+$root_directory = '/software/vtigercrm50/';
+
+// cache direcory path
+$cache_dir = 'cache/';
+
+// tmp_dir default value prepended by cache_dir = images/
+$tmp_dir = 'cache/images/';
+
+// import_dir default value prepended by cache_dir = import/
+$import_dir = 'cache/import/';
+
+// upload_dir default value prepended by cache_dir = upload/
+$upload_dir = 'cache/upload/';
+
+// mail server parameters
+$mail_server = '';
+$mail_server_username = '';
+$mail_server_password = '';
+
+// maximum file size for uploaded files in bytes also used when uploading import files
+// upload_maxsize default value = 3000000
+$upload_maxsize = 3000000;
+
+// flag to allow export functionality
+// 'all' to allow anyone to use exports
+// 'admin' to only allow admins to export
+// 'none' to block exports completely
+// allow_exports default value = all
+$allow_exports = 'all';
+
+// files with one of these extensions will have '.txt' appended to their filename on upload
+// upload_badext default value = php, php3, php4, php5, pl, cgi, py, asp, cfm, js, vbs, html, htm
+$upload_badext = array('php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py', 'asp', 'cfm', 'js', 'vbs', 'html', 'htm');
+
+// full path to include directory including the trailing slash
+// includeDirectory default value = $root_directory..'include/
+$includeDirectory = $root_directory.'include/';
+
+// list_max_entries_per_page default value = 20
+$list_max_entries_per_page = '20';
+
+// limitpage_navigation default value = 5
+$limitpage_navigation = '5';
+
+// history_max_viewed default value = 5
+$history_max_viewed = '5';
+
+// define list of menu tabs
+//$moduleList = Array('Home', 'Dashboard', 'Contacts', 'Accounts', 'Opportunities', 'Cases', 'Notes', 'Calls', 'Emails', 'Meetings', 'Tasks','MessageBoard');
+
+// map sugar language codes to jscalendar language codes
+// unimplemented until jscalendar language files are fixed
+// $cal_codes = array('en_us'=>'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr');
+
+// default_module default value = Home
+$default_module = 'Home';
+
+// default_action default value = index
+$default_action = 'index';
+
+// set default theme
+// default_theme default value = blue
+$default_theme = 'blue';
+
+// show or hide time to compose each page
+// calculate_response_time default value = true
+$calculate_response_time = true;
+
+// default text that is placed initially in the login form for user name
+// no default_user_name default value
+$default_user_name = '';
+
+// default text that is placed initially in the login form for password
+// no default_password default value
+$default_password = '';
+
+// create user with default username and password
+// create_default_user default value = false
+$create_default_user = false;
+// default_user_is_admin default value = false
+$default_user_is_admin = false;
+
+// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown
+// disable_persistent_connections default value = false
+$disable_persistent_connections = false;
+
+// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file)
+// languages default value = en_us=>US English
+$languages = Array('en_us'=>'US English',);
+
+// default charset
+// default charset default value = ISO-8859-1
+$default_charset = 'ISO-8859-1';
+
+// default language
+// default_language default value = en_us
+$default_language = 'en_us';
+
+// add the language pack name to every translation string in the display.
+// translation_string_prefix default value = false
+$translation_string_prefix = false;
+
+//Option to cache tabs permissions for speed.
+$cache_tab_perms = true;
+
+//Option to hide empty home blocks if no entries.
+$display_empty_home_blocks = false;
+
+// Generating Unique Application Key
+$application_unique_key = '2e67a990ef4db191f908f1eea4ba0ed9';
+?>
Modified: vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/data/CRMEntity.php Tue May 16 07:08:32 2006
@@ -86,8 +86,7 @@
$actid=$_REQUEST['record'];
}
$parentid=$_REQUEST['parent_id'];
-
- if($_REQUEST['module'] != 'Emails')
+ if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
{
if(!$parentid) {
$parentid = $adb->getUniqueID('seactivityrel');
Modified: vtigercrm/branches/5.0_postgresql_integration/include/ListView/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/ListView/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/ListView/ListView.php Tue May 16 07:08:32 2006
@@ -17,6 +17,7 @@
* Description: generic list view class.
********************************************************************************/
require_once('include/logging.php');
+require_once('include/ListView/ListViewSession.php');
class ListView {
Modified: vtigercrm/branches/5.0_postgresql_integration/include/js/Inventory.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/Inventory.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/Inventory.js Tue May 16 07:08:32 2006
@@ -48,10 +48,15 @@
document.EditView.totalProductCount.value = rowCnt;
}
-function productPickList(currObj) {
+function productPickList(currObj,module) {
var trObj=currObj.parentNode.parentNode
var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length))
- window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=inventory_prod&curr_row="+rowId,"productWin","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");
+
+ popuptype = 'inventory_prod';
+ if(module == 'PurchaseOrder')
+ popuptype = 'inventory_prod_po';
+
+ window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=600,height=400,resizable=1,scrollbars=1,status=1,top=150,left=200");
}
function priceBookPickList(currObj) {
@@ -161,6 +166,7 @@
function calcTotal(currObj) {
var trObj=currObj.parentNode.parentNode
var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length))
+
var total=eval(getObj("txtQty"+rowId).value*getObj("txtListPrice"+rowId).value)
getObj("total"+rowId).innerHTML=getObj("hdnTotal"+rowId).value=roundValue(total.toString())
calcGrandTotal()
Modified: vtigercrm/branches/5.0_postgresql_integration/include/js/ListView.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/ListView.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/ListView.js Tue May 16 07:08:32 2006
@@ -110,7 +110,7 @@
show("status");
var ajaxObj = new Ajax(ajaxSaveResponse);
var viewName = selectView.options[selectView.options.selectedIndex].value;
- var urlstring ="module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&viewname="+viewName;
+ var urlstring ="module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName;
ajaxObj.process("index.php?",urlstring);
}
Modified: vtigercrm/branches/5.0_postgresql_integration/include/js/general.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/general.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/general.js Tue May 16 07:08:32 2006
@@ -1362,7 +1362,7 @@
// Add & Delete Row in a Table
-function fnAddRow(){
+function fnAddRow(module){
rowCnt++;
var tableName = document.getElementById('proTab');
var prev = tableName.rows.length;
@@ -1380,16 +1380,16 @@
var colfive = row.insertCell(4);
var colsix = row.insertCell(5);
var colseven = row.insertCell(6);
- colone.innerHTML="<input type='text' name='txtProduct"+count+"' class='detailedViewProdTextBox' readonly/> <img src='themes/blue/images/search.gif' onclick='productPickList(this)' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
+ colone.innerHTML="<input type='text' id='txtProduct"+count+"' name='txtProduct"+count+"' class='txtBox' readonly/> <img src='themes/blue/images/search.gif' onclick='productPickList(this,\""+module+"\")' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
coltwo.innerHTML="<div id='qtyInStock"+count+"'>";
- colthree.innerHTML="<input type='text' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; settotalnoofrows(); calcTotal(this);' /> ";
+ colthree.innerHTML="<input type='text' id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; settotalnoofrows(); calcTotal(this);' /> ";
colfour.innerHTML=" </div><div id='unitPrice"+count+"'></div>";
- colfive.innerHTML="<input type='text' name='txtListPrice"+count+"' class='detailedViewProdTextBox' readonly onBlur='settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+ colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
colsix.innerHTML=" <div id='total"+count+"' align='right'></div><input type='hidden' id='hdnTotal"+count+"' name='hdnTotal"+count+"'>";
colseven.innerHTML="<span class='delTxt' onclick=\"deleteRow(this.parentNode.parentNode.rowIndex)\">Del</span>";
}
-function fnAddRowForPO(){
+function fnAddRowForPO(module){
rowCnt++;
var tableName = document.getElementById('proTab');
@@ -1407,10 +1407,10 @@
var colfour = row.insertCell(3);
var colfive = row.insertCell(4);
var colsix = row.insertCell(5);
- colone.innerHTML="<input type='text' name='txtProduct"+count+"' class='detailedViewProdTextBox' readonly/> <img src='themes/blue/images/search.gif' onclick='productPickList(this)' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
- coltwo.innerHTML="<input type='text' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; settotalnoofrows(); calcTotal(this);' /> ";
+ colone.innerHTML="<input type='text'id='txtProduct"+count+"' name='txtProduct"+count+"' class='txtBox' readonly/> <img src='themes/blue/images/search.gif' onclick='productPickList(this,\""+module+"\")' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
+ coltwo.innerHTML="<input type='text'id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; settotalnoofrows(); calcTotal(this);' /> ";
colthree.innerHTML=" <div id='unitPrice"+count+"'></div>";
- colfour.innerHTML="<input type='text' name='txtListPrice"+count+"' class='detailedViewProdTextBox' readonly onBlur='settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+ colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
colfive.innerHTML=" <div id='total"+count+"' align='right'></div><input type='hidden' id='hdnTotal"+count+"' name='hdnTotal"+count+"'>";
colsix.innerHTML="<span class='delTxt' onclick=\"deleteRow(this.parentNode.parentNode.rowIndex)\">Del</span>";
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 Tue May 16 07:08:32 2006
@@ -449,6 +449,7 @@
'LBL_SEARCH_NOW_BUTTON'=>'Search Now',
'LBL_GO_TO'=>'Go to',
'LBL_FEWER_BUTTON'=>'Fewer',
+'LBL_IN'=>'In',
'LBL_ADV_SEARCH_MSG_ANY'=>'Match Any of the Following',
'LBL_ADV_SEARCH_MSG_ALL'=>'Match All of the Following',
@@ -702,6 +703,7 @@
'Leads'=>'Leads',
'Accounts'=>'Accounts',
+'Accounts & Contacts'=>'Accounts & Contacts',
'Contacts'=>'Contacts',
'Potentials'=>'Potentials',
'Products'=>'Products',
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php Tue May 16 07:08:32 2006
@@ -1477,7 +1477,7 @@
}
if($module == "Emails")
{
- $query = "select distinct crmentity.crmid, crmentity.smownerid, activity.activityid, activity.subject, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from activity inner join crmentity on crmentity.crmid=activity.activityid left join users on users.id=crmentity.smownerid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE activity.activitytype='Emails' and crmentity.deleted=0 ";
+ $query = "select distinct crmentity.crmid, crmentity.smownerid, activity.activityid, activity.subject, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid , activity.date_start from activity inner join crmentity on crmentity.crmid=activity.activityid left join users on users.id=crmentity.smownerid left join seactivityrel on seactivityrel.activityid = activity.activityid left join contactdetails on contactdetails.contactid=seactivityrel.crmid left join cntactivityrel on cntactivityrel.activityid= activity.activityid and cntactivityrel.contactid=cntactivityrel.contactid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname left join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid left join emaildetails on emaildetails.emailid=activity.activityid WHERE activity.activitytype='Emails' and crmentity.deleted=0 ";
if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
{
$sec_parameter=getListViewSecurityParameter($module);
@@ -1895,11 +1895,14 @@
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
$output = '<td align="right" style="padding="5px;">';
+
+ /* //commented due to usablity conflict -- Philip
$output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start=1&viewname='.$viewid.'&allflag='.$navigation_array['allflag'].'" >'.$navigation_array['allflag'].'</a> ';
+ */
if(($navigation_array['prev']) != 0)
{
$output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start=1&viewname='.$viewid.'" title="First"><img src="'.$image_path.'start.gif" border="0" align="absmiddle"></a> ';
- $output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start='.$navigation_array['prev'].'&viewname='.$viewid.'"><img src="'.$image_path.'previous.gif" border="0" align="absmiddle"></a> ';
+ $output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start='.$navigation_array['prev'].'&viewname='.$viewid.'" title="Previous"><img src="'.$image_path.'previous.gif" border="0" align="absmiddle"></a> ';
}
else
@@ -1917,8 +1920,8 @@
}
if(($navigation_array['next']) !=0)
{
- $output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start='.$navigation_array['next'].'&viewname='.$viewid.'"><img src="'.$image_path.'next.gif" border="0" align="absmiddle"></a> ';
- $output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start='.$navigation_array['verylast'].'&viewname='.$viewid.'"><img src="'.$image_path.'end.gif" border="0" align="absmiddle"></a> ';
+ $output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start='.$navigation_array['next'].'&viewname='.$viewid.'" title="Next"><img src="'.$image_path.'next.gif" border="0" align="absmiddle"></a> ';
+ $output .= '<a href="index.php?module='.$module.'&action='.$action_val.$url_qry.'&start='.$navigation_array['verylast'].'&viewname='.$viewid.'" title="Last"><img src="'.$image_path.'end.gif" border="0" align="absmiddle"></a> ';
}
else
{
@@ -1934,7 +1937,7 @@
Param $currentmodule - modulename of the entity to be selected
Param $returnmodule - modulename for which the entity is assingned
Param $recordid - the record id for which the entity is assigned
-Return tyep string.
+Return type string.
*/
function getRelCheckquery($currentmodule,$returnmodule,$recordid)
@@ -1971,4 +1974,20 @@
return $where_relquery;
}
+/**This function stores the variables sent in list view url string.
+Param $lv_array - list view session array
+Return type void.
+*/
+
+function setSessionVar($lv_array)
+{
+ if(isset($_REQUEST['start']) && $_REQUEST['start'] !='')
+ $lv_array['start']=$_REQUEST['start'];
+ if(isset($_REQUEST['viewname']) && $_REQUEST['viewname'] !='')
+ $lv_array['viewname']=$_REQUEST['viewname'];
+
+ $_SESSION['lvs'][$_REQUEST['module']]=$lv_array;
+
+}
+
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/install/1checkSystem.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/install/1checkSystem.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/install/1checkSystem.php Tue May 16 07:08:32 2006
@@ -152,7 +152,7 @@
<HEAD>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>vtiger CRM 5.0 Alpha5 Installer: Step 1</title>
-<link rel="stylesheet" href="install/install.css" type="text/css" />
+<link rel="stylesheet" href="include/install/install.css" type="text/css" />
</head>
<body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0" class="">
@@ -162,10 +162,10 @@
<td align=center>
<br><br>
<!-- Top Header -->
- <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(install/images/cwTopBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(include/install/images/cwTopBg.gif) repeat-x;">
<tr>
- <td><img src="install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
- <td align=right><img src="install/images/cwTopRight.gif" alt="v5alpha5" title="v5alpha5"></td>
+ <td><img src="include/install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
+ <td align=right><img src="include/install/images/cwTopRight.gif" alt="v5alpha5" title="v5alpha5"></td>
</tr>
</table>
@@ -174,15 +174,15 @@
<!-- 1 of 5 header -->
<table border="0" cellspacing="0" cellpadding="5" width="75%" class=small>
<tr>
- <td valign=top><img src="install/images/cwIcoSystem.gif" alt="System Check" title="System Check"></td>
+ <td valign=top><img src="include/install/images/cwIcoSystem.gif" alt="System Check" title="System Check"></td>
<td width=98% valign=top>
<table border=0 cellspacing=0 cellpadding=0 width=100%>
<tr>
- <td><img src="install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
- <td align=right><img src="install/images/cwStep1of5.gif" alt="Step 1 of 5" title="Step 1 of 5"></td>
+ <td><img src="include/install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
+ <td align=right><img src="include/install/images/cwStep1of5.gif" alt="Step 1 of 5" title="Step 1 of 5"></td>
</tr>
<tr>
- <td colspan=2><img src="install/images/cwHdrSysCheck.gif" alt="System Check" title="System Check"></td>
+ <td colspan=2><img src="include/install/images/cwHdrSysCheck.gif" alt="System Check" title="System Check"></td>
</tr>
</table>
<hr noshade size=1>
@@ -337,20 +337,20 @@
<table border=0 cellspacing=0 cellpadding=0 width=70% class=small>
<tr>
- <td><img src="install/images/cwURL.gif"></td>
+ <td><img src="include/install/images/cwURL.gif"></td>
<td align=right>
<form action="install.php" method="post" name="form" id="form">
<input type="hidden" name="file" value="2setConfig.php" />
- <input type="image" src="install/images/cwBtnNext.gif" border="0" onClick="window.location=('install.php')">
+ <input type="image" src="include/install/images/cwBtnNext.gif" border="0" onClick="window.location=('install.php')">
</td>
</tr>
</table>
<br><br>
<!-- Horizontal Shade -->
- <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(install/images/cwShadeBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(include/install/images/cwShadeBg.gif) repeat-x;">
<tr>
- <td><img src="install/images/cwShadeLeft.gif"></td>
- <td align=right><img src="install/images/cwShadeRight.gif"></td>
+ <td><img src="include/install/images/cwShadeLeft.gif"></td>
+ <td align=right><img src="include/install/images/cwShadeRight.gif"></td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/install/2setConfig.php Tue May 16 07:08:32 2006
@@ -110,8 +110,10 @@
$site_URL = $site_URL;
else $site_URL = $web_root;
- if (isset($_REQUEST['root_directory'])) $root_directory = stripslashes($_REQUEST['root_directory']);
- else $root_directory = $current_dir;
+ if (! isset($_REQUEST['root_directory']))
+ {
+ $root_directory = $current_dir;
+ }
if (isset($_REQUEST['cache_dir']))
$cache_dir= $_REQUEST['cache_dir'];
@@ -160,7 +162,7 @@
<HEAD>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>vtiger CRM 5.0 Alpha4 Installer: Step 2</title>
-<link rel="stylesheet" href="install/install.css" type="text/css" />
+<link rel="stylesheet" href="include/install/install.css" type="text/css" />
</head>
<body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
@@ -248,10 +250,10 @@
<td align=center>
<br><br>
<!-- Top Header -->
- <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(install/images/cwTopBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(include/install/images/cwTopBg.gif) repeat-x;">
<tr>
- <td><img src="install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
- <td align=right><img src="install/images/cwTopRight.gif" alt="v5alpha4" title="v5alpha4"></td>
+ <td><img src="include/install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
+ <td align=right><img src="include/install/images/cwTopRight.gif" alt="v5alpha4" title="v5alpha4"></td>
</tr>
</table>
@@ -260,15 +262,15 @@
<!-- 1 of 5 header -->
<table border="0" cellspacing="0" cellpadding="5" width="75%" class=small>
<tr>
- <td valign=top><img src="install/images/cwIcoSystem.gif" alt="System Check" title="System Check"></td>
+ <td valign=top><img src="include/install/images/cwIcoSystem.gif" alt="System Check" title="System Check"></td>
<td width=98% valign=top>
<table border=0 cellspacing=0 cellpadding=0 width=100%>
<tr>
- <td><img src="install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
- <td align=right><img src="install/images/cwStep2of5.gif" alt="Step 2 of 5" title="Step 2 of 5"></td>
- </tr>
- <tr>
- <td colspan=2><img src="install/images/cwHdrSysConf.gif" alt="System Check" title="System Check"></td>
+ <td><img src="include/install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
+ <td align=right><img src="include/install/images/cwStep2of5.gif" alt="Step 2 of 5" title="Step 2 of 5"></td>
+ </tr>
+ <tr>
+ <td colspan=2><img src="include/install/images/cwHdrSysConf.gif" alt="System Check" title="System Check"></td>
</tr>
</table>
<hr noshade size=1>
@@ -410,20 +412,20 @@
<!-- -->
<table border=0 cellspacing=0 cellpadding=0 width=70% class=small>
<tr>
- <td><img src="install/images/cwURL.gif"></td>
+ <td><img src="include/install/images/cwURL.gif"></td>
<td align=right>
<input type="hidden" name="file" value="3confirmConfig.php" />
- <input type="image" src="install/images/cwBtnNext.gif" border="0" onclick="return verify_data(this.form); window.location=('install.php')">
+ <input type="image" src="include/install/images/cwBtnNext.gif" border="0" onclick="return verify_data(this.form); window.location=('install.php')">
</td>
</tr>
</table>
<br><br>
<!-- Horizontal Shade -->
- <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(install/images/cwShadeBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(include/install/images/cwShadeBg.gif) repeat-x;">
<tr>
- <td><img src="install/images/cwShadeLeft.gif"></td>
- <td align=right><img src="install/images/cwShadeRight.gif"></td>
+ <td><img src="include/install/images/cwShadeLeft.gif"></td>
+ <td align=right><img src="include/install/images/cwShadeRight.gif"></td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/install/4createConfigFile.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/install/4createConfigFile.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/install/4createConfigFile.php Tue May 16 07:08:32 2006
@@ -115,7 +115,7 @@
<title>vtiger CRM 5.0 beta Installer: Step 4</title>
-<link rel="stylesheet" href="install/install.css" type="text/css" />
+<link rel="stylesheet" href="include/install/install.css" type="text/css" />
</head>
@@ -127,10 +127,10 @@
<td align=center>
<br><br>
<!-- Top Header -->
- <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(install/images/cwTopBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(include/install/images/cwTopBg.gif) repeat-x;">
<tr>
- <td><img src="install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
- <td align=right><img src="install/images/cwTopRight.gif" alt="v5Beta" title="v5Beta"></td>
+ <td><img src="include/install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
+ <td align=right><img src="include/install/images/cwTopRight.gif" alt="v5Beta" title="v5Beta"></td>
</tr>
</table>
@@ -139,15 +139,15 @@
<!-- 4 of 5 header -->
<table border="0" cellspacing="0" cellpadding="5" width="75%" class=small>
<tr>
- <td valign=top><img src="install/images/cwIcoConfFile.gif" alt="System Check" title="System Check"></td>
+ <td valign=top><img src="include/install/images/cwIcoConfFile.gif" alt="System Check" title="System Check"></td>
<td width=98% valign=top>
<table border=0 cellspacing=0 cellpadding=0 width=100%>
<tr>
- <td><img src="install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
- <td align=right><img src="install/images/cwStep4of5.gif" alt="Step 4 of 5" title="Step 4 of 5"></td>
- </tr>
- <tr>
- <td colspan=2><img src="install/images/cwHdrCrConfFile.gif" alt="Create Configuration File" title="Create Configuration File"></td>
+ <td><img src="include/install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
+ <td align=right><img src="include/install/images/cwStep4of5.gif" alt="Step 4 of 5" title="Step 4 of 5"></td>
+ </tr>
+ <tr>
+ <td colspan=2><img src="include/install/images/cwHdrCrConfFile.gif" alt="Create Configuration File" title="Create Configuration File"></td>
</tr>
</table>
<hr noshade size=1>
@@ -234,7 +234,7 @@
<br><br>
<table border=0 cellspacing=0 cellpadding=0 width=100% class=small>
<tr>
- <td><img src="install/images/cwURL.gif"></td>
+ <td><img src="include/install/images/cwURL.gif"></td>
<td align=right>
<form action="install.php" method="post" name="form" id="form">
<!--<form action="install.php" method="post" name="form" id="form"> -->
@@ -248,7 +248,7 @@
<input type="hidden" class="dataInput" name="db_populate" value="<?php if (isset($db_populate)) echo "$db_populate"; ?>" />
<input type="hidden" class="dataInput" name="admin_email" value="<?php if (isset($admin_email)) echo "$admin_email"; ?>" />
<input type="hidden" class="dataInput" name="admin_password" value="<?php if (isset($admin_password)) echo "$admin_password"; ?>" />
- <input type="image" name="next" value="Next" src="install/images/cwBtnNext.gif" onClick="window.location=('install.php')" />
+ <input type="image" name="next" value="Next" src="include/install/images/cwBtnNext.gif" onClick="window.location=('install.php')" />
</form>
</td>
@@ -256,10 +256,10 @@
</table>
<br><br>
<!-- Horizontal Shade -->
- <table border="0" cellspacing="0" cellpadding="0" width="100%" style="background:url(install/images/cwShadeBg.gif) repeat-x;">
- <tr>
- <td><img src="install/images/cwShadeLeft.gif"></td>
- <td align=right><img src="install/images/cwShadeRight.gif"></td>
+ <table border="0" cellspacing="0" cellpadding="0" width="100%" style="background:url(include/install/images/cwShadeBg.gif) repeat-x;">
+ <tr>
+ <td><img src="include/install/images/cwShadeLeft.gif"></td>
+ <td align=right><img src="include/install/images/cwShadeRight.gif"></td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/install/5createTables.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/install/5createTables.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/install/5createTables.php Tue May 16 07:08:32 2006
@@ -32,7 +32,7 @@
<HEAD>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>vtiger CRM 5.0 beta Installer: Step 5</title>
-<link rel="stylesheet" href="install/install.css" type="text/css" />
+<link rel="stylesheet" href="install/include/install.css" type="text/css" />
<style type="text/css"><!--
@@ -76,10 +76,10 @@
<td align=center>
<br><br>
<!-- Top Header -->
- <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(install/images/cwTopBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="80%" style="background:url(include/install/images/cwTopBg.gif) repeat-x;">
<tr>
- <td><img src="install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
- <td align=right><img src="install/images/cwTopRight.gif" alt="v5alpha4" title="v5alpha4"></td>
+ <td><img src="include/install/images/cwTopLeft.gif" alt="vtiger CRM" title="vtiger CRM"></td>
+ <td align=right><img src="include/install/images/cwTopRight.gif" alt="v5alpha4" title="v5alpha4"></td>
</tr>
</table>
@@ -88,15 +88,15 @@
<!-- 5 of 5 header -->
<table border="0" cellspacing="0" cellpadding="5" width="75%" class=small>
<tr>
- <td valign=top><img src="install/images/cwIcoDB.gif" alt="Create Database Tables" title="Create Database Tables"></td>
+ <td valign=top><img src="include/install/images/cwIcoDB.gif" alt="Create Database Tables" title="Create Database Tables"></td>
<td width=98% valign=top>
<table border=0 cellspacing=0 cellpadding=0 width=100%>
<tr>
- <td><img src="install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
- <td align=right><img src="install/images/cwStep5of5.gif" alt="Step 5 of 5" title="Step 5 of 5"></td>
+ <td><img src="include/install/images/cwHdrVtConfWiz.gif" alt="vtiger CRM Configuration Wizard" title="vtiger CRM Configuration Wizard"></td>
+ <td align=right><img src="include/install/images/cwStep5of5.gif" alt="Step 5 of 5" title="Step 5 of 5"></td>
</tr>
<tr>
- <td colspan=2><img src="install/images/cwHdrCrDbTables.gif" alt="Create Database Tables" title="Create Database Tables"></td>
+ <td colspan=2><img src="include/install/images/cwHdrCrDbTables.gif" alt="Create Database Tables" title="Create Database Tables"></td>
</tr>
</table>
<hr noshade size=1>
@@ -150,16 +150,16 @@
<tr><td colspan=2 align="center">
<form action="index.php" method="post" name="form" id="form">
<input type="hidden" name="default_user_name" value="admin">
- <input type="image" src="<?echo $renamefile;?>install/images/cwBtnFinish.gif" name="next" value="Finish" />
+ <input type="image" src="include/install/images/cwBtnFinish.gif" name="next" value="Finish" />
</form>
</td></tr>
</table>
<br><br>
<!-- Horizontal Shade -->
- <table border="0" cellspacing="0" cellpadding="0" width="75%" style="background:url(<?echo $renamefile;?>install/images/cwShadeBg.gif) repeat-x;">
+ <table border="0" cellspacing="0" cellpadding="0" width="75%" style="background:url(include/install/images/cwShadeBg.gif) repeat-x;">
<tr>
- <td><img src="<?echo $renamefile;?>install/images/cwShadeLeft.gif"></td>
- <td align=right><img src="<?echo $renamefile;?>install/images/cwShadeRight.gif"></td>
+ <td><img src="include/install/images/cwShadeLeft.gif"></td>
+ <td align=right><img src="include/install/images/cwShadeRight.gif"></td>
</tr>
</table><br><br>
Modified: vtigercrm/branches/5.0_postgresql_integration/log4php/appenders/LoggerAppenderRollingFile.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/log4php/appenders/LoggerAppenderRollingFile.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/log4php/appenders/LoggerAppenderRollingFile.php Tue May 16 07:08:32 2006
@@ -144,7 +144,7 @@
$this->closeFile(); // keep windows happy.
$file = $fileName;
- rename($file, $target);
+ @rename($file, $target);
}
$this->setFile($fileName, false);
@@ -236,4 +236,4 @@
}
}
}
-?>
+?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php Tue May 16 07:08:32 2006
@@ -6,10 +6,13 @@
*/
function calendar_layout(& $param_arr)
{
+ global $mod_strings;
$cal_header = array ();
$cal_header['view'] = $param_arr['view'];
$cal_header['IMAGE_PATH'] = $param_arr['IMAGE_PATH'];
$cal_header['calendar'] = $param_arr['calendar'];
+ $eventlabel = $mod_strings['LBL_EVENTS'];
+ $todolabel = $mod_strings['LBL_TODOS'];
get_cal_header_tab($cal_header);
$subheader = "";
$subheader .=<<<EOQ
@@ -21,8 +24,8 @@
<table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
<tr>
<td class="dvtTabCache" style="width: 10px;" nowrap="nowrap"> </td>
- <td class="dvtSelectedCell" id="pi" onclick="fnLoadValues('pi','mi','mnuTab','mnuTab2')" align="center" nowrap="nowrap" width="75"><b>Events</b></td>
- <td class="dvtUnSelectedCell" style="width: 100px;" id="mi" onclick="fnLoadValues('mi','pi','mnuTab2','mnuTab')" align="center" nowrap="nowrap"><b>Todos</b></td>
+ <td class="dvtSelectedCell" id="pi" onclick="fnLoadValues('pi','mi','mnuTab','mnuTab2')" align="center" nowrap="nowrap" width="75"><b>$eventlabel</b></td>
+ <td class="dvtUnSelectedCell" style="width: 100px;" id="mi" onclick="fnLoadValues('mi','pi','mnuTab2','mnuTab')" align="center" nowrap="nowrap"><b>$todolabel</b></td>
<td class="dvtTabCache" nowrap="nowrap"> </td>
</tr>
</table>
@@ -473,6 +476,7 @@
function getdayEventLayer(& $cal,$slice)
{
+ global $mod_strings;
$eventlayer = '';
$arrow_img_name = '';
$act = $cal['calendar']->day_slice[$slice]->activities;
@@ -500,7 +504,7 @@
<td align="left" width="5%"><img src="'.$image.'" align="right top"></td>
<td align="left" width="85%"><span class="fontBold">'.$account_name.'</span><br>
<b>'.$start_hour.'</b> ,<span class="orgTab">'.$subject.'</span>
- <a href="index.php?action=DetailView&module=Activities&record='.$id.'&activity_mode=Events" class="webMnu">[More...]</a>
+ <a href="index.php?action=DetailView&module=Activities&record='.$id.'&activity_mode=Events" class="webMnu">['.$mod_strings['LBL_MORE'].'...]</a>
</td>
<td align="right" width="5%">
@@ -519,6 +523,7 @@
function getmonthEventLayer(& $cal,$slice)
{
+ global $mod_strings;
$eventlayer = '';
$arrow_img_name = '';
$act = $cal['calendar']->month_array[$slice]->activities;
@@ -560,7 +565,7 @@
{
$eventlayer .='<div valign=bottom align=right width=10%>
<a href="index.php?module=Calendar&action=index&view='.$cal['calendar']->month_array[$slice]->getView().'&'.$cal['calendar']->month_array[$slice]->start_time->get_date_str().'" class="webMnu">
- +'.$remin_list.' More</a></div>';
+ +'.$remin_list.' '.$mod_strings['LBL_MORE'].'</a></div>';
}
return $eventlayer;
}
@@ -571,7 +576,7 @@
function getEventList(& $calendar,$start_date,$end_date,$info='')
{
$Entries = Array();
- global $adb,$current_user;
+ global $adb,$current_user,$mod_strings;
$query = "SELECT cntactivityrel.contactid, activity.*
FROM activity
@@ -626,7 +631,7 @@
$contactname = getContactName($contact_id);
$contact_data = "<b>".$contactname."</b>,";
}
- $more_link = "<a href='index.php?action=DetailView&module=Activities&record=".$id."&activity_mode=Events' class='webMnu'>[More...]</a>";
+ $more_link = "<a href='index.php?action=DetailView&module=Activities&record=".$id."&activity_mode=Events' class='webMnu'>[".$mod_strings['LBL_MORE']."...]</a>";
$type = $adb->query_result($result,$i,"activitytype");
if($type == 'Call')
$image_tag = "<img src='".$calendar['IMAGE_PATH']."Calls.gif' align='middle'> ".$type;
@@ -761,8 +766,8 @@
{
$hour = $hour - 12;
$start_hour = $hour;
- if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
- $start_hour = "0".$start_hour;
+ /*if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
+ $start_hour = "0".$start_hour;*/
$start_time = $start_hour.":".$min."pm";
$end_min = $min+$duration_min;
$end_hour = $hour+$duration_hr;
@@ -781,8 +786,8 @@
elseif($hour == '12')
{
$start_hour = $hour;
- if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
- $start_hour = "0".$start_hour;
+ /*if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
+ $start_hour = "0".$start_hour;*/
$start_time = $start_hour.":".$min."pm";
$end_min = $min+$duration_min;
$end_hour = $hour+$duration_hr;
@@ -812,8 +817,8 @@
else
{
$start_hour = $hour;
- if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
- $start_hour = "0".$start_hour;
+ /*if($start_hour <= 9 && strlen(trim($start_hour)) < 2)
+ $start_hour = "0".$start_hour;*/
$start_time = $start_hour.":".$min."am";
$end_min = $min+$duration_min;
$end_hour = $hour+$duration_hr;
@@ -865,6 +870,9 @@
if($end_min <= 9 && strlen(trim($end_min)) < 2)
$end_min = "0".$end_min;
$end_time = $end_hour.":".$end_min;
+ if($hour <= 9 && strlen(trim($hour)) < 2)
+ $hour = "0".$hour;
+ $start_time = $hour.":".$min;
$return_data = Array(
'starttime'=>$start_time,
'endtime' =>$end_time
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 Tue May 16 07:08:32 2006
@@ -167,6 +167,8 @@
"Dec",
),
+'LBL_EVENTS'=>'Events',
+'LBL_TODOS'=>'Todos',
'LBL_ADD_EVENT'=>'Add Event',
'LBL_INVITE'=>'Invite',
'LBL_REMINDER'=>'Reminder',
@@ -183,6 +185,7 @@
'LBL_ACTION'=>'Actions',
'LBL_CURSTATUS'=>'Current Status',
'LBL_PENDING'=>'Pending',
+'LBL_MORE'=>'More',
//DON'T CONVERT THESE THEY ARE MAPPINGS
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php Tue May 16 07:08:32 2006
@@ -82,12 +82,12 @@
// Mike Crowe Mod --------------------------------------------------------getViewId
function getViewId($module)
{
- global $adb;
+ global $adb;
if(isset($_REQUEST['viewname']) == false)
{
- if (isset($_SESSION["cv$module"]) && $_SESSION["cv$module"]!='')
- {
- $viewid = $_SESSION["cv$module"];
+ if (isset($_SESSION['lvs'][$module]["viewname"]) && $_SESSION['lvs'][$module]["viewname"]!='')
+ {
+ $viewid = $_SESSION['lvs'][$module]["viewname"];
}
elseif($this->setdefaultviewid != "")
{
@@ -103,8 +103,9 @@
{
$viewid = $_REQUEST['viewname'];
}
- $_SESSION["cv$module"] = $viewid;
+ $_SESSION['lvs'][$module]["viewname"] = $viewid;
return $viewid;
+
}
// Mike Crowe Mod --------------------------------------------------------getGroupId
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 Tue May 16 07:08:32 2006
@@ -42,13 +42,14 @@
$focus->retrieve_entity_info($_REQUEST['record'],"Emails");
$log->info("Entity info successfully retrieved for DetailView.");
$focus->id = $_REQUEST['record'];
- $query = 'select from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+ $query = 'select email_flag,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'));
+ $smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_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('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('EMAIL_FLAG',$adb->query_result($result,0,'email_flag'));
if($focus->column_fields['name'] != '')
$focus->name = $focus->column_fields['name'];
else
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 Tue May 16 07:08:32 2006
@@ -162,7 +162,7 @@
}
if($_REQUEST['folderid'] =='2')
{
- $list_query .= "AND seactivityrel.crmid in (select contactid from contactdetails)";
+ $list_query .= "AND seactivityrel.crmid in (select contactid from contactdetails) AND emaildetails.email_flag !='WEBMAIL'";
}
if($_REQUEST['folderid'] =='3')
{
@@ -175,6 +175,10 @@
if($_REQUEST['folderid'] =='5')
{
$list_query .= "AND salesmanactivityrel.smid in (select id from users)";
+}
+if($_REQUEST['folderid'] =='6')
+{
+ $list_query .= "AND emaildetails.email_flag ='WEBMAIL'";
}
if(isset($order_by) && $order_by != '')
{
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 Tue May 16 07:08:32 2006
@@ -63,7 +63,7 @@
header("Location: index.php?module=Emails&action=index");
exit();
}
-if(isset($_REQUEST['fromemail']) && $_REQUEST['fromemail'] != null)
+/*if(isset($_REQUEST['fromemail']) && $_REQUEST['fromemail'] != null)
{
//get the list of data from the comma separated array
$emailids = explode(",",$_REQUEST['fromemail']);
@@ -119,7 +119,7 @@
}
header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename");
return;
-}
+}*/
/** Function to check whether the contact is exist of not
* input : contact id
@@ -144,7 +144,7 @@
return -1;
}
}
-
+//assign the focus values
$focus->filename = $_REQUEST['file_name'];
$focus->parent_id = $_REQUEST['parent_id'];
$focus->parent_type = $_REQUEST['parent_type'];
@@ -152,6 +152,8 @@
$focus->column_fields["activitytype"]="Emails";
$focus->column_fields["date_start"]= date('Y-m-d');
$focus->save("Emails");
+
+//saving the email details in emaildetails table
$return_id = $focus->id;
$email_id = $return_id;
$query = 'select emailid from emaildetails where emailid ='.$email_id;
@@ -165,12 +167,14 @@
$all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
if($adb->num_rows($result) > 0)
{
- $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;
+ $query = 'update emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" 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);
+$adb->query($query);
+
+
$focus->retrieve_entity_info($return_id,"Emails");
//this is to receive the data from the Select Users button
@@ -193,14 +197,6 @@
$local_log->debug("Saved record with id of ".$return_id);
-/*if($file_upload_error)
-{
- $return_module = 'Emails';
- $return_action = 'EditView';
- $return_id = $email_id.'&upload_error=true&return_module='.$_REQUEST['return_module'].'&return_action='.$_REQUEST['return_action'].'&return_id='.$_REQUEST['return_id'];
- header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename");
-}
-else*/
if( isset($_REQUEST['send_mail']) && $_REQUEST['send_mail'])
{
include("modules/Emails/mailsend.php");
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 Tue May 16 07:08:32 2006
@@ -182,7 +182,15 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+ $blocks['basicTab'] = $bas_block;
+ if(is_array($adv_block ))
+ $blocks['moreTab'] = $adv_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -278,8 +286,8 @@
$smarty->assign("CHECK", $check_button);
if($focus->mode == 'edit')
-$smarty->display("salesEditView.tpl");
+ $smarty->display("salesEditView.tpl");
else
-$smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.tpl');
?>
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 Tue May 16 07:08:32 2006
@@ -148,8 +148,8 @@
</tr>
<tr>
<td colspan="2" align="center">
- <input name="Save" value=" Save " onclick="this.form.action.value=\'LeadConvertToEntities\'; return verify_data(ConvertLead)" type="submit" class="classBtn">
- <input type="button" name=" Cancel " value=" Cancel " onClick="hide(\'orgLay\')" class="classBtn">
+ <input name="Save" value=" '.$app_strings['LBL_SAVE_BUTTON_LABEL'].' " onclick="this.form.action.value=\'LeadConvertToEntities\'; return verify_data(ConvertLead)" type="submit" class="classBtn">
+ <input type="button" name=" Cancel " value=" '.$app_strings['LBL_CANCEL_BUTTON_LABEL'].' " onClick="hide(\'orgLay\')" class="classBtn">
</td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php Tue May 16 07:08:32 2006
@@ -66,6 +66,22 @@
$_SESSION['LEADS_SORT_ORDER'] = $sorder;
//<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
+//Storing Listvew session object
+if(!$_SESSION['lvs'][$currentModule])
+{
+ unset($_SESSION['lvs']);
+ $modObj = new ListViewSession();
+ $modObj->sorder = $sorder;
+ $modObj->sortby = $order_by;
+ $_SESSION['lvs'][$currentModule] = get_object_vars($modObj);
+}
+else
+{
+ setSessionVar($_SESSION['lvs'][$currentModule]);
+}
+
+$modOb = $_SESSION['lvs'][$currentModule];
+
//for change owner and change status
$change_status = get_select_options_with_id($comboFieldArray['leadstatus_dom'], $focus->lead_status);
$smarty->assign("CHANGE_STATUS",$change_status);
@@ -172,11 +188,20 @@
$start = $_REQUEST['start'];
//added to remain the navigation when sort
- $url_string = "&start=".$_REQUEST['start'];
+ //$url_string = "&start=".$_REQUEST['start'];
+ $_SESSION['lvs'][$currentModule]['start'] = $_REQUEST['start'];
}
else
{
- $start = 1;
+ if ($start < ceil ($noofrows / $list_max_entries_per_page))
+ {
+ $start = ceil ($noofrows / $list_max_entries_per_page);
+ $_SESSION['lvs'][$currentModule]['start'] = $start;
+ }
+ else
+ {
+ $start = $modOb['start'];
+ }
}
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
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 Tue May 16 07:08:32 2006
@@ -41,7 +41,11 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $blocks['basicTab'] = $bas_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -91,5 +95,5 @@
if($focus->mode == 'edit')
$smarty->display('salesEditView.tpl');
else
- $smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.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 Tue May 16 07:08:32 2006
@@ -17,6 +17,7 @@
global $app_strings;
global $mod_strings;
global $currentModule;
+
$encode_val=$_REQUEST['encode_val'];
$decode_val=base64_decode($encode_val);
@@ -81,8 +82,15 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
- $smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+ $blocks['basicTab'] = $bas_block;
+ if(is_array($adv_block))
+ $blocks['moreTab'] = $adv_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -166,7 +174,7 @@
$smarty->assign("CHECK", $check_button);
if($focus->mode == 'edit')
-$smarty->display('salesEditView.tpl');
+ $smarty->display('salesEditView.tpl');
else
-$smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.tpl');
?>
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 Tue May 16 07:08:32 2006
@@ -84,7 +84,15 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+ $blocks['basicTab'] = $bas_block;
+ if(is_array($adv_block ))
+ $blocks['moreTab'] = $adv_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -186,7 +194,7 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
if($focus->mode == 'edit')
-$smarty->display('salesEditView.tpl');
+ $smarty->display('salesEditView.tpl');
else
-$smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.tpl');
?>
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 Tue May 16 07:08:32 2006
@@ -97,7 +97,15 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+ $blocks['basicTab'] = $bas_block;
+ if(is_array($adv_block ))
+ $blocks['moreTab'] = $adv_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -233,8 +241,8 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
if($focus->mode == 'edit')
-$smarty->display("salesEditView.tpl");
+ $smarty->display("salesEditView.tpl");
else
-$smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.tpl');
?>
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 Tue May 16 07:08:32 2006
@@ -106,6 +106,7 @@
'LBL_DESCRIPTION'=>'Description',
'LBL_TOOLS'=>'Tools',
'LBL_AND'=>'and',
+'LBL_ADD_NEW_GROUP'=>'Add New Group',
'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/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/SalesOrder/EditView.php Tue May 16 07:08:32 2006
@@ -168,7 +168,15 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+ $blocks['basicTab'] = $bas_block;
+ if(is_array($adv_block ))
+ $blocks['moreTab'] = $adv_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -282,8 +290,8 @@
$check_button = Button_Check($module);
$smarty->assign("CHECK", $check_button);
if($focus->mode == 'edit')
-$smarty->display("salesEditView.tpl");
+ $smarty->display("salesEditView.tpl");
else
-$smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.tpl');
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Settings/CreateCustomField.php Tue May 16 07:08:32 2006
@@ -122,7 +122,7 @@
<div id="orgLay" style="display:block;">
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
- <td width="40%" align="left" class="genHeaderSmall">Add Field </td>
+ <td width="40%" align="left" class="genHeaderSmall">'.$mod_strings['LBL_ADD_FIELD'].'</td>
<td width="60%" align="right"><a href="javascript:fninvsh(\'orgLay\');"><img src="'.$image_path.'close.gif" border="0" align="absmiddle" /></a></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
@@ -159,8 +159,8 @@
<tr><td style="border-bottom:1px dashed #CCCCCC;" colspan="2"> </td></tr>
<tr>
<td colspan="2" align="center">
- <input type="submit" name="save" value=" Save " class="classBtn" />
- <input type="button" name="cancel" value=" Cancel " class="classBtn" onclick="fninvsh(\'orgLay\');" />
+ <input type="submit" name="save" value=" '.$app_strings['LBL_SAVE_BUTTON_LABEL'].' " class="classBtn" />
+ <input type="button" name="cancel" value=" '.$app_strings['LBL_CANCEL_BUTTON_LABEL'].' " class="classBtn" onclick="fninvsh(\'orgLay\');" />
</td>
</tr>
<tr><td colspan="2" style="border-top:1px dashed #CCCCCC;"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Settings/language/en_us.lang.php Tue May 16 07:08:32 2006
@@ -178,7 +178,9 @@
'CUSTOMFIELD'=>'Custom Field',
-
+'LBL_ADD_FIELD'=>'Add Field',
+
+'LBL_CUSTM_MSG'=>'allows you to ....',
'PicklistFields'=>' Picklist Fields',
@@ -256,6 +258,10 @@
'LBL_INACTIVE'=>'Inactive',
+'LBL_NOTIFICATION'=>'Notification',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_TOOL'=>'Tool',
+
//Added fields for Title Informations -- after 4 Beta
@@ -285,7 +291,7 @@
'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'OutGoing Mail Server Password',
-
+'LBL_MAIL_SERVER_SMTP'=>'Mail Server (SMTP)',
'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration',
@@ -303,6 +309,10 @@
'LBL_CURRENCY_INFO'=>'Currency Information',
+'LBL_CURRENCY_TITLE'=>'Currency',
+
+'LBL_YES'=>'yes',
+'LBL_NO'=>'no',
//Fields for Settings
@@ -540,16 +550,16 @@
'Invoice'=>'Invoice',
//For Custom Fields
-'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Map Lead Custom Fields',
+'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields',
'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account
,contact, or potential fields. These mappings will be used when you convert leads',
'LBL_MAPPING_INFO'=>'Mapping Information',
-'LBL_ACCOUNT_FIELD'=>'Account Field',
-'LBL_CONTACT_FIELD'=>'Contact Field',
-'LBL_POTENTIAL_FIELD'=>'Potential Field',
+'LBL_ACCOUNT_FIELD'=>'Account Custom Field',
+'LBL_CONTACT_FIELD'=>'Contact Custom Field',
+'LBL_POTENTIAL_FIELD'=>'Potential Custom Field',
'CUSTOMFIELDMAPPING'=>'Custom Field Mapping',
'LBL_FIELD_MAPPING'=>'Field Mapping',
-'LBL_LEAD_FIELD'=>'Lead Field',
+'LBL_LEAD_FIELD'=>'Lead Custom Field',
//After 4.2 GA
'LBL_TEXT_AREA'=>'Text Area',
//for Edit ordering the blocks
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingDetailView.php Tue May 16 07:08:32 2006
@@ -39,9 +39,9 @@
$access_privileges[] = $entity_name;
$access_privileges[] = $entity_perr;
if($entity_perr != 'Private')
- $access_privileges[] = 'Users can '.str_replace('Public:','',$entity_perr).' other users '.$entity_name;
+ $access_privileges[] = $mod_strings['LBL_USR_CAN_ACCESS'] .str_replace('Public:','',$mod_strings[$entity_perr]). $mod_strings['LBL_USR_OTHERS'] . $app_strings[$entity_name];
else
- $access_privileges[] = 'Users cannot access other users '.$entity_name;
+ $access_privileges[] = $mod_strings['LBL_USR_CANNOT_ACCESS'] . $app_strings[$entity_name];
$row++;
}
$access_privileges=array_chunk($access_privileges,3);
@@ -121,7 +121,7 @@
}
elseif($permission == 1)
{
- $perr_out = 'Read Write';
+ $perr_out = 'Read / Write';
}
$access_permission [] = $shareid;
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingEditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingEditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/OrgSharingEditView.php Tue May 16 07:08:32 2006
@@ -52,7 +52,7 @@
{
$selected='selected';
}
- $output .= '<option value="'.$shareActId.'" '.$selected. '>'.$shareActName.'</option>';
+ $output .= '<option value="'.$shareActId.'" '.$selected. '>'.$mod_strings[$shareActName].'</option>';
}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php Tue May 16 07:08:32 2006
@@ -593,16 +593,16 @@
//Block 46
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','treet','Street',1,0,0,100,1,46,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
//Block 47
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
//Vendor Details -- END
@@ -667,10 +667,10 @@
$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
//Block55
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
//Block 56
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
//Quote Details -- END
@@ -721,10 +721,10 @@
$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
//Block61
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
//Block62
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
//Purchase Order Details -- END
@@ -777,10 +777,10 @@
$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
//Block67
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
//Block68
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
//Sales Order Details -- END
@@ -834,9 +834,9 @@
$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
//Block73
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
//Block74
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
//Invoice Details -- END
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 Tue May 16 07:08:32 2006
@@ -329,6 +329,33 @@
'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
'LBL_MESSAGE'=>'Message',
+//Added for Global Privileges
+
+'Public: Read Only'=>'Public: Read Only',
+'Public: Read, Create/Edit'=>'Public: Read, Create/Edit',
+'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete',
+'Private'=>'Private',
+'Hide Details'=>'Hide Details',
+'Hide Details and Add Events'=>'Hide Details and Add Events',
+'Show Details'=>'Show Details',
+'Show Details and Add Events'=>'Show Details and Add Events',
+
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+'LBL_USR_CAN_ACCESS'=>'Users can ',
+'LBL_USR_OTHERS'=>' other users ',
+
+'Read Only '=>'Read Only ',
+'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
+'Read, Create/Edit '=>'Read, Create/Edit ',
+'Read/Write'=>'Read/Write',
+'LBL_GO_TO_TOP'=>'Go to Top',
+'LNK_CLICK_HERE'=>'Click here',
+'LBL_RULE_NO'=>'Rule No.',
+'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
+'LBL_PRIVILEGES'=>'Privileges',
+'LBL_OF'=>'of',
+
+
//Added for 4.2GA support for mail server integration
'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server',
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 Tue May 16 07:08:32 2006
@@ -41,7 +41,15 @@
$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
else
{
- $smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+ $bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+ $adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+ $blocks['basicTab'] = $bas_block;
+ if(is_array($adv_block ))
+ $blocks['moreTab'] = $adv_block;
+
+ $smarty->assign("BLOCKS",$blocks);
+ $smarty->assign("BLOCKS_COUNT",count($blocks));
}
$smarty->assign("OP_MODE",$disp_view);
@@ -91,8 +99,8 @@
$smarty->assign("CHECK", $check_button);
if($focus->mode == 'edit')
-$smarty->display('salesEditView.tpl');
+ $smarty->display('salesEditView.tpl');
else
-$smarty->display('CreateView.tpl');
+ $smarty->display('InventoryCreateView.tpl');
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/Save.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Webmails/Save.php Tue May 16 07:08:32 2006
@@ -1,83 +1,101 @@
-<?php
-
-require_once('modules/Emails/Email.php');
-require_once('modules/Webmails/Webmail.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('include/utils/UserInfoUtil.php');
-global $current_user;
-
-$local_log =& LoggerManager::getLogger('index');
-$focus = new Email();
-
-$to_address = explode(";",$_REQUEST['to_list']);
-$cc_address = explode(";",$_REQUEST['cc_list']);
-$bcc_address = explode(";",$_REQUEST['bcc_list']);
-
-$date = $_REQUEST["date_start"];
-$subject = $_REQUEST['subject'];
-
-$mailInfo = getMailServerInfo($current_user);
-$temprow = $adb->fetch_array($mailInfo);
-
-$login_username= $temprow["mail_username"];
-$secretkey=$temprow["mail_password"];
-$imapServerAddress=$temprow["mail_servername"];
-$start_message=$_REQUEST["start_message"];
-$box_refresh=$temprow["box_refresh"];
-$mails_per_page=$temprow["mails_per_page"];
-$mail_protocol=$temprow["mail_protocol"];
-$ssltype=$temprow["ssltype"];
-$sslmeth=$temprow["sslmeth"];
-
-if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";}
-
-global $mbox;
-$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed");
-
-$email = new Webmail($mbox, $_REQUEST["mailid"]);
-
-if(isset($_REQUEST["email_body"]))
- $msgData = $_REQUEST["email_body"];
+<?php
+
+require_once('modules/Emails/Email.php');
+require_once('modules/Webmails/Webmail.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/utils/UserInfoUtil.php');
+global $current_user;
+
+
+$local_log =& LoggerManager::getLogger('index');
+$focus = new Email();
+
+$to_address = explode(";",$_REQUEST['to_list']);
+$cc_address = explode(";",$_REQUEST['cc_list']);
+$bcc_address = explode(";",$_REQUEST['bcc_list']);
+
+$date = $_REQUEST["date_start"];
+$subject = $_REQUEST['subject'];
+
+$start_message=$_REQUEST["start_message"];
+
+$mailInfo = getMailServerInfo($current_user);
+if($adb->num_rows($mailInfo) < 1) {
+ echo "<center><font color='red'><h3>Please configure your mail settings</h3></font></center>";
+ exit();
+}
+
+$temprow = $adb->fetch_array($mailInfo);
+$login_username= $temprow["mail_username"];
+$secretkey=$temprow["mail_password"];
+$imapServerAddress=$temprow["mail_servername"];
+$box_refresh=$temprow["box_refresh"];
+$mails_per_page=$temprow["mails_per_page"];
+$mail_protocol=$temprow["mail_protocol"];
+$ssltype=$temprow["ssltype"];
+$sslmeth=$temprow["sslmeth"];
+$account_name=$temprow["account_name"];
+
+if($_REQUEST["mailbox"] && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";}
+
+global $mbox;
+//$mbox = @imap_open("{".$imapServerAddress."/".$mail_protocol."/".$ssltype."/".$sslmeth."}".$mailbox, $login_username, $secretkey) or die("Connection to server failed");
+$mbox = @imap_open('{'.$imapServerAddress.'/'.$mail_protocol.'}'.$mailbox, $login_username, $secretkey) or die("Connection to server failed with: ".imap_last_error());
+
+$email = new Webmail($mbox, $_REQUEST["mailid"]);
+
+if(isset($_REQUEST["email_body"]))
+ $msgData = $_REQUEST["email_body"];
else {
$email->loadMail();
$msgData = $email->body;
$subject = $email->subject;
$imported=true;
}
-if($email->relationship != 0)
+
+$focus->column_fields['subject']=$subject;
+$focus->column_fields["activitytype"]="Emails";
+
+$ddate = date("Y-m-d");
+$dtime = date("h:m");
+$focus->column_fields["assigned_user_id"]=$current_user->id;
+$focus->column_fields["date_start"]=$ddate;
+$focus->column_fields["time_start"]=$dtime;
+
+//$tmpBody = preg_replace(array('/<br(.*?)>/i',"/>/i","/</i","/ /i","/&/i","/©/i","/<style(.*?)>(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData);
+//$focus->column_fields["description"]=strip_tags($tmpBody);
+$focus->column_fields["description"]=$msgData;
+
+
+//to save the email details in emaildetails tables
+$fieldid = $adb->query_result($adb->query('select fieldid from field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+if($email->relationship != 0)
{
- $focus->column_fields['parent_id']=$email->relationship["id"];
+ $focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
+}else
+{
+ //if relationship is not available create a contact and relate the email to the contact
+ require_once('modules/Contacts/Contact.php');
+ $contact_focus = new Contact();
+ $contact_focus->column_fields['lastname'] =$email->fromname;
+ $contact_focus->column_fields['email'] = $email->from;
+ $contact_focus->save("Contacts");
+ $focus->column_fields['parent_id']=$contact_focus->id.'@'.$fieldid.'|';
}
-
-$focus->column_fields['subject']=$subject;
-$focus->column_fields["activitytype"]="Emails";
-
-$ddate = date("Y-m-d");
-$dtime = date("h:m");
-$focus->column_fields["assigned_user_id"]=$current_user->id;
-$focus->column_fields["date_start"]=$ddate;
-$focus->column_fields["time_start"]=$dtime;
-
-$tmpBody = preg_replace(array('/<br(.*?)>/i',"/>/i","/</i","/ /i","/&/i","/©/i","/<style(.*?)>(.*?)<\/style>/i","/\{(.*?)\}/i","/BODY/i"),array("\r",">","<"," ","&","(c)","","",""),$msgData);
-$focus->column_fields["description"]=strip_tags($tmpBody);
-
-$focus->save("Emails");
+$_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
+$focus->save("Emails");
+
+//saving in emaildetails table
+$id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
+$all_to_ids = $email->from;
+$query = 'insert into emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
+$adb->query($query);
+
$return_id = $_REQUEST["mailid"];
$return_module='Webmails';
$return_action='ListView';
-
-// check for relationships
-if(!isset($_REQUEST["email_body"])) {
- $return_id = $focus->id;
- $return_module='Emails';
- $return_action='DetailView';
- if($email->relationship != 0) {
- $q = "INSERT INTO seactivityrel (crmid,activityid) VALUES ('".$email->relationship["id"]."','".$focus->id."')";
- $rs = $adb->query($q);
- }
-}
if(isset($_REQUEST["send_mail"]) && $_REQUEST["send_mail"] == "true") {
require_once("sendmail.php");
@@ -87,10 +105,10 @@
$emailaddr = $adb->query_result($res,0,'email1');
$who = $adb->query_result($res,0,'first_name')." ".$adb->query_result($res,0,'last_name');
sendmail($to_address,$cc_address,$bcc_address,$emailaddr,$who,$subject,$msgData);
- header("Location: index.php?action=$return_action&module=$return_module");
+ header("Location: index.php?action=$return_action&module=$return_module");
} else {
if($_POST["ajax"] != "true")
- header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
+ header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
}
return;
Modified: vtigercrm/branches/5.0_postgresql_integration/parent_tabdata.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/parent_tabdata.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/parent_tabdata.php Tue May 16 07:08:32 2006
@@ -1,0 +1,13 @@
+<?php
+
+
+//This file contains the commonly used variables
+
+$parent_tab_info_array=array(1=>'My Home Page',2=>'Marketing',3=>'Sales',4=>'Support',5=>'Analytics',6=>'Inventory',7=>'Tools',8=>'Settings');
+
+
+$parent_child_tab_rel_array=array(1=>array(3,9,17,10,),2=>array(26,6,4,),3=>array(7,6,4,2,20,22,23,14,19,8,),4=>array(13,15,6,4,14,8,),5=>array(1,25,),6=>array(14,18,19,21,22,20,23,),7=>array(24,27,8,),8=>array(),);
+
+
+
+?>
Modified: vtigercrm/branches/5.0_postgresql_integration/tabdata.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/tabdata.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/tabdata.php Tue May 16 07:08:32 2006
@@ -5,5 +5,5 @@
$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Activities'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Calendar'=>17,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,);
-$tab_seq_array=array(3=>0,7=>0,6=>0,4=>0,2=>0,8=>0,9=>0,10=>0,13=>0,14=>0,1=>0,15=>0,16=>2,17=>0,18=>0,19=>0,20=>0,21=>0,22=>0,23=>0,24=>0,25=>0,26=>0,27=>0,28=>0,);
+$tab_seq_array=array('3'=>0,'7'=>0,'6'=>0,'4'=>0,'2'=>0,'8'=>0,'9'=>0,'10'=>0,'13'=>0,'14'=>0,'1'=>0,'15'=>0,'16'=>2,'17'=>0,'18'=>0,'19'=>0,'20'=>0,'21'=>0,'22'=>0,'23'=>0,'24'=>0,'25'=>0,'26'=>0,'27'=>0,'28'=>0,);
?>
More information about the vtigercrm-commits
mailing list